@autohq/cli 0.1.228 → 0.1.230

package/dist/agent-bridge.js

@@ -19474,6 +19474,21 @@ var RuntimeTurnStatusSchema = external_exports.enum([
   "completed",
   "failed"
 ]);
+var RuntimeBridgeUsageHarnessSchema = external_exports.enum(["claude-code", "codex"]);
+var RuntimeBridgeModelUsageSchema = external_exports.object({
+  model: external_exports.string().trim().min(1),
+  inputTokens: external_exports.number().int().nonnegative(),
+  outputTokens: external_exports.number().int().nonnegative(),
+  cacheCreationTokens: external_exports.number().int().nonnegative(),
+  cacheReadTokens: external_exports.number().int().nonnegative(),
+  // The harness provider's own per-model cost, for reconciliation only; null
+  // when the harness reports none. Never the billed figure.
+  providerCostUsd: external_exports.number().nonnegative().nullable()
+}).strict();
+var RuntimeBridgeTurnUsageSchema = external_exports.object({
+  harness: RuntimeBridgeUsageHarnessSchema,
+  models: external_exports.array(RuntimeBridgeModelUsageSchema)
+}).strict();
 var ConversationTextContentPartSchema = external_exports.object({
   type: external_exports.literal("text"),
   text: external_exports.string()
@@ -19656,7 +19671,10 @@ var RuntimeBridgeOutputEntryEnvelopeWireSchema = external_exports.object({
   content: ConversationEntryContentSchema,
   createdAt: external_exports.string().datetime(),
   completedAt: external_exports.string().datetime().nullable(),
-  turnStatus: RuntimeTurnStatusSchema.optional()
+  turnStatus: RuntimeTurnStatusSchema.optional(),
+  // Present only on a turn's terminal result entry; carries the captured
+  // token/cost usage the persisting side turns into ledger rows.
+  usage: RuntimeBridgeTurnUsageSchema.optional()
 }).strict();
 var LegacyRuntimeBridgeOutputEntryEnvelopeSchema = RuntimeBridgeOutputEntryEnvelopeWireSchema.omit({ turnStatus: true }).extend({
   sessionStatusAfter: external_exports.enum(["awaiting", "failed"])
@@ -23322,7 +23340,7 @@ Object.assign(lookup, {
 // package.json
 var package_default = {
   name: "@autohq/cli",
-  version: "0.1.228",
+  version: "0.1.230",
   license: "SEE LICENSE IN README.md",
   publishConfig: {
     access: "public"
@@ -24565,13 +24583,29 @@ var ClaudeCodeUserRecordSchema = external_exports.object({
   type: external_exports.literal("user"),
   message: ClaudeCodeUserMessageSchema
 }).passthrough();
+var ClaudeCodeAggregateUsageSchema = external_exports.object({
+  input_tokens: external_exports.number().optional(),
+  output_tokens: external_exports.number().optional(),
+  cache_creation_input_tokens: external_exports.number().optional(),
+  cache_read_input_tokens: external_exports.number().optional()
+}).passthrough();
+var ClaudeCodeModelUsageSchema = external_exports.object({
+  inputTokens: external_exports.number().optional(),
+  outputTokens: external_exports.number().optional(),
+  cacheCreationInputTokens: external_exports.number().optional(),
+  cacheReadInputTokens: external_exports.number().optional(),
+  costUSD: external_exports.number().optional()
+}).passthrough();
 var ClaudeCodeResultRecordSchema = external_exports.object({
   type: external_exports.literal("result"),
   subtype: external_exports.string().optional(),
   is_error: external_exports.boolean().optional(),
   error: external_exports.string().optional(),
   errors: external_exports.array(external_exports.string()).optional(),
-  result: external_exports.string().optional()
+  result: external_exports.string().optional(),
+  total_cost_usd: external_exports.number().optional(),
+  usage: ClaudeCodeAggregateUsageSchema.optional(),
+  modelUsage: external_exports.record(external_exports.string(), ClaudeCodeModelUsageSchema).optional()
 }).passthrough();
 var ClaudeCodeSessionRecordSchema = external_exports.object({
   session_id: external_exports.string().trim().min(1)
@@ -24601,11 +24635,13 @@ function parseClaudeCodeStreamRecord(parsed) {
   const isError = record2.is_error === true || record2.subtype === "error";
   const sdkErrorMessage = record2.errors?.map((error51) => error51.trim()).filter(Boolean).join("\n");
   const errorMessage4 = isError ? record2.error ?? record2.result ?? (sdkErrorMessage || void 0) ?? "claude-code reported an error" : void 0;
+  const usage = claudeCodeUsageFromRecord(record2);
   return {
     projections: [],
     result: {
       isError,
-      errorMessage: errorMessage4
+      errorMessage: errorMessage4,
+      ...usage ? { usage } : {}
     }
   };
 }
@@ -24742,6 +24778,43 @@ function userContentProjections(message) {
   }
   return projections;
 }
+function claudeCodeUsageFromRecord(record2) {
+  const aggregate = record2.usage;
+  const modelUsage = record2.modelUsage;
+  if (!aggregate && !modelUsage) {
+    return void 0;
+  }
+  const perModel = Object.entries(modelUsage ?? {}).map(
+    ([model, usage]) => ({
+      model,
+      inputTokens: tokenCount(usage.inputTokens),
+      outputTokens: tokenCount(usage.outputTokens),
+      cacheCreationTokens: tokenCount(usage.cacheCreationInputTokens),
+      cacheReadTokens: tokenCount(usage.cacheReadInputTokens),
+      providerCostUsd: usdAmount(usage.costUSD)
+    })
+  );
+  return {
+    inputTokens: tokenCount(aggregate?.input_tokens),
+    outputTokens: tokenCount(aggregate?.output_tokens),
+    cacheCreationTokens: tokenCount(aggregate?.cache_creation_input_tokens),
+    cacheReadTokens: tokenCount(aggregate?.cache_read_input_tokens),
+    totalCostUsd: usdAmount(record2.total_cost_usd),
+    perModel
+  };
+}
+function tokenCount(value2) {
+  if (typeof value2 !== "number" || !Number.isFinite(value2) || value2 < 0) {
+    return 0;
+  }
+  return Math.trunc(value2);
+}
+function usdAmount(value2) {
+  if (typeof value2 !== "number" || !Number.isFinite(value2) || value2 < 0) {
+    return 0;
+  }
+  return value2;
+}
 
 // ../../packages/schemas/src/codex.ts
 var CodexRequestIdSchema = external_exports.union([external_exports.string(), external_exports.number()]);
@@ -27873,7 +27946,8 @@ function buildOutputEnvelope(context, outputSeq, projection) {
     content: entry.content,
     createdAt,
     completedAt: entry.status === "in_progress" ? null : createdAt,
-    ...entry.turnStatus ? { turnStatus: entry.turnStatus } : {}
+    ...entry.turnStatus ? { turnStatus: entry.turnStatus } : {},
+    ...entry.usage ? { usage: entry.usage } : {}
   });
 }
 function buildDeltaOutputEnvelope(input) {
@@ -27934,6 +28008,7 @@ var ClaudeCodeProjector = class {
   }
 };
 function projectClaudeCodeResult(result) {
+  const usage = claudeCodeTurnUsage(result.usage);
   return {
     type: "entry",
     entry: {
@@ -27948,10 +28023,27 @@ function projectClaudeCodeResult(result) {
             text: result.isError ? `claude-code failed: ${result.errorMessage ?? "unknown error"}` : "claude-code completed"
           }
         ]
-      }
+      },
+      ...usage ? { usage } : {}
     }
   };
 }
+function claudeCodeTurnUsage(usage) {
+  if (!usage || usage.perModel.length === 0) {
+    return void 0;
+  }
+  return {
+    harness: "claude-code",
+    models: usage.perModel.map((model) => ({
+      model: model.model,
+      inputTokens: model.inputTokens,
+      outputTokens: model.outputTokens,
+      cacheCreationTokens: model.cacheCreationTokens,
+      cacheReadTokens: model.cacheReadTokens,
+      providerCostUsd: model.providerCostUsd
+    }))
+  };
+}
 function anthropicMessageIdFromStreamStart(message) {
   const event = message.event;
   if (event.type !== "message_start") {

package/dist/index.js

@@ -15967,11 +15967,13 @@ function parseClaudeCodeStreamRecord(parsed) {
   const isError = record2.is_error === true || record2.subtype === "error";
   const sdkErrorMessage = record2.errors?.map((error51) => error51.trim()).filter(Boolean).join("\n");
   const errorMessage6 = isError ? record2.error ?? record2.result ?? (sdkErrorMessage || void 0) ?? "claude-code reported an error" : void 0;
+  const usage = claudeCodeUsageFromRecord(record2);
   return {
     projections: [],
     result: {
       isError,
-      errorMessage: errorMessage6
+      errorMessage: errorMessage6,
+      ...usage ? { usage } : {}
     }
   };
 }
@@ -16105,7 +16107,44 @@ function userContentProjections(message) {
   }
   return projections;
 }
-var ASK_USER_QUESTION_TOOL_NAME, ClaudeCodeTextBlockSchema, ClaudeCodeToolUseBlockSchema, ClaudeCodeToolResultBlockSchema, ClaudeCodeAssistantContentBlockSchema, OptionalClaudeCodeAssistantContentBlockSchema, ClaudeCodeAssistantContentSchema, OptionalClaudeCodeToolResultBlockSchema, ClaudeCodeToolResultContentSchema, ClaudeCodeUserContentSchema, ClaudeCodeAssistantMessageSchema, ClaudeCodeUserMessageSchema, ClaudeCodeSystemRecordSchema, ClaudeCodeAssistantRecordSchema, ClaudeCodeUserRecordSchema, ClaudeCodeResultRecordSchema, ClaudeCodeSessionRecordSchema, ClaudeCodeStreamRecordSchema, AskUserQuestionInputSchema;
+function claudeCodeUsageFromRecord(record2) {
+  const aggregate = record2.usage;
+  const modelUsage = record2.modelUsage;
+  if (!aggregate && !modelUsage) {
+    return void 0;
+  }
+  const perModel = Object.entries(modelUsage ?? {}).map(
+    ([model, usage]) => ({
+      model,
+      inputTokens: tokenCount(usage.inputTokens),
+      outputTokens: tokenCount(usage.outputTokens),
+      cacheCreationTokens: tokenCount(usage.cacheCreationInputTokens),
+      cacheReadTokens: tokenCount(usage.cacheReadInputTokens),
+      providerCostUsd: usdAmount(usage.costUSD)
+    })
+  );
+  return {
+    inputTokens: tokenCount(aggregate?.input_tokens),
+    outputTokens: tokenCount(aggregate?.output_tokens),
+    cacheCreationTokens: tokenCount(aggregate?.cache_creation_input_tokens),
+    cacheReadTokens: tokenCount(aggregate?.cache_read_input_tokens),
+    totalCostUsd: usdAmount(record2.total_cost_usd),
+    perModel
+  };
+}
+function tokenCount(value) {
+  if (typeof value !== "number" || !Number.isFinite(value) || value < 0) {
+    return 0;
+  }
+  return Math.trunc(value);
+}
+function usdAmount(value) {
+  if (typeof value !== "number" || !Number.isFinite(value) || value < 0) {
+    return 0;
+  }
+  return value;
+}
+var ASK_USER_QUESTION_TOOL_NAME, ClaudeCodeTextBlockSchema, ClaudeCodeToolUseBlockSchema, ClaudeCodeToolResultBlockSchema, ClaudeCodeAssistantContentBlockSchema, OptionalClaudeCodeAssistantContentBlockSchema, ClaudeCodeAssistantContentSchema, OptionalClaudeCodeToolResultBlockSchema, ClaudeCodeToolResultContentSchema, ClaudeCodeUserContentSchema, ClaudeCodeAssistantMessageSchema, ClaudeCodeUserMessageSchema, ClaudeCodeSystemRecordSchema, ClaudeCodeAssistantRecordSchema, ClaudeCodeUserRecordSchema, ClaudeCodeAggregateUsageSchema, ClaudeCodeModelUsageSchema, ClaudeCodeResultRecordSchema, ClaudeCodeSessionRecordSchema, ClaudeCodeStreamRecordSchema, AskUserQuestionInputSchema;
 var init_claude_code = __esm({
   "../../packages/schemas/src/claude-code.ts"() {
     "use strict";
@@ -16176,13 +16215,29 @@ var init_claude_code = __esm({
       type: external_exports.literal("user"),
       message: ClaudeCodeUserMessageSchema
     }).passthrough();
+    ClaudeCodeAggregateUsageSchema = external_exports.object({
+      input_tokens: external_exports.number().optional(),
+      output_tokens: external_exports.number().optional(),
+      cache_creation_input_tokens: external_exports.number().optional(),
+      cache_read_input_tokens: external_exports.number().optional()
+    }).passthrough();
+    ClaudeCodeModelUsageSchema = external_exports.object({
+      inputTokens: external_exports.number().optional(),
+      outputTokens: external_exports.number().optional(),
+      cacheCreationInputTokens: external_exports.number().optional(),
+      cacheReadInputTokens: external_exports.number().optional(),
+      costUSD: external_exports.number().optional()
+    }).passthrough();
     ClaudeCodeResultRecordSchema = external_exports.object({
       type: external_exports.literal("result"),
       subtype: external_exports.string().optional(),
       is_error: external_exports.boolean().optional(),
       error: external_exports.string().optional(),
       errors: external_exports.array(external_exports.string()).optional(),
-      result: external_exports.string().optional()
+      result: external_exports.string().optional(),
+      total_cost_usd: external_exports.number().optional(),
+      usage: ClaudeCodeAggregateUsageSchema.optional(),
+      modelUsage: external_exports.record(external_exports.string(), ClaudeCodeModelUsageSchema).optional()
     }).passthrough();
     ClaudeCodeSessionRecordSchema = external_exports.object({
       session_id: external_exports.string().trim().min(1)
@@ -16552,7 +16607,7 @@ function reduceConversationRealtimeEvent(entries, event) {
     return next;
   }
   const existingByMessage = event.messageId === void 0 ? -1 : entries.findIndex(
-    (entry) => entry.messageId === event.messageId && entry.status === "in_progress" && entry.role === event.role && entry.kind === event.kind
+    (entry) => entry.messageId === event.messageId && (entry.status === "in_progress" || isLocalOptimisticEntry(entry)) && entry.role === event.role && entry.kind === event.kind
   );
   if (existingByMessage >= 0) {
     const next = [...entries];
@@ -16561,6 +16616,9 @@ function reduceConversationRealtimeEvent(entries, event) {
   }
   return [...entries, event];
 }
+function isLocalOptimisticEntry(entry) {
+  return entry.id.startsWith("local-");
+}
 function syntheticDeltaEntry(event) {
   return {
     type: "conversation.entry",
@@ -22238,7 +22296,7 @@ var init_package = __esm({
   "package.json"() {
     package_default = {
       name: "@autohq/cli",
-      version: "0.1.228",
+      version: "0.1.230",
       license: "SEE LICENSE IN README.md",
       publishConfig: {
         access: "public"
@@ -26879,7 +26937,7 @@ function conversationEscapeAction(input) {
 function WorkingIndicator({
   word,
   startedAt,
-  tokenCount
+  tokenCount: tokenCount2
 }) {
   const [tick, setTick] = useState2(0);
   useEffect2(() => {
@@ -26907,7 +26965,7 @@ function WorkingIndicator({
       /* @__PURE__ */ jsx4(Text4, { color: TRANSCRIPT_COLORS.spinner, children: "\u2026 " }),
       /* @__PURE__ */ jsx4(Text4, { color: TRANSCRIPT_COLORS.dim, children: formatWorkingSuffix({
         elapsedSeconds: elapsedSeconds(startedAt),
-        tokenCount
+        tokenCount: tokenCount2
       }) })
     ] })
   ] });
@@ -31663,6 +31721,21 @@ var RuntimeTurnStatusSchema = external_exports.enum([
   "completed",
   "failed"
 ]);
+var RuntimeBridgeUsageHarnessSchema = external_exports.enum(["claude-code", "codex"]);
+var RuntimeBridgeModelUsageSchema = external_exports.object({
+  model: external_exports.string().trim().min(1),
+  inputTokens: external_exports.number().int().nonnegative(),
+  outputTokens: external_exports.number().int().nonnegative(),
+  cacheCreationTokens: external_exports.number().int().nonnegative(),
+  cacheReadTokens: external_exports.number().int().nonnegative(),
+  // The harness provider's own per-model cost, for reconciliation only; null
+  // when the harness reports none. Never the billed figure.
+  providerCostUsd: external_exports.number().nonnegative().nullable()
+}).strict();
+var RuntimeBridgeTurnUsageSchema = external_exports.object({
+  harness: RuntimeBridgeUsageHarnessSchema,
+  models: external_exports.array(RuntimeBridgeModelUsageSchema)
+}).strict();
 var ConversationTextContentPartSchema2 = external_exports.object({
   type: external_exports.literal("text"),
   text: external_exports.string()
@@ -31845,7 +31918,10 @@ var RuntimeBridgeOutputEntryEnvelopeWireSchema = external_exports.object({
   content: ConversationEntryContentSchema2,
   createdAt: external_exports.string().datetime(),
   completedAt: external_exports.string().datetime().nullable(),
-  turnStatus: RuntimeTurnStatusSchema.optional()
+  turnStatus: RuntimeTurnStatusSchema.optional(),
+  // Present only on a turn's terminal result entry; carries the captured
+  // token/cost usage the persisting side turns into ledger rows.
+  usage: RuntimeBridgeTurnUsageSchema.optional()
 }).strict();
 var LegacyRuntimeBridgeOutputEntryEnvelopeSchema = RuntimeBridgeOutputEntryEnvelopeWireSchema.omit({ turnStatus: true }).extend({
   sessionStatusAfter: external_exports.enum(["awaiting", "failed"])
@@ -32589,7 +32665,8 @@ function buildOutputEnvelope(context, outputSeq, projection) {
     content: entry.content,
     createdAt,
     completedAt: entry.status === "in_progress" ? null : createdAt,
-    ...entry.turnStatus ? { turnStatus: entry.turnStatus } : {}
+    ...entry.turnStatus ? { turnStatus: entry.turnStatus } : {},
+    ...entry.usage ? { usage: entry.usage } : {}
   });
 }
 function buildDeltaOutputEnvelope(input) {
@@ -32651,6 +32728,7 @@ var ClaudeCodeProjector = class {
   }
 };
 function projectClaudeCodeResult(result) {
+  const usage = claudeCodeTurnUsage(result.usage);
   return {
     type: "entry",
     entry: {
@@ -32665,10 +32743,27 @@ function projectClaudeCodeResult(result) {
             text: result.isError ? `claude-code failed: ${result.errorMessage ?? "unknown error"}` : "claude-code completed"
           }
         ]
-      }
+      },
+      ...usage ? { usage } : {}
     }
   };
 }
+function claudeCodeTurnUsage(usage) {
+  if (!usage || usage.perModel.length === 0) {
+    return void 0;
+  }
+  return {
+    harness: "claude-code",
+    models: usage.perModel.map((model) => ({
+      model: model.model,
+      inputTokens: model.inputTokens,
+      outputTokens: model.outputTokens,
+      cacheCreationTokens: model.cacheCreationTokens,
+      cacheReadTokens: model.cacheReadTokens,
+      providerCostUsd: model.providerCostUsd
+    }))
+  };
+}
 function anthropicMessageIdFromStreamStart(message) {
   const event = message.event;
   if (event.type !== "message_start") {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@autohq/cli",
-  "version": "0.1.228",
+  "version": "0.1.230",
   "license": "SEE LICENSE IN README.md",
   "publishConfig": {
     "access": "public"