feat(FN-4068): add branch conflict detection and recovery for stale worktre

Implements branch conflict detection and recovery across the Fusion engine, CLI, and dashboard — surfacing git worktree conflicts when tasks conflict with unrelated branch state, and providing a recovery workflow to resolve them. The executor and worktree pool now integrate typed branch conflict che Fusion-Task-Id: FN-4068
2026-05-12 17:10:26 -07:00
parent ceccc382b1
commit bddcc3a931
28 changed files with 1341 additions and 209 deletions
--- a/packages/core/src/settings-schema.ts
+++ b/packages/core/src/settings-schema.ts
@@ -180,6 +180,7 @@ export const DEFAULT_PROJECT_SETTINGS = {
  testCommand: undefined,
  buildCommand: undefined,
  recycleWorktrees: false,
+  executorAllowSiblingBranchRename: false,
  worktreeNaming: "random",
  taskPrefix: "FN",
  includeTaskIdInCommit: true,