* test(#2852): add failing-first regression coverage for wave-cleanup isolation Adds the #2852 test matrix to executeWorktreeWaveCleanupPlan: per-entry block reasons must isolate to the blocked entry instead of aborting the rest of the wave, and a deletion must only block when another wave member's branch still touches the deleted path. These fail against the current implementation (RED) — the fix lands in the next commit. * fix(#2852): isolate wave-cleanup blocks to their own entry and scope the deletions guard to real dependents executeWorktreeWaveCleanupPlan aborted the rest of a cleanup wave on the first blocked entry (branch_mismatch, base_mismatch, worktree_dirty, merge_failed, etc.), dumping every remaining entry into `pending` untouched instead of evaluating it. Every per-entry block reason now isolates via `continue` instead of `break` + bulk pending push. The one exception is a failed --no-ff merge, which can leave repoRoot itself mid-merge: that path now attempts `git merge --abort` and only halts the remaining wave if the abort itself fails (an unrecoverable repo-level failure), matching every other block reason's isolation. The `branch_contains_deletions` guard also blocked any deletion unconditionally, even one nothing else in the wave depends on (the reported repro: folding a test file into a sibling and deleting the original). It now blocks only when another wave member's branch still touches the deleted path — computed lazily per wave so a run with no deletions pays no extra git call, and fails closed (still blocks) when a sibling's diff cannot be determined. * fix(#2852): eagerly cache each entry's own diff to fix an ordering bug in the deletions-overlap check The deletions cross-entry overlap check (previous commit) computed each "other" entry's touched-files set lazily, the first time some later entry's overlap check needed it. That is wrong: once an entry has already been merged earlier in the same loop pass, its branch becomes an ancestor of HEAD, and `git diff --name-only HEAD...branch` silently collapses to empty. A dependent entry that appears BEFORE the deleting entry in the manifest (and has therefore already merged by the time the deletion check runs) would be missed, letting a genuinely-depended-on deletion through undetected — a live violation of the negative-space acceptance criterion, caught by /code-review's Spec-axis before this shipped. Fixed by populating each entry's touched-files cache eagerly, during that entry's own turn in the loop, immediately before its own merge attempt (the only step that can move HEAD) — so every entry's diff is captured before it could possibly have been merged, regardless of manifest order. Adds a regression test reproducing the exact broken ordering (dependent merges first, then a later entry tries to delete the file it depends on). * refactor(#2852): extract shared git name-only line parser /code-review's Standards axis flagged duplicated parsing logic: `stdout.split('\n').map((l) => l.trim()).filter(Boolean)` appeared at both the per-entry deletion list and the cross-entry touched-files cache added by this fix. Extracted into parseGitNameOnlyLines(), used by both call sites, so the two can't silently drift apart. * revert(#2852): scope the fix to wave-isolation only, restore unconditional deletions guard #2852's own triage comment explicitly deferred the deletions-guard policy question as a separate product decision ("Policy/enhancement ask, not a defect ... Out of scope: deciding or implementing an opt-in mechanism for intentional deletions"). All four of the issue's actual acceptance criteria concern wave isolation only. The prior two commits on this branch built a cross-entry deletion-dependency heuristic that substituted a derived judgment for that deferred product decision — out of scope for a confirmed-bug fix. Reverts: getEntryChangedFiles, touchedFilesCache, the overlapUnknown fail-closed branch, parseGitNameOnlyLines, and the eager per-turn cache-population call. `branch_contains_deletions` now blocks unconditionally again (byte-identical trigger condition to pre-fix); the only change is `continue` instead of `break` + bulk `pending.push`, same as the other 7 block reasons. Keeps: the full wave-isolation fix (all 8 sites) and the merge_failed / git merge --abort recovery-and-carve-out, both squarely inside the issue's actual acceptance criteria. The deferred opt-in-for-intentional-deletions decision is filed as #3003, citing #2852's triage as origin. * refactor(#2852): extract blockEntry() helper to remove duplicated block-assembly across 8 sites /code-review's Standards axis flagged the repeated "result.status='blocked'; result.reason=...; result.stderr=...; results.push(result); ok=false;" shape at every one of the 8 per-entry block sites this fix touches. Extracted into blockEntry(), called at each site; each call site still owns its own continue/break decision. No behavior change. * fix(#2852): check actual repo state instead of git merge --abort's exit code The merge_failed recovery path decided "genuinely unrecoverable, halt the wave" based on whether `git merge --abort` itself exited successfully. That is not a reliable signal: git refuses many merges (e.g. "your local changes would be overwritten by merge") WITHOUT ever creating a MERGE_HEAD, in which case repoRoot's tree was never touched — but `git merge --abort` still fails with "There is no merge to abort (MERGE_HEAD missing)?" in that exact safe case. Trusting that exit code alone misclassified an ordinary per-entry merge failure as a repo-level one and stranded the rest of the wave — the exact defect #2852 exists to fix, reintroduced through the recovery path (caught in review). Fixed by checking repoRoot's actual state directly via `git rev-parse --verify -q MERGE_HEAD` after the abort attempt: MERGE_HEAD present means genuinely still mid-merge (unrecoverable, halt); absent means safe (isolate and continue), whether because no merge state was ever entered or because abort successfully cleared it. An unexpected git error or timeout degrades to the conservative "still mid-merge" answer rather than throwing or guessing. Rewrites the "unrecoverable merge_failed" test, which previously used the safe "There is no merge to abort" string as its unrecoverable example — that pinned the defect as correct behavior. Adds the missing case: an ordinary merge_failed that never entered a merge state must not abort the wave. * test(#2852): cover repoRootStillMidMerge's fail-closed branches /code-review flagged that the two conservative fail-closed branches of repoRootStillMidMerge (a timeout on the post-abort MERGE_HEAD check, and an unexpected non-0/1 exit code such as a fatal git error) had no test coverage — exactly the branches most likely to hide a mutation survivor (e.g. a flipped `timedOut` check or a flipped final `return true`). Adds both cases: each must halt the wave (fail closed) rather than assume repoRoot is safe when its state cannot be verified. * chore(#2852): backfill changeset PR number to 3009 --------- Co-authored-by: sim <sim@local>
This commit is contained in:
Tom Boucher
5
.changeset/wise-sloths-frolic.md
Normal file
5
.changeset/wise-sloths-frolic.md
Normal file
@@ -0,0 +1,5 @@
|
||||
---
|
||||
type: Fixed
|
||||
pr: 3009
|
||||
---
|
||||
**`worktree cleanup-wave` no longer aborts the rest of a wave when one entry is blocked** — a blocked entry (mismatched branch/base, a deletion, a dirty worktree, or a failed merge/removal) now stays blocked with its existing reason code, while every other independently-clean entry in the wave still merges and is removed instead of being stranded unattempted. (#2852)
|
||||
@@ -519,6 +519,36 @@ function gitResultOk(result: GitResult | null | undefined): boolean {
|
||||
return !!(result && result.exitCode === 0 && !result.timedOut);
|
||||
}
|
||||
|
||||
/**
|
||||
* #2852: after a failed `git merge` + a `git merge --abort` attempt, determine
|
||||
* whether `repoRoot` is STILL mid-merge — the only condition that genuinely
|
||||
* invalidates the rest of a cleanup wave.
|
||||
*
|
||||
* `git merge --abort`'s own exit code is NOT a reliable signal here: git refuses
|
||||
* many merges (e.g. "your local changes to the following files would be
|
||||
* overwritten by merge") WITHOUT ever creating a `MERGE_HEAD`, in which case
|
||||
* `repoRoot`'s tree was never touched and `git merge --abort` correctly fails
|
||||
* with "fatal: There is no merge to abort (MERGE_HEAD missing)?" — a SAFE
|
||||
* outcome, not a broken one. Trusting that exit code alone would misclassify an
|
||||
* ordinary per-entry merge failure as a repo-level one and strand the rest of
|
||||
* the wave (caught in review).
|
||||
*
|
||||
* Checked directly via `git rev-parse --verify -q MERGE_HEAD` against the git
|
||||
* ref itself rather than the filesystem: exit 0 means a merge is genuinely still
|
||||
* in progress (unrecoverable — halt); exit 1 (the ref simply doesn't exist) means
|
||||
* repoRoot is clean, whether because no merge state was ever entered or because
|
||||
* abort successfully cleared it (safe — isolate and continue). Anything else
|
||||
* (a timeout, or an unexpected git error) is treated conservatively as "still
|
||||
* mid-merge" — degrade to the safe/halting answer rather than throw or guess.
|
||||
*/
|
||||
function repoRootStillMidMerge(execGit: ExecGitFn, repoRoot: string): boolean {
|
||||
const check = execGit(['rev-parse', '--verify', '-q', 'MERGE_HEAD'], { cwd: repoRoot });
|
||||
if (check.timedOut) return true; // fail closed — cannot confirm safety
|
||||
if (check.exitCode === 0) return true; // MERGE_HEAD exists — genuinely still mid-merge
|
||||
if (check.exitCode === 1) return false; // ref not found — repoRoot is not mid-merge
|
||||
return true; // any other exit code (e.g. a fatal git error) — fail closed
|
||||
}
|
||||
|
||||
/**
|
||||
* Walk <worktreePath>/.planning/ recursively and collect absolute paths of
|
||||
* all files whose names match *SUMMARY.md. Returns [] when the directory
|
||||
@@ -679,6 +709,19 @@ function executeWorktreeWaveCleanupPlan(plan: WaveCleanupPlan | null, deps: Work
|
||||
const pending: CleanupManifestEntry[] = [];
|
||||
let ok = true;
|
||||
|
||||
// #2852: every per-entry failure site marks the SAME shape — status='blocked',
|
||||
// a reason code, the captured stderr, push to results, flip the overall `ok`
|
||||
// flag — and then either `continue` (isolate, the default) or, for the one
|
||||
// repo-level-failure carve-out, `break`. Factored out so the 8 call sites below
|
||||
// don't repeat the assembly; each site still owns its own control-flow decision.
|
||||
function blockEntry(result: WaveCleanupEntryResult, reason: string, stderr: string): void {
|
||||
result.status = 'blocked';
|
||||
result.reason = reason;
|
||||
result.stderr = stderr;
|
||||
results.push(result);
|
||||
ok = false;
|
||||
}
|
||||
|
||||
for (let i = 0; i < entries.length; i += 1) {
|
||||
const entry = entries[i];
|
||||
const result: WaveCleanupEntryResult = {
|
||||
@@ -690,13 +733,10 @@ function executeWorktreeWaveCleanupPlan(plan: WaveCleanupPlan | null, deps: Work
|
||||
|
||||
const branchCheck = execGit(['-C', entry.worktree_path, 'rev-parse', '--abbrev-ref', 'HEAD'], { cwd: plan.repoRoot });
|
||||
if (!gitResultOk(branchCheck) || branchCheck.stdout.trim() !== entry.branch) {
|
||||
result.status = 'blocked';
|
||||
result.reason = 'branch_mismatch';
|
||||
result.stderr = branchCheck?.stderr || '';
|
||||
results.push(result);
|
||||
pending.push(...entries.slice(i + 1));
|
||||
ok = false;
|
||||
break;
|
||||
blockEntry(result, 'branch_mismatch', branchCheck?.stderr || '');
|
||||
// #2852: isolate — this entry's problem does not touch repoRoot's git state,
|
||||
// so every remaining entry is still independently evaluated.
|
||||
continue;
|
||||
}
|
||||
|
||||
const mergeBase = execGit(['merge-base', 'HEAD', entry.branch], { cwd: plan.repoRoot });
|
||||
@@ -704,33 +744,23 @@ function executeWorktreeWaveCleanupPlan(plan: WaveCleanupPlan | null, deps: Work
|
||||
? entry.allowed_bases
|
||||
: [entry.expected_base];
|
||||
if (!gitResultOk(mergeBase) || !allowedBases.includes(mergeBase.stdout.trim())) {
|
||||
result.status = 'blocked';
|
||||
result.reason = 'base_mismatch';
|
||||
result.stderr = mergeBase?.stderr || '';
|
||||
results.push(result);
|
||||
pending.push(...entries.slice(i + 1));
|
||||
ok = false;
|
||||
break;
|
||||
blockEntry(result, 'base_mismatch', mergeBase?.stderr || '');
|
||||
continue; // #2852: isolate
|
||||
}
|
||||
|
||||
const deletions = execGit(['diff', '--diff-filter=D', '--name-only', `HEAD...${entry.branch}`], { cwd: plan.repoRoot });
|
||||
if (!gitResultOk(deletions)) {
|
||||
result.status = 'blocked';
|
||||
result.reason = 'deletion_check_failed';
|
||||
result.stderr = deletions?.stderr || '';
|
||||
results.push(result);
|
||||
pending.push(...entries.slice(i + 1));
|
||||
ok = false;
|
||||
break;
|
||||
blockEntry(result, 'deletion_check_failed', deletions?.stderr || '');
|
||||
continue; // #2852: isolate
|
||||
}
|
||||
if (deletions.stdout) {
|
||||
result.status = 'blocked';
|
||||
result.reason = 'branch_contains_deletions';
|
||||
result.stderr = deletions.stdout;
|
||||
results.push(result);
|
||||
pending.push(...entries.slice(i + 1));
|
||||
ok = false;
|
||||
break;
|
||||
// Unconditional: any deletion in this entry's branch blocks THIS entry. Whether
|
||||
// that guard should have an opt-in for intentional deletions is a deferred
|
||||
// product decision (issue #2852's own triage scoped it out — tracked in #3003);
|
||||
// this fix only isolates the block to this one entry (#2852) instead of aborting
|
||||
// the rest of the wave, same as every other block reason below.
|
||||
blockEntry(result, 'branch_contains_deletions', deletions.stdout);
|
||||
continue; // #2852: isolate
|
||||
}
|
||||
|
||||
// Safety net: rescue uncommitted SUMMARY.md artifacts before the dirty check.
|
||||
@@ -738,24 +768,14 @@ function executeWorktreeWaveCleanupPlan(plan: WaveCleanupPlan | null, deps: Work
|
||||
// orchestrator commits it. Mirrors quick.md shell fallback (#2296, #2070, #2838, #3804).
|
||||
const { rescuedRelPaths, failures: rescueFailures } = rescueSummaryArtifacts(entry.worktree_path, plan.repoRoot, deps);
|
||||
if (rescueFailures.length > 0) {
|
||||
result.status = 'blocked';
|
||||
result.reason = 'summary_rescue_failed';
|
||||
result.stderr = rescueFailures.map((f) => `${f.relPath}: ${f.error}`).join('; ');
|
||||
results.push(result);
|
||||
pending.push(...entries.slice(i + 1));
|
||||
ok = false;
|
||||
break;
|
||||
blockEntry(result, 'summary_rescue_failed', rescueFailures.map((f) => `${f.relPath}: ${f.error}`).join('; '));
|
||||
continue; // #2852: isolate
|
||||
}
|
||||
|
||||
const worktreeStatus = execGit(['-C', entry.worktree_path, 'status', '--porcelain', '--untracked-files=all'], { cwd: plan.repoRoot });
|
||||
if (!gitResultOk(worktreeStatus)) {
|
||||
result.status = 'blocked';
|
||||
result.reason = 'worktree_dirty';
|
||||
result.stderr = worktreeStatus?.stderr || '';
|
||||
results.push(result);
|
||||
pending.push(...entries.slice(i + 1));
|
||||
ok = false;
|
||||
break;
|
||||
blockEntry(result, 'worktree_dirty', worktreeStatus?.stderr || '');
|
||||
continue; // #2852: isolate
|
||||
}
|
||||
// Filter rescued SUMMARY paths out of the porcelain output before deciding dirty.
|
||||
// A line like "?? .planning/q1-SUMMARY.md" should not block when the SUMMARY
|
||||
@@ -769,24 +789,32 @@ function executeWorktreeWaveCleanupPlan(plan: WaveCleanupPlan | null, deps: Work
|
||||
return !rescuedRelPaths.has(filePath);
|
||||
});
|
||||
if (dirtyLines.length > 0) {
|
||||
result.status = 'blocked';
|
||||
result.reason = 'worktree_dirty';
|
||||
result.stderr = dirtyLines.join('\n');
|
||||
results.push(result);
|
||||
pending.push(...entries.slice(i + 1));
|
||||
ok = false;
|
||||
break;
|
||||
blockEntry(result, 'worktree_dirty', dirtyLines.join('\n'));
|
||||
continue; // #2852: isolate
|
||||
}
|
||||
|
||||
const merge = execGit(['merge', entry.branch, '--no-ff', '--no-edit', '-m', `chore: merge executor worktree (${entry.branch})`], { cwd: plan.repoRoot });
|
||||
if (!gitResultOk(merge)) {
|
||||
result.status = 'blocked';
|
||||
result.reason = 'merge_failed';
|
||||
result.stderr = merge?.stderr || merge?.stdout || '';
|
||||
results.push(result);
|
||||
pending.push(...entries.slice(i + 1));
|
||||
ok = false;
|
||||
break;
|
||||
blockEntry(result, 'merge_failed', merge?.stderr || merge?.stdout || '');
|
||||
// #2852: a failed --no-ff merge MIGHT leave repoRoot itself mid-merge
|
||||
// (MERGE_HEAD set, conflict markers in the tree) — unlike every other block
|
||||
// reason above, that specific state is NOT scoped to this one entry: a second
|
||||
// `git merge` cannot even start while one is in progress, so every remaining
|
||||
// entry would be corrupted by it. But git also refuses many merges WITHOUT ever
|
||||
// entering a merge state (e.g. "your local changes would be overwritten by
|
||||
// merge") — in that case repoRoot's tree was never touched and this failure is
|
||||
// scoped to this entry, same as everything else. Attempt the abort as a
|
||||
// best-effort cleanup, then check repoRoot's ACTUAL state directly — not
|
||||
// `git merge --abort`'s own exit code, which fails "There is no merge to abort"
|
||||
// in the safe case too and would misclassify it as unrecoverable (caught in
|
||||
// review). Only a repo genuinely still mid-merge afterward legitimately halts
|
||||
// the rest of the wave (the brief's "infrastructure-level failure" carve-out).
|
||||
execGit(['merge', '--abort'], { cwd: plan.repoRoot });
|
||||
if (repoRootStillMidMerge(execGit, plan.repoRoot)) {
|
||||
pending.push(...entries.slice(i + 1));
|
||||
break;
|
||||
}
|
||||
continue; // #2852: isolate — repoRoot is not (or no longer) mid-merge
|
||||
}
|
||||
|
||||
let remove = execGit(['worktree', 'remove', entry.worktree_path, '--force'], { cwd: plan.repoRoot });
|
||||
@@ -798,13 +826,10 @@ function executeWorktreeWaveCleanupPlan(plan: WaveCleanupPlan | null, deps: Work
|
||||
remove = execGit(['worktree', 'remove', entry.worktree_path, '--force'], { cwd: plan.repoRoot });
|
||||
}
|
||||
if (!gitResultOk(remove)) {
|
||||
result.status = 'blocked';
|
||||
result.reason = 'worktree_remove_failed';
|
||||
result.stderr = remove?.stderr || '';
|
||||
results.push(result);
|
||||
pending.push(...entries.slice(i + 1));
|
||||
ok = false;
|
||||
break;
|
||||
blockEntry(result, 'worktree_remove_failed', remove?.stderr || '');
|
||||
// #2852: isolate — the merge already landed on repoRoot; only this entry's
|
||||
// worktree/branch teardown is affected.
|
||||
continue;
|
||||
}
|
||||
|
||||
const branchDelete = execGit(['branch', '-D', entry.branch], { cwd: plan.repoRoot });
|
||||
|
||||
@@ -1779,7 +1779,194 @@ describe('executeWorktreeWaveCleanupPlan', () => {
|
||||
assert.equal(calls.some((call) => call.args.join(' ') === 'branch -D worktree-agent-a1'), false);
|
||||
});
|
||||
|
||||
test('stops on merge conflict and records remaining manifest entries', () => {
|
||||
// #2852: this test previously asserted the wave-abort BUG — that a merge conflict on
|
||||
// entry 1 left entry 2 stranded in `pending`, untouched. That is exactly the defect
|
||||
// reported in #2852 (part b): one blocked branch must not abort the rest of the wave.
|
||||
// The corrected contract is exercised as three rows of the #2852 test matrix below:
|
||||
// "an ordinary merge_failed without entering a merge state" (no MERGE_HEAD was ever
|
||||
// created — the common case, e.g. "your local changes would be overwritten" — isolate),
|
||||
// "a recovered merge_failed" (a real conflict, `git merge --abort` clears MERGE_HEAD —
|
||||
// isolate), and "an unrecoverable merge_failed" (MERGE_HEAD is STILL present after the
|
||||
// abort attempt — the one case that genuinely corrupts repoRoot for every remaining
|
||||
// entry — halt).
|
||||
//
|
||||
// CORRECTNESS NOTE (caught in review): `git merge --abort`'s own exit code is NOT the
|
||||
// right signal for "unrecoverable". git legitimately fails abort with "There is no
|
||||
// merge to abort (MERGE_HEAD missing)?" in the SAFE case too — whenever the original
|
||||
// merge never entered a merge state in the first place (no conflict, just a refused
|
||||
// merge). An earlier version of this fix trusted abort's exit code alone, which
|
||||
// misclassified that common safe case as unrecoverable and stranded the rest of the
|
||||
// wave — the exact bug #2852 exists to fix, reintroduced through the recovery path.
|
||||
// The fix checks repoRoot's ACTUAL state via `git rev-parse --verify -q MERGE_HEAD`.
|
||||
|
||||
test('#2852: an ordinary merge_failed without entering a merge state does not abort the wave', () => {
|
||||
// No MERGE_HEAD is ever created here — git refuses the merge outright (e.g. local
|
||||
// changes would be overwritten). `git merge --abort` therefore legitimately fails
|
||||
// with "There is no merge to abort", but repoRoot's tree was never touched, so this
|
||||
// is an ORDINARY per-entry failure — entry 2 must still be evaluated and merge.
|
||||
const plan = {
|
||||
ok: true,
|
||||
repoRoot: '/repo/main',
|
||||
action: 'cleanup_wave',
|
||||
discovery: 'manifest',
|
||||
entries: [
|
||||
{
|
||||
agent_id: 'a1',
|
||||
worktree_path: '/repo/.claude/worktrees/agent-a1',
|
||||
branch: 'worktree-agent-a1',
|
||||
expected_base: 'abc123',
|
||||
},
|
||||
{
|
||||
agent_id: 'a2',
|
||||
worktree_path: '/repo/.claude/worktrees/agent-a2',
|
||||
branch: 'worktree-agent-a2',
|
||||
expected_base: 'abc123',
|
||||
},
|
||||
],
|
||||
};
|
||||
const result = executeWorktreeWaveCleanupPlan(plan, {
|
||||
execGit: (args) => {
|
||||
const key = args.join(' ');
|
||||
if (key === '-C /repo/.claude/worktrees/agent-a1 rev-parse --abbrev-ref HEAD') {
|
||||
return { exitCode: 0, stdout: 'worktree-agent-a1', stderr: '' };
|
||||
}
|
||||
if (key === 'merge-base HEAD worktree-agent-a1') {
|
||||
return { exitCode: 0, stdout: 'abc123', stderr: '' };
|
||||
}
|
||||
if (key === 'diff --diff-filter=D --name-only HEAD...worktree-agent-a1') {
|
||||
return { exitCode: 0, stdout: '', stderr: '' };
|
||||
}
|
||||
if (key === '-C /repo/.claude/worktrees/agent-a1 status --porcelain --untracked-files=all') {
|
||||
return { exitCode: 0, stdout: '', stderr: '' };
|
||||
}
|
||||
if (key.startsWith('merge worktree-agent-a1')) {
|
||||
// No conflict — git refuses the merge outright. No MERGE_HEAD is created.
|
||||
return { exitCode: 1, stdout: '', stderr: 'error: Your local changes to the following files would be overwritten by merge' };
|
||||
}
|
||||
if (key === 'merge --abort') {
|
||||
// Legitimately fails — there was never a merge to abort. NOT a signal of
|
||||
// repo corruption; the wave-isolation decision must not trust this exit code.
|
||||
return { exitCode: 1, stdout: '', stderr: 'fatal: There is no merge to abort (MERGE_HEAD missing)?' };
|
||||
}
|
||||
if (key === 'rev-parse --verify -q MERGE_HEAD') {
|
||||
// repoRoot is NOT mid-merge — the ref simply doesn't exist.
|
||||
return { exitCode: 1, stdout: '', stderr: '' };
|
||||
}
|
||||
// Entry 2 must still be evaluated independently.
|
||||
if (key === '-C /repo/.claude/worktrees/agent-a2 rev-parse --abbrev-ref HEAD') {
|
||||
return { exitCode: 0, stdout: 'worktree-agent-a2', stderr: '' };
|
||||
}
|
||||
if (key === 'merge-base HEAD worktree-agent-a2') {
|
||||
return { exitCode: 0, stdout: 'abc123', stderr: '' };
|
||||
}
|
||||
if (key === 'diff --diff-filter=D --name-only HEAD...worktree-agent-a2') {
|
||||
return { exitCode: 0, stdout: '', stderr: '' };
|
||||
}
|
||||
if (key === '-C /repo/.claude/worktrees/agent-a2 status --porcelain --untracked-files=all') {
|
||||
return { exitCode: 0, stdout: '', stderr: '' };
|
||||
}
|
||||
if (key.startsWith('merge worktree-agent-a2')) {
|
||||
return { exitCode: 0, stdout: '', stderr: '' };
|
||||
}
|
||||
if (key === 'worktree remove /repo/.claude/worktrees/agent-a2 --force') {
|
||||
return { exitCode: 0, stdout: '', stderr: '' };
|
||||
}
|
||||
if (key === 'branch -D worktree-agent-a2') {
|
||||
return { exitCode: 0, stdout: '', stderr: '' };
|
||||
}
|
||||
throw new Error(`unexpected git call: ${key}`);
|
||||
},
|
||||
});
|
||||
assert.equal(result.ok, false, 'overall ok is false because entry 1 blocked');
|
||||
assert.equal(result.entries[0].status, 'blocked');
|
||||
assert.equal(result.entries[0].reason, 'merge_failed');
|
||||
assert.equal(result.entries[1].status, 'merged_removed', 'entry 2 must still merge — no merge state was ever entered');
|
||||
assert.deepEqual(result.pending, [], 'pending must be empty — every entry was evaluated');
|
||||
});
|
||||
|
||||
test('#2852: a recovered merge_failed isolates to entry 1, entry 2 still merges', () => {
|
||||
const calls = [];
|
||||
const plan = {
|
||||
ok: true,
|
||||
repoRoot: '/repo/main',
|
||||
action: 'cleanup_wave',
|
||||
discovery: 'manifest',
|
||||
entries: [
|
||||
{
|
||||
agent_id: 'a1',
|
||||
worktree_path: '/repo/.claude/worktrees/agent-a1',
|
||||
branch: 'worktree-agent-a1',
|
||||
expected_base: 'abc123',
|
||||
},
|
||||
{
|
||||
agent_id: 'a2',
|
||||
worktree_path: '/repo/.claude/worktrees/agent-a2',
|
||||
branch: 'worktree-agent-a2',
|
||||
expected_base: 'abc123',
|
||||
},
|
||||
],
|
||||
};
|
||||
const result = executeWorktreeWaveCleanupPlan(plan, {
|
||||
execGit: (args) => {
|
||||
const key = args.join(' ');
|
||||
calls.push(key);
|
||||
if (key === '-C /repo/.claude/worktrees/agent-a1 rev-parse --abbrev-ref HEAD') {
|
||||
return { exitCode: 0, stdout: 'worktree-agent-a1', stderr: '' };
|
||||
}
|
||||
if (key === 'merge-base HEAD worktree-agent-a1') {
|
||||
return { exitCode: 0, stdout: 'abc123', stderr: '' };
|
||||
}
|
||||
if (key === 'diff --diff-filter=D --name-only HEAD...worktree-agent-a1') {
|
||||
return { exitCode: 0, stdout: '', stderr: '' };
|
||||
}
|
||||
if (key === '-C /repo/.claude/worktrees/agent-a1 status --porcelain --untracked-files=all') {
|
||||
return { exitCode: 0, stdout: '', stderr: '' };
|
||||
}
|
||||
if (key.startsWith('merge worktree-agent-a1')) {
|
||||
// A real conflict — MERGE_HEAD IS created.
|
||||
return { exitCode: 1, stdout: '', stderr: 'CONFLICT' };
|
||||
}
|
||||
if (key === 'merge --abort') {
|
||||
return { exitCode: 0, stdout: '', stderr: '' };
|
||||
}
|
||||
if (key === 'rev-parse --verify -q MERGE_HEAD') {
|
||||
// abort succeeded — repoRoot is no longer mid-merge.
|
||||
return { exitCode: 1, stdout: '', stderr: '' };
|
||||
}
|
||||
// Entry 2 must still be evaluated independently after recovery.
|
||||
if (key === '-C /repo/.claude/worktrees/agent-a2 rev-parse --abbrev-ref HEAD') {
|
||||
return { exitCode: 0, stdout: 'worktree-agent-a2', stderr: '' };
|
||||
}
|
||||
if (key === 'merge-base HEAD worktree-agent-a2') {
|
||||
return { exitCode: 0, stdout: 'abc123', stderr: '' };
|
||||
}
|
||||
if (key === 'diff --diff-filter=D --name-only HEAD...worktree-agent-a2') {
|
||||
return { exitCode: 0, stdout: '', stderr: '' };
|
||||
}
|
||||
if (key === '-C /repo/.claude/worktrees/agent-a2 status --porcelain --untracked-files=all') {
|
||||
return { exitCode: 0, stdout: '', stderr: '' };
|
||||
}
|
||||
if (key.startsWith('merge worktree-agent-a2')) {
|
||||
return { exitCode: 0, stdout: '', stderr: '' };
|
||||
}
|
||||
if (key === 'worktree remove /repo/.claude/worktrees/agent-a2 --force') {
|
||||
return { exitCode: 0, stdout: '', stderr: '' };
|
||||
}
|
||||
if (key === 'branch -D worktree-agent-a2') {
|
||||
return { exitCode: 0, stdout: '', stderr: '' };
|
||||
}
|
||||
throw new Error(`unexpected git call: ${key}`);
|
||||
},
|
||||
});
|
||||
assert.equal(result.ok, false, 'overall ok is false because entry 1 blocked');
|
||||
assert.equal(result.entries[0].status, 'blocked');
|
||||
assert.equal(result.entries[0].reason, 'merge_failed');
|
||||
assert.equal(result.entries[1].status, 'merged_removed', 'entry 2 must still merge — isolation, not wave-abort');
|
||||
assert.deepEqual(result.pending, [], 'pending must be empty — every entry was evaluated');
|
||||
assert.ok(calls.includes('merge --abort'), 'a failed merge must attempt recovery with git merge --abort');
|
||||
});
|
||||
|
||||
test('#2852: an unrecoverable merge_failed (repoRoot STILL mid-merge after abort) legitimately halts the remaining wave', () => {
|
||||
const plan = {
|
||||
ok: true,
|
||||
repoRoot: '/repo/main',
|
||||
@@ -1818,12 +2005,150 @@ describe('executeWorktreeWaveCleanupPlan', () => {
|
||||
if (key.startsWith('merge worktree-agent-a1')) {
|
||||
return { exitCode: 1, stdout: '', stderr: 'CONFLICT' };
|
||||
}
|
||||
throw new Error(`unexpected git call after conflict: ${key}`);
|
||||
if (key === 'merge --abort') {
|
||||
return { exitCode: 1, stdout: '', stderr: 'fatal: unable to abort' };
|
||||
}
|
||||
if (key === 'rev-parse --verify -q MERGE_HEAD') {
|
||||
// repoRoot IS genuinely still mid-merge — the abort attempt did not clear it.
|
||||
// This, not abort's own exit code, is what legitimately halts the wave.
|
||||
return { exitCode: 0, stdout: 'deadbeefdeadbeefdeadbeefdeadbeefdeadbeef', stderr: '' };
|
||||
}
|
||||
throw new Error(`unexpected git call — repoRoot is unrecoverable, entry 2 must not be evaluated: ${key}`);
|
||||
},
|
||||
});
|
||||
assert.equal(result.ok, false);
|
||||
assert.equal(result.entries[0].status, 'blocked');
|
||||
assert.equal(result.entries[0].reason, 'merge_failed');
|
||||
assert.equal(result.entries.length, 1, 'entry 2 must not have been evaluated at all');
|
||||
assert.deepEqual(result.pending.map((entry) => entry.branch), ['worktree-agent-a2']);
|
||||
});
|
||||
|
||||
test('#2852: an unverifiable repo state after merge_failed (rev-parse times out) fails closed and halts the wave', () => {
|
||||
// Boundary coverage for repoRootStillMidMerge's fail-closed branches (caught in
|
||||
// review as an untested mutation-survivor risk): when the post-abort
|
||||
// `git rev-parse --verify -q MERGE_HEAD` check itself cannot be trusted — here, it
|
||||
// times out — the module's existing degrade-not-throw contract applies: treat the
|
||||
// repo state as unknown-therefore-unsafe (still mid-merge) rather than guessing
|
||||
// it's clean. Entry 2 must NOT be evaluated.
|
||||
const plan = {
|
||||
ok: true,
|
||||
repoRoot: '/repo/main',
|
||||
action: 'cleanup_wave',
|
||||
discovery: 'manifest',
|
||||
entries: [
|
||||
{
|
||||
agent_id: 'a1',
|
||||
worktree_path: '/repo/.claude/worktrees/agent-a1',
|
||||
branch: 'worktree-agent-a1',
|
||||
expected_base: 'abc123',
|
||||
},
|
||||
{
|
||||
agent_id: 'a2',
|
||||
worktree_path: '/repo/.claude/worktrees/agent-a2',
|
||||
branch: 'worktree-agent-a2',
|
||||
expected_base: 'abc123',
|
||||
},
|
||||
],
|
||||
};
|
||||
const result = executeWorktreeWaveCleanupPlan(plan, {
|
||||
execGit: (args) => {
|
||||
const key = args.join(' ');
|
||||
if (key === '-C /repo/.claude/worktrees/agent-a1 rev-parse --abbrev-ref HEAD') {
|
||||
return { exitCode: 0, stdout: 'worktree-agent-a1', stderr: '' };
|
||||
}
|
||||
if (key === 'merge-base HEAD worktree-agent-a1') {
|
||||
return { exitCode: 0, stdout: 'abc123', stderr: '' };
|
||||
}
|
||||
if (key === 'diff --diff-filter=D --name-only HEAD...worktree-agent-a1') {
|
||||
return { exitCode: 0, stdout: '', stderr: '' };
|
||||
}
|
||||
if (key === '-C /repo/.claude/worktrees/agent-a1 status --porcelain --untracked-files=all') {
|
||||
return { exitCode: 0, stdout: '', stderr: '' };
|
||||
}
|
||||
if (key.startsWith('merge worktree-agent-a1')) {
|
||||
return { exitCode: 1, stdout: '', stderr: 'CONFLICT' };
|
||||
}
|
||||
if (key === 'merge --abort') {
|
||||
return { exitCode: 0, stdout: '', stderr: '' };
|
||||
}
|
||||
if (key === 'rev-parse --verify -q MERGE_HEAD') {
|
||||
// Cannot determine repo state — the check itself timed out.
|
||||
return {
|
||||
exitCode: null,
|
||||
stdout: '',
|
||||
stderr: '',
|
||||
timedOut: true,
|
||||
signal: 'SIGTERM',
|
||||
error: Object.assign(new Error('spawnSync git ETIMEDOUT'), { code: 'ETIMEDOUT' }),
|
||||
};
|
||||
}
|
||||
throw new Error(`unexpected git call — repo state is unverified, entry 2 must not be evaluated: ${key}`);
|
||||
},
|
||||
});
|
||||
assert.equal(result.ok, false);
|
||||
assert.equal(result.entries[0].status, 'blocked');
|
||||
assert.equal(result.entries[0].reason, 'merge_failed');
|
||||
assert.equal(result.entries.length, 1, 'entry 2 must not have been evaluated — state is unverified, fail closed');
|
||||
assert.deepEqual(result.pending.map((entry) => entry.branch), ['worktree-agent-a2']);
|
||||
});
|
||||
|
||||
test('#2852: an unverifiable repo state after merge_failed (rev-parse errors unexpectedly) fails closed and halts the wave', () => {
|
||||
// Same boundary as the timeout case, but for a non-0/1 exit code (e.g. a fatal git
|
||||
// error, code 128) from the post-abort MERGE_HEAD check — neither "found" (0) nor
|
||||
// the well-known "not found" (1). Must also fail closed.
|
||||
const plan = {
|
||||
ok: true,
|
||||
repoRoot: '/repo/main',
|
||||
action: 'cleanup_wave',
|
||||
discovery: 'manifest',
|
||||
entries: [
|
||||
{
|
||||
agent_id: 'a1',
|
||||
worktree_path: '/repo/.claude/worktrees/agent-a1',
|
||||
branch: 'worktree-agent-a1',
|
||||
expected_base: 'abc123',
|
||||
},
|
||||
{
|
||||
agent_id: 'a2',
|
||||
worktree_path: '/repo/.claude/worktrees/agent-a2',
|
||||
branch: 'worktree-agent-a2',
|
||||
expected_base: 'abc123',
|
||||
},
|
||||
],
|
||||
};
|
||||
const result = executeWorktreeWaveCleanupPlan(plan, {
|
||||
execGit: (args) => {
|
||||
const key = args.join(' ');
|
||||
if (key === '-C /repo/.claude/worktrees/agent-a1 rev-parse --abbrev-ref HEAD') {
|
||||
return { exitCode: 0, stdout: 'worktree-agent-a1', stderr: '' };
|
||||
}
|
||||
if (key === 'merge-base HEAD worktree-agent-a1') {
|
||||
return { exitCode: 0, stdout: 'abc123', stderr: '' };
|
||||
}
|
||||
if (key === 'diff --diff-filter=D --name-only HEAD...worktree-agent-a1') {
|
||||
return { exitCode: 0, stdout: '', stderr: '' };
|
||||
}
|
||||
if (key === '-C /repo/.claude/worktrees/agent-a1 status --porcelain --untracked-files=all') {
|
||||
return { exitCode: 0, stdout: '', stderr: '' };
|
||||
}
|
||||
if (key.startsWith('merge worktree-agent-a1')) {
|
||||
return { exitCode: 1, stdout: '', stderr: 'CONFLICT' };
|
||||
}
|
||||
if (key === 'merge --abort') {
|
||||
return { exitCode: 0, stdout: '', stderr: '' };
|
||||
}
|
||||
if (key === 'rev-parse --verify -q MERGE_HEAD') {
|
||||
// A fatal git error (e.g. corrupted repo) — neither the "found" (0) nor the
|
||||
// well-known "not found" (1) exit code.
|
||||
return { exitCode: 128, stdout: '', stderr: 'fatal: not a git repository' };
|
||||
}
|
||||
throw new Error(`unexpected git call — repo state is unverified, entry 2 must not be evaluated: ${key}`);
|
||||
},
|
||||
});
|
||||
assert.equal(result.ok, false);
|
||||
assert.equal(result.entries[0].status, 'blocked');
|
||||
assert.equal(result.entries[0].reason, 'merge_failed');
|
||||
assert.equal(result.entries.length, 1, 'entry 2 must not have been evaluated — state is unverified, fail closed');
|
||||
assert.deepEqual(result.pending.map((entry) => entry.branch), ['worktree-agent-a2']);
|
||||
});
|
||||
|
||||
@@ -2428,6 +2753,337 @@ describe('executeWorktreeWaveCleanupPlan', () => {
|
||||
assert.equal(calls.some((call) => call === 'worktree remove /repo/.claude/worktrees/agent-a1 --force'), false);
|
||||
assert.equal(calls.some((call) => call === 'branch -D worktree-agent-a1'), false);
|
||||
});
|
||||
|
||||
// ─── #2852: wave-abort isolation ───────────────────────────────────────────
|
||||
//
|
||||
// Every per-entry block reason (branch_mismatch, base_mismatch,
|
||||
// branch_contains_deletions, deletion_check_failed, summary_rescue_failed,
|
||||
// worktree_dirty ×2, merge_failed, worktree_remove_failed) previously aborted
|
||||
// the REST of the wave via `pending.push(...entries.slice(i + 1)); break;`.
|
||||
// Fixed by isolating each block to its own entry (`continue`), except an
|
||||
// unrecoverable `merge_failed` (repoRoot itself left mid-merge), which
|
||||
// legitimately halts the remaining wave.
|
||||
//
|
||||
// Scope note: `branch_contains_deletions` itself STAYS unconditional — any
|
||||
// deletion in an entry's branch blocks that entry, exactly as before this fix.
|
||||
// Issue #2852's own triage explicitly scoped an opt-in for intentional
|
||||
// deletions OUT of this fix as a separate, deferred product decision (see the
|
||||
// tracked follow-up issue cited in the fix commit); only the wave-abort
|
||||
// behavior is in scope here.
|
||||
|
||||
function makeEntry(id, branch, base = 'abc123') {
|
||||
return {
|
||||
agent_id: id,
|
||||
worktree_path: `/repo/.claude/worktrees/agent-${id}`,
|
||||
branch,
|
||||
expected_base: base,
|
||||
};
|
||||
}
|
||||
|
||||
// Default git responses for an entry that should merge cleanly: no branch/base
|
||||
// mismatch, no deletions, no dirty files. Returns undefined for an unmatched key
|
||||
// so callers can layer entry-specific overrides in front of this fallback.
|
||||
function cleanEntryResponse(key, branch, worktreePath) {
|
||||
if (key === `-C ${worktreePath} rev-parse --abbrev-ref HEAD`) {
|
||||
return { exitCode: 0, stdout: branch, stderr: '' };
|
||||
}
|
||||
if (key === `merge-base HEAD ${branch}`) {
|
||||
return { exitCode: 0, stdout: 'abc123', stderr: '' };
|
||||
}
|
||||
if (key === `diff --diff-filter=D --name-only HEAD...${branch}`) {
|
||||
return { exitCode: 0, stdout: '', stderr: '' };
|
||||
}
|
||||
if (key === `-C ${worktreePath} status --porcelain --untracked-files=all`) {
|
||||
return { exitCode: 0, stdout: '', stderr: '' };
|
||||
}
|
||||
if (key === `merge ${branch} --no-ff --no-edit -m chore: merge executor worktree (${branch})`) {
|
||||
return { exitCode: 0, stdout: '', stderr: '' };
|
||||
}
|
||||
if (key === `worktree remove ${worktreePath} --force`) {
|
||||
return { exitCode: 0, stdout: '', stderr: '' };
|
||||
}
|
||||
if (key === `branch -D ${branch}`) {
|
||||
return { exitCode: 0, stdout: '', stderr: '' };
|
||||
}
|
||||
return undefined;
|
||||
}
|
||||
|
||||
test('#2852: a branch_mismatch block on entry 1 does not abort entries 2 and 3', () => {
|
||||
const e1 = makeEntry('a1', 'worktree-agent-a1');
|
||||
const e2 = makeEntry('a2', 'worktree-agent-a2');
|
||||
const e3 = makeEntry('a3', 'worktree-agent-a3');
|
||||
const plan = { ok: true, repoRoot: '/repo/main', action: 'cleanup_wave', discovery: 'manifest', entries: [e1, e2, e3] };
|
||||
const result = executeWorktreeWaveCleanupPlan(plan, {
|
||||
execGit: (args) => {
|
||||
const key = args.join(' ');
|
||||
if (key === '-C /repo/.claude/worktrees/agent-a1 rev-parse --abbrev-ref HEAD') {
|
||||
// HEAD is on the wrong branch — branch_mismatch
|
||||
return { exitCode: 0, stdout: 'some-other-branch', stderr: '' };
|
||||
}
|
||||
const clean2 = cleanEntryResponse(key, e2.branch, e2.worktree_path);
|
||||
if (clean2) return clean2;
|
||||
const clean3 = cleanEntryResponse(key, e3.branch, e3.worktree_path);
|
||||
if (clean3) return clean3;
|
||||
throw new Error(`unexpected git call: ${key}`);
|
||||
},
|
||||
});
|
||||
assert.equal(result.ok, false);
|
||||
assert.equal(result.entries.length, 3, 'all three entries must be evaluated');
|
||||
assert.equal(result.entries[0].status, 'blocked');
|
||||
assert.equal(result.entries[0].reason, 'branch_mismatch');
|
||||
assert.equal(result.entries[1].status, 'merged_removed');
|
||||
assert.equal(result.entries[2].status, 'merged_removed');
|
||||
assert.deepEqual(result.pending, [], 'pending must be empty — every entry was evaluated');
|
||||
});
|
||||
|
||||
test('#2852: a base_mismatch block on entry 1 does not abort entry 2', () => {
|
||||
const e1 = makeEntry('a1', 'worktree-agent-a1');
|
||||
const e2 = makeEntry('a2', 'worktree-agent-a2');
|
||||
const plan = { ok: true, repoRoot: '/repo/main', action: 'cleanup_wave', discovery: 'manifest', entries: [e1, e2] };
|
||||
const result = executeWorktreeWaveCleanupPlan(plan, {
|
||||
execGit: (args) => {
|
||||
const key = args.join(' ');
|
||||
if (key === '-C /repo/.claude/worktrees/agent-a1 rev-parse --abbrev-ref HEAD') {
|
||||
return { exitCode: 0, stdout: 'worktree-agent-a1', stderr: '' };
|
||||
}
|
||||
if (key === 'merge-base HEAD worktree-agent-a1') {
|
||||
return { exitCode: 0, stdout: 'unrelatedbase', stderr: '' };
|
||||
}
|
||||
const clean2 = cleanEntryResponse(key, e2.branch, e2.worktree_path);
|
||||
if (clean2) return clean2;
|
||||
throw new Error(`unexpected git call: ${key}`);
|
||||
},
|
||||
});
|
||||
assert.equal(result.ok, false);
|
||||
assert.equal(result.entries[0].status, 'blocked');
|
||||
assert.equal(result.entries[0].reason, 'base_mismatch');
|
||||
assert.equal(result.entries[1].status, 'merged_removed');
|
||||
assert.deepEqual(result.pending, []);
|
||||
});
|
||||
|
||||
test('#2852: a branch_contains_deletions block on entry 1 does not abort entry 2', () => {
|
||||
// Scope note: the deletions guard itself stays UNCONDITIONAL (any deletion in
|
||||
// entry 1's branch blocks entry 1) — issue #2852's own triage scoped an opt-in
|
||||
// for intentional deletions OUT of this fix as a separate product decision
|
||||
// (tracked in #3003). This fix only isolates the block to entry 1 instead of
|
||||
// aborting the rest of the wave, same as every other block reason.
|
||||
const e1 = makeEntry('a1', 'worktree-agent-a1');
|
||||
const e2 = makeEntry('a2', 'worktree-agent-a2');
|
||||
const plan = { ok: true, repoRoot: '/repo/main', action: 'cleanup_wave', discovery: 'manifest', entries: [e1, e2] };
|
||||
const result = executeWorktreeWaveCleanupPlan(plan, {
|
||||
execGit: (args) => {
|
||||
const key = args.join(' ');
|
||||
if (key === '-C /repo/.claude/worktrees/agent-a1 rev-parse --abbrev-ref HEAD') {
|
||||
return { exitCode: 0, stdout: 'worktree-agent-a1', stderr: '' };
|
||||
}
|
||||
if (key === 'merge-base HEAD worktree-agent-a1') {
|
||||
return { exitCode: 0, stdout: 'abc123', stderr: '' };
|
||||
}
|
||||
if (key === 'diff --diff-filter=D --name-only HEAD...worktree-agent-a1') {
|
||||
return { exitCode: 0, stdout: 'src/lib/payments/__tests__/payment-allocation.test.ts', stderr: '' };
|
||||
}
|
||||
const clean2 = cleanEntryResponse(key, e2.branch, e2.worktree_path);
|
||||
if (clean2) return clean2;
|
||||
throw new Error(`unexpected git call: ${key}`);
|
||||
},
|
||||
});
|
||||
assert.equal(result.ok, false);
|
||||
assert.equal(result.entries[0].status, 'blocked');
|
||||
assert.equal(result.entries[0].reason, 'branch_contains_deletions');
|
||||
assert.equal(result.entries[1].status, 'merged_removed', 'entry 2 must still merge — isolation, not wave-abort');
|
||||
assert.deepEqual(result.pending, []);
|
||||
});
|
||||
|
||||
test('#2852: a worktree_remove_failed on entry 1 does not abort entry 2', () => {
|
||||
const e1 = makeEntry('a1', 'worktree-agent-a1');
|
||||
const e2 = makeEntry('a2', 'worktree-agent-a2');
|
||||
const plan = { ok: true, repoRoot: '/repo/main', action: 'cleanup_wave', discovery: 'manifest', entries: [e1, e2] };
|
||||
const result = executeWorktreeWaveCleanupPlan(plan, {
|
||||
execGit: (args) => {
|
||||
const key = args.join(' ');
|
||||
if (key === '-C /repo/.claude/worktrees/agent-a1 rev-parse --abbrev-ref HEAD') {
|
||||
return { exitCode: 0, stdout: 'worktree-agent-a1', stderr: '' };
|
||||
}
|
||||
if (key === 'merge-base HEAD worktree-agent-a1') {
|
||||
return { exitCode: 0, stdout: 'abc123', stderr: '' };
|
||||
}
|
||||
if (key === 'diff --diff-filter=D --name-only HEAD...worktree-agent-a1') {
|
||||
return { exitCode: 0, stdout: '', stderr: '' };
|
||||
}
|
||||
if (key === '-C /repo/.claude/worktrees/agent-a1 status --porcelain --untracked-files=all') {
|
||||
return { exitCode: 0, stdout: '', stderr: '' };
|
||||
}
|
||||
if (key.startsWith('merge worktree-agent-a1')) {
|
||||
return { exitCode: 0, stdout: '', stderr: '' };
|
||||
}
|
||||
if (key === 'worktree unlock /repo/.claude/worktrees/agent-a1') {
|
||||
return { exitCode: 1, stdout: '', stderr: 'not locked' };
|
||||
}
|
||||
if (key === 'worktree remove /repo/.claude/worktrees/agent-a1 --force') {
|
||||
return { exitCode: 1, stdout: '', stderr: 'still locked' };
|
||||
}
|
||||
const clean2 = cleanEntryResponse(key, e2.branch, e2.worktree_path);
|
||||
if (clean2) return clean2;
|
||||
throw new Error(`unexpected git call: ${key}`);
|
||||
},
|
||||
});
|
||||
assert.equal(result.ok, false);
|
||||
assert.equal(result.entries[0].status, 'blocked');
|
||||
assert.equal(result.entries[0].reason, 'worktree_remove_failed');
|
||||
assert.equal(result.entries[1].status, 'merged_removed');
|
||||
assert.deepEqual(result.pending, []);
|
||||
});
|
||||
|
||||
test('#2852: a deletion_check_failed on entry 1 does not abort entry 2', () => {
|
||||
const e1 = makeEntry('a1', 'worktree-agent-a1');
|
||||
const e2 = makeEntry('a2', 'worktree-agent-a2');
|
||||
const plan = { ok: true, repoRoot: '/repo/main', action: 'cleanup_wave', discovery: 'manifest', entries: [e1, e2] };
|
||||
const result = executeWorktreeWaveCleanupPlan(plan, {
|
||||
execGit: (args) => {
|
||||
const key = args.join(' ');
|
||||
if (key === '-C /repo/.claude/worktrees/agent-a1 rev-parse --abbrev-ref HEAD') {
|
||||
return { exitCode: 0, stdout: 'worktree-agent-a1', stderr: '' };
|
||||
}
|
||||
if (key === 'merge-base HEAD worktree-agent-a1') {
|
||||
return { exitCode: 0, stdout: 'abc123', stderr: '' };
|
||||
}
|
||||
if (key === 'diff --diff-filter=D --name-only HEAD...worktree-agent-a1') {
|
||||
// simulate a timed-out / errored git diff for entry 1
|
||||
return { exitCode: 1, stdout: '', stderr: 'fatal: unable to read tree', timedOut: true };
|
||||
}
|
||||
const clean2 = cleanEntryResponse(key, e2.branch, e2.worktree_path);
|
||||
if (clean2) return clean2;
|
||||
throw new Error(`unexpected git call: ${key}`);
|
||||
},
|
||||
});
|
||||
assert.equal(result.ok, false);
|
||||
assert.equal(result.entries[0].status, 'blocked');
|
||||
assert.equal(result.entries[0].reason, 'deletion_check_failed');
|
||||
assert.equal(result.entries[1].status, 'merged_removed');
|
||||
assert.deepEqual(result.pending, []);
|
||||
});
|
||||
|
||||
test('#2852: worktree_dirty (status query failed) on entry 1 does not abort entry 2', () => {
|
||||
const e1 = makeEntry('a1', 'worktree-agent-a1');
|
||||
const e2 = makeEntry('a2', 'worktree-agent-a2');
|
||||
const plan = { ok: true, repoRoot: '/repo/main', action: 'cleanup_wave', discovery: 'manifest', entries: [e1, e2] };
|
||||
const result = executeWorktreeWaveCleanupPlan(plan, {
|
||||
execGit: (args) => {
|
||||
const key = args.join(' ');
|
||||
if (key === '-C /repo/.claude/worktrees/agent-a1 rev-parse --abbrev-ref HEAD') {
|
||||
return { exitCode: 0, stdout: 'worktree-agent-a1', stderr: '' };
|
||||
}
|
||||
if (key === 'merge-base HEAD worktree-agent-a1') {
|
||||
return { exitCode: 0, stdout: 'abc123', stderr: '' };
|
||||
}
|
||||
if (key === 'diff --diff-filter=D --name-only HEAD...worktree-agent-a1') {
|
||||
return { exitCode: 0, stdout: '', stderr: '' };
|
||||
}
|
||||
if (key === '-C /repo/.claude/worktrees/agent-a1 status --porcelain --untracked-files=all') {
|
||||
return { exitCode: 1, stdout: '', stderr: 'fatal: index corrupt' };
|
||||
}
|
||||
const clean2 = cleanEntryResponse(key, e2.branch, e2.worktree_path);
|
||||
if (clean2) return clean2;
|
||||
throw new Error(`unexpected git call: ${key}`);
|
||||
},
|
||||
});
|
||||
assert.equal(result.ok, false);
|
||||
assert.equal(result.entries[0].status, 'blocked');
|
||||
assert.equal(result.entries[0].reason, 'worktree_dirty');
|
||||
assert.equal(result.entries[1].status, 'merged_removed');
|
||||
});
|
||||
|
||||
test('#2852: worktree_dirty (real dirty lines) on entry 1 does not abort entry 2', () => {
|
||||
const e1 = makeEntry('a1', 'worktree-agent-a1');
|
||||
const e2 = makeEntry('a2', 'worktree-agent-a2');
|
||||
const plan = { ok: true, repoRoot: '/repo/main', action: 'cleanup_wave', discovery: 'manifest', entries: [e1, e2] };
|
||||
const result = executeWorktreeWaveCleanupPlan(plan, {
|
||||
execGit: (args) => {
|
||||
const key = args.join(' ');
|
||||
if (key === '-C /repo/.claude/worktrees/agent-a1 rev-parse --abbrev-ref HEAD') {
|
||||
return { exitCode: 0, stdout: 'worktree-agent-a1', stderr: '' };
|
||||
}
|
||||
if (key === 'merge-base HEAD worktree-agent-a1') {
|
||||
return { exitCode: 0, stdout: 'abc123', stderr: '' };
|
||||
}
|
||||
if (key === 'diff --diff-filter=D --name-only HEAD...worktree-agent-a1') {
|
||||
return { exitCode: 0, stdout: '', stderr: '' };
|
||||
}
|
||||
if (key === '-C /repo/.claude/worktrees/agent-a1 status --porcelain --untracked-files=all') {
|
||||
return { exitCode: 0, stdout: '?? scratch.txt', stderr: '' };
|
||||
}
|
||||
const clean2 = cleanEntryResponse(key, e2.branch, e2.worktree_path);
|
||||
if (clean2) return clean2;
|
||||
throw new Error(`unexpected git call: ${key}`);
|
||||
},
|
||||
});
|
||||
assert.equal(result.ok, false);
|
||||
assert.equal(result.entries[0].status, 'blocked');
|
||||
assert.equal(result.entries[0].reason, 'worktree_dirty');
|
||||
assert.equal(result.entries[1].status, 'merged_removed');
|
||||
});
|
||||
|
||||
test('#2852: a summary_rescue_failed on entry 1 does not abort entry 2', () => {
|
||||
const e1 = makeEntry('a1', 'worktree-agent-a1');
|
||||
const e2 = makeEntry('a2', 'worktree-agent-a2');
|
||||
const plan = { ok: true, repoRoot: '/repo/main', action: 'cleanup_wave', discovery: 'manifest', entries: [e1, e2] };
|
||||
const result = executeWorktreeWaveCleanupPlan(plan, {
|
||||
execGit: (args) => {
|
||||
const key = args.join(' ');
|
||||
if (key === '-C /repo/.claude/worktrees/agent-a1 rev-parse --abbrev-ref HEAD') {
|
||||
return { exitCode: 0, stdout: 'worktree-agent-a1', stderr: '' };
|
||||
}
|
||||
if (key === 'merge-base HEAD worktree-agent-a1') {
|
||||
return { exitCode: 0, stdout: 'abc123', stderr: '' };
|
||||
}
|
||||
if (key === 'diff --diff-filter=D --name-only HEAD...worktree-agent-a1') {
|
||||
return { exitCode: 0, stdout: '', stderr: '' };
|
||||
}
|
||||
if (key === '-C /repo/.claude/worktrees/agent-a1 cat-file -e HEAD:.planning/q1-SUMMARY.md') {
|
||||
return { exitCode: 128, stdout: '', stderr: "fatal: path '.planning/q1-SUMMARY.md' does not exist in 'HEAD'" };
|
||||
}
|
||||
const clean2 = cleanEntryResponse(key, e2.branch, e2.worktree_path);
|
||||
if (clean2) return clean2;
|
||||
throw new Error(`unexpected git call: ${key}`);
|
||||
},
|
||||
findSummaryFiles: (worktreePath) => {
|
||||
if (worktreePath === '/repo/.claude/worktrees/agent-a1') {
|
||||
return ['/repo/.claude/worktrees/agent-a1/.planning/q1-SUMMARY.md'];
|
||||
}
|
||||
return [];
|
||||
},
|
||||
readFileSync: () => 'summary content',
|
||||
existsSync: () => false,
|
||||
mkdirSync: () => {},
|
||||
copyFileSync: () => { throw new Error('ENOSPC: no space left on device'); },
|
||||
});
|
||||
assert.equal(result.ok, false);
|
||||
assert.equal(result.entries[0].status, 'blocked');
|
||||
assert.equal(result.entries[0].reason, 'summary_rescue_failed');
|
||||
assert.equal(result.entries[1].status, 'merged_removed');
|
||||
});
|
||||
|
||||
test('#2852: an all-clean 3-entry wave still merges every entry (unchanged)', () => {
|
||||
const e1 = makeEntry('a1', 'worktree-agent-a1');
|
||||
const e2 = makeEntry('a2', 'worktree-agent-a2');
|
||||
const e3 = makeEntry('a3', 'worktree-agent-a3');
|
||||
const plan = { ok: true, repoRoot: '/repo/main', action: 'cleanup_wave', discovery: 'manifest', entries: [e1, e2, e3] };
|
||||
const result = executeWorktreeWaveCleanupPlan(plan, {
|
||||
execGit: (args) => {
|
||||
const key = args.join(' ');
|
||||
for (const e of [e1, e2, e3]) {
|
||||
const clean = cleanEntryResponse(key, e.branch, e.worktree_path);
|
||||
if (clean) return clean;
|
||||
}
|
||||
throw new Error(`unexpected git call: ${key}`);
|
||||
},
|
||||
});
|
||||
assert.equal(result.ok, true);
|
||||
assert.equal(result.entries.length, 3);
|
||||
assert.ok(result.entries.every((e) => e.status === 'merged_removed'));
|
||||
assert.deepEqual(result.pending, []);
|
||||
});
|
||||
|
||||
});
|
||||
|
||||
// ─── MOVE 2: resolveWorktreeRoot and pruneOrphanedWorktrees (#1268 T0) ────────
|
||||
|
||||
Reference in New Issue
Block a user