feat(FN-5633): standalone AI merge path (clean-room merge + AI reviewer)
New default merge path (merger.mode="ai"), self-contained in merger-ai.ts and dispatched from ProjectEngine.onMerge instead of the legacy aiMergeTask pipeline (kept for merger.mode="deterministic"). Flow: clean-room detached worktree at the target branch tip → AI agent merges the task branch + squashes (resolving conflicts) → fresh read-only AI reviewer audits with corrective retries (blocking vs advisory; advisory lands, unfixable correctness hard-fails via AiMergeBlockedError; fail-safe verdict parsing) → land via `git merge --ff-only` when the checkout is on the target (else update-ref CAS) → sync the local checkout (stash → ff → restore; AI reconciles a conflicting restore and keeps the original edits in a backup stash; un-stashable dirt advances the ref + warns) → finalize (delete task branch — never the integration branch — task→done, remove temp worktree). - Per-task target branch honored (falls back to the default integration branch); local checkout synced only when on that target. - Structurally immune to the dirty-clobber and stale-base/non-FF bug classes of the legacy path (clean room + FF-by-construction). - Progress surfaced on the task status pill + task log stream. - Clear error when the target branch has no local ref. Settings: merger.mode / merger.reviewerModel / merger.maxReviewPasses, surfaced in Settings → Merge; legacy merge-mechanics settings hidden when AI mode is on. Tests: merger-ai.test.ts (verdict parser, clean merge, blocking hard-fail, advisory land, empty no-op, target-branch isolation, missing-target error, landSquash clean/other-branch/dirty-restore/AI-resolved). Legacy merge-orchestration tests pinned to deterministic mode. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
This commit is contained in:
@@ -262,6 +262,7 @@ export const DEFAULT_PROJECT_SETTINGS = {
|
||||
],
|
||||
prerebaseDivergenceThreshold: 50,
|
||||
mergeConflictStrategy: "smart-prefer-main",
|
||||
merger: { mode: "ai", reviewerModel: undefined, maxReviewPasses: 3 },
|
||||
mergeDiffVolumeMinLines: undefined,
|
||||
mergeDiffVolumeThreshold: undefined,
|
||||
mergeDiffVolumeAllowlist: undefined,
|
||||
|
||||
Reference in New Issue
Block a user