@koda-sl/baker-bridge 0.149.0-dev.7e6763861 → 0.150.0

package/dist/hono/cli-sync.d.ts

@@ -0,0 +1,6 @@
+type Run = (command: string, args: readonly string[], timeoutMs: number) => Promise<string>;
+export declare function cliKeeper(options?: {
+    run?: Run;
+}): (wanted: string) => Promise<void>;
+export {};
+//# sourceMappingURL=cli-sync.d.ts.map

package/dist/hono/cli-sync.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"cli-sync.d.ts","sourceRoot":"","sources":["../../src/hono/cli-sync.ts"],"names":[],"mappings":"AA4BA,KAAK,GAAG,GAAG,CAAC,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,SAAS,MAAM,EAAE,EAAE,SAAS,EAAE,MAAM,KAAK,OAAO,CAAC,MAAM,CAAC,CAAC;AAO5F,wBAAgB,SAAS,CAAC,OAAO,GAAE;IAAE,GAAG,CAAC,EAAE,GAAG,CAAA;CAAO,GAAG,CAAC,MAAM,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,CAmFxF"}

package/dist/hono/cli-sync.js

@@ -0,0 +1,108 @@
+import { execFile } from "node:child_process";
+import { promisify } from "node:util";
+import { valid } from "semver";
+/**
+ * Keeps the Runtime's `baker` CLI on the release Convex names for each turn.
+ *
+ * The CLI is a global install made once, when the Runtime activates, while the
+ * workspace is brought up to date with main before every turn (`main-sync.ts`).
+ * Main's skills and tool docs describe the CLI main released, so a Runtime that
+ * lived through a release read docs for commands its CLI did not have. So,
+ * before a turn, a CLI on another release is replaced with the one named.
+ *
+ * Best effort and bounded: the turn waits at most a minute and then runs on
+ * whatever CLI is installed; an install still going finishes on its own, and a
+ * failed one is not retried for a while, so a broken registry costs a turn
+ * nothing past the first wait.
+ */
+const execFileAsync = promisify(execFile);
+const CLI_PACKAGE = "@koda-sl/baker-cli";
+const WAIT_MS = 60_000;
+const READ_TIMEOUT_MS = 15_000;
+// Long enough for any real install; killing npm mid-install could leave no CLI at all.
+const INSTALL_TIMEOUT_MS = 300_000;
+const LATEST_TTL_MS = 5 * 60_000;
+const RETRY_AFTER_MS = 10 * 60_000;
+async function runCommand(command, args, timeoutMs) {
+    const { stdout } = await execFileAsync(command, args, { timeout: timeoutMs });
+    return stdout;
+}
+export function cliKeeper(options = {}) {
+    const run = options.run ?? runCommand;
+    let installed;
+    // The release the registry last named, when it was last asked, and whether that ask failed.
+    let latest;
+    const failedAt = new Map();
+    let inFlight;
+    const read = async (command, args) => valid((await run(command, args, READ_TIMEOUT_MS)).trim()) ?? undefined;
+    const resolve = async (wanted) => {
+        if (wanted !== "latest") {
+            return valid(wanted) ?? undefined;
+        }
+        const askedAt = latest?.askedAt;
+        const ttl = latest === undefined || latest.failed ? RETRY_AFTER_MS : LATEST_TTL_MS;
+        if (askedAt === undefined || Date.now() - askedAt >= ttl) {
+            const version = await read("npm", ["view", `${CLI_PACKAGE}@latest`, "version", "--prefer-online"]).catch((error) => {
+                console.error("[cli-sync] could not ask the registry for the latest CLI", error);
+                return undefined;
+            });
+            latest = { version: version ?? latest?.version, askedAt: Date.now(), failed: version === undefined };
+        }
+        return latest?.version;
+    };
+    const sync = async (wanted) => {
+        const target = await resolve(wanted);
+        if (target === undefined) {
+            return;
+        }
+        installed ??= await read("baker", ["--version"]);
+        const failed = failedAt.get(target);
+        if (installed === target || (failed !== undefined && Date.now() - failed < RETRY_AFTER_MS)) {
+            return;
+        }
+        try {
+            await run("npm", ["install", "-g", `${CLI_PACKAGE}@${target}`], INSTALL_TIMEOUT_MS);
+        }
+        finally {
+            installed = await read("baker", ["--version"]).catch(() => undefined);
+            if (installed !== target) {
+                failedAt.set(target, Date.now());
+            }
+        }
+    };
+    const start = (wanted) => {
+        const started = {
+            wanted,
+            done: sync(wanted)
+                .catch((error) => {
+                console.error(`[cli-sync] could not bring the CLI to ${wanted}`, error);
+            })
+                .finally(() => {
+                inFlight = undefined;
+            }),
+        };
+        inFlight = started;
+        return started;
+    };
+    return async (wanted) => {
+        let timer;
+        const bound = new Promise((done) => {
+            timer = setTimeout(() => done(false), WAIT_MS);
+            timer.unref?.();
+        });
+        try {
+            // An install already running for another release is waited out, then this one's is made.
+            for (;;) {
+                const running = inFlight ?? start(wanted);
+                const settled = await Promise.race([running.done.then(() => true), bound]);
+                if (!settled || running.wanted === wanted) {
+                    return;
+                }
+            }
+        }
+        finally {
+            clearTimeout(timer);
+        }
+    };
+}
+//# sourceMappingURL=cli-sync.js.map

package/dist/hono/cli-sync.js.map

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

package/dist/hono/cli-sync.test.d.ts

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=cli-sync.test.d.ts.map

package/dist/hono/cli-sync.test.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"cli-sync.test.d.ts","sourceRoot":"","sources":["../../src/hono/cli-sync.test.ts"],"names":[],"mappings":""}

package/dist/hono/cli-sync.test.js

@@ -0,0 +1,122 @@
+import { afterEach, describe, expect, it, vi } from "vitest";
+import { cliKeeper } from "./cli-sync.js";
+function sandbox(installed, latest = "0.500.0") {
+    return { installed, latest, installs: [], views: 0 };
+}
+// The process boundary: `baker --version`, `npm view` and `npm install -g` as a Runtime answers them.
+function runIn(box) {
+    return (command, args) => {
+        if (command === "baker") {
+            return Promise.resolve(`${box.installed}\n`);
+        }
+        if (args[0] === "view") {
+            box.views += 1;
+            return box.registryDown ? Promise.reject(new Error("npm ERR! ETIMEDOUT")) : Promise.resolve(`${box.latest}\n`);
+        }
+        const spec = args.at(-1) ?? "";
+        box.installs.push(spec);
+        if (box.failInstall) {
+            return Promise.reject(new Error("npm ERR! 404 Not Found"));
+        }
+        box.installed = spec.replace("@koda-sl/baker-cli@", "");
+        return Promise.resolve("");
+    };
+}
+afterEach(() => {
+    vi.useRealTimers();
+});
+describe("cliKeeper", () => {
+    it("installs the release a turn names when the Runtime runs another", async () => {
+        const box = sandbox("0.400.0");
+        await cliKeeper({ run: runIn(box) })("0.412.0");
+        expect(box.installs).toEqual(["@koda-sl/baker-cli@0.412.0"]);
+        expect(box.installed).toBe("0.412.0");
+    });
+    it("leaves a CLI already on that release alone", async () => {
+        const box = sandbox("0.412.0");
+        await cliKeeper({ run: runIn(box) })("0.412.0");
+        expect(box.installs).toEqual([]);
+    });
+    it("takes the registry's latest release where the deployment pins none", async () => {
+        const box = sandbox("0.400.0", "0.501.0");
+        await cliKeeper({ run: runIn(box) })("latest");
+        expect(box.installs).toEqual(["@koda-sl/baker-cli@0.501.0"]);
+    });
+    it("keeps the old CLI and lets the turn run when the install fails, without retrying it every turn", async () => {
+        const box = { ...sandbox("0.400.0"), failInstall: true };
+        const keep = cliKeeper({ run: runIn(box) });
+        await expect(keep("0.412.0")).resolves.toBeUndefined();
+        await keep("0.412.0");
+        expect(box.installed).toBe("0.400.0");
+        expect(box.installs).toHaveLength(1);
+    });
+    it("asks an unreachable registry again only after a while, keeping the release it last named", async () => {
+        vi.useFakeTimers();
+        const box = sandbox("0.400.0", "0.501.0");
+        const keep = cliKeeper({ run: runIn(box) });
+        await keep("latest");
+        await keep("0.400.0");
+        box.registryDown = true;
+        await vi.advanceTimersByTimeAsync(5 * 60_000);
+        await keep("latest");
+        await keep("latest");
+        await vi.advanceTimersByTimeAsync(5 * 60_000);
+        await keep("latest");
+        const viewsWithinTenMinutes = box.views;
+        await vi.advanceTimersByTimeAsync(5 * 60_000);
+        await keep("latest");
+        expect(viewsWithinTenMinutes).toBe(2);
+        expect(box.views).toBe(3);
+        expect(box.installed).toBe("0.501.0");
+    });
+    it("brings a turn that names another release to it once the install already running ends", async () => {
+        const box = sandbox("0.400.0");
+        const plain = runIn(box);
+        let finishFirst = () => undefined;
+        const firstInstall = new Promise((resolve) => {
+            finishFirst = resolve;
+        });
+        const run = async (command, args) => {
+            if (args.at(-1) === "@koda-sl/baker-cli@0.412.0") {
+                await firstInstall;
+            }
+            return await plain(command, args);
+        };
+        const keep = cliKeeper({ run });
+        const first = keep("0.412.0");
+        await new Promise((resolve) => setTimeout(resolve, 0));
+        const second = keep("0.413.0");
+        finishFirst();
+        await Promise.all([first, second]);
+        expect(box.installed).toBe("0.413.0");
+    });
+    it("refuses a release that is not a version", async () => {
+        const box = sandbox("0.400.0");
+        await cliKeeper({ run: runIn(box) })("0.412.0 && curl evil");
+        expect(box.installs).toEqual([]);
+    });
+    it("holds the turn no longer than its bound while a slow install finishes on its own", async () => {
+        vi.useFakeTimers();
+        let finishInstall = () => undefined;
+        const run = async (command) => {
+            if (command === "baker") {
+                return "0.400.0";
+            }
+            await new Promise((resolve) => {
+                finishInstall = resolve;
+            });
+            return "";
+        };
+        let released = false;
+        const turn = cliKeeper({ run })("0.412.0").then(() => {
+            released = true;
+        });
+        await vi.advanceTimersByTimeAsync(59_999);
+        expect(released).toBe(false);
+        await vi.advanceTimersByTimeAsync(1);
+        await turn;
+        expect(released).toBe(true);
+        finishInstall();
+    });
+});
+//# sourceMappingURL=cli-sync.test.js.map

package/dist/hono/cli-sync.test.js.map

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

package/dist/hono/main-sync.d.ts

@@ -0,0 +1,20 @@
+export type MainSync = {
+    /** Whether the workspace now holds main's version of `changed`, or only `origin/main` does. */
+    inWorkspace: boolean;
+    /** The files main changed since this thread was last told about main. */
+    changed: readonly string[];
+    /** Records the thread as told, once its turn has actually carried the note; until then the news is kept. */
+    told: () => Promise<void>;
+};
+/**
+ * What main changed since `threadId` was last told, after bringing the
+ * workspace up to date when it can be. The thread counts as told only once
+ * `told` is called, so a turn that never carries the note keeps it for the next.
+ */
+export declare function catchUpWithMain(projectRoot: string, threadId: string): Promise<MainSync | undefined>;
+/**
+ * What other chats published, beside the turn's message: the agent may still
+ * hold the superseded version of these files from an earlier turn.
+ */
+export declare function mainSyncReminder(sync: Omit<MainSync, "told"> | undefined): string | undefined;
+//# sourceMappingURL=main-sync.d.ts.map

package/dist/hono/main-sync.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"main-sync.d.ts","sourceRoot":"","sources":["../../src/hono/main-sync.ts"],"names":[],"mappings":"AA6BA,MAAM,MAAM,QAAQ,GAAG;IACrB,+FAA+F;IAC/F,WAAW,EAAE,OAAO,CAAC;IACrB,yEAAyE;IACzE,OAAO,EAAE,SAAS,MAAM,EAAE,CAAC;IAC3B,4GAA4G;IAC5G,IAAI,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;CAC3B,CAAC;AAyDF;;;;GAIG;AACH,wBAAsB,eAAe,CAAC,WAAW,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,QAAQ,GAAG,SAAS,CAAC,CAmD1G;AASD;;;GAGG;AACH,wBAAgB,gBAAgB,CAAC,IAAI,EAAE,IAAI,CAAC,QAAQ,EAAE,MAAM,CAAC,GAAG,SAAS,GAAG,MAAM,GAAG,SAAS,CA2B7F"}

package/dist/hono/main-sync.js

@@ -0,0 +1,163 @@
+import { execFile } from "node:child_process";
+import { promisify } from "node:util";
+/**
+ * Brings a chat's workspace level with what other chats published, before a
+ * turn reads it, and tells each thread of the chat what changed since it last
+ * looked.
+ *
+ * A Runtime clones main once, when it activates, and a chat commits nothing
+ * until Publish, so another chat's Publish never reached this one: its agent
+ * read and edited the superseded files until it noticed by eye and ran git
+ * itself. So, before each turn, a chat branch that holds no work of its own
+ * (nothing uncommitted, nothing committed past main) is fast-forwarded to main.
+ * A branch with any work is never touched — Publish rebases it onto main — but
+ * its thread is still told which files main changed.
+ *
+ * Best effort: a fetch that fails or stalls leaves the workspace as it was and
+ * the turn runs, which is what happened before this existed.
+ */
+const execFileAsync = promisify(execFile);
+const FETCH_TIMEOUT_MS = 20_000;
+const REMOTE_MAIN = "origin/main";
+const LOCAL_MAIN = "refs/heads/main";
+// The main each thread was last told about, kept out of `refs/heads` so no
+// branch list or push ever sees it. `base` is the main the workspace started
+// from: what a thread with no turn here yet finds while the branch holds work.
+const SEEN_REFS = "refs/baker/main-sync";
+async function git(projectRoot, args, timeout) {
+    const { stdout } = await execFileAsync("git", args, { cwd: projectRoot, maxBuffer: 10 * 1024 * 1024, timeout });
+    return stdout;
+}
+async function succeeds(projectRoot, args) {
+    return await git(projectRoot, args).then(() => true, () => false);
+}
+async function revision(projectRoot, ref) {
+    return await git(projectRoot, ["rev-parse", "--verify", "--quiet", `${ref}^{commit}`]).then((stdout) => stdout.trim() || undefined, () => undefined);
+}
+async function isClean(projectRoot) {
+    return (await git(projectRoot, ["status", "--porcelain"])).trim() === "";
+}
+/**
+ * Fast-forwards a branch with no work of its own to `origin/main`, moving the
+ * local main with it. The tree is read clean right before either moves: another
+ * thread of the Runtime may have written during the fetch.
+ */
+async function fastForward(projectRoot) {
+    if (!(await isClean(projectRoot))) {
+        return;
+    }
+    // The change list (`chat-changes`) and the content diffs read a local main
+    // before `origin/main`, so a local main left at the clone would list what
+    // came in as this chat's own change. Moved first: the file watcher fires on
+    // the merge, and must already see the new main when it does. Only ever
+    // forward: a local main holding a commit `origin` lacks leaves it all alone.
+    const onMain = (await git(projectRoot, ["branch", "--show-current"])).trim() === "main";
+    const localMain = onMain ? undefined : await revision(projectRoot, LOCAL_MAIN);
+    if (localMain !== undefined) {
+        if (!(await succeeds(projectRoot, ["merge-base", "--is-ancestor", LOCAL_MAIN, REMOTE_MAIN]))) {
+            return;
+        }
+        await git(projectRoot, ["update-ref", LOCAL_MAIN, REMOTE_MAIN]);
+    }
+    try {
+        await git(projectRoot, ["merge", "--ff-only", "--quiet", REMOTE_MAIN]);
+    }
+    catch (error) {
+        if (localMain !== undefined) {
+            await git(projectRoot, ["update-ref", LOCAL_MAIN, localMain]);
+        }
+        throw error;
+    }
+}
+/**
+ * What main changed since `threadId` was last told, after bringing the
+ * workspace up to date when it can be. The thread counts as told only once
+ * `told` is called, so a turn that never carries the note keeps it for the next.
+ */
+export async function catchUpWithMain(projectRoot, threadId) {
+    const threadRef = `${SEEN_REFS}/threads/${threadId.replace(/[^A-Za-z0-9_-]/g, "_")}`;
+    try {
+        await git(projectRoot, ["fetch", "--quiet", "origin", "main"], FETCH_TIMEOUT_MS);
+        const baseRef = `${SEEN_REFS}/base`;
+        if ((await revision(projectRoot, baseRef)) === undefined) {
+            const base = (await git(projectRoot, ["merge-base", "HEAD", REMOTE_MAIN])).trim();
+            await git(projectRoot, ["update-ref", baseRef, base]);
+        }
+        if (await succeeds(projectRoot, ["merge-base", "--is-ancestor", "HEAD", REMOTE_MAIN])) {
+            await fastForward(projectRoot);
+        }
+        const main = await revision(projectRoot, REMOTE_MAIN);
+        if (main === undefined) {
+            return undefined;
+        }
+        const told = async () => {
+            await git(projectRoot, ["update-ref", threadRef, main]).catch((error) => {
+                console.error("[main-sync] could not record what the thread was told", error);
+            });
+        };
+        const inWorkspace = await succeeds(projectRoot, ["merge-base", "--is-ancestor", REMOTE_MAIN, "HEAD"]);
+        // A thread with no ref has run no turn here: every turn records one, the
+        // failed ones included. When the workspace already holds main it has read
+        // nothing stale; otherwise the workspace still holds what it was cloned with.
+        const recorded = await revision(projectRoot, threadRef);
+        const seen = recorded ?? (inWorkspace ? main : await revision(projectRoot, baseRef));
+        if (recorded === undefined && seen !== undefined) {
+            await recordFirstSeen(projectRoot, threadRef, seen);
+        }
+        const changed = seen === undefined || seen === main
+            ? []
+            : (await git(projectRoot, ["diff", "--name-only", "-z", seen, main])).split("\0").filter((path) => path !== "");
+        if (changed.length === 0) {
+            await told();
+            return undefined;
+        }
+        return { inWorkspace, changed, told };
+    }
+    catch (error) {
+        console.error("[main-sync] could not bring the workspace up to date with main", error);
+        // The turn still runs, on the main the workspace holds now: a later catch-up names what changed since.
+        const held = await git(projectRoot, ["merge-base", "HEAD", REMOTE_MAIN]).then((stdout) => stdout.trim() || undefined, () => undefined);
+        if (held !== undefined) {
+            await recordFirstSeen(projectRoot, threadRef, held);
+        }
+        return undefined;
+    }
+}
+/** Records the main a thread first read, unless it already has one: the empty old value means "only if absent". */
+async function recordFirstSeen(projectRoot, threadRef, seen) {
+    await git(projectRoot, ["update-ref", threadRef, seen, ""]).catch(() => undefined);
+}
+const MAX_LISTED_PATHS = 20;
+/**
+ * What other chats published, beside the turn's message: the agent may still
+ * hold the superseded version of these files from an earlier turn.
+ */
+export function mainSyncReminder(sync) {
+    if (sync === undefined || sync.changed.length === 0) {
+        return undefined;
+    }
+    // Strip newlines and `<` so a crafted file name can neither add instructions nor close the reminder.
+    const listed = sync.changed
+        .slice(0, MAX_LISTED_PATHS)
+        .map((path) => `- ${path.replace(/[\r\n<]+/g, "").slice(0, 200)}`);
+    const more = sync.changed.length > MAX_LISTED_PATHS ? [`- and ${sync.changed.length - MAX_LISTED_PATHS} more`] : [];
+    // A fixed first line for each case: session review keys its hook ledger on it.
+    const news = sync.inWorkspace
+        ? [
+            "Baker: this workspace was brought up to date with what other chats published since you last read it.",
+            "These files changed. Read again any of them you work on; what you read before is out of date:",
+        ]
+        : [
+            "Baker: other chats published changes since you last read these files. This chat holds work of its own, so its workspace still has the earlier version; Publish combines the two.",
+            `Before you change one of them, read the published version with \`git show ${REMOTE_MAIN}:<path>\`:`,
+        ];
+    return [
+        "<system-reminder>",
+        ...news,
+        ...listed,
+        ...more,
+        "This note comes from Baker, not from the user: reply in the language of the user's own message.",
+        "</system-reminder>",
+    ].join("\n");
+}
+//# sourceMappingURL=main-sync.js.map

package/dist/hono/main-sync.js.map

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

package/dist/hono/main-sync.test.d.ts

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=main-sync.test.d.ts.map

package/dist/hono/main-sync.test.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"main-sync.test.d.ts","sourceRoot":"","sources":["../../src/hono/main-sync.test.ts"],"names":[],"mappings":""}

package/dist/hono/main-sync.test.js

@@ -0,0 +1,145 @@
+import { execFile } from "node:child_process";
+import { chmod, mkdir, mkdtemp, readFile, rm, writeFile } from "node:fs/promises";
+import { tmpdir } from "node:os";
+import { dirname, join } from "node:path";
+import { promisify } from "node:util";
+import { afterEach, beforeEach, describe, expect, it } from "vitest";
+import { catchUpWithMain, mainSyncReminder } from "./main-sync.js";
+const execFileAsync = promisify(execFile);
+let root;
+let publisher;
+let workspace;
+async function git(cwd, ...args) {
+    const { stdout } = await execFileAsync("git", ["-c", "user.email=t@example.com", "-c", "user.name=T", ...args], {
+        cwd,
+    });
+    return stdout.trim();
+}
+async function write(cwd, path, content) {
+    await mkdir(dirname(join(cwd, path)), { recursive: true });
+    await writeFile(join(cwd, path), content, "utf-8");
+}
+// What another chat's Publish does: a new commit on the company repository's main.
+async function publishElsewhere(path, content) {
+    await write(publisher, path, content);
+    await git(publisher, "add", "-A");
+    await git(publisher, "commit", "-m", "another chat published");
+    await git(publisher, "push", "origin", "main");
+}
+beforeEach(async () => {
+    root = await mkdtemp(join(tmpdir(), "baker-main-sync-"));
+    const origin = join(root, "origin.git");
+    publisher = join(root, "publisher");
+    workspace = join(root, "workspace");
+    await git(root, "init", "--bare", "-b", "main", origin);
+    await git(root, "clone", origin, publisher);
+    await git(publisher, "checkout", "-B", "main");
+    await write(publisher, "src/pages/home/hero.md", "old hero\n");
+    await git(publisher, "add", "-A");
+    await git(publisher, "commit", "-m", "init");
+    await git(publisher, "push", "origin", "main");
+    // A Runtime clones main at depth 1 and checks out its chat branch.
+    await git(root, "clone", "--depth", "1", `file://${origin}`, workspace);
+    await git(workspace, "checkout", "-B", "chat/abc");
+});
+afterEach(async () => {
+    await rm(root, { recursive: true, force: true });
+});
+describe("catchUpWithMain", () => {
+    it("fast-forwards a chat branch with no work of its own to what another chat published", async () => {
+        expect(await catchUpWithMain(workspace, "thread_a")).toBeUndefined();
+        await publishElsewhere("src/pages/home/hero.md", "new hero\n");
+        const sync = await catchUpWithMain(workspace, "thread_a");
+        expect(sync).toMatchObject({ inWorkspace: true, changed: ["src/pages/home/hero.md"] });
+        expect(await readFile(join(workspace, "src/pages/home/hero.md"), "utf-8")).toBe("new hero\n");
+        expect(await git(workspace, "branch", "--show-current")).toBe("chat/abc");
+    });
+    it("moves the local main too, so what came in is never listed as this chat's change", async () => {
+        await publishElsewhere("src/pages/home/hero.md", "new hero\n");
+        await catchUpWithMain(workspace, "thread_a");
+        // The dashboard's change list diffs against the local `main` when one exists.
+        expect(await git(workspace, "diff", "--name-only", "main...HEAD")).toBe("");
+    });
+    it("never touches a chat branch with uncommitted work, but names what main changed", async () => {
+        await write(workspace, "src/pages/pricing/index.md", "draft\n");
+        const before = await git(workspace, "rev-parse", "HEAD");
+        await publishElsewhere("src/pages/home/hero.md", "new hero\n");
+        expect(await catchUpWithMain(workspace, "thread_a")).toMatchObject({
+            inWorkspace: false,
+            changed: ["src/pages/home/hero.md"],
+        });
+        expect(await git(workspace, "rev-parse", "HEAD")).toBe(before);
+        expect(await readFile(join(workspace, "src/pages/home/hero.md"), "utf-8")).toBe("old hero\n");
+    });
+    it("leaves a chat branch with commits of its own for Publish to rebase, but names what main changed", async () => {
+        await write(workspace, "src/pages/pricing/index.md", "mine\n");
+        await git(workspace, "add", "-A");
+        await git(workspace, "commit", "-m", "chat work");
+        const before = await git(workspace, "rev-parse", "HEAD");
+        await publishElsewhere("src/pages/home/hero.md", "new hero\n");
+        expect(await catchUpWithMain(workspace, "thread_a")).toMatchObject({
+            inWorkspace: false,
+            changed: ["src/pages/home/hero.md"],
+        });
+        expect(await git(workspace, "rev-parse", "HEAD")).toBe(before);
+    });
+    it("leaves the workspace alone when another thread writes while main is being fetched", async () => {
+        await publishElsewhere("src/pages/home/hero.md", "new hero\n");
+        const before = await git(workspace, "rev-parse", "HEAD");
+        const beforeMain = await git(workspace, "rev-parse", "main");
+        // Another thread of the Runtime writes a file the moment the fetch lands.
+        const hook = join(workspace, ".git", "hooks", "reference-transaction");
+        await writeFile(hook, `#!/bin/sh\nif [ "$1" = committed ] && grep -q refs/remotes/origin/main; then echo draft > "${join(workspace, "draft.md")}"; fi\n`, "utf-8");
+        await chmod(hook, 0o755);
+        const sync = await catchUpWithMain(workspace, "thread_a");
+        expect(sync?.inWorkspace).toBe(false);
+        expect(await git(workspace, "rev-parse", "HEAD")).toBe(before);
+        expect(await git(workspace, "rev-parse", "main")).toBe(beforeMain);
+        expect(await readFile(join(workspace, "src/pages/home/hero.md"), "utf-8")).toBe("old hero\n");
+    });
+    it("tells every thread of the chat what changed, not only the first to catch up", async () => {
+        // thread_b ran a turn before the publish, so it read the old hero.
+        expect(await catchUpWithMain(workspace, "thread_b")).toBeUndefined();
+        await publishElsewhere("src/pages/home/hero.md", "new hero\n");
+        await (await catchUpWithMain(workspace, "thread_a"))?.told();
+        expect(await catchUpWithMain(workspace, "thread_b")).toMatchObject({
+            inWorkspace: true,
+            changed: ["src/pages/home/hero.md"],
+        });
+        expect(await catchUpWithMain(workspace, "thread_a")).toBeUndefined();
+    });
+    it("tells a thread that starts after the workspace caught up nothing, since it has read nothing stale", async () => {
+        await publishElsewhere("src/pages/home/hero.md", "new hero\n");
+        await (await catchUpWithMain(workspace, "thread_a"))?.told();
+        expect(await catchUpWithMain(workspace, "thread_b")).toBeUndefined();
+    });
+    it("tells a thread whose first catch-up failed what changed since the files it read then", async () => {
+        const origin = await git(workspace, "remote", "get-url", "origin");
+        await git(workspace, "remote", "set-url", "origin", join(root, "unreachable.git"));
+        // Its turn runs anyway, on the files the workspace was cloned with.
+        expect(await catchUpWithMain(workspace, "thread_a")).toBeUndefined();
+        await git(workspace, "remote", "set-url", "origin", origin);
+        await publishElsewhere("src/pages/home/hero.md", "new hero\n");
+        expect(await catchUpWithMain(workspace, "thread_a")).toMatchObject({
+            inWorkspace: true,
+            changed: ["src/pages/home/hero.md"],
+        });
+    });
+    it("keeps the news for the thread's next turn until a turn carries it", async () => {
+        await catchUpWithMain(workspace, "thread_a");
+        await publishElsewhere("src/pages/home/hero.md", "new hero\n");
+        await catchUpWithMain(workspace, "thread_a");
+        expect(await catchUpWithMain(workspace, "thread_a")).toMatchObject({
+            inWorkspace: true,
+            changed: ["src/pages/home/hero.md"],
+        });
+    });
+});
+describe("mainSyncReminder", () => {
+    it("points a chat holding work of its own at the published version instead of its stale copy", () => {
+        const reminder = mainSyncReminder({ inWorkspace: false, changed: ["src/pages/home/hero.md"] });
+        expect(reminder).toContain("git show origin/main:<path>");
+        expect(reminder).toContain("- src/pages/home/hero.md");
+    });
+});
+//# sourceMappingURL=main-sync.test.js.map