fix(FN-4350): complete Step 4 — pass verification gates

Fusion-Task-Id: FN-4350 Fusion-Task-Lineage: 11fff2c2-1cd1-4562-9b01-032a15217479
2026-05-13 12:20:55 -07:00
parent c3e87e5eec
commit 7cdba43908
1 changed files with 4 additions and 1 deletions
--- a/packages/engine/src/worktree-pool.ts
+++ b/packages/engine/src/worktree-pool.ts
@@ -256,7 +256,10 @@ export class WorktreePool {
      }

      if (!options?.allowSiblingBranchRename) {
-        throw inspection.error;
+        if (inspection.kind === "live") {
+          throw inspection.error;
+        }
+        throw new Error(`Branch ${branchName} is already in use at ${conflictingPath}`);
      }

      const conflictBase = branchName;