root/fusion
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat(dashboard): expose mergeAdvanceAutoSync in the project settings modal

Browse Source 
Adds the missing form control for the auto-sync mode introduced by the
merger hook. Lives next to Direct merge commit routing / Integration
worktree inside the merge-strategy panel and only renders when
mergeStrategy === "direct". Three options with descriptions cribbed from
docs/settings-reference.md:

  - Stash + fast-forward (default): preserve local edits across the snap
  - Fast-forward only: skip dirty worktrees, surface the banner instead
  - Off: legacy behavior; project root stays stale until manual pull

Value is normalized through normalizeMergeAdvanceAutoSyncMode on both the
merged-settings and scoped-settings load paths so a missing/invalid
stored value cleanly falls back to the default.

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
This commit is contained in:
gsxdsm
2026-05-23 15:50:03 -07:00
parent a2ac5cb7a3
commit d8493f9467
2 changed files with 53 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
.changeset/merge-advance-auto-sync-settings-ui.md Normal file
View File

@@ -0,0 +1,13 @@
---
"@fusion/dashboard": patch
---
feat(dashboard): expose `mergeAdvanceAutoSync` in the project settings modal
Adds the missing form control for the auto-sync mode introduced by the merger hook. Lives next to the existing Direct merge commit routing / Integration worktree controls inside the merge-strategy panel and only renders when `mergeStrategy === "direct"`. Three options with the same labels and descriptions as `docs/settings-reference.md`:
- **Stash + fast-forward (default)** — preserve local edits across the auto-snap
- **Fast-forward only** — skip dirty worktrees, surface the banner instead
- **Off** — legacy behavior, project root stays stale until manual pull
Value is normalized through `normalizeMergeAdvanceAutoSyncMode` on both the merged-settings and scoped-settings load paths so a missing/invalid stored value cleanly falls back to the default without spamming validation errors.