@koda-sl/baker-bridge 0.71.0 → 0.72.0-dev.423b46fd1

package/README.md

@@ -298,8 +298,19 @@ Convex action ──POST /message/async──▶ Bridge AgentSession
 - **Context window usage** is relayed after every turn to `POST
   /api/chat/context-usage` as `{ tokens, window }`. Occupied `tokens` come from
   the **last main-conversation request's own usage** (`input_tokens +
-  cache_read_input_tokens + cache_creation_input_tokens` off that assistant
-  message) — the real fill of the window at that request. The bridge does *not*
+  cache_read_input_tokens + cache_creation_input_tokens`) — the real fill of the
+  window at that request. It is read from **two** places, because neither is
+  reliable alone: the assembled assistant message, and the raw
+  `message_delta` stream event (`streamEventContextUsage`). Anthropic reports a
+  request's input counts on `message_start`, which is where the runtime builds
+  the message's `usage` from — but the OpenRouter passthrough sends
+  `message_start` empty and puts the real numbers on `message_delta`, so the
+  assistant message arrives all zeros. Reading only the message meant the meter
+  never had a single reading in production: 3,910 assistant messages in one day,
+  every one reporting zero input tokens, so no chat ever stored a
+  `contextUsage` and the meter never rendered. A zero from either source is
+  ignored rather than written, so the meter holds its last real value instead of
+  resetting. The bridge does *not*
   use the turn `result`'s per-model token totals: those aggregate every API
   round-trip in the turn (one per tool call, plus any same-model subagent work),
   so summing them inflates the reading by roughly the number of tool calls and
@@ -308,7 +319,11 @@ Convex action ──POST /message/async──▶ Bridge AgentSession
   messages count). The `window` is the model's **real OpenRouter context
   length**, resolved from the model id (`contextWindowForModel` in
   `model-capabilities.ts`): opus 5, opus 4.6, sonnet 4.6 and sonnet 5 are 1M, haiku 4.5
-  is 200k. We resolve it ourselves because the runtime reaches these models through
+  is 200k — and resolved from **the model that actually served the request**,
+  which is not always the session's. A skill can pin its own model for the turn
+  (publish pins Haiku 4.5), and measuring such a turn against the session's 1M
+  reads a third full when it is in fact over — the mismatch that hid the publish
+  failure. We resolve it ourselves because the runtime reaches these models through
   the OpenRouter passthrough (`ANTHROPIC_BASE_URL=openrouter.ai`) while the CLI
   resolves the window from its own bundled catalog, which is keyed to the
   first-party API. There they disagree: the catalog lists opus 4.6 and sonnet 4.6
@@ -372,22 +387,44 @@ Convex action ──POST /message/async──▶ Bridge AgentSession
   would push the command off the front and it would land as ordinary message
   text. `/compact` resumes the live session and asks the SDK to summarize older
   turns.
-- **Publish never summarizes as a precaution.** Auto-compact fires on a
-  *threshold*, not on a real overflow, so on a long chat every Publish click paid
-  for a summary before anything happened — the user watched "Summarizing this chat
-  to free up space…" instead of a publish starting. A `/publish` turn therefore
-  runs with `settings.autoCompactEnabled: false`: same session, same context, it
-  just starts working. If a request is then genuinely refused for size
-  (`isContextOverflowError` — Anthropic's `prompt is too long`, OpenRouter's
-  `maximum context length`), the turn retries **once** with compaction allowed,
-  resuming the in-flight publish session (forked) so the steps already completed
-  are not repeated. Compaction still happens — only when publishing is otherwise
-  impossible, which is the one case where it buys something.
+- **Publish runs detached from the chat session.** `/publish` neither resumes the
+  chat's session nor replaces it on the way out (`detachedSession` on the
+  attempt): it starts empty, every time, whatever the conversation is doing.
+  - **Why.** The publish skill pins its own model — Haiku 4.5, a genuine 200k
+    window — while the chat runs on a 1M one. Resuming the chat's session
+    therefore handed a conversation sized for 1M to a model with a fifth of the
+    room. Measured on a failure in production: the last chat request was 356,707
+    tokens (36% of its own window, 78% *over* the publish model's), and the
+    provider refused the publish pre-flight while the chat's own meter showed
+    plenty of space. Summarizing could not rescue it either — the summary request
+    has to send the same conversation. Detached publishes measured ~51k against
+    the same 200k window.
+  - **It costs nothing**, because publish does not read the conversation: the
+    skill says so outright ("Do not reference or act on prior conversation
+    context"), and it works from the state of the workspace — scripts, git, and
+    the files verify complains about.
+  - **The chat's session is left intact**, on success *and* on failure. Handing
+    publish's throwaway session back as the thread's boundary would make the next
+    message resume a transcript holding one `/publish` and nothing else, and
+    clearing the boundary on a failed publish would charge the user their
+    conversation for a publish that did not happen.
+- **Publish still never summarizes as a precaution.** Auto-compact fires on a
+  *threshold*, not on a real overflow, so a long chat once paid for a summary
+  before anything happened — the user watched "Summarizing this chat to free up
+  space…" instead of a publish starting. A `/publish` turn runs with
+  `settings.autoCompactEnabled: false`, because it still runs a build and a
+  verify inside its own session and that output alone can cross the threshold.
+  If the turn's *own* work then overflows (`isContextOverflowError` — Anthropic's
+  `prompt is too long`, OpenRouter's `maximum context length`), it retries once
+  with compaction allowed, resuming the in-flight session (forked) so the steps
+  already completed are not repeated. Gated on work having been produced
+  (`resumeSessionAt`), which is the only state where a summary has anything to
+  shrink — before that, the turn stops rather than re-sending a request the
+  provider just refused.
 - **The refusal itself is never shown.** The CLI renders a refused request as an
   assistant message *before* the query throws, and relayed text is never
-  retracted — so the recovery above used to leave a raw `Prompt is too long` in
-  the chat, above the publish that then succeeded. While a publish turn is still
-  owed its compaction retry, that message is dropped outright
+  retracted — so recovery used to leave a raw `Prompt is too long` in the chat,
+  above the publish that then succeeded. That message is dropped outright
   (`isContextOverflowRefusal`: a single text block, ≤200 chars, leading with the
   provider's error *and* matching `isContextOverflowError` — so `API Error: 400 …
   prompt is too long` is dropped, `API Error: 500` and an answer that merely
@@ -397,8 +434,9 @@ Convex action ──POST /message/async──▶ Bridge AgentSession
   changes the leftover cannot come back as the turn's end-of-turn post. Dropping
   it before the session observer also stops it from counting as
   work done, which would otherwise make the retry resume with "continue where you
-  left off" instead of delivering the `/publish` the turn still owes. If the
-  retry fails too, the error surfaces normally.
+  left off" instead of delivering the `/publish` the turn still owes. A turn that
+  cannot recover reports the failure once, in product language — the provider's
+  wording never reaches the chat.
 - **Compaction progress + confirmation.** A compaction summarizes the session to
   free context. A manual `/compact` turn emits no assistant text, so it would
   otherwise complete with nothing visible; an automatic compaction happens

package/dist/hono/bridge-job.d.ts

@@ -133,7 +133,7 @@ export type BridgeJobRelay = {
     heartbeat(target: CallbackTarget): Promise<void>;
     compaction(target: CallbackTarget, state: "compacting" | "done"): Promise<void>;
     contextUsage(target: CallbackTarget, usage: ContextUsage): Promise<void>;
-    contextSource(target: CallbackTarget, source: "local_resume" | "rehydrated_missing_session" | "rehydrated_invalid_resume" | "rehydrated_repaired_tool_state" | "rehydration_failed", metadata: Record<string, unknown>): Promise<void>;
+    contextSource(target: CallbackTarget, source: "local_resume" | "rehydrated_missing_session" | "rehydrated_invalid_resume" | "rehydrated_repaired_tool_state" | "detached_publish" | "rehydration_failed", metadata: Record<string, unknown>): Promise<void>;
     complete(target: CallbackTarget, outcome: BridgeJobOutcome): Promise<void>;
 };
 export type AgentSdkQuery = AsyncIterable<SDKMessage> & {
@@ -256,6 +256,20 @@ export declare class BridgeJobExecutor {
     private drainQuery;
     private createStallDetector;
     private consumeSdkMessage;
+    /**
+     * Surface how full the conversation's context is, at turn end.
+     *
+     * Tokens come from the last main-conversation request's own usage — the real
+     * occupancy of the window at that request. We deliberately do NOT use the
+     * result's per-model token totals: those aggregate every API round-trip in the
+     * turn (one per tool call, plus any same-model subagent work), so a handful of
+     * tool calls inflates them past the window and pins the meter at 100% on an
+     * almost-empty chat. The window is the model's real OpenRouter context length
+     * (opus/sonnet 4.6 = 1M); we resolve it from the model id because the runtime
+     * under-reports it through the OpenRouter passthrough, falling back to the
+     * reported window for unknown models. A relay failure must never fail the turn.
+     */
+    private publishContextUsage;
     private handleMessage;
     private handleSystemMessage;
     private handleContentBlockStart;

package/dist/hono/bridge-job.d.ts.map

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

package/dist/hono/bridge-job.js

@@ -3,7 +3,7 @@ import { homedir } from "node:os";
 import { isAbsolute, join, relative, resolve } from "node:path";
 import { applyInFlightTask, applyTaskLifecycleMessage, backgroundTaskSnapshot } from "./agent-tasks.js";
 import { CONNECTION_INPUT_TOOL_NAME, normalizeConnectionInputToolInput, } from "./connection-input.js";
-import { messageContextTokens, pickContextWindow, turnContextUsage, } from "./context-usage.js";
+import { messageContextTokens, pickContextWindow, streamEventContextUsage, turnContextUsage, } from "./context-usage.js";
 import { FLOW_INPUT_TOOL_NAME, normalizeFlowInputToolInput, sanitizeFlowRequests, } from "./flow-input.js";
 import { composioScopesToInvalidate, failedCustomServers, reportMcpInvalid, } from "./mcp-servers.js";
 import { autoCompactWindowForModel, betasForModel, contextWindowForModel } from "./model-capabilities.js";
@@ -126,7 +126,7 @@ function createBridgeJobState() {
         inProgressSession: emptyInProgressSession(),
         observedCostUsd: 0,
         controlChannelDenies: 0,
-        compactionRetryOwed: false,
+        detachedSession: false,
         modelUsageTotals: new Map(),
         queryModelUsage: new Map(),
     };
@@ -152,6 +152,18 @@ function isUserVisibleSdkMessage(msg) {
     const delta = event.delta;
     return delta?.type === "text_delta" && typeof delta.text === "string" && delta.text.length > 0;
 }
+// What the user reads when a turn ends on a size refusal the restart could not
+// save. "Prompt is too long" is the provider talking to us, not the product
+// talking to a marketer: it names nothing they did and nothing they can do. The
+// failed turn clears the session, so sending again genuinely does start from the
+// shorter rehydrated history — which is the action this asks for.
+const CONTEXT_OVERFLOW_MESSAGE = "This chat has grown too long to continue in one step. Send your message again — it will pick up from a shorter version of this conversation.";
+function userFacingTurnError(message) {
+    if (isContextOverflowError(message)) {
+        return CONTEXT_OVERFLOW_MESSAGE;
+    }
+    return enrichImageError(message);
+}
 function enrichImageError(message) {
     if (!message.toLowerCase().includes("could not process image")) {
         return message;
@@ -586,17 +598,39 @@ function createTurnEndController(job, query, closeQuery, timings) {
 }
 // Track the occupancy of the last main-conversation request. The meter reads a
 // single request's usage, not the turn's aggregate totals — and only from the
-// main conversation, so subagent work never pollutes it. Some OpenRouter
-// provider routes (observed: Amazon Bedrock) report all-zero usage on the
-// assistant message; zero is never a real occupancy, so keep the previous
-// reading rather than overwrite the meter with 0.
+// main conversation, so subagent work never pollutes it.
+//
+// Two sources, because neither is reliable alone. The assembled assistant
+// message is the natural one, but through the OpenRouter passthrough every
+// provider route we run reports it as all zeros: the runtime builds that usage
+// from `message_start`, which the passthrough sends empty, and puts the real
+// numbers on `message_delta` instead. Production showed the cost of trusting
+// only the message — 3,910 assistant messages in a day, every one reporting zero
+// input tokens, so the meter had no reading to show and never appeared at all.
+//
+// Zero is never a real occupancy, so a zero from either source keeps the
+// previous reading rather than resetting the meter.
 function trackMainRequestUsage(state, msg) {
+    if (msg.type === "stream_event") {
+        if (msg.parent_tool_use_id) {
+            return;
+        }
+        const event = msg.event;
+        recordMainRequestUsage(state, streamEventContextUsage(event), event?.message?.model);
+        return;
+    }
     if (msg.type !== "assistant" || msg.parent_tool_use_id || msg.subagent_type) {
         return;
     }
-    const usage = msg.message.usage;
+    const message = msg.message;
+    recordMainRequestUsage(state, message.usage, message.model);
+}
+function recordMainRequestUsage(state, usage, model) {
     if (usage && messageContextTokens(usage) > 0) {
         state.lastMainRequestUsage = usage;
+        if (typeof model === "string" && model.length > 0) {
+            state.lastMainRequestModel = model;
+        }
     }
 }
 function classifyDirtyReason(error, controls) {
@@ -648,6 +682,7 @@ export class BridgeJobExecutor {
             const loaded = await this.loadTrustedBoundary(job, controls);
             attempt = prepareSessionAttempt({ requestPrompt, history: job.history, loaded });
             state.usedBoundary = attempt.usedBoundary;
+            state.detachedSession = attempt.detachedSession === true;
             result.attemptedRehydration = attempt.attemptedRehydration;
             this.recordAttemptContextSource(job, attempt);
             result = await this.runAttempt(job, controls, state, attempt);
@@ -710,12 +745,19 @@ export class BridgeJobExecutor {
                 break;
             }
             catch (error) {
-                // The turn ran with compaction switched off (publish) and the request was
-                // refused for size — summarizing is now the only way it can proceed, so
-                // allow it and resend. Once per turn: the retry has compaction on, so a
-                // second overflow is a real failure, not something to loop on.
-                if (current.autoCompact === false && isContextOverflowError(error) && controls.isActive()) {
-                    console.error(`[BridgeJob] publish no longer fits the context window — compacting for thread ${job.threadId}`);
+                // The publish turn's OWN work no longer fits. Not the conversation —
+                // publish never carries it (`prepareSessionAttempt` runs it detached) —
+                // but a build plus a verify inside one session, which is the only thing
+                // left that a summary can actually shrink. Gated on work having been
+                // produced, because that is what makes the session worth keeping;
+                // summarizing an empty one could not free a single token. Once per turn:
+                // the retry runs with compaction on, so a second overflow is a real
+                // failure rather than something to loop on.
+                if (isContextOverflowError(error) &&
+                    controls.isActive() &&
+                    current.autoCompact === false &&
+                    state.inProgressSession.resumeSessionAt) {
+                    console.error(`[BridgeJob] publish outgrew the context window mid-turn — compacting for ${job.threadId}`);
                     current = compactionRetryAttempt(current, state.inProgressSession);
                     continue;
                 }
@@ -742,7 +784,13 @@ export class BridgeJobExecutor {
             await this.clearIfDirty(job, controls, state, "abort");
             return { kind: "cancelled", costUsd, model: state.model, modelUsage };
         }
-        const cleanBoundary = buildCleanBoundary({ inProgress: state.inProgressSession, nowMs: this.now() });
+        // A detached turn (publish) ran in a session of its own. Handing that session
+        // back as the thread's boundary would make the next chat message resume a
+        // transcript containing one `/publish` and nothing else — the conversation,
+        // still perfectly good, replaced by the turn that was told not to read it.
+        const cleanBoundary = state.detachedSession
+            ? undefined
+            : buildCleanBoundary({ inProgress: state.inProgressSession, nowMs: this.now() });
         return { kind: "completed", costUsd, model: state.model, modelUsage, cleanBoundary };
     }
     errorOutcome(job, controls, state, result, error) {
@@ -764,13 +812,19 @@ export class BridgeJobExecutor {
             costUsd: result.costUsd,
             model,
             modelUsage,
-            errors: [enrichImageError(errorMessage(error))],
+            errors: [userFacingTurnError(errorMessage(error))],
         };
     }
     resultWithObservedCost(result, state) {
         return { ...result, costUsd: Math.max(result.costUsd, state.observedCostUsd) };
     }
     recordAttemptContextSource(job, attempt) {
+        if (attempt.contextSource === "detached_publish") {
+            void this.relay.contextSource({ threadId: job.threadId, turnId: job.turnId }, "detached_publish", {
+                historyEntryCount: job.history?.entries.length ?? 0,
+            });
+            return;
+        }
         if (attempt.contextSource === "local_resume") {
             void this.relay.contextSource({ threadId: job.threadId, turnId: job.turnId }, "local_resume", {
                 historyEntryCount: job.history?.entries.length ?? 0,
@@ -861,7 +915,6 @@ export class BridgeJobExecutor {
         // it (they are cumulative); it is folded into the turn totals in `finally`,
         // so a stall that lands after a clean result still contributes its snapshot.
         state.queryModelUsage = new Map();
-        state.compactionRetryOwed = attempt.autoCompact === false;
         const mcpServers = await this.resolveMcpServers(job);
         const skills = await readSessionSkills(bridgeRuntimeFiles.projectRoot());
         const autoCompactWindow = autoCompactWindowForModel(model);
@@ -1108,14 +1161,15 @@ export class BridgeJobExecutor {
             return costUsd;
         }
         controls.markEvent?.();
-        // Drop the size refusal outright while a compaction retry is still owed: the
-        // turn recovers on the next attempt, so relaying it would leave a raw
-        // provider error in the chat. Dropping it before `observeInProgressSession`
-        // also keeps it from setting `resumeSessionAt` — the refusal is not work the
-        // agent did, and counting it as such would make the retry resume with
-        // "continue where you left off" instead of delivering the `/publish` the turn
-        // still owes.
-        if (state.compactionRetryOwed && isContextOverflowRefusal(msg)) {
+        // Drop the size refusal outright. A recovered turn must not leave a raw
+        // provider error sitting above the work that then succeeded, and a turn that
+        // fails anyway says so once, in product language, through the error outcome —
+        // never twice, and never in the provider's words. Dropping it before
+        // `observeInProgressSession` also keeps it from setting `resumeSessionAt` —
+        // the refusal is not work the agent did, and counting it as such would send
+        // the retry a "continue where you left off" note instead of the `/publish`
+        // the turn still owes.
+        if (isContextOverflowRefusal(msg)) {
             // Today the refusal is synthetic — the request is rejected pre-flight, so
             // no deltas precede it and `turnText` is empty. Clearing it anyway is what
             // makes the drop hold if that ever changes: streamed text survives the
@@ -1151,22 +1205,7 @@ export class BridgeJobExecutor {
             if (snapshot.size > 0) {
                 state.queryModelUsage = snapshot;
             }
-            // Surface how full the conversation's context is. Tokens come from the last
-            // main-conversation request's own usage — the real occupancy of the window
-            // at that request. We deliberately do NOT use the result's per-model token
-            // totals: those aggregate every API round-trip in the turn (one per tool
-            // call, plus any same-model subagent work), so a handful of tool calls
-            // inflates them past the window and pins the meter at 100% on an almost-
-            // empty chat. The window is the model's real OpenRouter context length
-            // (opus/sonnet 4.6 = 1M); we resolve it from the model id because the
-            // runtime under-reports it through the OpenRouter passthrough, falling back
-            // to the reported window for unknown models. A relay failure must never
-            // fail the turn.
-            const window = contextWindowForModel(state.model) ?? pickContextWindow(msg.modelUsage);
-            const contextUsage = turnContextUsage(state.lastMainRequestUsage, window);
-            if (contextUsage) {
-                await this.relay.contextUsage({ threadId: job.threadId, turnId: job.turnId }, contextUsage);
-            }
+            await this.publishContextUsage(job, state, msg.modelUsage);
             const resultError = sdkResultError(msg);
             if (resultError) {
                 await this.clearIfDirty(job, controls, state, "result_error");
@@ -1180,6 +1219,38 @@ export class BridgeJobExecutor {
         await this.handleMessage(job, state, msg);
         return costUsd;
     }
+    /**
+     * Surface how full the conversation's context is, at turn end.
+     *
+     * Tokens come from the last main-conversation request's own usage — the real
+     * occupancy of the window at that request. We deliberately do NOT use the
+     * result's per-model token totals: those aggregate every API round-trip in the
+     * turn (one per tool call, plus any same-model subagent work), so a handful of
+     * tool calls inflates them past the window and pins the meter at 100% on an
+     * almost-empty chat. The window is the model's real OpenRouter context length
+     * (opus/sonnet 4.6 = 1M); we resolve it from the model id because the runtime
+     * under-reports it through the OpenRouter passthrough, falling back to the
+     * reported window for unknown models. A relay failure must never fail the turn.
+     */
+    async publishContextUsage(job, state, modelUsage) {
+        const window = contextWindowForModel(state.lastMainRequestModel) ??
+            contextWindowForModel(state.model) ??
+            pickContextWindow(modelUsage);
+        const contextUsage = turnContextUsage(state.lastMainRequestUsage, window);
+        if (contextUsage) {
+            await this.relay.contextUsage({ threadId: job.threadId, turnId: job.turnId }, contextUsage);
+            return;
+        }
+        if (state.postedAssistantEvent) {
+            // A turn that produced assistant output but no occupancy reading means every
+            // source we know of came back empty. That is how the meter stayed dead
+            // without anyone noticing: silence looked exactly like a quiet chat. The
+            // cause is a shape mismatch upstream, not something a test can catch, so it
+            // has to be visible from the outside — grep the sandbox logs for this line
+            // before concluding the meter "just doesn't show".
+            console.error(`[BridgeJob] no context occupancy reported this turn for thread ${job.threadId}`);
+        }
+    }
     async handleMessage(job, state, msg) {
         const target = { threadId: job.threadId, turnId: job.turnId };
         if (msg.type === "system") {
@@ -1270,6 +1341,12 @@ export class BridgeJobExecutor {
         await this.relay.assistantEvent({ threadId: job.threadId, turnId: job.turnId }, syntheticAssistant, state.model);
     }
     async clearIfDirty(job, controls, state, reason) {
+        // A detached turn never touched the stored session, so nothing it does can
+        // have dirtied it. Clearing here would take the conversation away as the
+        // price of a failed publish — the session id this turn saw is its own.
+        if (state.detachedSession) {
+            return;
+        }
         if (!state.usedBoundary && !state.inProgressSession.sawSessionId) {
             return;
         }