fusion

Files

gsxdsm 327f0a9a4f FN-5818: fix shared-branch-group execution to use per-task working branches

Ensure shared branch-group flows consistently derive and acquire per-task working branches.

- update engine merge/executor/scheduler/self-healing paths to resolve task-scoped working branch names instead of shared branch-group names
- adjust worktree acquisition and already-merged detection logic to use the corrected branch resolution
- add regression coverage for shared-branch-group working-branch behavior, worktree acquisition, and worktree name derivation
- add a patch changeset for @runfusion/fusion

Files changed:
 .changeset/fn-5818-shared-branch-working-branch.md |  5 ++
 .../shared-branch-group-working-branch.test.ts     | 53 ++++++++++++++++++++++
 .../src/__tests__/worktree-acquisition.test.ts     | 52 +++++++++++++++++++++
 .../engine/src/__tests__/worktree-names.test.ts    | 20 +++++++-
 packages/engine/src/already-merged-detector.ts     |  6 +--
 packages/engine/src/executor.ts                    | 10 ++--
 packages/engine/src/merger-ai.ts                   |  4 +-
 packages/engine/src/merger.ts                      | 16 +++----
 packages/engine/src/scheduler.ts                   |  6 +--
 packages/engine/src/self-healing.ts                | 12 ++---
 packages/engine/src/worktree-acquisition.ts        |  4 +-
 packages/engine/src/worktree-names.ts              |  9 +++-
 12 files changed, 166 insertions(+), 31 deletions(-)

Fusion-Task-Id: FN-5818

Fusion-Task-Lineage: c7eb1ec4-971a-49ad-9156-5c0349c629aa

2026-06-01 01:37:25 -07:00

_helpers.ts

feat(FN-4890): complete Step 5 — board-health recovery levers

2026-05-17 19:36:12 -07:00

active-worktree-removal-liveness.test.ts

fix(FN-4807): unblock engine build with typed liveness mocks

2026-05-16 17:08:09 -07:00

audit-and-recovery.test.ts

feat(FN-4839): harden real-git test timeouts across engine suites

2026-05-16 22:36:57 -07:00

auto-prerebase-interactions.test.ts

test(FN-4958): complete Step 4 — reliability interaction backstop

2026-05-18 06:20:53 -07:00

auto-recovery-contamination.test.ts

feat(FN-4887): complete Step 2-3 — add foreign-only recovery sweep and shared handler

2026-05-17 17:07:01 -07:00

auto-recovery-dispatch.test.ts

feat(FN-4640): complete Step 6 — dashboard sandbox audit surface

2026-05-15 16:19:42 -07:00

auto-recovery-message-delivery.test.ts

feat(FN-4545): complete Step 10 — documentation and delivery artifacts

2026-05-14 22:16:44 -07:00

auto-revive-and-watchdog.test.ts

test(FN-4361): add reliability interaction backstop suite

2026-05-13 22:08:41 -07:00

backward-move-triple-proof.test.ts

fix(FN-5335): enforce triple-proof gating for backward recovery

2026-05-21 19:15:27 -07:00

board-stall-auto-recovery.test.ts

fix(FN-5335): enforce triple-proof gating for backward recovery

2026-05-21 19:15:27 -07:00

branch-autocorrect-no-create-from-head.real-git.test.ts

fix(FN-5456): tighten branch-autocorrect verify and add real-git regression

2026-05-22 21:40:40 -07:00

branch-group-automerge-precedence.test.ts

FN-5783: enforce branch-group autoMerge precedence for shared promotions

2026-05-31 15:17:11 -07:00

branch-group-merge-routing.test.ts

FN-5782: wire branch groups into merge routing

2026-05-31 13:50:23 -07:00

branch-group-promotion-gate.test.ts

FN-5788: add group promotion gate to merge coordinator

2026-05-31 15:59:59 -07:00

branch-recovery-live-zero-commits.test.ts

fix(FN-5335): enforce triple-proof gating for backward recovery

2026-05-21 19:15:27 -07:00

branch-recovery-stale-cached-base.test.ts

feat(FN-5329): remove orphan rescue and branch-recovery primitives from eng

2026-05-20 16:43:27 -07:00

branch-worktree-auto-recovery.test.ts

feat(FN-4536): complete auto-recovery branch/worktree handler

2026-05-14 19:06:25 -07:00

completion-fanout-x-self-healing.test.ts

test(FN-4523): complete Step 4 — add completion fan-out coverage

2026-05-14 14:09:57 -07:00

completion-handoff-limbo.test.ts

chore(dashboard): publish MobileNavBar render decision to vpdebug

2026-05-22 09:37:23 -07:00

concurrent-execute-race.test.ts

fix(FN-4811): close concurrent-execute race that produced parallel runs

2026-05-16 18:55:03 -07:00

cross-node-assignment-wake.test.ts

test(FN-4824): reliability-interaction coverage for cross-node assignment wakes

2026-05-16 21:53:18 -07:00

cwd-integration-fallback-removed.test.ts

fix(merger): autostash dirty reuse worktrees and fail loudly on autostash errors

2026-05-22 14:38:29 -07:00

dashboard-diff-boundary.test.ts

test(FN-4754): add engine dashboard diff import boundary guard

2026-05-16 10:50:06 -07:00

dependency-cycle-reconcile.test.ts

feat(FN-5432): merge fusion/fn-5432

2026-05-22 16:09:43 -07:00

dirty-integration-worktree.real-git.test.ts

fix(tests): drop SIGTERM handlers + skip flaky reconciliation test

2026-05-23 00:22:19 -07:00

done-task-verification-benign.real-git.test.ts

feat(FN-4700): complete Step 3 — reconcile benign verification finalizes

2026-05-15 20:18:55 -07:00

dual-observe-merge-seam.test.ts

FN-5743: cut over merge dequeue authority to merge-request queue

2026-05-30 20:48:16 -07:00

duplicate-task-auto-archive.test.ts

feat(FN-5374): raise room transcript defaults and align compaction settings

2026-05-21 07:05:48 -07:00

engine-active-since-floor.test.ts

feat(FN-5223): anchor staleness and stall detectors to engine activation ti

2026-05-20 14:29:07 -07:00

engine-stop-aborts-execution.test.ts

feat(FN-5403): merge fusion/fn-5403

2026-05-22 23:12:49 -07:00

executing-task-lock.test.ts

fix(FN-4811): scope-leak guard always allows .changeset/ paths

2026-05-16 21:15:10 -07:00

executor-liveness-gate.test.ts

FN-5772: re-anchor nested task worktree paths

2026-05-31 08:32:01 -07:00

executor-no-task-done-vs-worktree-reclaim.test.ts

fix(FN-4917): stabilize workspace verification after worktree recovery changes

2026-05-17 14:10:46 -07:00

executor-pending-review-skip-retry.test.ts

fix(FN-057): park pending review without failed status

2026-05-29 06:54:45 -07:00

explicit-duplicate-marker-sweep.test.ts

fix(engine-tests): eliminate temp-dir leak and raise subprocess guard for concurrent workspace runs

2026-05-22 20:20:42 -07:00

foreign-only-contamination-recovery.real-git.test.ts

feat(FN-5349): add integration branch resolver with auto-recovery fallback

2026-05-21 12:04:58 -07:00

foreign-start-point-no-owned-commit.real-git.test.ts

fix(FN-5335): enforce triple-proof gating for backward recovery

2026-05-21 19:15:27 -07:00

ghost-bug-preflight.test.ts

test(FN-4892): fix type-safe intake preflight coverage

2026-05-18 00:53:24 -07:00

in-progress-limbo-recovery.test.ts

fix(FN-5335): enforce triple-proof gating for backward recovery

2026-05-21 19:15:27 -07:00

in-review-automerge-off.test.ts

test(FN-5147): complete Step 6 — stabilize verification coverage

2026-05-19 10:07:44 -07:00

in-review-branch-rebind.test.ts

test(FN-5083): tighten rebind reliability and quality-gate coverage

2026-05-18 18:27:08 -07:00

in-review-handoff-atomic.test.ts

feat(FN-5241): add atomic in-review handoff seam with executor/self-healing

2026-05-20 01:01:08 -07:00

in-review-retry-exhausted-policy-convergence.test.ts

feat(FN-5536): add retry-exhausted in-review policy convergence invariant

2026-05-23 04:05:25 -07:00

in-review-stall-deadlock-disposition.test.ts

test(FN-5052): complete Step 6 — cover self-healing autoMerge gating

2026-05-18 08:44:20 -07:00

in-review-stalled-detector.test.ts

test(FN-5093): complete Step 5 — add reliability interaction backstop

2026-05-19 03:54:49 -07:00

integration-worktree-state.test.ts

fix(merger): autostash dirty reuse worktrees and fail loudly on autostash errors

2026-05-22 14:38:29 -07:00

integrity-warning-persisted-dedup.test.ts

feat(FN-5518): merge fusion/fn-5518

2026-05-22 22:42:57 -07:00

landed-content-soft-blocker.real-git.test.ts

test(FN-4648): complete Step 4 — regression coverage updates

2026-05-15 11:41:35 -07:00

landed-files-attribution.test.ts

fix(FN-5304): guard against silent no-op landed-file attribution mismatches

2026-05-20 08:23:40 -07:00

layer3-ai-arbiter-file-scope.real-git.test.ts

test(FN-4956): complete Step 4 — add layer3 file-scope regressions

2026-05-18 01:30:16 -07:00

lease-recovery-central-claim.test.ts

feat(FN-5337): remove speculative orphan requeue from self-healing sweep

2026-05-20 18:49:38 -07:00

merge-request-cancel-on-hard-cancel.test.ts

FN-5743: cut over merge dequeue authority to merge-request queue

2026-05-30 20:48:16 -07:00

merge-request-shadow-handoff.test.ts

FN-5741: persist merge-request handoff shadow contract

2026-05-30 14:42:50 -07:00

merge-reuse-task-worktree.slow.test.ts

chore(test-isolation): detect live engine lock + prune stale tests

2026-05-23 20:18:08 -07:00

merge-strategy-and-overlap.test.ts

feat(FN-4839): harden real-git test timeouts across engine suites

2026-05-16 22:36:57 -07:00

meta-archive-guard-composition.test.ts

feat(FN-5064): merge fusion/fn-5064

2026-05-18 12:46:23 -07:00

meta-chain-auto-close.test.ts

fix(FN-4890): stabilize board-health integration and blocker release coverage

2026-05-17 19:36:14 -07:00

misrouted-foreign-commit.real-git.test.ts

feat(FN-4948): complete Steps 7-8 — finalize verification and release artifacts

2026-05-17 17:29:31 -07:00

mission-stranded-feature-retriage.test.ts

FN-5754: re-triage stranded features in active mission slices

2026-05-30 16:47:15 -07:00

mission-validation-trigger-gap.test.ts

FN-5764: expose mission assertion backfill through API and CLI

2026-05-31 08:32:01 -07:00

multi-node-claim-mutex-interactions.test.ts

test(FN-4818): complete Step 1 — add claim mutex interaction coverage

2026-05-16 20:27:40 -07:00

near-duplicate-intake.test.ts

FN-5731: require confirmation before archiving near-duplicate tasks

2026-05-30 15:52:46 -07:00

no-changes-finalized.real-git.test.ts

feat(FN-4839): harden real-git test timeouts across engine suites

2026-05-16 22:36:57 -07:00

node-settings-sync-auth.test.ts

fix(FN-4847): keep engine contract test build-safe

2026-05-17 08:47:16 -07:00

non-progress-churn.test.ts

fix(engine): split stuck requeue fallback handling

2026-05-31 10:57:54 -07:00

orphan-detected-no-requeue.test.ts

feat(FN-5337): remove speculative orphan requeue from self-healing sweep

2026-05-20 18:49:38 -07:00

owning-node-unavailable-interactions.test.ts

feat(FN-4823): complete lease recovery central-claim reconciliation

2026-05-16 21:26:04 -07:00

paused-scope-decay.test.ts

fix(FN-5335): enforce triple-proof gating for backward recovery

2026-05-21 19:15:27 -07:00

post-completion-stale-self-owned-binding.test.ts

fix(FN-5256): keep live task worktrees through pause/resume races

2026-05-21 09:06:23 -07:00

post-finalize-verification-noop-status-write.test.ts

feat(FN-5633): standalone AI merge path (clean-room merge + AI reviewer)

2026-05-28 18:50:23 -07:00

post-finalize-verification-noop.real-git.test.ts

FN-5646: preserve AI body when canonicalizing merge commits

2026-05-29 00:55:17 -07:00

pr-changes-requested-reexecution.test.ts

test(FN-4992): add changes-requested reliability interaction coverage

2026-05-17 19:37:02 -07:00

pr-conflict-reclaim.test.ts

fix(FN-5335): enforce triple-proof gating for backward recovery

2026-05-21 19:15:27 -07:00

pr-merged-auto-transition.test.ts

test(FN-4992): add merged PR auto-transition interaction coverage

2026-05-17 19:37:02 -07:00

pr-mode-worktree-invariants.test.ts

feat(FN-5455): merge fusion/fn-5455

2026-05-22 21:08:00 -07:00

precommit-identity-guard.real-git.test.ts

feat(FN-5271): add precommit identity guard for worktree hooks

2026-05-20 06:42:05 -07:00

reap-unregistered-orphans-defers-active-session.test.ts

feat(FN-5065): merge fusion/fn-5065

2026-05-18 14:16:22 -07:00

reclaim-defers-on-active-session.test.ts

fix(FN-4811): defer self-healing reclaim when worktree has an active session

2026-05-16 17:59:03 -07:00

reclaim-defers-on-in-flight-executor.test.ts

fix(FN-4949): defer stale active branch reclaim during live executor work

2026-05-17 18:37:48 -07:00

reclaim-self-owned-resume-limbo-escalation.test.ts

FN-5704: escalate self-owned execution limbo instead of endless resume

2026-05-29 20:05:14 -07:00

scheduler-overlap-priority-inversion.test.ts

fix(FN-166): bypass coordination-only overlap leases

2026-05-30 06:47:02 -07:00

scope-auto-widen.real-git.test.ts

feat(FN-5226): add scope auto-widen layer 2.5 to merger for attribution-bas

2026-05-21 16:30:31 -07:00

secrets-env-materialization.test.ts

test(FN-4912): complete Step 9 — add env materialization verification coverage

2026-05-17 23:29:21 -07:00

secrets-sync-cross-node.test.ts

feat(FN-4882): add cross-node secrets sync reliability backstop with integr

2026-05-18 02:25:21 -07:00

self-defeating-dep-reconcile.test.ts

feat(FN-4898): reconcile task title-id drift in storage migrations

2026-05-17 09:51:10 -07:00

self-healing-interactions.test.ts

fix(FN-5335): enforce triple-proof gating for backward recovery

2026-05-21 19:15:27 -07:00

self-healing-multi-pr.test.ts

feat(FN-4967): merge fusion/fn-4967

2026-05-18 15:50:48 -07:00

shared-branch-group-working-branch.test.ts

FN-5818: fix shared-branch-group execution to use per-task working branches

2026-06-01 01:37:25 -07:00

soft-blocker-auto-finalize-interactions.real-git.test.ts

test(FN-4653): complete Step 6 — finalize governance and typing-safe interactions

2026-05-15 12:40:10 -07:00

soft-delete-audit-and-column.test.ts

feat(FN-5175): thread soft-delete audit context and add reconciliation scri

2026-05-20 02:46:49 -07:00

soft-delete-blocker-residue.test.ts

FN-5634: fix ntfy JSON publish priority mapping

2026-05-28 21:17:02 -07:00

soft-delete-deadlock-scan-exclusion.test.ts

feat(FN-5566): add soft-delete cleanup sweep for blocker residue

2026-05-23 21:54:07 -07:00

soft-delete-end-to-end.test.ts

Fn-5196

2026-05-22 04:09:22 -07:00

soft-delete-in-flight-abort.test.ts

fix(FN-5256): await disposal across task:moved-away and task:deleted

2026-05-21 10:14:38 -07:00

soft-delete-stickiness-FN-5233.test.ts

feat(FN-5233): add tombstone recreate guard and allow-resurrection delete f

2026-05-23 17:07:14 -07:00

stale-self-owned-active-session-recovery.test.ts

fix(FN-5256): keep live task worktrees through pause/resume races

2026-05-21 09:06:23 -07:00

stale-self-owned-session-registry.test.ts

fix(FN-5256): keep live task worktrees through pause/resume races

2026-05-21 09:06:23 -07:00

starved-refinement-x-approval-gate.test.ts

fix(FN-4662): address test typing and scenario coverage

2026-05-15 21:57:57 -07:00

starved-refinement-x-triage-poll.test.ts

fix(FN-4662): address test typing and scenario coverage

2026-05-15 21:57:57 -07:00

task-done-refusal-x-invariant.test.ts

feat(FN-4990): complete Step 5 — finalize verification and delivery

2026-05-18 02:43:33 -07:00

verification-fix-already-on-main.real-git.test.ts

FN-5646: preserve AI body when canonicalizing merge commits

2026-05-29 00:55:17 -07:00

verification-followup-dedup.test.ts

feat(FN-5232): add deterministic verification-followup deduplication to pre

2026-05-19 19:28:05 -07:00

verification-spawn-supervision.real-git.test.ts

test(FN-5189): complete Step 4 — add supervision regression test

2026-05-19 17:19:03 -07:00

workflow-and-file-scope.test.ts

feat(FN-4839): harden real-git test timeouts across engine suites

2026-05-16 22:36:57 -07:00

workflow-interpreter-dual-observe.test.ts

FN-5768: add dual-observe workflow parity instrumentation

2026-05-31 08:32:01 -07:00

worktree-contamination-attribution.real-git.test.ts

fix(engine-tests): subprocess timeout attribution + ENOTEMPTY retry on cleanup

2026-05-22 22:10:45 -07:00

worktree-incomplete-session-start.test.ts

test(FN-4987): align session-start interaction tests with recovery contract

2026-05-17 20:10:17 -07:00

worktree-init-stderr-surfacing.test.ts

fix(FN-4834): align reliability fixture task fields with task typing

2026-05-16 21:34:25 -07:00

worktree-metadata-reconcile.test.ts

test(FN-4962): stabilize recovery test expectations and typing

2026-05-17 15:55:18 -07:00

worktree-pool-merger-release.test.ts

feat(FN-5279): add merge integration worktree feature with settings UI and

2026-05-20 09:42:40 -07:00

worktree-stale-lock-recovery.test.ts

feat(FN-4830): complete Steps 4-7 stale lock recovery delivery

2026-05-16 20:54:39 -07:00

worktree-stale-registration-recovery.real-git.test.ts

feat(FN-5063): merge fusion/fn-5063

2026-05-18 15:51:01 -07:00

worktrunk-audit.test.ts

feat(FN-5320): canonicalize worktrunk binary name and manifest

2026-05-20 07:44:57 -07:00

worktrunk-failure.test.ts

feat(FN-4625): complete Step 4 — add self-healing worktrunk pause guardrail

2026-05-15 20:53:54 -07:00

worktrunk-self-healing.test.ts

feat(FN-5329): remove orphan rescue and branch-recovery primitives from eng

2026-05-20 16:43:27 -07:00

worktrunk-worktree-removal.test.ts

fix(FN-4742): stabilize worktrunk removal interaction assertions

2026-05-16 10:08:02 -07:00