@cargo-ai/cli 1.0.104 → 1.0.106

package/build/commands/ai/message.js

@@ -28,8 +28,8 @@ export function registerMessageCommands(parent, getApi) {
         .option("--integration-slug <slug>", "Integration slug (string)")
         .option("--connector-uuid <uuid>", "Connector UUID (string)")
         .option("--language-model-slug <slug>", "Language model slug (string)")
-        .option("--harness-slug <slug>", `Coding-agent runtime: ${AiUtils.harnessSlugs.join(", ")}. When omitted, later turns use the agent's pinned release, if any.`)
-        .option("--repository <json>", "Git workspace for a coding harness (JSON object: connectorUuid, repository as owner/name, defaultBranch, rootDirectory, env)")
+        .option("--harness-slug <slug>", `Coding-agent runtime for the auto-created chat: ${AiUtils.harnessSlugs.join(", ")}. Rejected with --chat-uuid. When omitted, the agent's pinned release decides.`)
+        .option("--repository <json>", "Git workspace for a coding harness, on the auto-created chat (JSON object: connectorUuid, repository as owner/name, defaultBranch, rootDirectory, env). Rejected with --chat-uuid.")
         .option("--output <json>", 'Output format for the assistant message (JSON object, e.g. \'{"type":"text"}\' or \'{"type":"jsonSchema","jsonSchema":{...}}\'). Defaults to text when omitted.')
         .option("--wait-until-finished [true|false]", "Poll the assistant message until finished before returning (defaults to true when passed bare)", parseBooleanOption)
         .option("--polling-interval <ms>", "Polling interval in milliseconds, used with --wait-until-finished (integer, default: 5000)", "5000")

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;AAGxC,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,iBAAiB,CAAC;AAuB3C,OAAO,EAGL,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,CAsUxB"}
+{"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"}

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

@@ -82,13 +82,10 @@ export async function createLocalHarness(input) {
             }),
         },
         id: "cargo-ai-ask",
-        sandbox: withGetPortEndpoint(createLocalSandbox({ cwd: workspace.sandboxCwd })),
         sandboxConfig: workspace.workDir === undefined ? {} : { workDir: workspace.workDir },
         instructions: localHarnessInstructions(input.dir, release),
         skills: localHarnessSkills(input.dir),
         model: input.languageModelSlug,
-        // Nested @ai-sdk/harness ships its own @ai-sdk/provider-utils, so its
-        // ToolSet does not unify with this package's. Runtime shape is the same.
         tools: hostTools,
         permissionMode: "allow-reads",
         ...(ASK_TIMING_ENABLED === false
@@ -96,14 +93,27 @@ export async function createLocalHarness(input) {
             : { debug: { enabled: true }, onLog: reportHarnessDiagnostic }),
     });
     setupPhase("harness agent constructed");
-    // Local sandbox cannot broker credentials via request transforms; the
-    // harness always warns. Keep that off the Ask tree (stderr mid-reply).
-    const session = await withMutedCredentialBrokerWarning(() => harnessAgent.createSession());
+    // Ours rather than the agent's, so ours to stop: the bridge and Claude Code
+    // run inside it.
+    const sandboxSession = await withGetPortEndpoint(createLocalSandbox({ cwd: workspace.sandboxCwd })).createSession();
+    const stopSandbox = () => Promise.resolve(sandboxSession.stop()).catch(() => undefined);
+    let session;
+    try {
+        // Local sandbox cannot broker credentials via request transforms; the
+        // harness always warns. Keep that off the Ask tree (stderr mid-reply).
+        session = await withMutedCredentialBrokerWarning(() => harnessAgent.createSession({ sandboxSession }));
+    }
+    catch (error) {
+        await stopSandbox();
+        throw error;
+    }
     setupPhase("harness session created");
     // Consumed by the first prompt: this session has never seen the chat, so it
     // is told the story once rather than on every question.
     let pendingHistory = input.history;
     let proxyLastUsedAtMs;
+    // Carried from turn to turn: see `LocalTurnAccumulator.reportedCostUsd`.
+    let reportedCostUsd = 0;
     // Approvals the previous turn asked about and never answered — a turn
     // cancelled at the confirmation prompt leaves one here.
     const unanswered = [];
@@ -127,17 +137,9 @@ export async function createLocalHarness(input) {
                 // user who walked away from the prompt is "no" — carrying the
                 // question into a turn they did not ask for would be worse.
                 const denials = unanswered.map((approval) => ({
-                    approvalResponse: {
-                        type: "tool-approval-response",
-                        approvalId: approval.approvalId,
-                        approved: false,
-                    },
-                    toolCall: {
-                        type: "tool-call",
-                        toolCallId: approval.toolCallId,
-                        toolName: approval.toolName,
-                        input: approval.input,
-                    },
+                    type: "tool-approval-response",
+                    approvalId: approval.approvalId,
+                    approved: false,
                 }));
                 unanswered.length = 0;
                 // The drain gets its own controller so the timeout can stop it rather
@@ -181,7 +183,7 @@ export async function createLocalHarness(input) {
                 }
                 turnPhase("unfinished previous turn drained");
             }
-            const accumulator = createTurnAccumulator();
+            const accumulator = createTurnAccumulator(reportedCostUsd);
             let answer;
             askUserQuestionAsk.current =
                 options === undefined ? undefined : options.onUserQuestion;
@@ -251,6 +253,7 @@ export async function createLocalHarness(input) {
             }
             finally {
                 askUserQuestionAsk.current = undefined;
+                reportedCostUsd = accumulator.reportedCostUsd;
             }
             if (didReachAnthropic(accumulator.usage) === true) {
                 proxyLastUsedAtMs = Date.now();
@@ -292,6 +295,7 @@ export async function createLocalHarness(input) {
             // this call exists to prevent, but a teardown already stuck is no more
             // likely to finish while the user waits on it.
             await settleWithin(session.destroy().catch(() => undefined), SESSION_DESTROY_TIMEOUT_MS);
+            await settleWithin(stopSandbox(), SESSION_DESTROY_TIMEOUT_MS);
         },
     };
 }

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

@@ -1,13 +1,11 @@
 import type { Ai, Orchestration } from "@cargo-ai/api";
+import { jsonSchema } from "ai";
 import type { Api } from "../../../api.js";
 /** Mount prefix so agent MCP tools can be auto-approved without widening user MCP. */
 export declare const CARGO_AGENT_MCP_NAME_PREFIX = "cargoagent_";
 type HostTool = {
     description?: string;
-    inputSchema: {
-        type: "object";
-        additionalProperties: true;
-    };
+    inputSchema: ReturnType<typeof jsonSchema>;
     execute: (data: unknown) => Promise<unknown>;
 };
 export declare function buildReleaseInstructionAppendix(release: Ai.Release): string | undefined;

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

@@ -1 +1 @@
-{"version":3,"file":"release.d.ts","sourceRoot":"","sources":["../../../../src/commands/ask/harness/release.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,EAAE,EAAE,aAAa,EAAE,MAAM,eAAe,CAAC;AAEvD,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,iBAAiB,CAAC;AAE3C,sFAAsF;AACtF,eAAO,MAAM,2BAA2B,gBAAgB,CAAC;AAEzD,KAAK,QAAQ,GAAG;IACd,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,WAAW,EAAE;QACX,IAAI,EAAE,QAAQ,CAAC;QACf,oBAAoB,EAAE,IAAI,CAAC;KAC5B,CAAC;IACF,OAAO,EAAE,CAAC,IAAI,EAAE,OAAO,KAAK,OAAO,CAAC,OAAO,CAAC,CAAC;CAC9C,CAAC;AAEF,wBAAgB,+BAA+B,CAC7C,OAAO,EAAE,EAAE,CAAC,OAAO,GAClB,MAAM,GAAG,SAAS,CAwCpB;AAED,wBAAgB,sBAAsB,CACpC,UAAU,EAAE,EAAE,CAAC,SAAS,EAAE,GACzB,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAiBzB;AAED,wBAAgB,qBAAqB,CACnC,GAAG,EAAE,GAAG,EACR,OAAO,EAAE,EAAE,CAAC,MAAM,EAAE,GACnB,MAAM,CAAC,MAAM,EAAE,QAAQ,CAAC,CA4B1B;AAED,wBAAgB,eAAe,CAC7B,MAAM,EAAE,EAAE,CAAC,MAAM,GAChB,aAAa,CAAC,GAAG,CAAC,oBAAoB,CAAC,QAAQ,CAAC,CAgClD"}
+{"version":3,"file":"release.d.ts","sourceRoot":"","sources":["../../../../src/commands/ask/harness/release.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,EAAE,EAAE,aAAa,EAAE,MAAM,eAAe,CAAC;AACvD,OAAO,EAAE,UAAU,EAAE,MAAM,IAAI,CAAC;AAEhC,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,iBAAiB,CAAC;AAE3C,sFAAsF;AACtF,eAAO,MAAM,2BAA2B,gBAAgB,CAAC;AAEzD,KAAK,QAAQ,GAAG;IACd,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,WAAW,EAAE,UAAU,CAAC,OAAO,UAAU,CAAC,CAAC;IAC3C,OAAO,EAAE,CAAC,IAAI,EAAE,OAAO,KAAK,OAAO,CAAC,OAAO,CAAC,CAAC;CAC9C,CAAC;AAEF,wBAAgB,+BAA+B,CAC7C,OAAO,EAAE,EAAE,CAAC,OAAO,GAClB,MAAM,GAAG,SAAS,CAwCpB;AAED,wBAAgB,sBAAsB,CACpC,UAAU,EAAE,EAAE,CAAC,SAAS,EAAE,GACzB,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAiBzB;AAED,wBAAgB,qBAAqB,CACnC,GAAG,EAAE,GAAG,EACR,OAAO,EAAE,EAAE,CAAC,MAAM,EAAE,GACnB,MAAM,CAAC,MAAM,EAAE,QAAQ,CAAC,CA4B1B;AAED,wBAAgB,eAAe,CAC7B,MAAM,EAAE,EAAE,CAAC,MAAM,GAChB,aAAa,CAAC,GAAG,CAAC,oBAAoB,CAAC,QAAQ,CAAC,CAgClD"}

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

@@ -1,3 +1,4 @@
+import { jsonSchema } from "ai";
 /** Mount prefix so agent MCP tools can be auto-approved without widening user MCP. */
 export const CARGO_AGENT_MCP_NAME_PREFIX = "cargoagent_";
 export function buildReleaseInstructionAppendix(release) {
@@ -46,10 +47,10 @@ export function buildReleaseHostTools(api, actions) {
     for (const action of actions) {
         tools[action.slug] = {
             description: action.description,
-            inputSchema: {
+            inputSchema: jsonSchema({
                 type: "object",
                 additionalProperties: true,
-            },
+            }),
             execute: async (data) => {
                 try {
                     return await api.orchestration.action.execute({

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

@@ -1,3 +1,4 @@
+import type { ToolApprovalResponse } from "ai";
 import { type LocalTurnAccumulator } from "./usage.js";
 /**
  * A built-in tool Claude Code wants to run that `permissionMode` does not
@@ -70,24 +71,10 @@ export type StreamLike = {
     fullStream: AsyncIterable<unknown>;
     text: PromiseLike<string>;
 };
-export type ApprovalContinuation = {
-    approvalResponse: {
-        type: "tool-approval-response";
-        approvalId: string;
-        approved: boolean;
-        reason?: string;
-    };
-    toolCall: {
-        type: "tool-call";
-        toolCallId: string;
-        toolName: string;
-        input: unknown;
-    };
-};
 /** The two harness calls a turn needs. Split out so tests can fake them. */
 export type TurnDriver = {
     start: () => Promise<StreamLike>;
-    continueWithApprovals: (continuations: readonly ApprovalContinuation[]) => Promise<StreamLike>;
+    continueWithApprovals: (continuations: readonly ToolApprovalResponse[]) => Promise<StreamLike>;
 };
 /**
  * Run one turn to completion, answering approval requests along the way.

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

@@ -59,7 +59,7 @@ export async function runPromptTurn(input) {
     const handlers = input.handlers === undefined ? {} : input.handlers;
     const onApproval = handlers.onApproval;
     const accumulator = input.accumulator === undefined
-        ? createTurnAccumulator()
+        ? createTurnAccumulator(0)
         : input.accumulator;
     const stallTimeoutMs = input.stallTimeoutMs === undefined
         ? TURN_STALL_TIMEOUT_MS
@@ -81,7 +81,7 @@ export async function runPromptTurn(input) {
             handlers,
             assistantChunks,
             toolCalls,
-            usage: accumulator.usage,
+            accumulator,
             turnState,
             stallTimeoutMs,
             toolStallTimeoutMs,
@@ -132,24 +132,16 @@ export async function runPromptTurn(input) {
                 }
             }
             continuations.push({
-                approvalResponse: {
-                    type: "tool-approval-response",
-                    approvalId: approval.approvalId,
-                    approved,
-                    // Told why, so it does something else rather than asking again
-                    // until the approval-round cap ends the turn.
-                    reason: question !== undefined
-                        ? question.reason
-                        : denied === true
-                            ? DENIED_TOOL_REASON
-                            : undefined,
-                },
-                toolCall: {
-                    type: "tool-call",
-                    toolCallId: approval.toolCallId,
-                    toolName: approval.toolName,
-                    input: approval.input,
-                },
+                type: "tool-approval-response",
+                approvalId: approval.approvalId,
+                approved,
+                // Told why, so it does something else rather than asking again
+                // until the approval-round cap ends the turn.
+                reason: question !== undefined
+                    ? question.reason
+                    : denied === true
+                        ? DENIED_TOOL_REASON
+                        : undefined,
             });
         }
         retractAbandonedCalls(turnState.announced, handlers.onActivity);
@@ -495,9 +487,9 @@ async function consumeTurn(input) {
         }
         if (part["type"] === "finish") {
             // One suspended turn is several streams, each ending with its own
-            // `finish` and its own totals — sum them. Per-step parts are ignored
-            // so the same tokens are not counted twice.
-            addTurnUsage(input.usage, part);
+            // `finish` — all of them count. Per-step parts are ignored so the same
+            // tokens are not counted twice.
+            addTurnUsage(input.accumulator, part);
             continue;
         }
         if (part["type"] === "tool-approval-request") {

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

@@ -21,9 +21,13 @@ export type LocalTurnUsage = {
 export type LocalTurnAccumulator = {
     chunks: string[];
     usage: LocalTurnUsage;
+    /**
+     * Claude Code's last running cost for the session. It counts every turn so
+     * far, so a turn starts from the previous turn's and bills what it added.
+     */
+    reportedCostUsd: number;
 };
-/** Exported for tests. */
-export declare function createTurnAccumulator(): LocalTurnAccumulator;
+export declare function createTurnAccumulator(lastReportedCostUsd: number): LocalTurnAccumulator;
 /**
  * Whether the turn got as far as Anthropic. `costUsd` and `totalTokens` are
  * reported independently by the harness, so either alone means it did.
@@ -31,10 +35,12 @@ export declare function createTurnAccumulator(): LocalTurnAccumulator;
 export declare function didReachAnthropic(usage: LocalTurnUsage): boolean;
 /**
  * Add one stream's `finish` totals to the turn. `totalUsage` is the AI SDK
- * shape; `costUsd` is what Claude Code reports for the same stream under
- * `harnessMetadata`, and is stored on the ingested message.
+ * shape and counts that stream alone. `costUsd`, under `harnessMetadata`, is a
+ * running total, so the turn takes what it added since the last report; a
+ * total below that belongs to a new session, and counts in full. The turn's
+ * cost is stored on the ingested message.
  */
-export declare function addTurnUsage(usage: LocalTurnUsage, part: Record<string, unknown>): void;
+export declare function addTurnUsage(accumulator: LocalTurnAccumulator, part: Record<string, unknown>): void;
 /**
  * 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;CACvB,CAAC;AAEF,0BAA0B;AAC1B,wBAAgB,qBAAqB,IAAI,oBAAoB,CAa5D;AAED;;;GAGG;AACH,wBAAgB,iBAAiB,CAAC,KAAK,EAAE,cAAc,GAAG,OAAO,CAEhE;AAED;;;;GAIG;AACH,wBAAgB,YAAY,CAC1B,KAAK,EAAE,cAAc,EACrB,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAC5B,IAAI,CAmCN;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":"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"}

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

@@ -1,7 +1,7 @@
-/** Exported for tests. */
-export function createTurnAccumulator() {
+export function createTurnAccumulator(lastReportedCostUsd) {
     return {
         chunks: [],
+        reportedCostUsd: lastReportedCostUsd,
         usage: {
             costUsd: 0,
             totalTokens: 0,
@@ -22,13 +22,20 @@ export function didReachAnthropic(usage) {
 }
 /**
  * Add one stream's `finish` totals to the turn. `totalUsage` is the AI SDK
- * shape; `costUsd` is what Claude Code reports for the same stream under
- * `harnessMetadata`, and is stored on the ingested message.
+ * shape and counts that stream alone. `costUsd`, under `harnessMetadata`, is a
+ * running total, so the turn takes what it added since the last report; a
+ * total below that belongs to a new session, and counts in full. The turn's
+ * cost is stored on the ingested message.
  */
-export function addTurnUsage(usage, part) {
+export function addTurnUsage(accumulator, part) {
+    const usage = accumulator.usage;
     const costUsd = readClaudeCodeCostUsd(part);
     if (costUsd !== undefined) {
-        usage.costUsd += costUsd;
+        usage.costUsd +=
+            costUsd >= accumulator.reportedCostUsd
+                ? costUsd - accumulator.reportedCostUsd
+                : costUsd;
+        accumulator.reportedCostUsd = costUsd;
     }
     const totalUsage = part["totalUsage"];
     if (typeof totalUsage !== "object" || totalUsage === null) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cargo-ai/cli",
-  "version": "1.0.104",
+  "version": "1.0.106",
   "private": false,
   "license": "UNLICENSED",
   "homepage": "https://getcargo.ai",
@@ -65,16 +65,16 @@
     "format:check": "prettier --check ."
   },
   "dependencies": {
-    "@ai-sdk/harness": "^1.0.95",
-    "@ai-sdk/harness-claude-code": "^1.0.99",
+    "@ai-sdk/harness": "^1.0.144",
+    "@ai-sdk/harness-claude-code": "^1.0.148",
     "@cargo-ai/api": "^1.0.87",
     "@cargo-ai/app-sdk": "^1.0.11",
     "@cargo-ai/cdk": "^1.0.99",
-    "@cargo-ai/types": "^1.0.89",
+    "@cargo-ai/types": "^1.0.90",
     "@cargo-ai/utils": "^1.0.32",
     "@cargo-ai/worker-sdk": "^1.0.20",
-    "@modelcontextprotocol/sdk": "1.31.0",
-    "ai": "^7.0.84",
+    "@modelcontextprotocol/sdk": "^1.31.0",
+    "ai": "^7.0.133",
     "ai-sdk-sandbox-local": "^0.1.2",
     "commander": "^12.1.0",
     "tsx": "^4.19.2",