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

feat(FN-5353): fix merge-reuse handoff race by gating reacquire and strict

Browse Source 
Fixes merge handoff stalls by enforcing strict queue targeting and self-enqueue in the merger (FN-5353 Step 4), forcing reacquire before reuse handoff gates (Step 5), and aligning integration-root contract tests (Steps 1 & 7). Consolidates two prior changesets into `fn-5353-merge-reuse-stall-fix.md`

Fusion-Task-Id: FN-5353
This commit is contained in:
Fusion (runfusion.ai)
2026-05-21 15:29:26 -07:00
committed by gsxdsm
parent f21464070a
commit 8df21a6b68
11 changed files with 281 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
.changeset/fix-fn-5353-reacquire-worktree.md
View File

@@ -1,7 +0,0 @@
---
"@runfusion/fusion": patch
---
fix(FN-5353): reacquire fresh worktree when merge reuse handoff fails instead of falling back to main
When `mergeIntegrationWorktree=reuse-task-worktree` and no task worktree is available (worktree=null after executor teardown), the merger now acquires a fresh worktree (`git worktree add -b fusion/<id>`) instead of falling back to `cwd-main`. Falls back to `cwd-main` only if fresh acquisition itself throws. New audit events: `merge:reuse-fallback-new-worktree`, `merge:reuse-worktree-fresh-acquire`, `merge:reuse-worktree-fresh-acquired`, `merge:reuse-fallback-cwd-main`.

5
.changeset/fix-merge-queue-pollution-no-lease.md
View File

@@ -1,5 +0,0 @@
---
"@runfusion/fusion": patch
---
Fix merge-queue reuse-handoff contention that caused `merge:reuse-handoff-refused` (`reason=no-lease`) for valid in-review tasks when unrelated rows polluted queue head state. `acquireMergeQueueLease({ targetTaskId })` now honors the target strictly (no queue-head fallback), and merge-queue lifecycle handling is now column-aware: enqueue is rejected for non-`in-review` tasks, lease selection auto-cleans stale non-review rows, and `in-review` column exits scrub queue rows when leases are absent or expired.

5
.changeset/fn-5353-merge-reuse-stall-fix.md Normal file
View File

@@ -0,0 +1,5 @@
---
"@runfusion/fusion": patch
---
Fix in-review merge stall under the new mergeIntegrationWorktree=reuse-task-worktree default: strict targetTaskId leasing prevents cross-task lease bleed, and missing task.worktree always triggers the reacquire fallback instead of misrouting handoff gates against the project root.