root/fusion
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
7,860 Commits 1 Branch 0 Tags
7d20a997b964b7a6c5e20bc1e3a17ce8c9ee99ad
Commit Graph

13 Commits

Author SHA1 Message Date
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
gsxdsm
b1cf6fa3d1 chore(engine): silence unused-param warning in worktree-acquisition test 
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
 2026-05-23 03:06:11 -07:00
gsxdsm
e7088704e6 fix(engine): verify resumed worktrees aren't bootstrap-misbound 
The resume path in acquireTaskWorktree returned a reused worktree
without checking whether its branch contained foreign commits. If a
sibling task's tip had been baked into the branch at creation time,
the executor preflight would later fail contamination checks forever
(observed in the FN-5475 cascade).

The resume path now computes a fresh merge-base and runs
classifyBootstrapMisbinding. For the foreign-only / zero-own-commits
shape it re-anchors inline and emits a branch:reanchor audit event.
Mixed contamination continues to flow through the executor's
primary recovery path.

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
 2026-05-23 02:32:01 -07:00
Fusion (runfusion.ai)
d702231adc feat(FN-4938): complete Step 2 — add helper and wire cleanup 
Fusion-Task-Id: FN-4938
Fusion-Task-Lineage: 8b53a5da-1321-4796-9775-ff043efdcef3
 2026-05-18 01:50:22 -07:00
Fusion (runfusion.ai)
b8514b658e test(FN-4954): cover pool double-lease throw and fresh fallback 
Fusion-Task-Id: FN-4954
Fusion-Task-Lineage: b3dd2d2f-3aa3-48f1-8a56-56e66518d139
 2026-05-17 21:17:38 -07:00
Fusion (runfusion.ai)
7e90bce8bb feat(FN-4954): harden pool leasing invariants and wire runtime auditing 
Fusion-Task-Id: FN-4954
Fusion-Task-Lineage: b3dd2d2f-3aa3-48f1-8a56-56e66518d139
 2026-05-17 21:17:38 -07:00
Fusion (runfusion.ai)
2bc76cf00f feat(FN-4917): complete Step 3 — gate pooled and resume worktree validity 
Fusion-Task-Id: FN-4917
Fusion-Task-Lineage: 1422a545-f4b5-4e1f-a347-8be2a4202f45
 2026-05-17 14:10:43 -07:00
Fusion (runfusion.ai)
ed8c8752f0 feat(FN-4834): complete Step 1 — surface init diagnostics in task log 
Fusion-Task-Id: FN-4834
Fusion-Task-Lineage: 714c9c73-ca66-4c3f-980c-d03e6b50316a
 2026-05-16 21:34:25 -07:00
Fusion (runfusion.ai)
0f372f67c3 feat(FN-4623): complete Step 3 — add backend-aware path resolution 
Fusion-Task-Id: FN-4623
Fusion-Task-Lineage: 58122853-cab7-4102-9649-4ceda4c5959e
 2026-05-15 19:37:48 -07:00
Fusion
0a98e97a90 feat(FN-4499): complete Step 5 — add acquisition misbinding warning 
Fusion-Task-Id: FN-4499
Fusion-Task-Lineage: 3e9fee75-5c3d-4ce5-aa8b-3f2bb94e48eb
 2026-05-14 13:33:01 -07:00
Fusion
0570ec3891 feat(FN-4410): complete Step 1 — dispatch reclaim telemetry wiring 
Fusion-Task-Id: FN-4410
Fusion-Task-Lineage: 306d4fe0-d024-49dd-86b4-fb98d4ceff59
 2026-05-14 03:41:20 -07:00
gsxdsm
86f8caf14e chore(FN-4428): import dependency content from fusion/fn-4410 
Squash-imported the working tree of fusion/fn-4410 as a single commit so this branch carries the dep's content without inheriting its individual commits. If the dep is later squash-merged to main, this commit's patch-id should match the merge and rebase cleanly.

Fusion-Task-Id: FN-4428
Fusion-Task-Lineage: ea174f50-49ac-4105-b6cf-db3bab0984fd
 2026-05-14 02:28:56 -07:00
Fusion
bf6a679ff1 feat(FN-4257): run durable heartbeat task sessions in worktree 
Fusion-Task-Id: FN-4257
Fusion-Task-Lineage: db48d51e-9e7d-471d-b26b-2a8763fb41d1
 2026-05-13 06:29:34 -07:00