From 0c1a20b1bd86beb405b9d6e553044687ed47072d Mon Sep 17 00:00:00 2001 From: gsxdsm Date: Tue, 7 Jul 2026 09:53:27 -0700 Subject: [PATCH] chore: add changesets for workspace landedSha + sub-repo worktree branch-strip fixes --- .changeset/fn-workspace-landedsha-recovery.md | 7 +++++++ .changeset/fn-worktree-subrepo-branch-strip.md | 7 +++++++ 2 files changed, 14 insertions(+) create mode 100644 .changeset/fn-workspace-landedsha-recovery.md create mode 100644 .changeset/fn-worktree-subrepo-branch-strip.md 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.