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

fix(FN-3305): preserve task branch on worktree conflict retry

Browse Source
This commit is contained in:
gsxdsm
2026-05-03 17:24:19 -07:00
parent 36ad3fa83a
commit 6d4408c179
4 changed files with 63 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -234,10 +234,13 @@ export class WorktreePool {
}
// Conflicting worktree exists and is active — use a suffixed branch name
// to avoid disrupting the other worktree
// to avoid disrupting the other worktree. Seed the suffix from the
// original task branch tip rather than the generic base ref so retries
// preserve the task's commits instead of resetting to main/baseBranch.
const conflictBase = branchName;
for (let suffix = 2; suffix <= 6; suffix++) {
const suffixedName = `${branchName}-${suffix}`;
const suffixedCmd = `git checkout -B "${suffixedName}" ${base}`;
const suffixedCmd = `git checkout -B "${suffixedName}" ${conflictBase}`;
try {
await execAsync(suffixedCmd, { cwd: worktreePath });
return suffixedName;