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

feat(FN-4623): complete Step 6/7 — verification fixes, docs, and changeset

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:37:09 -07:00
committed by gsxdsm
parent 81b2f4ea8f
commit 3d9260e0a8
6 changed files with 79 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -67,10 +67,7 @@ describe("acquireTaskWorktree backend wiring", () => {
audit,
});
expect(execMock).toHaveBeenCalledWith(
'"worktrunk" "switch" "--create" "fusion/fn-1"',
expect.objectContaining({ cwd: "/repo" }),
);
expect(execMock.mock.calls.some((call) => String(call[0]).includes('"worktrunk" "switch" "--create" "fusion/fn-1"'))).toBe(true);
expect(audit.git).toHaveBeenCalledWith(
expect.objectContaining({
type: "worktree:worktrunk-create",
@@ -124,6 +121,7 @@ describe("acquireTaskWorktree backend wiring", () => {
remove: vi.fn(),
sync: vi.fn().mockResolvedValue({ skipped: true as const }),
prune: vi.fn(),
resolveWorktreePath: vi.fn().mockResolvedValue("/tmp/custom-path"),
};
const result = await acquireTaskWorktree({

29
packages/engine/src/__tests__/worktree-acquisition-worktrunk.test.ts
View File

@@ -74,7 +74,7 @@ describe("acquireTaskWorktree worktrunk wiring", () => {
});
expect(createWorktree).toHaveBeenCalledTimes(1);
expect(execMock).not.toHaveBeenCalled();
expect(execMock.mock.calls.some((call) => String(call[0]).includes('"worktrunk" "switch"'))).toBe(false);
});
it("emits worktrunk + native create audits when worktrunk succeeds", async () => {
@@ -90,11 +90,7 @@ describe("acquireTaskWorktree worktrunk wiring", () => {
audit: audit as any,
});
expect(execMock).toHaveBeenCalledWith(
'"worktrunk" "switch" "--create" "fusion/fn-1"',
expect.objectContaining({ cwd: "/repo", timeout: 120000, maxBuffer: 10485760 }),
);
expect(execMock).toHaveBeenCalledTimes(1);
expect(execMock.mock.calls.some((call) => String(call[0]).includes('"worktrunk" "switch" "--create" "fusion/fn-1" "--no-hooks" "--no-cd"'))).toBe(true);
expect(events.filter((event) => event.type === "worktree:worktrunk-create")).toHaveLength(1);
expect(events.filter((event) => event.type === "worktree:create")).toHaveLength(1);
});
@@ -114,15 +110,20 @@ describe("acquireTaskWorktree worktrunk wiring", () => {
}),
).rejects.toMatchObject({ code: "worktrunk_operation_failed", operation: "create" });
expect(execMock).toHaveBeenCalledTimes(1);
expect(execMock.mock.calls[0]?.[0]).toBe('"worktrunk" "switch" "--create" "fusion/fn-1"');
expect(execMock.mock.calls.some((call) => String(call[0]).includes('"worktrunk" "switch" "--create" "fusion/fn-1"'))).toBe(true);
expect(events.some((event) => event.type === "worktree:worktrunk-fallback")).toBe(false);
});
it("falls back to native when onFailure=fallback-native", async () => {
execMock
.mockRejectedValueOnce({ stderr: "broken", status: 3 })
.mockResolvedValueOnce({ stdout: "", stderr: "" });
execMock.mockImplementation((command: string) => {
if (command.includes('"config" "show"')) {
return Promise.resolve({ stdout: "", stderr: "" });
}
if (command.includes('"switch" "--create"')) {
return Promise.reject({ stderr: "broken", status: 3 });
}
return Promise.resolve({ stdout: "", stderr: "" });
});
const { acquireTaskWorktree } = await import("../worktree-acquisition.js");
const { audit, events } = makeAudit();
@@ -135,9 +136,8 @@ describe("acquireTaskWorktree worktrunk wiring", () => {
logger: { log: vi.fn(), warn: vi.fn(), error: vi.fn() },
});
expect(execMock).toHaveBeenCalledTimes(2);
expect(execMock.mock.calls[0]?.[0]).toBe('"worktrunk" "switch" "--create" "fusion/fn-1"');
expect(execMock.mock.calls[1]?.[0]).toContain("git worktree add -b");
expect(execMock.mock.calls.some((call) => String(call[0]).includes('"worktrunk" "switch" "--create" "fusion/fn-1"'))).toBe(true);
expect(execMock.mock.calls.some((call) => String(call[0]).includes("git worktree add -b"))).toBe(true);
expect(events.filter((event) => event.type === "worktree:worktrunk-fallback")).toHaveLength(1);
});
@@ -169,6 +169,7 @@ describe("acquireTaskWorktree worktrunk wiring", () => {
remove: vi.fn(),
sync: vi.fn().mockResolvedValue({ skipped: true as const }),
prune: vi.fn(),
resolveWorktreePath: vi.fn().mockResolvedValue("/tmp/custom-path"),
},
});

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

@@ -6,15 +6,13 @@ import {
resolveWorktreeBackend,
} from "../worktree-backend.js";
const { execMock, execFileMock, accessMock } = vi.hoisted(() => {
const { execMock, accessMock } = vi.hoisted(() => {
const mock = vi.fn();
const fileMock = vi.fn();
(mock as any)[Symbol.for("nodejs.util.promisify.custom")] = mock;
(fileMock as any)[Symbol.for("nodejs.util.promisify.custom")] = fileMock;
return { execMock: mock, execFileMock: fileMock, accessMock: vi.fn() };
return { execMock: mock, accessMock: vi.fn() };
});
vi.mock("node:child_process", () => ({ exec: execMock, execFile: execFileMock }));
vi.mock("node:child_process", () => ({ exec: execMock }));
vi.mock("node:fs/promises", () => ({ access: accessMock }));
vi.mock("../branch-conflicts.js", () => ({
inspectBranchConflict: vi.fn().mockResolvedValue({ kind: "stale" }),
@@ -22,7 +20,6 @@ vi.mock("../branch-conflicts.js", () => ({
beforeEach(() => {
execMock.mockReset();
execFileMock.mockReset();
accessMock.mockReset();
accessMock.mockResolvedValue(undefined);
});
@@ -142,7 +139,7 @@ describe("WorktrunkWorktreeBackend", () => {
});
it("throws operation failed with stderr/exitCode", async () => {
execFileMock.mockRejectedValue({ stderr: "bad news", status: 7 });
execMock.mockRejectedValue({ stderr: "bad news", status: 7 });
const backend = new WorktrunkWorktreeBackend({ binaryPath: "worktrunk" });
await expect(
@@ -156,8 +153,9 @@ describe("WorktrunkWorktreeBackend", () => {
});
it("invokes create mapping with timeout/maxBuffer and cwd", async () => {
execFileMock.mockResolvedValue({ stdout: "", stderr: "" });
execMock.mockResolvedValue({ stdout: "worktree /repo/.worktrees/fusion/fn-1\n", stderr: "" });
execMock
.mockResolvedValueOnce({ stdout: "", stderr: "" })
.mockResolvedValueOnce({ stdout: "worktree /repo/.worktrees/fusion/fn-1\n", stderr: "" });
const backend = new WorktrunkWorktreeBackend({ binaryPath: "worktrunk" });
await backend.create({
@@ -168,15 +166,15 @@ describe("WorktrunkWorktreeBackend", () => {
taskId: "FN-1",
});
expect(execFileMock).toHaveBeenCalledWith(
"worktrunk",
["switch", "--create", "fusion/fn-1", "--no-hooks", "--no-cd", "--base", "main"],
expect(execMock).toHaveBeenNthCalledWith(
1,
'"worktrunk" "switch" "--create" "fusion/fn-1" "--no-hooks" "--no-cd" "--base" "main"',
expect.objectContaining({ cwd: "/repo", timeout: 120000, maxBuffer: 10485760 }),
);
});
it("invokes remove mapping", async () => {
execFileMock.mockResolvedValue({ stdout: "", stderr: "" });
execMock.mockResolvedValue({ stdout: "", stderr: "" });
const backend = new WorktrunkWorktreeBackend({ binaryPath: "worktrunk" });
await backend.remove({
@@ -185,15 +183,14 @@ describe("WorktrunkWorktreeBackend", () => {
branch: "fusion/fn-1",
});
expect(execFileMock).toHaveBeenCalledWith(
"worktrunk",
["remove", "--foreground", "fusion/fn-1"],
expect(execMock).toHaveBeenCalledWith(
'"worktrunk" "remove" "--foreground" "fusion/fn-1"',
expect.objectContaining({ cwd: "/repo", timeout: 60000, maxBuffer: 10485760 }),
);
});
it("treats remove not-found style failures as idempotent success", async () => {
execFileMock.mockRejectedValue({ stderr: "branch not found", status: 1 });
execMock.mockRejectedValue({ stderr: "branch not found", status: 1 });
const backend = new WorktrunkWorktreeBackend({ binaryPath: "worktrunk" });
await expect(
@@ -202,7 +199,7 @@ describe("WorktrunkWorktreeBackend", () => {
});
it("maps ENOENT to worktrunk_binary_missing", async () => {
execFileMock.mockRejectedValue({ code: "ENOENT", stderr: "not found" });
execMock.mockRejectedValue({ code: "ENOENT", stderr: "not found" });
const backend = new WorktrunkWorktreeBackend({ binaryPath: "worktrunk" });
await expect(
@@ -216,7 +213,7 @@ describe("WorktrunkWorktreeBackend", () => {
});
it("maps SIGTERM timeout to worktrunk_timeout", async () => {
execFileMock.mockRejectedValue({ signal: "SIGTERM", stderr: "timed out" });
execMock.mockRejectedValue({ signal: "SIGTERM", stderr: "timed out" });
const backend = new WorktrunkWorktreeBackend({ binaryPath: "worktrunk" });
await expect(
@@ -276,21 +273,20 @@ describe("WorktrunkWorktreeBackend", () => {
});
it("resolves worktrunk path from wt config show template", async () => {
execFileMock.mockResolvedValue({ stdout: '{"config":{"worktree-path":"{{ repo_path }}/../{{ repo }}.{{ branch | sanitize }}"}}', stderr: "" });
execMock.mockResolvedValue({ stdout: '{"config":{"worktree-path":"{{ repo_path }}/../{{ repo }}.{{ branch | sanitize }}"}}', stderr: "" });
const backend = new WorktrunkWorktreeBackend({ binaryPath: "worktrunk" });
await expect(
backend.resolveWorktreePath({ rootDir: "/repo/project", worktreeName: "ignored", branch: "fusion/fn-1" }),
).resolves.toBe("/repo/project.fusion-fn-1");
expect(execFileMock).toHaveBeenCalledWith(
"worktrunk",
["config", "show", "--format", "json"],
expect(execMock).toHaveBeenCalledWith(
'"worktrunk" "config" "show" "--format" "json"',
expect.objectContaining({ cwd: "/repo/project", timeout: 5000, maxBuffer: 10485760 }),
);
});
it("falls back to default layout template when config cannot be read", async () => {
execFileMock.mockRejectedValue(new Error("missing config"));
execMock.mockRejectedValue(new Error("missing config"));
const backend = new WorktrunkWorktreeBackend({ binaryPath: "worktrunk" });
await expect(
@@ -299,22 +295,24 @@ describe("WorktrunkWorktreeBackend", () => {
});
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: "" });
execMock
.mockResolvedValueOnce({
stdout:
"worktree /repo\nbranch refs/heads/main\n\nworktree /repo/.worktrees/fusion-fn-1\nbranch refs/heads/fusion/fn-1\n\n",
stderr: "",
})
.mockResolvedValueOnce({ stdout: "", stderr: "" });
const backend = new WorktrunkWorktreeBackend({ binaryPath: "worktrunk" });
await expect(backend.prune({ rootDir: "/repo" })).resolves.toBeUndefined();
expect(execMock).toHaveBeenCalledWith(
expect(execMock).toHaveBeenNthCalledWith(
1,
"git worktree list --porcelain",
expect.objectContaining({ cwd: "/repo", timeout: 60000, maxBuffer: 10485760 }),
);
expect(execFileMock).toHaveBeenCalledWith(
"worktrunk",
["remove", "--foreground", "fusion/fn-1"],
expect(execMock).toHaveBeenNthCalledWith(
2,
'"worktrunk" "remove" "--foreground" "fusion/fn-1"',
expect.objectContaining({ cwd: "/repo", timeout: 60000, maxBuffer: 10485760 }),
);
});

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

@@ -1,4 +1,4 @@
import { exec, execFile } from "node:child_process";
import { exec } from "node:child_process";
import { access } from "node:fs/promises";
import { basename, resolve } from "node:path";
import { promisify } from "node:util";
@@ -8,7 +8,6 @@ import { inspectBranchConflict } from "./branch-conflicts.js";
import { formatError } from "./logger.js";
const execAsync = promisify(exec);
const execFileAsync = promisify(execFile);
const NATIVE_TIMEOUT_MS = 120_000;
const REMOVE_TIMEOUT_MS = 60_000;
const MAX_BUFFER = 10 * 1024 * 1024;
@@ -306,7 +305,8 @@ export class WorktrunkWorktreeBackend implements WorktreeBackend {
this.deps.logger?.log?.(`[worktree-backend] running worktrunk command: ${binaryPath} ${args.join(" ")}`);
try {
return await execFileAsync(binaryPath, args, {
const command = `${quoteShellArg(binaryPath)} ${args.map((arg) => quoteShellArg(arg)).join(" ")}`;
return await execAsync(command, {
cwd: opts.cwd,
encoding: "utf-8",
timeout: WORKTRUNK_TIMEOUTS_MS[opts.operation],
@@ -341,17 +341,22 @@ export class WorktrunkWorktreeBackend implements WorktreeBackend {
if (input.startPoint) args.push("--base", input.startPoint);
await this.runWorktrunk(args, { cwd: input.rootDir, operation: "create" });
const { stdout } = await execAsync("git worktree list --porcelain", {
cwd: input.rootDir,
encoding: "utf-8",
timeout: WORKTRUNK_TIMEOUTS_MS.layout,
maxBuffer: MAX_BUFFER,
});
const rows = parseWorktreesFromPorcelain(stdout);
const resolved =
rows.find((row) => row.branch === input.branch)?.path ??
rows.find((row) => row.path.endsWith(input.branch) || row.path === input.worktreePath)?.path ??
input.worktreePath;
let resolved = input.worktreePath;
try {
const { stdout } = await execAsync("git worktree list --porcelain", {
cwd: input.rootDir,
encoding: "utf-8",
timeout: WORKTRUNK_TIMEOUTS_MS.layout,
maxBuffer: MAX_BUFFER,
});
const rows = parseWorktreesFromPorcelain(stdout);
resolved =
rows.find((row) => row.branch === input.branch)?.path ??
rows.find((row) => row.path.endsWith(input.branch) || row.path === input.worktreePath)?.path ??
input.worktreePath;
} catch {
resolved = input.worktreePath;
}
return { path: resolved, branch: input.branch };
}