@cargo-ai/cli 1.0.125 → 1.0.127

package/build/commands/ask/harness/bridgeOutput.d.ts

@@ -0,0 +1,19 @@
+/**
+ * `@ai-sdk/harness` copies every line the Claude Code bridge writes to its
+ * stderr onto ours, as `[harness:claude-code:stderr] …`, with no option to
+ * turn it off. In the middle of a session that lands on the spinner row and
+ * breaks the tree: an API retry warning is the usual one.
+ *
+ * So while a session runs, those lines are taken off stderr and handed to
+ * `onLine` instead. `CARGO_ASK_TIMING` leaves them alone, since that is when
+ * someone wants to read them. Returns the function that puts stderr back.
+ */
+export declare function interceptBridgeOutput(onLine: (line: string) => void): () => void;
+/**
+ * A spinner label for Claude Code retrying a failed API call, or undefined
+ * for any other bridge line.
+ *
+ * Exported for tests.
+ */
+export declare function describeBridgeRetry(line: string): string | undefined;
+//# sourceMappingURL=bridgeOutput.d.ts.map

package/build/commands/ask/harness/bridgeOutput.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"bridgeOutput.d.ts","sourceRoot":"","sources":["../../../../src/commands/ask/harness/bridgeOutput.ts"],"names":[],"mappings":"AAEA;;;;;;;;;GASG;AACH,wBAAgB,qBAAqB,CACnC,MAAM,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,GAC7B,MAAM,IAAI,CAoBZ;AAED;;;;;GAKG;AACH,wBAAgB,mBAAmB,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAQpE"}

package/build/commands/ask/harness/bridgeOutput.js

@@ -0,0 +1,42 @@
+import { ASK_TIMING_ENABLED } from "./timing.js";
+/**
+ * `@ai-sdk/harness` copies every line the Claude Code bridge writes to its
+ * stderr onto ours, as `[harness:claude-code:stderr] …`, with no option to
+ * turn it off. In the middle of a session that lands on the spinner row and
+ * breaks the tree: an API retry warning is the usual one.
+ *
+ * So while a session runs, those lines are taken off stderr and handed to
+ * `onLine` instead. `CARGO_ASK_TIMING` leaves them alone, since that is when
+ * someone wants to read them. Returns the function that puts stderr back.
+ */
+export function interceptBridgeOutput(onLine) {
+    if (ASK_TIMING_ENABLED === true) {
+        return () => undefined;
+    }
+    const write = process.stderr.write;
+    // The harness writes each forwarded line in a single call, prefix first.
+    process.stderr.write = ((chunk, ...rest) => {
+        if (typeof chunk === "string" && chunk.startsWith(BRIDGE_PREFIX) === true) {
+            onLine(chunk.trimEnd());
+            return true;
+        }
+        return Reflect.apply(write, process.stderr, [chunk, ...rest]);
+    });
+    return () => {
+        process.stderr.write = write;
+    };
+}
+/**
+ * A spinner label for Claude Code retrying a failed API call, or undefined
+ * for any other bridge line.
+ *
+ * Exported for tests.
+ */
+export function describeBridgeRetry(line) {
+    const match = line.match(/API retry: attempt (\d+)\/(\d+)/);
+    if (match === null || match[1] === undefined || match[2] === undefined) {
+        return undefined;
+    }
+    return `Retrying the API (${match[1]}/${match[2]})`;
+}
+const BRIDGE_PREFIX = "[harness:";

package/build/commands/ask/harness/create.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"create.d.ts","sourceRoot":"","sources":["../../../../src/commands/ask/harness/create.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,EAAE,EAAE,MAAM,eAAe,CAAC;AAIxC,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,iBAAiB,CAAC;AAwB3C,OAAO,EAEL,KAAK,kBAAkB,EAKxB,MAAM,WAAW,CAAC;AAGnB,MAAM,MAAM,YAAY,GAAG;IACzB,YAAY,EAAE,CACZ,QAAQ,EAAE,MAAM,EAChB,OAAO,CAAC,EAAE,kBAAkB,KACzB,OAAO,CAAC,MAAM,CAAC,CAAC;IACrB;;;;OAIG;IACH,iBAAiB,EAAE,MAAM,MAAM,GAAG,SAAS,CAAC;IAC5C,sEAAsE;IACtE,KAAK,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;CAC5B,CAAC;AAcF,wBAAsB,kBAAkB,CAAC,KAAK,EAAE;IAC9C,GAAG,EAAE,GAAG,CAAC;IACT;;;;OAIG;IACH,UAAU,EAAE,MAAM,CAAC;IACnB,GAAG,EAAE,MAAM,CAAC;IACZ,QAAQ,EAAE,MAAM,CAAC;IACjB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB;;;;OAIG;IACH,OAAO,CAAC,EAAE,EAAE,CAAC,OAAO,CAAC;IACrB,UAAU,EAAE,MAAM,CAAC;IACnB;;;;OAIG;IACH,aAAa,EAAE,MAAM,CAAC;IACtB,eAAe,EAAE,MAAM,CAAC;IACxB,iBAAiB,EAAE,MAAM,CAAC;IAC1B;;;;OAIG;IACH,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB;;;OAGG;IACH,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB;;;;OAIG;IACH,uBAAuB,EAAE,OAAO,CAAC;CAClC,GAAG,OAAO,CAAC,YAAY,CAAC,CAgVxB"}
+{"version":3,"file":"create.d.ts","sourceRoot":"","sources":["../../../../src/commands/ask/harness/create.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,EAAE,EAAE,MAAM,eAAe,CAAC;AAIxC,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,iBAAiB,CAAC;AAwB3C,OAAO,EAEL,KAAK,kBAAkB,EAKxB,MAAM,WAAW,CAAC;AAGnB,MAAM,MAAM,YAAY,GAAG;IACzB,YAAY,EAAE,CACZ,QAAQ,EAAE,MAAM,EAChB,OAAO,CAAC,EAAE,kBAAkB,KACzB,OAAO,CAAC,MAAM,CAAC,CAAC;IACrB;;;;OAIG;IACH,iBAAiB,EAAE,MAAM,MAAM,GAAG,SAAS,CAAC;IAC5C,sEAAsE;IACtE,KAAK,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;CAC5B,CAAC;AAcF,wBAAsB,kBAAkB,CAAC,KAAK,EAAE;IAC9C,GAAG,EAAE,GAAG,CAAC;IACT;;;;OAIG;IACH,UAAU,EAAE,MAAM,CAAC;IACnB,GAAG,EAAE,MAAM,CAAC;IACZ,QAAQ,EAAE,MAAM,CAAC;IACjB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB;;;;OAIG;IACH,OAAO,CAAC,EAAE,EAAE,CAAC,OAAO,CAAC;IACrB,UAAU,EAAE,MAAM,CAAC;IACnB;;;;OAIG;IACH,aAAa,EAAE,MAAM,CAAC;IACtB,eAAe,EAAE,MAAM,CAAC;IACxB,iBAAiB,EAAE,MAAM,CAAC;IAC1B;;;;OAIG;IACH,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB;;;OAGG;IACH,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB;;;;OAIG;IACH,uBAAuB,EAAE,OAAO,CAAC;CAClC,GAAG,OAAO,CAAC,YAAY,CAAC,CAiVxB"}

package/build/commands/ask/harness/create.js

@@ -64,7 +64,8 @@ export async function createLocalHarness(input) {
     // createClaudeCode auto-detect AI Gateway from the host process and ignore
     // the Cargo proxy.
     // Wrapped so a batched tool call stays known to the stream that is asked to
-    // approve it (see `toolCallReplay.ts`).
+    // approve it, and a second approval asked at the same time reaches the next
+    // stream instead of one nobody reads (see `toolCallReplay.ts`).
     const claudeCode = withToolCallReplay(createClaudeCode({
         auth: {
             ANTHROPIC_BASE_URL: anthropicBaseUrl,

package/build/commands/ask/harness/index.d.ts

@@ -1,10 +1,11 @@
 export { isAlwaysDenied, isAutoApproved } from "./approvals.js";
 export { ASK_USER_QUESTION_DENIED_REASON, ASK_USER_QUESTION_MISSING_INPUT_REASON, ASK_USER_QUESTION_TOOL_NAME, buildAskUserQuestionHostTool, denyNativeAskUserQuestion, formatAskUserQuestionAnswers, readAskUserQuestions, summarizeAskUserQuestion, } from "./askUserQuestion.js";
+export { describeBridgeRetry, interceptBridgeOutput } from "./bridgeOutput.js";
 export { createLocalHarness, type LocalHarness } from "./create.js";
 export { localHarnessInstructions, localHarnessSkills, } from "./instructions.js";
 export { resolveWorkspaceLayout } from "./layout.js";
 export { CARGO_MCP_SERVER_NAME } from "./mcp.js";
-export { replayKnownToolCalls, withToolCallReplay, wrapSession, } from "./toolCallReplay.js";
-export { HarnessTurnStalled, HarnessTurnStuck, isBridgeClosedError, type LocalStreamHandlers, type LocalStreamOptions, type LocalToolActivity, type LocalToolApproval, runPromptTurn, settleWithin, type StreamLike, type TurnDriver, } from "./turn.js";
-export { createTurnAccumulator, type LocalTurnAccumulator, type LocalTurnUsage, readClaudeCodeCostUsd, } from "./usage.js";
+export { replayKnownToolCalls, routeSessionEvents, withToolCallReplay, wrapSession, } from "./toolCallReplay.js";
+export { HarnessTurnStalled, HarnessTurnStuck, isBridgeClosedError, type LocalStreamHandlers, type LocalStreamOptions, type LocalToolActivity, type LocalToolApproval, type LocalUsageUpdate, runPromptTurn, settleWithin, type StreamLike, type TurnDriver, } from "./turn.js";
+export { createTurnAccumulator, creditsForStep, type LocalTurnAccumulator, type LocalTurnUsage, readClaudeCodeCostUsd, } from "./usage.js";
 //# sourceMappingURL=index.d.ts.map

package/build/commands/ask/harness/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/commands/ask/harness/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAC;AAChE,OAAO,EACL,+BAA+B,EAC/B,sCAAsC,EACtC,2BAA2B,EAC3B,4BAA4B,EAC5B,yBAAyB,EACzB,4BAA4B,EAC5B,oBAAoB,EACpB,wBAAwB,GACzB,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EAAE,kBAAkB,EAAE,KAAK,YAAY,EAAE,MAAM,aAAa,CAAC;AACpE,OAAO,EACL,wBAAwB,EACxB,kBAAkB,GACnB,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EAAE,sBAAsB,EAAE,MAAM,aAAa,CAAC;AACrD,OAAO,EAAE,qBAAqB,EAAE,MAAM,UAAU,CAAC;AACjD,OAAO,EACL,oBAAoB,EACpB,kBAAkB,EAClB,WAAW,GACZ,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EACL,kBAAkB,EAClB,gBAAgB,EAChB,mBAAmB,EACnB,KAAK,mBAAmB,EACxB,KAAK,kBAAkB,EACvB,KAAK,iBAAiB,EACtB,KAAK,iBAAiB,EACtB,aAAa,EACb,YAAY,EACZ,KAAK,UAAU,EACf,KAAK,UAAU,GAChB,MAAM,WAAW,CAAC;AACnB,OAAO,EACL,qBAAqB,EACrB,KAAK,oBAAoB,EACzB,KAAK,cAAc,EACnB,qBAAqB,GACtB,MAAM,YAAY,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/commands/ask/harness/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAC;AAChE,OAAO,EACL,+BAA+B,EAC/B,sCAAsC,EACtC,2BAA2B,EAC3B,4BAA4B,EAC5B,yBAAyB,EACzB,4BAA4B,EAC5B,oBAAoB,EACpB,wBAAwB,GACzB,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EAAE,mBAAmB,EAAE,qBAAqB,EAAE,MAAM,mBAAmB,CAAC;AAC/E,OAAO,EAAE,kBAAkB,EAAE,KAAK,YAAY,EAAE,MAAM,aAAa,CAAC;AACpE,OAAO,EACL,wBAAwB,EACxB,kBAAkB,GACnB,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EAAE,sBAAsB,EAAE,MAAM,aAAa,CAAC;AACrD,OAAO,EAAE,qBAAqB,EAAE,MAAM,UAAU,CAAC;AACjD,OAAO,EACL,oBAAoB,EACpB,kBAAkB,EAClB,kBAAkB,EAClB,WAAW,GACZ,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EACL,kBAAkB,EAClB,gBAAgB,EAChB,mBAAmB,EACnB,KAAK,mBAAmB,EACxB,KAAK,kBAAkB,EACvB,KAAK,iBAAiB,EACtB,KAAK,iBAAiB,EACtB,KAAK,gBAAgB,EACrB,aAAa,EACb,YAAY,EACZ,KAAK,UAAU,EACf,KAAK,UAAU,GAChB,MAAM,WAAW,CAAC;AACnB,OAAO,EACL,qBAAqB,EACrB,cAAc,EACd,KAAK,oBAAoB,EACzB,KAAK,cAAc,EACnB,qBAAqB,GACtB,MAAM,YAAY,CAAC"}

package/build/commands/ask/harness/index.js

@@ -1,9 +1,10 @@
 export { isAlwaysDenied, isAutoApproved } from "./approvals.js";
 export { ASK_USER_QUESTION_DENIED_REASON, ASK_USER_QUESTION_MISSING_INPUT_REASON, ASK_USER_QUESTION_TOOL_NAME, buildAskUserQuestionHostTool, denyNativeAskUserQuestion, formatAskUserQuestionAnswers, readAskUserQuestions, summarizeAskUserQuestion, } from "./askUserQuestion.js";
+export { describeBridgeRetry, interceptBridgeOutput } from "./bridgeOutput.js";
 export { createLocalHarness } from "./create.js";
 export { localHarnessInstructions, localHarnessSkills, } from "./instructions.js";
 export { resolveWorkspaceLayout } from "./layout.js";
 export { CARGO_MCP_SERVER_NAME } from "./mcp.js";
-export { replayKnownToolCalls, withToolCallReplay, wrapSession, } from "./toolCallReplay.js";
+export { replayKnownToolCalls, routeSessionEvents, withToolCallReplay, wrapSession, } from "./toolCallReplay.js";
 export { HarnessTurnStalled, HarnessTurnStuck, isBridgeClosedError, runPromptTurn, settleWithin, } from "./turn.js";
-export { createTurnAccumulator, readClaudeCodeCostUsd, } from "./usage.js";
+export { createTurnAccumulator, creditsForStep, readClaudeCodeCostUsd, } from "./usage.js";

package/build/commands/ask/harness/toolCallReplay.d.ts

@@ -15,11 +15,42 @@
  * own `emit`, so the session remembers every tool call and replays one into a
  * stream that is about to receive an approval for a call it never saw. Remove
  * this once the agent keeps tool calls for the session.
+ *
+ * The same batch also loses events outright, which is the stall
+ * `HarnessTurnStalled` reports. The agent stops reading a stream at the first
+ * approval request in it, but the adapter keeps that stream's listener on the
+ * bridge until the turn's `finish`, so whatever the bridge says next goes into
+ * a stream nobody reads. When Claude Code asks about two tools at once, the
+ * second request lands there: the next stream never hears of it, Claude Code
+ * waits for an answer, and the turn waits for output. `routeSessionEvents`
+ * holds those events and hands them to the next stream instead.
  */
 import type { HarnessV1, HarnessV1Session, HarnessV1StreamPart } from "@ai-sdk/harness";
 type Emit = (event: HarnessV1StreamPart) => void;
 /** Exported for tests: one stream's `emit`, fed from a session-wide memory. */
 export declare function replayKnownToolCalls(known: Map<string, HarnessV1StreamPart>, emit: Emit): Emit;
+/**
+ * Exported for tests: delivers every bridge event of a session once, to the
+ * stream the agent is still reading.
+ *
+ * Each stream's listener stays on the bridge after the agent is done with it,
+ * so one event reaches every listener still attached — the same object each
+ * time, which is what lets it be delivered once. It goes to the stream opened
+ * last. Once that stream has carried an approval request the agent has
+ * stopped reading it, so the rest is also held, in order, and opening the next
+ * stream hands it over.
+ *
+ * Held events are still delivered to the stopped stream, so if the agent ever
+ * does read past an approval, it misses nothing; it would see them twice.
+ */
+export declare function routeSessionEvents(): {
+    /** The `emit` every stream hands the bridge, current or not. */
+    listen: () => Emit;
+    /** A new stream is about to be read: send it everything held. */
+    open: (emit: Emit, options: {
+        freshTurn: boolean;
+    }) => void;
+};
 /** Exported for tests. */
 export declare function wrapSession(session: HarnessV1Session): HarnessV1Session;
 /** The harness, with every session it starts keeping its tool calls. */

package/build/commands/ask/harness/toolCallReplay.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"toolCallReplay.d.ts","sourceRoot":"","sources":["../../../../src/commands/ask/harness/toolCallReplay.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;GAiBG;AAEH,OAAO,KAAK,EACV,SAAS,EACT,gBAAgB,EAChB,mBAAmB,EACpB,MAAM,iBAAiB,CAAC;AAEzB,KAAK,IAAI,GAAG,CAAC,KAAK,EAAE,mBAAmB,KAAK,IAAI,CAAC;AAEjD,+EAA+E;AAC/E,wBAAgB,oBAAoB,CAClC,KAAK,EAAE,GAAG,CAAC,MAAM,EAAE,mBAAmB,CAAC,EACvC,IAAI,EAAE,IAAI,GACT,IAAI,CAqBN;AAED,0BAA0B;AAC1B,wBAAgB,WAAW,CAAC,OAAO,EAAE,gBAAgB,GAAG,gBAAgB,CA+BvE;AAED,wEAAwE;AACxE,wBAAgB,kBAAkB,CAAC,OAAO,EAAE,SAAS,GAAG,SAAS,CAKhE"}
+{"version":3,"file":"toolCallReplay.d.ts","sourceRoot":"","sources":["../../../../src/commands/ask/harness/toolCallReplay.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;GA0BG;AAEH,OAAO,KAAK,EACV,SAAS,EACT,gBAAgB,EAChB,mBAAmB,EACpB,MAAM,iBAAiB,CAAC;AAEzB,KAAK,IAAI,GAAG,CAAC,KAAK,EAAE,mBAAmB,KAAK,IAAI,CAAC;AAEjD,+EAA+E;AAC/E,wBAAgB,oBAAoB,CAClC,KAAK,EAAE,GAAG,CAAC,MAAM,EAAE,mBAAmB,CAAC,EACvC,IAAI,EAAE,IAAI,GACT,IAAI,CAqBN;AAED;;;;;;;;;;;;;GAaG;AACH,wBAAgB,kBAAkB,IAAI;IACpC,gEAAgE;IAChE,MAAM,EAAE,MAAM,IAAI,CAAC;IACnB,iEAAiE;IACjE,IAAI,EAAE,CAAC,IAAI,EAAE,IAAI,EAAE,OAAO,EAAE;QAAE,SAAS,EAAE,OAAO,CAAA;KAAE,KAAK,IAAI,CAAC;CAC7D,CAsDA;AAED,0BAA0B;AAC1B,wBAAgB,WAAW,CAAC,OAAO,EAAE,gBAAgB,GAAG,gBAAgB,CA4CvE;AAED,wEAAwE;AACxE,wBAAgB,kBAAkB,CAAC,OAAO,EAAE,SAAS,GAAG,SAAS,CAKhE"}

package/build/commands/ask/harness/toolCallReplay.js

@@ -15,6 +15,15 @@
  * own `emit`, so the session remembers every tool call and replays one into a
  * stream that is about to receive an approval for a call it never saw. Remove
  * this once the agent keeps tool calls for the session.
+ *
+ * The same batch also loses events outright, which is the stall
+ * `HarnessTurnStalled` reports. The agent stops reading a stream at the first
+ * approval request in it, but the adapter keeps that stream's listener on the
+ * bridge until the turn's `finish`, so whatever the bridge says next goes into
+ * a stream nobody reads. When Claude Code asks about two tools at once, the
+ * second request lands there: the next stream never hears of it, Claude Code
+ * waits for an answer, and the turn waits for output. `routeSessionEvents`
+ * holds those events and hands them to the next stream instead.
  */
 /** Exported for tests: one stream's `emit`, fed from a session-wide memory. */
 export function replayKnownToolCalls(known, emit) {
@@ -35,17 +44,89 @@ export function replayKnownToolCalls(known, emit) {
         emit(event);
     };
 }
+/**
+ * Exported for tests: delivers every bridge event of a session once, to the
+ * stream the agent is still reading.
+ *
+ * Each stream's listener stays on the bridge after the agent is done with it,
+ * so one event reaches every listener still attached — the same object each
+ * time, which is what lets it be delivered once. It goes to the stream opened
+ * last. Once that stream has carried an approval request the agent has
+ * stopped reading it, so the rest is also held, in order, and opening the next
+ * stream hands it over.
+ *
+ * Held events are still delivered to the stopped stream, so if the agent ever
+ * does read past an approval, it misses nothing; it would see them twice.
+ */
+export function routeSessionEvents() {
+    const delivered = new WeakSet();
+    const held = [];
+    const current = {
+        emit: undefined,
+        stopped: false,
+    };
+    const deliver = (event) => {
+        if (current.emit === undefined) {
+            held.push(event);
+            return;
+        }
+        if (current.stopped === true) {
+            held.push(event);
+        }
+        current.emit(event);
+        // The agent ends the stream right here to ask; nothing after this in
+        // the same stream is read.
+        if (event.type === "tool-approval-request") {
+            current.stopped = true;
+        }
+    };
+    return {
+        listen: () => (event) => {
+            if (delivered.has(event) === true) {
+                return;
+            }
+            delivered.add(event);
+            deliver(event);
+        },
+        open: (emit, options) => {
+            current.emit = emit;
+            current.stopped = false;
+            const backlog = held.splice(0, held.length);
+            // A new prompt replaces whatever the bridge was still doing, so what
+            // the last turn left behind belongs to nobody.
+            if (options.freshTurn === true) {
+                return;
+            }
+            for (const event of backlog) {
+                deliver(event);
+            }
+        },
+    };
+}
 /** Exported for tests. */
 export function wrapSession(session) {
     const known = new Map();
-    const doPromptTurn = (options) => session.doPromptTurn({
-        ...options,
-        emit: replayKnownToolCalls(known, options.emit),
-    });
-    const doContinueTurn = (options) => session.doContinueTurn({
-        ...options,
-        emit: replayKnownToolCalls(known, options.emit),
-    });
+    const router = routeSessionEvents();
+    const doPromptTurn = (options) => {
+        router.open(replayKnownToolCalls(known, options.emit), {
+            freshTurn: true,
+        });
+        return session.doPromptTurn({
+            ...options,
+            emit: router.listen(),
+        });
+    };
+    const doContinueTurn = (options) => {
+        // Opened before the adapter wires the stream: its emit already queues,
+        // and anything the bridge says in between belongs to this stream too.
+        router.open(replayKnownToolCalls(known, options.emit), {
+            freshTurn: false,
+        });
+        return session.doContinueTurn({
+            ...options,
+            emit: router.listen(),
+        });
+    };
     // A proxy rather than a spread or a prototype: a session may be a class
     // with private state, so every other member is read from it and its methods
     // run bound to it.

package/build/commands/ask/harness/turn.d.ts

@@ -23,6 +23,8 @@ export type LocalToolActivity = {
     toolCallId: string;
     toolName: string;
     isError: boolean;
+    /** What the tool returned, or its error, as text. Capped in length. */
+    output: string;
 }
 /**
  * Announced, then never run — a tool whose input stopped mid-stream, one
@@ -36,8 +38,23 @@ export type LocalToolActivity = {
     toolCallId: string;
     toolName: string;
 };
+/**
+ * Tokens one model call used (`step`) or one stream used in total (`stream`).
+ * A step's input is the whole context it was sent, which is how full the
+ * window is.
+ */
+export type LocalUsageUpdate = {
+    scope: "step" | "stream";
+    inputTokens: number;
+    /** The part of `inputTokens` served from the prompt cache. */
+    cacheReadTokens: number;
+    outputTokens: number;
+};
 export type LocalStreamHandlers = {
     onTextDelta?: (delta: string) => void;
+    /** Claude Code's summarized thinking, as it streams. */
+    onReasoningDelta?: (delta: string) => void;
+    onUsage?: (usage: LocalUsageUpdate) => void;
     /**
      * Decide whether the tool may run. Omitted (`--print`, non-interactive)
      * means deny — the turn continues and the model reports what it could not

package/build/commands/ask/harness/turn.d.ts.map

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

package/build/commands/ask/harness/turn.js

@@ -1,6 +1,6 @@
 import { DENIED_TOOL_REASON, isAlwaysDenied, isAutoApproved, } from "./approvals.js";
 import { ASK_USER_QUESTION_DENIED_REASON, ASK_USER_QUESTION_TOOL_NAME, formatAskUserQuestionAnswers, summarizeAskUserQuestion, } from "./askUserQuestion.js";
-import { addTurnUsage, createTurnAccumulator, } from "./usage.js";
+import { addTurnUsage, createTurnAccumulator, readUsageTokens, } from "./usage.js";
 /**
  * How many times one turn may suspend for approvals. Each round trip is a
  * decision the user made, so this is only a stop for a harness that keeps
@@ -464,6 +464,7 @@ async function consumeTurn(input) {
                     toolCallId,
                     toolName: recorded === undefined ? "tool" : recorded.toolName,
                     isError,
+                    output: readToolOutputText(part),
                 });
             }
             if (typeof toolCallId === "string" && preliminary === false) {
@@ -487,9 +488,33 @@ async function consumeTurn(input) {
         }
         if (part["type"] === "finish") {
             // One suspended turn is several streams, each ending with its own
-            // `finish` — all of them count. Per-step parts are ignored so the same
-            // tokens are not counted twice.
+            // `finish` — all of them count. Per-step parts stay out of the turn's
+            // usage so the same tokens are not counted twice.
             addTurnUsage(input.accumulator, part);
+            const totals = readUsageTokens(part["totalUsage"]);
+            if (totals !== undefined && handlers.onUsage !== undefined) {
+                handlers.onUsage({ scope: "stream", ...totals });
+            }
+            continue;
+        }
+        if (part["type"] === "finish-step") {
+            const step = readUsageTokens(part["usage"]);
+            if (step !== undefined && handlers.onUsage !== undefined) {
+                handlers.onUsage({ scope: "step", ...step });
+            }
+            continue;
+        }
+        if (part["type"] === "reasoning-delta") {
+            const text = typeof part["text"] === "string"
+                ? part["text"]
+                : typeof part["delta"] === "string"
+                    ? part["delta"]
+                    : undefined;
+            if (text !== undefined &&
+                text.length > 0 &&
+                handlers.onReasoningDelta !== undefined) {
+                handlers.onReasoningDelta(text);
+            }
             continue;
         }
         if (part["type"] === "tool-approval-request") {
@@ -666,3 +691,60 @@ function isToolErrorPart(part) {
         part["type"] === "tool-output-error" ||
         part["type"] === "tool-output-denied");
 }
+/** Where a finished tool part may carry its result, most specific first. */
+const TOOL_OUTPUT_FIELDS = ["errorText", "error", "output", "result"];
+/** Enough of a tool's output to preview; the rest is never shown. */
+const TOOL_OUTPUT_MAX_LENGTH = 4_000;
+/**
+ * A finished tool's result as text, for the transcript. Built-in tools return
+ * a string; MCP tools return content blocks; a failure carries an error.
+ */
+function readToolOutputText(part) {
+    if (part["type"] === "tool-output-denied") {
+        return "Denied.";
+    }
+    // The first field with something in it. The UI stream spells the error
+    // `errorText`; older AI SDK parts used `result` for `output`. Presence is
+    // not enough: an empty `error` must not hide a real `output`.
+    const text = TOOL_OUTPUT_FIELDS.map((field) => toolValueText(part[field])).find((candidate) => candidate.trim() !== "");
+    if (text === undefined) {
+        return "";
+    }
+    return text.length > TOOL_OUTPUT_MAX_LENGTH
+        ? `${text.slice(0, TOOL_OUTPUT_MAX_LENGTH)}…`
+        : text;
+}
+function toolValueText(value) {
+    if (value === undefined || value === null) {
+        return "";
+    }
+    if (typeof value === "string") {
+        return value;
+    }
+    if (value instanceof Error) {
+        return value.message;
+    }
+    if (Array.isArray(value)) {
+        return value.map(toolValueText).join("\n");
+    }
+    if (typeof value === "object") {
+        const record = value;
+        // `{ type: "text", text }` content blocks, and the AI SDK's
+        // `{ type: "text", value }` tool output.
+        if (typeof record["text"] === "string") {
+            return record["text"];
+        }
+        if (record["type"] === "text" && typeof record["value"] === "string") {
+            return record["value"];
+        }
+        if (Array.isArray(record["content"])) {
+            return toolValueText(record["content"]);
+        }
+    }
+    try {
+        return JSON.stringify(value, null, 2);
+    }
+    catch {
+        return "";
+    }
+}

package/build/commands/ask/harness/usage.d.ts

@@ -1,3 +1,13 @@
+/**
+ * Credits the proxy bills for one model call, rounded up to the hundredth
+ * per call as it does. `inputTokens` is the whole prompt; cache writes are
+ * charged as plain input.
+ */
+export declare function creditsForStep(tokens: {
+    inputTokens: number;
+    cacheReadTokens: number;
+    outputTokens: number;
+}): number;
 /**
  * What one turn spent upstream, summed over the streams a suspended turn is
  * made of. `costUsd` is Claude Code's own accounting; the API stores it on
@@ -41,6 +51,15 @@ export declare function didReachAnthropic(usage: LocalTurnUsage): boolean;
  * cost is stored on the ingested message.
  */
 export declare function addTurnUsage(accumulator: LocalTurnAccumulator, part: Record<string, unknown>): void;
+/**
+ * Input and output tokens off an AI SDK usage object, or undefined when the
+ * part carries none. Input is the whole prompt, cached or not.
+ */
+export declare function readUsageTokens(value: unknown): {
+    inputTokens: number;
+    cacheReadTokens: number;
+    outputTokens: number;
+} | undefined;
 /**
  * What Claude Code says the turn cost, off the `finish` part.
  *

package/build/commands/ask/harness/usage.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"usage.d.ts","sourceRoot":"","sources":["../../../../src/commands/ask/harness/usage.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AACH,MAAM,MAAM,cAAc,GAAG;IAC3B,OAAO,EAAE,MAAM,CAAC;IAChB,WAAW,EAAE,MAAM,CAAC;IACpB,WAAW,EAAE,MAAM,CAAC;IACpB,YAAY,EAAE,MAAM,CAAC;IACrB,eAAe,EAAE,MAAM,CAAC;IACxB,gBAAgB,EAAE,MAAM,CAAC;IACzB,eAAe,EAAE,MAAM,CAAC;CACzB,CAAC;AAEF;;;;GAIG;AACH,MAAM,MAAM,oBAAoB,GAAG;IACjC,MAAM,EAAE,MAAM,EAAE,CAAC;IACjB,KAAK,EAAE,cAAc,CAAC;IACtB;;;OAGG;IACH,eAAe,EAAE,MAAM,CAAC;CACzB,CAAC;AAEF,wBAAgB,qBAAqB,CACnC,mBAAmB,EAAE,MAAM,GAC1B,oBAAoB,CActB;AAED;;;GAGG;AACH,wBAAgB,iBAAiB,CAAC,KAAK,EAAE,cAAc,GAAG,OAAO,CAEhE;AAED;;;;;;GAMG;AACH,wBAAgB,YAAY,CAC1B,WAAW,EAAE,oBAAoB,EACjC,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAC5B,IAAI,CAwCN;AAQD;;;;;;;;;;GAUG;AACH,wBAAgB,qBAAqB,CACnC,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAC5B,MAAM,GAAG,SAAS,CA0BpB"}
+{"version":3,"file":"usage.d.ts","sourceRoot":"","sources":["../../../../src/commands/ask/harness/usage.ts"],"names":[],"mappings":"AAeA;;;;GAIG;AACH,wBAAgB,cAAc,CAAC,MAAM,EAAE;IACrC,WAAW,EAAE,MAAM,CAAC;IACpB,eAAe,EAAE,MAAM,CAAC;IACxB,YAAY,EAAE,MAAM,CAAC;CACtB,GAAG,MAAM,CAWT;AAED;;;;;GAKG;AACH,MAAM,MAAM,cAAc,GAAG;IAC3B,OAAO,EAAE,MAAM,CAAC;IAChB,WAAW,EAAE,MAAM,CAAC;IACpB,WAAW,EAAE,MAAM,CAAC;IACpB,YAAY,EAAE,MAAM,CAAC;IACrB,eAAe,EAAE,MAAM,CAAC;IACxB,gBAAgB,EAAE,MAAM,CAAC;IACzB,eAAe,EAAE,MAAM,CAAC;CACzB,CAAC;AAEF;;;;GAIG;AACH,MAAM,MAAM,oBAAoB,GAAG;IACjC,MAAM,EAAE,MAAM,EAAE,CAAC;IACjB,KAAK,EAAE,cAAc,CAAC;IACtB;;;OAGG;IACH,eAAe,EAAE,MAAM,CAAC;CACzB,CAAC;AAEF,wBAAgB,qBAAqB,CACnC,mBAAmB,EAAE,MAAM,GAC1B,oBAAoB,CActB;AAED;;;GAGG;AACH,wBAAgB,iBAAiB,CAAC,KAAK,EAAE,cAAc,GAAG,OAAO,CAEhE;AAED;;;;;;GAMG;AACH,wBAAgB,YAAY,CAC1B,WAAW,EAAE,oBAAoB,EACjC,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAC5B,IAAI,CAwCN;AAED;;;GAGG;AACH,wBAAgB,eAAe,CAC7B,KAAK,EAAE,OAAO,GAEZ;IAAE,WAAW,EAAE,MAAM,CAAC;IAAC,eAAe,EAAE,MAAM,CAAC;IAAC,YAAY,EAAE,MAAM,CAAA;CAAE,GACtE,SAAS,CAkBZ;AAQD;;;;;;;;;;GAUG;AACH,wBAAgB,qBAAqB,CACnC,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAC5B,MAAM,GAAG,SAAS,CA0BpB"}

package/build/commands/ask/harness/usage.js

@@ -1,3 +1,31 @@
+/**
+ * What one Cargo credit is worth, and what the sandbox proxy charges per
+ * million tokens. Mirrors `USD_PER_CREDIT` and
+ * `ANTHROPIC_FALLBACK_RATES_USD_PER_MILLION` in the backend's harness usage:
+ * the proxy prices each request from these, not from Claude Code's own cost,
+ * so the credits shown after a turn have to use them too.
+ */
+const USD_PER_CREDIT = 0.04;
+const PROXY_RATES_USD_PER_MILLION = {
+    input: 3,
+    output: 15,
+    cacheRead: 0.3,
+};
+/**
+ * Credits the proxy bills for one model call, rounded up to the hundredth
+ * per call as it does. `inputTokens` is the whole prompt; cache writes are
+ * charged as plain input.
+ */
+export function creditsForStep(tokens) {
+    const usdPerMillion = Math.max(tokens.inputTokens - tokens.cacheReadTokens, 0) *
+        PROXY_RATES_USD_PER_MILLION.input +
+        tokens.cacheReadTokens * PROXY_RATES_USD_PER_MILLION.cacheRead +
+        tokens.outputTokens * PROXY_RATES_USD_PER_MILLION.output;
+    const credits = usdPerMillion / 1_000_000 / USD_PER_CREDIT;
+    // `toFixed` first, as the backend does, so float noise cannot round an
+    // exact hundredth up by one.
+    return Math.ceil(Number((credits * 100).toFixed(6))) / 100;
+}
 export function createTurnAccumulator(lastReportedCostUsd) {
     return {
         chunks: [],
@@ -57,6 +85,24 @@ export function addTurnUsage(accumulator, part) {
         usage.reasoningTokens += readCount(details["reasoningTokens"]);
     }
 }
+/**
+ * Input and output tokens off an AI SDK usage object, or undefined when the
+ * part carries none. Input is the whole prompt, cached or not.
+ */
+export function readUsageTokens(value) {
+    if (typeof value !== "object" || value === null) {
+        return undefined;
+    }
+    const usage = value;
+    const inputDetails = usage["inputTokenDetails"];
+    return {
+        inputTokens: readCount(usage["inputTokens"]),
+        cacheReadTokens: typeof inputDetails === "object" && inputDetails !== null
+            ? readCount(inputDetails["cacheReadTokens"])
+            : 0,
+        outputTokens: readCount(usage["outputTokens"]),
+    };
+}
 function readCount(value) {
     return typeof value === "number" && Number.isFinite(value) && value > 0
         ? value

package/build/commands/ask/input/completer.d.ts

@@ -1,5 +1,5 @@
 /** Chat slash commands offered on Tab when the line is `/…`. */
-export declare const ASK_SLASH_COMMANDS: readonly ["/help", "/clear", "/new", "/agent", "/cancel", "/exit"];
+export declare const ASK_SLASH_COMMANDS: readonly ["/help", "/clear", "/new", "/agent", "/tools", "/reasoning", "/cancel", "/exit"];
 export type AskCompleter = (line: string) => [string[], string];
 /** What a `/…` token turned out to be. */
 export type SlashTokenKind = "command" | "path" | "unknown";

package/build/commands/ask/input/completer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"completer.d.ts","sourceRoot":"","sources":["../../../../src/commands/ask/input/completer.ts"],"names":[],"mappings":"AAYA,gEAAgE;AAChE,eAAO,MAAM,kBAAkB,oEAOrB,CAAC;AAEX,MAAM,MAAM,YAAY,GAAG,CAAC,IAAI,EAAE,MAAM,KAAK,CAAC,MAAM,EAAE,EAAE,MAAM,CAAC,CAAC;AAEhE,0CAA0C;AAC1C,MAAM,MAAM,cAAc,GAAG,SAAS,GAAG,MAAM,GAAG,SAAS,CAAC;AAE5D;;;;;;;;;;;;;GAaG;AACH,wBAAgB,kBAAkB,CAAC,KAAK,EAAE,MAAM,GAAG,cAAc,CAgBhE;AAED,sDAAsD;AACtD,eAAO,MAAM,yBAAyB,IAAI,CAAC;AAE3C;;;GAGG;AACH,wBAAgB,kBAAkB,CAAC,GAAG,EAAE,MAAM,GAAG,YAAY,CAU5D;AAED;;;GAGG;AACH,wBAAgB,eAAe,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,GAAG,MAAM,EAAE,CASnE;AAED;;;GAGG;AACH,wBAAgB,eAAe,CAAC,IAAI,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,GAAG,MAAM,CAYxE;AAED;;;GAGG;AACH,wBAAgB,aAAa,CAAC,IAAI,EAAE,MAAM,GAAG,CAAC,MAAM,EAAE,EAAE,MAAM,CAAC,GAAG,SAAS,CAY1E;AAED;;;GAGG;AACH,wBAAgB,YAAY,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,GAAG,CAAC,MAAM,EAAE,EAAE,MAAM,CAAC,CAwE1E"}
+{"version":3,"file":"completer.d.ts","sourceRoot":"","sources":["../../../../src/commands/ask/input/completer.ts"],"names":[],"mappings":"AAYA,gEAAgE;AAChE,eAAO,MAAM,kBAAkB,4FASrB,CAAC;AAEX,MAAM,MAAM,YAAY,GAAG,CAAC,IAAI,EAAE,MAAM,KAAK,CAAC,MAAM,EAAE,EAAE,MAAM,CAAC,CAAC;AAEhE,0CAA0C;AAC1C,MAAM,MAAM,cAAc,GAAG,SAAS,GAAG,MAAM,GAAG,SAAS,CAAC;AAE5D;;;;;;;;;;;;;GAaG;AACH,wBAAgB,kBAAkB,CAAC,KAAK,EAAE,MAAM,GAAG,cAAc,CAgBhE;AAED,sDAAsD;AACtD,eAAO,MAAM,yBAAyB,IAAI,CAAC;AAE3C;;;GAGG;AACH,wBAAgB,kBAAkB,CAAC,GAAG,EAAE,MAAM,GAAG,YAAY,CAU5D;AAED;;;GAGG;AACH,wBAAgB,eAAe,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,GAAG,MAAM,EAAE,CASnE;AAED;;;GAGG;AACH,wBAAgB,eAAe,CAAC,IAAI,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,GAAG,MAAM,CAYxE;AAED;;;GAGG;AACH,wBAAgB,aAAa,CAAC,IAAI,EAAE,MAAM,GAAG,CAAC,MAAM,EAAE,EAAE,MAAM,CAAC,GAAG,SAAS,CAY1E;AAED;;;GAGG;AACH,wBAAgB,YAAY,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,GAAG,CAAC,MAAM,EAAE,EAAE,MAAM,CAAC,CAwE1E"}

package/build/commands/ask/input/completer.js

@@ -7,6 +7,8 @@ export const ASK_SLASH_COMMANDS = [
     "/clear",
     "/new",
     "/agent",
+    "/tools",
+    "/reasoning",
     "/cancel",
     "/exit",
 ];

package/build/commands/ask/input/prompt.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"prompt.d.ts","sourceRoot":"","sources":["../../../../src/commands/ask/input/prompt.ts"],"names":[],"mappings":";AAiBA;;;;;;GAMG;AACH,qBAAa,cAAe,SAAQ,KAAK;;CAKxC;AASD;;;;;;GAMG;AACH,wBAAsB,WAAW,CAC/B,KAAK,EAAE,MAAM,CAAC,cAAc,EAC5B,GAAG,EAAE,MAAM;AACX;;;;GAIG;AACH,WAAW,SAAK,GACf,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAiQ7B"}
+{"version":3,"file":"prompt.d.ts","sourceRoot":"","sources":["../../../../src/commands/ask/input/prompt.ts"],"names":[],"mappings":";AAkBA;;;;;;GAMG;AACH,qBAAa,cAAe,SAAQ,KAAK;;CAKxC;AASD;;;;;;GAMG;AACH,wBAAsB,WAAW,CAC/B,KAAK,EAAE,MAAM,CAAC,cAAc,EAC5B,GAAG,EAAE,MAAM;AACX;;;;GAIG;AACH,WAAW,SAAK,GACf,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CA+R7B"}