fix(engine): respect autoMerge and mergeStrategy in recover-mergeable-review sweep
The periodic maintenance job `recover-mergeable-review` was silently merging in-review tasks regardless of `autoMerge` and `mergeStrategy` settings, defeating the PR-based review flow for users with `autoMerge: false` and `mergeStrategy: "pull-request"`. Gate the sweep on `settings.autoMerge` (and globalPause/enginePaused for consistency with other merge entry points) and route through the engine's merge queue via the existing `enqueueMerge` callback so `mergeStrategy === "pull-request"` is honored. Falls back to the direct `store.mergeTask` path only when no enqueue callback is wired (standalone/tests). Closes https://github.com/Runfusion/Fusion/issues/21 Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
This commit is contained in:
13
.changeset/recover-mergeable-respects-merge-settings.md
Normal file
13
.changeset/recover-mergeable-respects-merge-settings.md
Normal file
@@ -0,0 +1,13 @@
|
||||
---
|
||||
"@runfusion/fusion": patch
|
||||
"runfusion.ai": patch
|
||||
"@fusion/core": patch
|
||||
"@fusion/dashboard": patch
|
||||
"@fusion/desktop": patch
|
||||
"@fusion/engine": patch
|
||||
"@fusion/mobile": patch
|
||||
"@fusion/pi-claude-cli": patch
|
||||
"@fusion/plugin-sdk": patch
|
||||
---
|
||||
|
||||
Fix [#21](https://github.com/Runfusion/Fusion/issues/21): the `recover-mergeable-review` maintenance sweep no longer bypasses `autoMerge` and `mergeStrategy`. The sweep now early-returns when `autoMerge !== true` (or when the engine is paused) and routes recovery merges through the engine's merge queue so `mergeStrategy: "pull-request"` is honored — eligible in-review tasks go through `processPullRequestMerge` instead of a raw local `git merge`. Operators using a PR-based review flow with `autoMerge: false` will no longer have tasks silently merged behind their back.
|
||||
Reference in New Issue
Block a user