feat(FN-4072): add diff volume gate to merger

Added a diff volume gate to the merger that blocks or warns on large diffs before merge completes. The feature includes a new `merger-diff-volume-gate` module wired into the merger, configurable via project settings, with tests covering all gate paths. Also updated docs and the changeset for the `@r Fusion-Task-Id: FN-4072
2026-05-12 18:23:13 -07:00
parent e7fc3a9d17
commit 8fa3e8bfd1
8 changed files with 660 additions and 6 deletions
--- a/packages/core/src/settings-schema.ts
+++ b/packages/core/src/settings-schema.ts
@@ -211,6 +211,9 @@ export const DEFAULT_PROJECT_SETTINGS = {
  worktreeRebaseRemote: "",
  worktreeRebaseLocalBase: true,
  mergeConflictStrategy: "smart-prefer-main",
+  mergeDiffVolumeMinLines: undefined,
+  mergeDiffVolumeThreshold: undefined,
+  mergeDiffVolumeAllowlist: undefined,
  mergeStrategyOverlapBehavior: "flip-to-prefer-branch",
  workflowStepTimeoutMs: 360_000,
  workflowRevisionForkOnScopeMismatch: true,