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
This commit is contained in:
Fusion
2026-05-12 17:10:26 -07:00
committed by gsxdsm
parent ceccc382b1
commit bddcc3a931
28 changed files with 1341 additions and 209 deletions

View File

@@ -593,5 +593,5 @@ describe("ensureBundledDependencyGraphPluginInstalled", () => {
await rm(stagedRoot, { recursive: true, force: true });
await rm(pluginStateRoot, { recursive: true, force: true });
}
});
}, 20_000);
});