diff --git a/.changeset/fn-workspace-landedsha-recovery.md b/.changeset/fn-workspace-landedsha-recovery.md new file mode 100644 index 0000000000..af5234acf1 --- /dev/null +++ b/.changeset/fn-workspace-landedsha-recovery.md @@ -0,0 +1,7 @@ +--- +"@runfusion/fusion": patch +--- + +summary: Fix workspace partial-land recovery losing the already-landed sub-repo sha. +category: fix +dev: merger-ai.ts landWorkspaceTask now recovers the integration-tip sha as landedSha when the A1 trailer-fallback proved a sub-repo landed but its sha was never persisted, so finalizeWorkspaceTask can build merge proof instead of stranding the partial-land retry in-review. diff --git a/.changeset/fn-worktree-subrepo-branch-strip.md b/.changeset/fn-worktree-subrepo-branch-strip.md new file mode 100644 index 0000000000..de0ef82743 --- /dev/null +++ b/.changeset/fn-worktree-subrepo-branch-strip.md @@ -0,0 +1,7 @@ +--- +"@runfusion/fusion": patch +--- + +summary: Fix workspace sub-repo worktree creation failing on absent shared branch. +category: fix +dev: worktree-acquisition.ts acquireWorkspaceRepoWorktree now strips the shared project integrationBranch/baseBranch overrides before forwarding to acquireTaskWorktree, so FN-7360's freshStartPoint resolution no longer tries to git-worktree-add a branch absent from the sub-repo.