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

fix(FN-4623): align worktrunk sync target and prune fallback

Browse Source 
Fusion-Task-Id: FN-4623
Fusion-Task-Lineage: 58122853-cab7-4102-9649-4ceda4c5959e
This commit is contained in:
Fusion (runfusion.ai)
2026-05-15 19:14:33 -07:00
committed by gsxdsm
parent 67b8051b91
commit c98a4e2f82
2 changed files with 62 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
packages/engine/src/__tests__/worktree-backend.test.ts
View File

@@ -242,6 +242,23 @@ describe("WorktrunkWorktreeBackend", () => {
);
});
it("sync supports explicit trunk target", async () => {
execMock.mockResolvedValue({ stdout: "", stderr: "" });
const backend = new WorktrunkWorktreeBackend({ binaryPath: "worktrunk" });
await backend.sync({ rootDir: "/repo", worktreePath: "/repo/.worktrees/fn-1", branch: "fusion/fn-1", trunk: "release" });
expect(execMock).toHaveBeenNthCalledWith(
1,
'git fetch origin "release"',
expect.objectContaining({ cwd: "/repo/.worktrees/fn-1" }),
);
expect(execMock).toHaveBeenNthCalledWith(
2,
'git rebase "release"',
expect.objectContaining({ cwd: "/repo/.worktrees/fn-1" }),
);
});
it("maps rebase conflicts to worktrunk_sync_conflict", async () => {
execMock.mockResolvedValueOnce({ stdout: "", stderr: "" }).mockRejectedValueOnce({ stderr: "CONFLICT" });
const backend = new WorktrunkWorktreeBackend({ binaryPath: "worktrunk" });
@@ -251,13 +268,23 @@ describe("WorktrunkWorktreeBackend", () => {
).rejects.toMatchObject({ code: "worktrunk_sync_conflict", operation: "sync" });
});
it("prunes via git worktree prune fallback", async () => {
execMock.mockResolvedValue({ stdout: "", stderr: "" });
it("prunes by listing worktrees and removing worktrunk managed entries", async () => {
execMock.mockResolvedValue({
stdout:
"worktree /repo\nbranch refs/heads/main\n\nworktree /repo/.worktrees/fusion-fn-1\nbranch refs/heads/fusion/fn-1\n\n",
stderr: "",
});
execFileMock.mockResolvedValue({ stdout: "", stderr: "" });
const backend = new WorktrunkWorktreeBackend({ binaryPath: "worktrunk" });
await expect(backend.prune({ rootDir: "/repo" })).resolves.toBeUndefined();
expect(execMock).toHaveBeenCalledWith(
"git worktree prune",
"git worktree list --porcelain",
expect.objectContaining({ cwd: "/repo", timeout: 60000, maxBuffer: 10485760 }),
);
expect(execFileMock).toHaveBeenCalledWith(
"worktrunk",
["remove", "--foreground", "fusion/fn-1"],
expect.objectContaining({ cwd: "/repo", timeout: 60000, maxBuffer: 10485760 }),
);
});