@cargo-ai/cli 1.0.124 → 1.0.126

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;AAuB3C,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,CA4UxB"}
+{"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

@@ -12,6 +12,7 @@ import { ensureHarnessPnpmOnPath } from "./pnpmShim.js";
 import { buildReleaseHostTools, buildReleaseMcpServers } from "./release.js";
 import { withGetPortEndpoint } from "./sandbox.js";
 import { ASK_TIMING_ENABLED, createPhaseLog, reportHarnessDiagnostic, timeStreamParts, } from "./timing.js";
+import { withToolCallReplay } from "./toolCallReplay.js";
 import { HarnessTurnStuck, runPromptTurn, settleWithin, } from "./turn.js";
 import { createTurnAccumulator, didReachAnthropic } from "./usage.js";
 /**
@@ -62,14 +63,17 @@ export async function createLocalHarness(input) {
     // through `auth`, not `env`: passing them via `env` alone lets
     // createClaudeCode auto-detect AI Gateway from the host process and ignore
     // the Cargo proxy.
-    const claudeCode = createClaudeCode({
+    // Wrapped so a batched tool call stays known to the stream that is asked to
+    // 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,
             ANTHROPIC_API_KEY: input.proxyToken,
         },
         env: { CLAUDE_CONFIG_DIR: askClaudeConfigDir() },
         mcpServers,
-    });
+    }));
     const harnessAgent = new HarnessAgent({
         // Native AskUserQuestion is withheld on the session, not via
         // `inactiveTools` (that would drop the host tool of the same name) and

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

@@ -4,6 +4,7 @@ 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, routeSessionEvents, 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";
 //# 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,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,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,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"}

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

@@ -4,5 +4,6 @@ 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, routeSessionEvents, withToolCallReplay, wrapSession, } from "./toolCallReplay.js";
 export { HarnessTurnStalled, HarnessTurnStuck, isBridgeClosedError, runPromptTurn, settleWithin, } from "./turn.js";
 export { createTurnAccumulator, readClaudeCodeCostUsd, } from "./usage.js";

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

@@ -0,0 +1,59 @@
+/**
+ * Keeps a batched tool call known to the turn that is asked to approve it.
+ *
+ * When Claude asks for several tools that need approval in one message, the
+ * Claude Code bridge emits every `tool-call` up front, then one approval
+ * request; the rest come one per stream after each answer. The bridge
+ * remembers which calls it emitted for the whole turn, so it does not emit
+ * them again. The agent forgets them at the end of every stream, and the next
+ * stream throws on the second approval:
+ *
+ *   Harness 'claude-code' emitted approval request '…' for unknown tool call '…'.
+ *
+ * Upstream: https://github.com/vercel/ai/issues/23499 (open, reproduced on
+ * `main`). Each `doPromptTurn` / `doContinueTurn` is one agent stream with its
+ * 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. */
+export declare function withToolCallReplay(harness: HarnessV1): HarnessV1;
+export {};
+//# sourceMappingURL=toolCallReplay.d.ts.map

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

@@ -0,0 +1 @@
+{"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

@@ -0,0 +1,152 @@
+/**
+ * Keeps a batched tool call known to the turn that is asked to approve it.
+ *
+ * When Claude asks for several tools that need approval in one message, the
+ * Claude Code bridge emits every `tool-call` up front, then one approval
+ * request; the rest come one per stream after each answer. The bridge
+ * remembers which calls it emitted for the whole turn, so it does not emit
+ * them again. The agent forgets them at the end of every stream, and the next
+ * stream throws on the second approval:
+ *
+ *   Harness 'claude-code' emitted approval request '…' for unknown tool call '…'.
+ *
+ * Upstream: https://github.com/vercel/ai/issues/23499 (open, reproduced on
+ * `main`). Each `doPromptTurn` / `doContinueTurn` is one agent stream with its
+ * 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) {
+    const seen = new Set();
+    return (event) => {
+        if (event.type === "tool-call") {
+            known.set(event.toolCallId, event);
+            seen.add(event.toolCallId);
+        }
+        else if (event.type === "tool-approval-request" &&
+            seen.has(event.toolCallId) === false) {
+            const call = known.get(event.toolCallId);
+            if (call !== undefined) {
+                seen.add(event.toolCallId);
+                emit(call);
+            }
+        }
+        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 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.
+    return new Proxy(session, {
+        get(target, key) {
+            if (key === "doPromptTurn") {
+                return doPromptTurn;
+            }
+            if (key === "doContinueTurn") {
+                return doContinueTurn;
+            }
+            const value = Reflect.get(target, key, target);
+            return typeof value === "function" ? value.bind(target) : value;
+        },
+    });
+}
+/** The harness, with every session it starts keeping its tool calls. */
+export function withToolCallReplay(harness) {
+    return {
+        ...harness,
+        doStart: async (options) => wrapSession(await harness.doStart(options)),
+    };
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cargo-ai/cli",
-  "version": "1.0.124",
+  "version": "1.0.126",
   "mcpName": "io.github.getcargohq/cargo",
   "private": false,
   "license": "UNLICENSED",
@@ -76,8 +76,8 @@
     "@ai-sdk/harness-claude-code": "1.0.148",
     "@cargo-ai/api": "^1.0.101",
     "@cargo-ai/app-sdk": "^1.0.11",
-    "@cargo-ai/cdk": "^1.0.119",
-    "@cargo-ai/types": "^1.0.102",
+    "@cargo-ai/cdk": "^1.0.120",
+    "@cargo-ai/types": "^1.0.103",
     "@cargo-ai/utils": "^1.0.35",
     "@cargo-ai/worker-sdk": "^1.0.21",
     "@modelcontextprotocol/sdk": "^1.31.0",