@koda-sl/baker-bridge 0.108.0-dev.f7c15fa76 → 0.109.0-dev.f28c07bd2

package/dist/hono/bridge-job.test.js

@@ -229,7 +229,7 @@ function createExecutor(options) {
         now: options.now,
         readUsageBaseline: async (sessionId) => options.usageBaselines?.[sessionId],
         stalledCliExitMs: 0,
-        ...(options.mainSync ? { mainSync: options.mainSync } : {}),
+        prepareAttachments: options.prepareAttachments,
     });
 }
 function resultMessage(costUsd, sessionId, modelUsage) {
@@ -1112,6 +1112,18 @@ describe("BridgeJobExecutor", () => {
         await executor.execute({ threadId: "thread_bedrock", turnId: "turn_bedrock", prompt: "Build a landing", history: history([]) }, activeControls());
         expect(queryInputs[0]?.options.env).toMatchObject({ CLAUDE_CODE_MODEL_CAPABILITIES: "-per_turn_effort" });
     });
+    // Behind the OpenRouter base URL the CLI loads every MCP tool schema up front:
+    // a connected Make toolkit put ~180 schemas (~115k tokens) into every request of
+    // a Session that called two of them. Tool search defers them to their names.
+    it("defers MCP tool schemas behind tool search instead of loading them into every request", async () => {
+        const queryInputs = [];
+        const executor = createExecutor({
+            queryInputs,
+            queryResults: [scriptedMessages(resultMessage(0, "session_tool_search"))],
+        });
+        await executor.execute({ threadId: "thread_tool_search", turnId: "turn_tool_search", prompt: "Check Make", history: history([]) }, activeControls());
+        expect(queryInputs[0]?.options.env).toMatchObject({ ENABLE_TOOL_SEARCH: "true" });
+    });
     it("silences the CLI task reminders and ANSI colour in the agent subprocess", async () => {
         const queryInputs = [];
         const executor = createExecutor({
@@ -1473,174 +1485,87 @@ describe("BridgeJobExecutor", () => {
         expect(queryInputs[0]?.prompt).toBe("/publish");
         expect(queryInputs[0]?.reminder).toBeUndefined();
     });
-    it("brings the workspace level with main before the turn and tells the agent what changed, beside the viewing context", async () => {
+    it("keeps the viewing-reference context beside the message when a stale session falls back to rehydration", async () => {
         const queryInputs = [];
-        const syncedThreads = [];
-        const syncedPublishes = [];
         const executor = createExecutor({
+            loadedBoundary: cleanBoundary("session_stale_viewing"),
             queryInputs,
-            queryResults: [scriptedMessages(resultMessage(0, "session_main_moved"))],
-            mainSync: {
-                beforeTurn: (threadId, published) => {
-                    syncedThreads.push(threadId);
-                    syncedPublishes.push(...published.map((entry) => entry.sha));
-                    return Promise.resolve({
-                        recovered: "<system-reminder>\nBaker: this workspace now includes work published since your last look.\n</system-reminder>",
-                    });
-                },
-                refuseWrite: () => null,
-            },
+            queryResults: [
+                scriptedError(new Error("Cannot resume: session not found")),
+                scriptedMessages(resultMessage(0, "session_next_viewing")),
+            ],
         });
         await executor.execute({
-            threadId: "thread_main_moved",
-            turnId: "turn_main_moved",
-            prompt: "change the hero title",
-            history: history([]),
+            threadId: "thread_stale_viewing",
+            turnId: "turn_stale_viewing",
+            prompt: "quita el pricing",
+            history: history([{ role: "user", text: "Persisted fact", createdAt: 1 }]),
             currentReference: { type: "landing", slug: "homepage", title: "Homepage" },
-            publishedElsewhere: [
-                {
-                    sha: "abc123",
-                    chatId: "sibling",
-                    title: "New hero",
-                    publishedAt: 1,
-                    paths: ["src/pages/hero/index.astro"],
-                },
-            ],
         }, activeControls());
-        expect(syncedThreads).toEqual(["thread_main_moved"]);
-        expect(syncedPublishes).toEqual(["abc123"]);
-        expect(queryInputs[0]?.prompt).toBe("change the hero title");
-        expect(queryInputs[0]?.reminder).toContain("Baker: this workspace now includes work published");
-        expect(queryInputs[0]?.reminder).toContain('landing "Homepage" (slug: homepage)');
-    });
-    it("does not move the workspace under a publish command", async () => {
-        const queryInputs = [];
-        const syncedThreads = [];
-        const executor = createExecutor({
-            queryInputs,
-            queryResults: [scriptedMessages(resultMessage(0, "session_publish_main"))],
-            mainSync: {
-                beforeTurn: (threadId) => {
-                    syncedThreads.push(threadId);
-                    return Promise.resolve({ resumed: "<system-reminder>\nBaker: moved\n</system-reminder>" });
-                },
-                refuseWrite: () => null,
-            },
-        });
-        await executor.execute({ threadId: "thread_publish_main", turnId: "turn_publish_main", prompt: "/publish", history: history([]) }, activeControls());
-        expect(syncedThreads).toEqual([]);
-        expect(queryInputs[0]?.reminder).toBeUndefined();
-    });
-    it("tells a resumed session only what is new, since it remembers every earlier note", async () => {
-        const queryInputs = [];
-        const executor = createExecutor({
-            loadedBoundary: cleanBoundary("session_resumed_main"),
-            queryInputs,
-            queryResults: [scriptedMessages(resultMessage(0, "session_resumed_main_next"))],
-            mainSync: {
-                beforeTurn: () => Promise.resolve({ recovered: "<system-reminder>\nBaker: standing\n</system-reminder>" }),
-                refuseWrite: () => null,
-            },
-        });
-        await executor.execute({ threadId: "thread_resumed_main", turnId: "turn_resumed_main", prompt: "hola", history: history([]) }, activeControls());
-        expect(queryInputs[0]?.reminder).toBeUndefined();
+        expect(queryInputs[1]?.prompt).toContain("Current user request\nquita el pricing");
+        expect(queryInputs[1]?.prompt).not.toContain("preview pane");
+        expect(queryInputs[1]?.reminder).toContain('landing "Homepage" (slug: homepage)');
     });
-    it("repeats the standing workspace notice when a stale session falls back to rehydration", async () => {
+    // A late answer to a blocking prompt continues a request whose files the
+    // Session received with it. A rebuilt Session only has that request's history,
+    // which names the files but cannot open them, so they are handed over again.
+    it("hands over the continued request's files when the Session is rebuilt", async () => {
         const queryInputs = [];
         const executor = createExecutor({
-            loadedBoundary: cleanBoundary("session_stale_main"),
             queryInputs,
-            queryResults: [
-                scriptedError(new Error("Cannot resume: session not found")),
-                scriptedMessages(resultMessage(0, "session_stale_main_next")),
-            ],
-            mainSync: {
-                beforeTurn: () => Promise.resolve({ recovered: "<system-reminder>\nBaker: standing\n</system-reminder>" }),
-                refuseWrite: () => null,
-            },
+            prepareAttachments: async (attachments, attachedTo) => `\n\nFILES for ${attachedTo}: ${attachments.map((attachment) => attachment.filename).join(", ")}`,
         });
         await executor.execute({
-            threadId: "thread_stale_main",
-            turnId: "turn_stale_main",
-            prompt: "quita el pricing",
-            history: history([{ role: "user", text: "Persisted fact", createdAt: 1 }]),
+            threadId: "thread_continued_files",
+            turnId: "turn_continued_files",
+            prompt: "They have now replied: HubSpot",
+            continuedAttachments: [
+                { url: "https://files.example/logo.png", contentType: "image/png", filename: "logo.png" },
+            ],
+            history: history([{ role: "user", text: "Build a page with my logo", createdAt: 1 }]),
         }, activeControls());
-        expect(queryInputs[0]?.reminder).toBeUndefined();
-        expect(queryInputs[1]?.reminder).toContain("Baker: standing");
+        expect(queryInputs[0]?.prompt).toContain("FILES for continued_request: logo.png");
     });
-    it("brings the workspace level with main before a skill command without putting a note in front of it", async () => {
-        const workspace = await mkdtemp(join(tmpdir(), "baker-job-skill-main-"));
-        await mkdir(join(workspace, ".claude", "skills", "landing"), { recursive: true });
-        projectRootMock.value = workspace;
+    it("does not hand the continued request's files over again to a resumed Session", async () => {
         const queryInputs = [];
-        const syncs = [];
         const executor = createExecutor({
+            loadedBoundary: cleanBoundary("session_holds_files"),
             queryInputs,
-            queryResults: [scriptedMessages(resultMessage(0, "session_skill_main"))],
-            mainSync: {
-                beforeTurn: (threadId, _published, turn) => {
-                    syncs.push({ threadId, ...turn });
-                    return Promise.resolve({});
-                },
-                refuseWrite: () => null,
-            },
-        });
-        await executor.execute({ threadId: "thread_skill_main", turnId: "turn_skill_main", prompt: "/landing pricing", history: history([]) }, activeControls());
-        expect(syncs).toEqual([{ threadId: "thread_skill_main", withNote: false }]);
-        expect(queryInputs[0]?.prompt).toBe("/landing pricing");
-        expect(queryInputs[0]?.reminder).toBeUndefined();
-    });
-    it("refuses a write that would create a page another chat already published, with the reason for the agent", async () => {
-        let guardResult;
-        const executor = new BridgeJobExecutor({
-            sdk: {
-                query: (input) => ({
-                    async *[Symbol.asyncIterator]() {
-                        guardResult = await input.options.canUseTool?.("Write", { file_path: "/workspace/src/pages/sales-v2/index.astro", content: "v2" }, {
-                            toolUseID: "tool_write",
-                            requestId: "req_write",
-                            signal: input.options.abortController?.signal ?? new AbortController().signal,
-                        });
-                        yield resultMessage(0, "session_page_clash");
-                    },
-                }),
-            },
-            model: "claude-test",
-            sessionStore: { load: async () => undefined, save: async () => undefined, clear: async () => undefined },
-            relay: recordingRelay(),
-            mainSync: {
-                beforeTurn: () => Promise.resolve({}),
-                refuseWrite: (threadId, filePath) => threadId === "thread_page_clash" && filePath.endsWith("src/pages/sales-v2/index.astro")
-                    ? "`src/pages/sales-v2` was already published by another chat"
-                    : null,
-            },
-        });
-        await executor.execute({ threadId: "thread_page_clash", turnId: "turn_page_clash", prompt: "build sales v2" }, activeControls());
-        expect(guardResult).toEqual({
-            behavior: "deny",
-            message: "`src/pages/sales-v2` was already published by another chat",
+            prepareAttachments: async (attachments) => `\n\nFILES: ${attachments.map((attachment) => attachment.filename).join(", ")}`,
         });
+        await executor.execute({
+            threadId: "thread_resumed_files",
+            turnId: "turn_resumed_files",
+            prompt: "They have now replied: HubSpot",
+            continuedAttachments: [
+                { url: "https://files.example/logo.png", contentType: "image/png", filename: "logo.png" },
+            ],
+            history: history([{ role: "user", text: "Build a page with my logo", createdAt: 1 }]),
+        }, activeControls());
+        expect(queryInputs[0]?.prompt).toBe("They have now replied: HubSpot");
     });
-    it("keeps the viewing-reference context beside the message when a stale session falls back to rehydration", async () => {
+    it("hands the continued request's files over when a stale Session falls back to history", async () => {
         const queryInputs = [];
         const executor = createExecutor({
-            loadedBoundary: cleanBoundary("session_stale_viewing"),
+            loadedBoundary: cleanBoundary("session_stale_files"),
             queryInputs,
             queryResults: [
                 scriptedError(new Error("Cannot resume: session not found")),
-                scriptedMessages(resultMessage(0, "session_next_viewing")),
+                scriptedMessages(resultMessage(0, "session_rebuilt_files")),
             ],
+            prepareAttachments: async (attachments) => `\n\nFILES: ${attachments.map((attachment) => attachment.filename).join(", ")}`,
         });
         await executor.execute({
-            threadId: "thread_stale_viewing",
-            turnId: "turn_stale_viewing",
-            prompt: "quita el pricing",
-            history: history([{ role: "user", text: "Persisted fact", createdAt: 1 }]),
-            currentReference: { type: "landing", slug: "homepage", title: "Homepage" },
+            threadId: "thread_stale_files",
+            turnId: "turn_stale_files",
+            prompt: "They have now replied: HubSpot",
+            continuedAttachments: [
+                { url: "https://files.example/logo.png", contentType: "image/png", filename: "logo.png" },
+            ],
+            history: history([{ role: "user", text: "Build a page with my logo", createdAt: 1 }]),
         }, activeControls());
-        expect(queryInputs[1]?.prompt).toContain("Current user request\nquita el pricing");
-        expect(queryInputs[1]?.prompt).not.toContain("preview pane");
-        expect(queryInputs[1]?.reminder).toContain('landing "Homepage" (slug: homepage)');
+        expect(queryInputs[0]?.prompt).not.toContain("FILES");
+        expect(queryInputs[1]?.prompt).toContain("Current user request\nThey have now replied: HubSpot\n\nFILES: logo.png");
     });
     it("clears an invalid clean boundary and retries once with rehydrated history", async () => {
         const relay = recordingRelay();
@@ -3323,6 +3248,35 @@ describe("BridgeJobExecutor turn end with background tasks", () => {
         expect(outcome).toMatchObject({ kind: "completed", costUsd: 0.1 });
         expect(endInputAt.count).toBe(3);
     });
+    // The production shape: the model refused, the CLI answered with an error
+    // result and then waited on stdin like after any other result. The error was
+    // no longer thrown, and only a clean result ended input, so the turn sat idle
+    // until the 30-minute session watchdog reported a lost connection.
+    it("ends input after the error result of a refused turn", async () => {
+        const endInputAt = { count: -1 };
+        const refusal = {
+            type: "system",
+            subtype: "model_refusal_no_fallback",
+            original_model: "claude-opus-5-5",
+            api_refusal_category: "reasoning_extraction",
+            session_id: "session_refused",
+        };
+        const erroredResult = {
+            type: "result",
+            subtype: "error_during_execution",
+            is_error: true,
+            errors: ["API Error: Claude Code is unable to respond to this request."],
+            total_cost_usd: 0.01,
+            session_id: "session_refused",
+        };
+        const executor = createExecutor({ queryResults: [cliLikeQuery(endInputAt, refusal, erroredResult)] });
+        const outcome = await executor.execute({ threadId: "thread_refused", turnId: "turn_refused", prompt: "Hi", history: history([]) }, activeControls());
+        expect(outcome).toMatchObject({
+            kind: "errored",
+            errors: ["I couldn't help with that request. Try rephrasing what you need."],
+        });
+        expect(endInputAt.count).toBe(2);
+    });
     it("does not hold the turn open for ambient skip_transcript tasks", async () => {
         const endInputAt = { count: -1 };
         const executor = createExecutor({