root/fusion
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat(FN-4508): complete Step 2 — handle tip-already-merged recovery paths

Browse Source 
Fusion-Task-Id: FN-4508
Fusion-Task-Lineage: 948a9cae-3975-4f15-bd47-2f88b379171d
This commit is contained in:
Fusion
2026-05-14 16:02:21 -07:00
committed by gsxdsm
parent 663e5d2cdc
commit 473ea373b8
3 changed files with 120 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
packages/engine/src/worktree-pool.ts
View File

@@ -267,8 +267,15 @@ export class WorktreePool {
ownerTaskId: taskId,
startPoint: base,
});
if (inspection.kind === "stale" || inspection.kind === "stale-resolved") {
if (inspection.kind === "stale" || inspection.kind === "stale-resolved" || inspection.kind === "tip-already-merged") {
await execAsync("git worktree prune", { cwd: worktreePath });
if (inspection.kind === "tip-already-merged") {
try {
await execAsync(`git branch -D "${branchName}"`, { cwd: worktreePath });
} catch {
// best-effort
}
}
await execAsync(checkoutCmd, { cwd: worktreePath });
await assertCleanBranchAtBase(worktreePath, branchName, resolvedBase, taskId);
return { branch: branchName, worktreePath, reclaimed: false };