fix(engine): block dirty integration merge landings

Refuse AI merge landing on a checked-out dirty integration worktree by default. This prevents Fusion from stashing/restoring unrelated project-root edits into main and then marking tasks done against contaminated state. Fusion-Task-Id: FN-5780
2026-05-31 12:11:54 -07:00
parent 93e8a5f78a
commit 3dee395d67
8 changed files with 97 additions and 15 deletions
--- a/packages/core/src/settings-schema.ts
+++ b/packages/core/src/settings-schema.ts
@@ -268,7 +268,7 @@ export const DEFAULT_PROJECT_SETTINGS = {
  ],
  prerebaseDivergenceThreshold: 50,
  mergeConflictStrategy: "smart-prefer-main",
-  merger: { mode: "ai", maxReviewPasses: 3 },
+  merger: { mode: "ai", maxReviewPasses: 3, allowDirtyLocalCheckoutSync: false },
  mergeDiffVolumeMinLines: undefined,
  mergeDiffVolumeThreshold: undefined,
  mergeDiffVolumeAllowlist: undefined,