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

fix(FN-4698): harden worktrunk path resolution and coverage

Browse Source 
Fusion-Task-Id: FN-4698
Fusion-Task-Lineage: 267131ce-b02a-4e54-8d71-c949e3b55e56
This commit is contained in:
Fusion (runfusion.ai)
2026-05-16 01:25:01 -07:00
committed by gsxdsm
parent b98afd4ea3
commit 6e74f6366c
3 changed files with 217 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -7,13 +7,14 @@ import {
resolveWorktreeBackend,
} from "../worktree-backend.js";
const { execMock, accessMock } = vi.hoisted(() => {
const { execMock, accessMock, existsSyncMock } = vi.hoisted(() => {
const mock = vi.fn();
(mock as any)[Symbol.for("nodejs.util.promisify.custom")] = mock;
return { execMock: mock, accessMock: vi.fn() };
return { execMock: mock, accessMock: vi.fn(), existsSyncMock: vi.fn() };
});
vi.mock("node:child_process", () => ({ exec: execMock }));
vi.mock("node:fs", () => ({ existsSync: existsSyncMock }));
vi.mock("node:fs/promises", () => ({ access: accessMock }));
vi.mock("../branch-conflicts.js", () => ({
inspectBranchConflict: vi.fn().mockResolvedValue({ kind: "stale" }),
@@ -22,7 +23,9 @@ vi.mock("../branch-conflicts.js", () => ({
beforeEach(() => {
execMock.mockReset();
accessMock.mockReset();
existsSyncMock.mockReset();
accessMock.mockResolvedValue(undefined);
existsSyncMock.mockReturnValue(true);
});
describe("NativeWorktreeBackend", () => {
@@ -156,7 +159,10 @@ describe("WorktrunkWorktreeBackend", () => {
it("invokes create mapping with timeout/maxBuffer and cwd", async () => {
execMock
.mockResolvedValueOnce({ stdout: "", stderr: "" })
.mockResolvedValueOnce({ stdout: "worktree /repo/.worktrees/fusion/fn-1\n", stderr: "" });
.mockResolvedValueOnce({
stdout: "worktree /repo/.worktrees/fusion/fn-1\nbranch refs/heads/fusion/fn-1\n",
stderr: "",
});
const backend = new WorktrunkWorktreeBackend({ binaryPath: "worktrunk" });
await backend.create({
@@ -174,6 +180,118 @@ describe("WorktrunkWorktreeBackend", () => {
);
});
describe("create() — path resolution", () => {
it("returns porcelain-resolved path and warns on drift", async () => {
const logger = { log: vi.fn(), warn: vi.fn() };
execMock
.mockResolvedValueOnce({ stdout: "", stderr: "" })
.mockResolvedValueOnce({
stdout:
"worktree /repo/.worktrees/custom/fusion-fn-1\nbranch refs/heads/fusion/fn-1\n\nworktree /repo\nbranch refs/heads/main\n",
stderr: "",
});
existsSyncMock.mockImplementation((path: string) => path === "/repo/.worktrees/custom/fusion-fn-1");
const result = await new WorktrunkWorktreeBackend({ binaryPath: "worktrunk", logger }).create({
rootDir: "/repo",
worktreePath: "/repo/.worktrees/fn-1",
branch: "fusion/fn-1",
taskId: "FN-1",
});
expect(result).toEqual({ path: "/repo/.worktrees/custom/fusion-fn-1", branch: "fusion/fn-1" });
expect(logger.warn).toHaveBeenCalledTimes(1);
expect(logger.warn).toHaveBeenCalledWith(
"[worktree-backend] worktrunk created branch fusion/fn-1 at /repo/.worktrees/custom/fusion-fn-1 (fusion assumed /repo/.worktrees/fn-1); using worktrunk-assigned path",
);
});
it("fails when no branch match exists", async () => {
execMock
.mockResolvedValueOnce({ stdout: "", stderr: "" })
.mockResolvedValueOnce({ stdout: "worktree /repo/.worktrees/other\nbranch refs/heads/other\n", stderr: "" });
await expect(
new WorktrunkWorktreeBackend({ binaryPath: "worktrunk" }).create({
rootDir: "/repo",
worktreePath: "/repo/.worktrees/fn-1",
branch: "fusion/fn-1",
taskId: "FN-1",
}),
).rejects.toMatchObject({
name: "WorktrunkOperationError",
code: "worktrunk_operation_failed",
stderr: expect.stringContaining("fusion/fn-1"),
});
});
it("fails when multiple branch matches exist", async () => {
execMock
.mockResolvedValueOnce({ stdout: "", stderr: "" })
.mockResolvedValueOnce({
stdout:
"worktree /repo/.worktrees/a\nbranch refs/heads/fusion/fn-1\n\nworktree /repo/.worktrees/b\nbranch refs/heads/fusion/fn-1\n",
stderr: "",
});
await expect(
new WorktrunkWorktreeBackend({ binaryPath: "worktrunk" }).create({
rootDir: "/repo",
worktreePath: "/repo/.worktrees/fn-1",
branch: "fusion/fn-1",
taskId: "FN-1",
}),
).rejects.toMatchObject({
name: "WorktrunkOperationError",
code: "worktrunk_operation_failed",
stderr: expect.stringContaining("/repo/.worktrees/a, /repo/.worktrees/b"),
});
});
it("fails when resolved path does not exist on disk", async () => {
existsSyncMock.mockReturnValue(false);
execMock
.mockResolvedValueOnce({ stdout: "", stderr: "" })
.mockResolvedValueOnce({
stdout: "worktree /repo/.worktrees/missing\nbranch refs/heads/fusion/fn-1\n",
stderr: "",
});
await expect(
new WorktrunkWorktreeBackend({ binaryPath: "worktrunk" }).create({
rootDir: "/repo",
worktreePath: "/repo/.worktrees/fn-1",
branch: "fusion/fn-1",
taskId: "FN-1",
}),
).rejects.toMatchObject({
name: "WorktrunkOperationError",
code: "worktrunk_operation_failed",
stderr: "worktrunk reported worktree at /repo/.worktrees/missing but the path does not exist",
});
});
it("wraps porcelain command failures as worktrunk operation errors", async () => {
execMock
.mockResolvedValueOnce({ stdout: "", stderr: "" })
.mockRejectedValueOnce({ stderr: "porcelain failed", status: 2 });
await expect(
new WorktrunkWorktreeBackend({ binaryPath: "worktrunk" }).create({
rootDir: "/repo",
worktreePath: "/repo/.worktrees/fn-1",
branch: "fusion/fn-1",
taskId: "FN-1",
}),
).rejects.toMatchObject({
name: "WorktrunkOperationError",
code: "worktrunk_operation_failed",
stderr: "porcelain failed",
exitCode: 2,
});
});
});
it("invokes remove mapping", async () => {
execMock.mockResolvedValue({ stdout: "", stderr: "" });
const backend = new WorktrunkWorktreeBackend({ binaryPath: "worktrunk" });