@synap-core/cli 1.12.2 → 1.13.1-next.20261102.ec3d166

package/dist/commands/worker-runs.test.js

@@ -0,0 +1,150 @@
+/**
+ * The worker end to end with a fake `claude`: each code run gets its own tree
+ * folder, runs as the App token, and finished runs' trees are swept.
+ */
+import { execFileSync } from "node:child_process";
+import fs from "node:fs";
+import os from "node:os";
+import path from "node:path";
+import { afterEach, beforeEach, describe, expect, it } from "vitest";
+import { createWorker } from "./worker.js";
+import { sweepTreeFolder } from "./worker-worktrees.js";
+const git = (cwd, ...a) => execFileSync("git", ["-c", "user.email=t@t", "-c", "user.name=t", ...a], { cwd, encoding: "utf8" });
+let home;
+let oldHome;
+let root;
+let repo;
+let out;
+let claude;
+const workers = [];
+/** The nearest CLAUDE.md on the path above `dir` (Claude Code reads every CLAUDE.md on its cwd's parent path). */
+const claudeMdOnParentPath = (dir) => {
+    for (let d = dir; d !== path.dirname(d); d = path.dirname(d))
+        if (fs.existsSync(path.join(d, "CLAUDE.md")))
+            return path.join(d, "CLAUDE.md");
+    return undefined;
+};
+const SIDS = {
+    aaaaaaaa: "aaaaaaaa-0000-4000-8000-000000000001", // clean worktree
+    bbbbbbbb: "bbbbbbbb-0000-4000-8000-000000000002", // uncommitted change
+    cccccccc: "cccccccc-0000-4000-8000-000000000003", // unpushed commit
+};
+beforeEach(() => {
+    oldHome = process.env.HOME;
+    home = fs.realpathSync(fs.mkdtempSync(path.join(os.tmpdir(), "wk-home-")));
+    process.env.HOME = home;
+    root = fs.realpathSync(fs.mkdtempSync(path.join(os.tmpdir(), "wk-root-")));
+    out = path.join(root, "out");
+    fs.mkdirSync(out);
+    const origin = path.join(root, "origin.git");
+    git(root, "init", "-q", "--bare", origin);
+    repo = path.join(root, "code", "repo");
+    fs.mkdirSync(repo, { recursive: true });
+    fs.writeFileSync(path.join(root, "code", "CLAUDE.md"), "the safety rules");
+    git(repo, "init", "-q", "-b", "main");
+    fs.writeFileSync(path.join(repo, "f"), "1");
+    git(repo, "add", "f");
+    git(repo, "commit", "-q", "-m", "init");
+    git(repo, "remote", "add", "origin", origin);
+    git(repo, "push", "-q", "origin", "main");
+    git(repo, "fetch", "-q", "origin");
+    claude = path.join(root, "fake-claude.sh");
+    // $2 is the prompt; the run makes its worktree in its own cwd, as the prompt tells it.
+    fs.writeFileSync(claude, `#!/bin/sh
+sid=$(printf '%s' "$2" | sed -n 's/^Session: \\(........\\).*/\\1/p')
+echo "$sid|$PWD|$GH_TOKEN|$VERCEL_TOKEN" >> "${out}/runs.log"
+git -C "${repo}" worktree add -q --no-track "$PWD/repo" -b "devbox/$sid-x" origin/main
+case "$sid" in
+  bbbbbbbb) echo dirty > "$PWD/repo/dirty" ;;
+  cccccccc) echo c > "$PWD/repo/c" && git -C "$PWD/repo" add c && git -C "$PWD/repo" -c user.email=t@t -c user.name=t commit -q -m c ;;
+esac
+sleep 1
+`, { mode: 0o755 });
+});
+afterEach(() => {
+    process.env.HOME = oldHome;
+    delete process.env.VERCEL_TOKEN;
+    for (const w of workers.splice(0))
+        w.stop();
+});
+const handed = (...ids) => JSON.stringify({ startHere: { pendingReview: { count: 0 }, handedToYou: { count: ids.length, items: ids.map((id) => ({ id, goal: "g" })) } } });
+const sessionText = JSON.stringify({ session: { id: "s", goal: "g" }, outcomes: { status: "ok", outcomes: [] } });
+const mk = (ids, deps = {}) => {
+    const lines = [];
+    const worker = createWorker({ agent: "w1-test", cwd: path.join(root, "code"), claudeBin: claude, maxParallel: "3" }, {
+        mcp: {
+            call: async (tool) => tool === "synap_orient" ? { isError: false, text: handed(...ids) } : { isError: false, text: sessionText },
+        },
+        podUrl: "http://pod.test",
+        apiKey: "k",
+        selfAgentId: "self",
+        say: (l) => lines.push(l),
+        ...deps,
+    });
+    workers.push(worker);
+    return { worker, lines };
+};
+describe("a code run gets a tree folder of its own", () => {
+    it("two runs at once work in different folders, as the App token; clean trees go, unpushed or dirty ones stay and are named", async () => {
+        process.env.VERCEL_TOKEN = "vercel-secret";
+        const { worker, lines } = mk(Object.values(SIDS), { githubToken: { get: async () => "ghs_app_token" } });
+        expect((await worker.tick()).launched).toBe(3);
+        await worker.waitForChildren();
+        const runs = fs.readFileSync(path.join(out, "runs.log"), "utf8").trim().split("\n").map((l) => l.split("|"));
+        const cwds = runs.map((r) => r[1]);
+        expect(new Set(cwds).size).toBe(3);
+        for (const [sid, cwd, token, vercel] of runs) {
+            expect(vercel).toBe(""); // the worker's own VERCEL_TOKEN never reaches a run
+            expect(cwd).toBe(path.join(root, "code", ".worker-trees", sid));
+            expect(claudeMdOnParentPath(cwd)).toBe(path.join(root, "code", "CLAUDE.md"));
+            expect(token).toBe("ghs_app_token");
+        }
+        const trees = path.join(root, "code", ".worker-trees");
+        expect(fs.existsSync(path.join(trees, "aaaaaaaa"))).toBe(false); // clean: removed with its folder
+        expect(fs.existsSync(path.join(trees, "bbbbbbbb", "repo", "dirty"))).toBe(true);
+        expect(fs.existsSync(path.join(trees, "cccccccc", "repo", "c"))).toBe(true);
+        expect(worker.state.runs[SIDS.aaaaaaaa].keptTrees).toBeUndefined();
+        expect(worker.state.runs[SIDS.bbbbbbbb].result).toMatch(/KEPT.*uncommitted changes/);
+        expect(worker.state.runs[SIDS.cccccccc].result).toMatch(/KEPT.*unpushed commits/);
+        expect(lines.join("\n")).not.toContain("ghs_app_token");
+    });
+    it("the same hand-off is not launched twice, before or after its tree is swept", async () => {
+        const { worker } = mk([SIDS.aaaaaaaa], { githubToken: { get: async () => "t" } });
+        expect((await worker.tick()).launched).toBe(1);
+        expect((await worker.tick()).launched).toBe(0); // still running
+        await worker.waitForChildren();
+        expect((await worker.tick()).launched).toBe(0); // done, tree swept
+        expect(fs.readFileSync(path.join(out, "runs.log"), "utf8").trim().split("\n")).toHaveLength(1);
+    });
+    it("without the App files it still runs, and says LOUDLY whose login it uses", async () => {
+        const { worker, lines } = mk([SIDS.aaaaaaaa]);
+        expect((await worker.tick()).launched).toBe(1);
+        await worker.waitForChildren();
+        expect(lines.filter((l) => l.includes("WARNING") && l.includes("environment's GitHub login"))).toHaveLength(1);
+    });
+    it("a failing App token does not launch the run, and does not record it (retried next tick)", async () => {
+        const { worker, lines } = mk([SIDS.aaaaaaaa], {
+            githubToken: {
+                get: async () => {
+                    throw new Error("GitHub POST … answered 401");
+                },
+            },
+        });
+        expect((await worker.tick()).launched).toBe(1); // counted as attempted; nothing ran
+        expect(worker.state.runs[SIDS.aaaaaaaa]).toBeUndefined();
+        expect(fs.existsSync(path.join(out, "runs.log"))).toBe(false);
+        expect(lines.join("\n")).toMatch(/no GitHub App token.*not launching/);
+    });
+});
+describe("sweepTreeFolder", () => {
+    it("an unreadable status keeps the folder (never deletes on doubt)", async () => {
+        const folder = path.join(root, "tree");
+        fs.mkdirSync(path.join(folder, "repo"), { recursive: true });
+        fs.writeFileSync(path.join(folder, "repo", ".git"), "gitdir: nowhere");
+        const r = await sweepTreeFolder(folder, async () => ({ code: 128, stdout: "" }));
+        expect(r.removed).toEqual([]);
+        expect(r.kept[0].why).toBe("git status failed");
+        expect(fs.existsSync(path.join(folder, "repo"))).toBe(true);
+    });
+});
+//# sourceMappingURL=worker-runs.test.js.map

package/dist/commands/worker-runs.test.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"worker-runs.test.js","sourceRoot":"","sources":["../../src/commands/worker-runs.test.ts"],"names":[],"mappings":"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"}

package/dist/commands/worker-worktrees.d.ts

@@ -0,0 +1,34 @@
+/**
+ * One tree folder per code run, so two runs at once never share a checkout
+ * (finding f94c0287: both worked in the one clone under `--cwd`).
+ *
+ * The worker's `--cwd` is usually a folder OF repos, not a repo, so the worker
+ * cannot create the worktree itself: it gives the run an empty folder
+ * (`<state>/trees/<short id>`) as its cwd, the prompt tells the run to make its
+ * worktrees there (`git -C <cwd>/<repo> worktree add <folder>/<repo> …`), and
+ * when the run ends the worker sweeps the folder: a worktree with no
+ * uncommitted change and no commit that is not on a remote is removed; any
+ * other is KEPT, and named in the run's result.
+ */
+export interface GitResult {
+    code: number;
+    stdout: string;
+}
+export type GitFn = (cwd: string, args: string[]) => Promise<GitResult>;
+export declare const defaultGit: GitFn;
+export declare function treeFolderFor(treesRoot: string, sessionId: string): string;
+/** The run's own folder under the trees root; created owner-only. */
+export declare function ensureTreeFolder(folder: string): void;
+export interface SweepResult {
+    removed: string[];
+    /** Worktrees left in place, each with why. */
+    kept: {
+        dir: string;
+        why: string;
+    }[];
+}
+/**
+ * Removes the run's clean worktrees. A failed check is a reason to KEEP, never
+ * "clean": an unreadable status must not delete work.
+ */
+export declare function sweepTreeFolder(folder: string, git?: GitFn): Promise<SweepResult>;

package/dist/commands/worker-worktrees.js

@@ -0,0 +1,87 @@
+/**
+ * One tree folder per code run, so two runs at once never share a checkout
+ * (finding f94c0287: both worked in the one clone under `--cwd`).
+ *
+ * The worker's `--cwd` is usually a folder OF repos, not a repo, so the worker
+ * cannot create the worktree itself: it gives the run an empty folder
+ * (`<state>/trees/<short id>`) as its cwd, the prompt tells the run to make its
+ * worktrees there (`git -C <cwd>/<repo> worktree add <folder>/<repo> …`), and
+ * when the run ends the worker sweeps the folder: a worktree with no
+ * uncommitted change and no commit that is not on a remote is removed; any
+ * other is KEPT, and named in the run's result.
+ */
+import { execFile } from "node:child_process";
+import fs from "node:fs";
+import path from "node:path";
+export const defaultGit = (cwd, args) => new Promise((resolve) => {
+    execFile("git", args, { cwd, timeout: 60_000, maxBuffer: 16 * 1024 * 1024 }, (err, stdout) => {
+        const code = err ? (typeof err.code === "number" ? err.code : 1) : 0;
+        resolve({ code, stdout: String(stdout ?? "") });
+    });
+});
+export function treeFolderFor(treesRoot, sessionId) {
+    return path.join(treesRoot, sessionId.slice(0, 8));
+}
+/** The run's own folder under the trees root; created owner-only. */
+export function ensureTreeFolder(folder) {
+    fs.mkdirSync(folder, { recursive: true, mode: 0o700 });
+}
+/**
+ * Removes the run's clean worktrees. A failed check is a reason to KEEP, never
+ * "clean": an unreadable status must not delete work.
+ */
+export async function sweepTreeFolder(folder, git = defaultGit) {
+    const out = { removed: [], kept: [] };
+    let entries;
+    try {
+        entries = fs.readdirSync(folder, { withFileTypes: true });
+    }
+    catch {
+        return out;
+    }
+    for (const e of entries) {
+        const dir = path.join(folder, e.name);
+        if (!e.isDirectory())
+            continue;
+        if (!fs.existsSync(path.join(dir, ".git"))) {
+            out.kept.push({ dir, why: "not a git worktree" });
+            continue;
+        }
+        const status = await git(dir, ["status", "--porcelain"]);
+        if (status.code !== 0) {
+            out.kept.push({ dir, why: "git status failed" });
+            continue;
+        }
+        if (status.stdout.trim()) {
+            out.kept.push({ dir, why: "uncommitted changes" });
+            continue;
+        }
+        // Commits reachable from HEAD that no remote-tracking ref has: unpushed work.
+        const unpushed = await git(dir, ["rev-list", "--count", "HEAD", "--not", "--remotes"]);
+        if (unpushed.code !== 0 || Number(unpushed.stdout.trim()) !== 0) {
+            out.kept.push({ dir, why: unpushed.code !== 0 ? "git rev-list failed" : "unpushed commits" });
+            continue;
+        }
+        const common = await git(dir, ["rev-parse", "--path-format=absolute", "--git-common-dir"]);
+        if (common.code !== 0) {
+            out.kept.push({ dir, why: "git-common-dir failed" });
+            continue;
+        }
+        // Run from the main repo: git refuses to remove the worktree it is run in.
+        const removed = await git(path.dirname(common.stdout.trim()), ["worktree", "remove", dir]);
+        if (removed.code !== 0)
+            out.kept.push({ dir, why: "git worktree remove refused" });
+        else
+            out.removed.push(dir);
+    }
+    if (!out.kept.length) {
+        try {
+            fs.rmdirSync(folder);
+        }
+        catch {
+            /* not empty: something else is in it, leave it */
+        }
+    }
+    return out;
+}
+//# sourceMappingURL=worker-worktrees.js.map

package/dist/commands/worker-worktrees.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"worker-worktrees.js","sourceRoot":"","sources":["../../src/commands/worker-worktrees.ts"],"names":[],"mappings":"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"}