@autohq/cli 0.1.229 → 0.1.231

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.229",
+  version: "0.1.231",
   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()]);
@@ -24812,6 +24885,21 @@ var CodexTurnEnvelopeSchema = external_exports.object({
     error: external_exports.object({ message: external_exports.string() }).passthrough().nullish()
   }).passthrough()
 }).passthrough();
+var CodexTokenUsageSchema = external_exports.object({
+  totalTokens: external_exports.number().int().nonnegative(),
+  inputTokens: external_exports.number().int().nonnegative(),
+  cachedInputTokens: external_exports.number().int().nonnegative(),
+  outputTokens: external_exports.number().int().nonnegative(),
+  reasoningOutputTokens: external_exports.number().int().nonnegative()
+}).passthrough();
+var CodexTokenUsageEnvelopeSchema = external_exports.object({
+  threadId: external_exports.string(),
+  turnId: external_exports.string(),
+  tokenUsage: external_exports.object({
+    total: CodexTokenUsageSchema,
+    last: CodexTokenUsageSchema
+  }).passthrough()
+}).passthrough();
 var CodexFrameSchema = external_exports.object({
   id: CodexRequestIdSchema.optional(),
   method: external_exports.string().optional(),
@@ -24951,6 +25039,16 @@ function parseNotification(method, params) {
         item: parsed.data.item
       };
     }
+    case "thread/tokenUsage/updated": {
+      const parsed = CodexTokenUsageEnvelopeSchema.safeParse(params);
+      return parsed.success ? {
+        type: "tokenUsage",
+        threadId: parsed.data.threadId,
+        turnId: parsed.data.turnId,
+        total: parsed.data.tokenUsage.total,
+        last: parsed.data.tokenUsage.last
+      } : null;
+    }
     case "item/agentMessage/delta": {
       const parsed = external_exports.object({ itemId: external_exports.string(), delta: external_exports.string() }).passthrough().safeParse(params);
       return parsed.success ? {
@@ -27873,7 +27971,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 +28033,7 @@ var ClaudeCodeProjector = class {
   }
 };
 function projectClaudeCodeResult(result) {
+  const usage = claudeCodeTurnUsage(result.usage);
   return {
     type: "entry",
     entry: {
@@ -27948,10 +28048,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") {
@@ -49496,6 +49613,40 @@ function errorMessage2(error51) {
   return error51 instanceof Error ? error51.message : String(error51);
 }
 
+// src/commands/agent-bridge/harness/codex/usage.ts
+function addCodexUsage(accumulated, next) {
+  if (!accumulated) {
+    return next;
+  }
+  return {
+    totalTokens: accumulated.totalTokens + next.totalTokens,
+    inputTokens: accumulated.inputTokens + next.inputTokens,
+    cachedInputTokens: accumulated.cachedInputTokens + next.cachedInputTokens,
+    outputTokens: accumulated.outputTokens + next.outputTokens,
+    reasoningOutputTokens: accumulated.reasoningOutputTokens + next.reasoningOutputTokens
+  };
+}
+function codexTurnUsage(usage) {
+  if (usage.totalTokens === 0) {
+    return void 0;
+  }
+  const cacheReadTokens = usage.cachedInputTokens;
+  const inputTokens = Math.max(0, usage.inputTokens - cacheReadTokens);
+  return {
+    harness: "codex",
+    models: [
+      {
+        model: CODEX_DEFAULT_MODEL,
+        inputTokens,
+        outputTokens: usage.outputTokens,
+        cacheCreationTokens: 0,
+        cacheReadTokens,
+        providerCostUsd: null
+      }
+    ]
+  };
+}
+
 // src/commands/agent-bridge/harness/codex/index.ts
 function createCodexCommandHandler(input) {
   return new CodexCommandHandler({
@@ -49517,6 +49668,11 @@ var CodexCommandHandler = class {
   pendingApprovals = /* @__PURE__ */ new Map();
   outputBuffer;
   projector = new CodexProjector();
+  // The active turn's running usage sum. codex emits one
+  // `thread/tokenUsage/updated` per model request; their `last` breakdowns are
+  // summed here and ride the turn-completion entry. Reset at each turn boundary
+  // so usage never leaks across turns.
+  turnTokenUsage = null;
   // ---------------------------------------------------------------------------
   // Lifecycle (public API)
   // ---------------------------------------------------------------------------
@@ -49533,6 +49689,7 @@ var CodexCommandHandler = class {
     this.session?.close();
     this.session = null;
     this.pendingApprovals.clear();
+    this.turnTokenUsage = null;
   }
   async handleCommand(rawDelivery) {
     const delivery = RuntimeBridgeCommandDeliverySchema.parse(rawDelivery);
@@ -49658,8 +49815,25 @@ var CodexCommandHandler = class {
     if (!activeContext) {
       return;
     }
+    if (notification.type === "tokenUsage") {
+      this.turnTokenUsage = addCodexUsage(
+        this.turnTokenUsage,
+        notification.last
+      );
+      return;
+    }
+    if (notification.type === "turnStarted") {
+      this.turnTokenUsage = null;
+    }
+    const turnUsage = notification.type === "turnCompleted" && this.turnTokenUsage ? codexTurnUsage(this.turnTokenUsage) : void 0;
     for (const projection of this.projector.project(notification)) {
-      await this.emit(activeContext, projection);
+      await this.emit(
+        activeContext,
+        attachTurnUsage(notification, projection, turnUsage)
+      );
+    }
+    if (notification.type === "turnCompleted") {
+      this.turnTokenUsage = null;
     }
   }
   async handleServerRequest(request) {
@@ -49777,6 +49951,15 @@ function deliveryMode2(delivery) {
 function errorMessage3(error51) {
   return error51 instanceof Error ? error51.message : String(error51);
 }
+function attachTurnUsage(notification, projection, turnUsage) {
+  if (notification.type !== "turnCompleted" || projection.type !== "entry" || !turnUsage) {
+    return projection;
+  }
+  return {
+    type: "entry",
+    entry: { ...projection.entry, usage: turnUsage }
+  };
+}
 
 // src/commands/agent-bridge/harness/index.ts
 async function runAgentBridgeHarness(options) {

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)
@@ -16330,6 +16385,16 @@ function parseNotification(method, params) {
         item: parsed.data.item
       };
     }
+    case "thread/tokenUsage/updated": {
+      const parsed = CodexTokenUsageEnvelopeSchema.safeParse(params);
+      return parsed.success ? {
+        type: "tokenUsage",
+        threadId: parsed.data.threadId,
+        turnId: parsed.data.turnId,
+        total: parsed.data.tokenUsage.total,
+        last: parsed.data.tokenUsage.last
+      } : null;
+    }
     case "item/agentMessage/delta": {
       const parsed = external_exports.object({ itemId: external_exports.string(), delta: external_exports.string() }).passthrough().safeParse(params);
       return parsed.success ? {
@@ -16442,7 +16507,7 @@ function textContent2(text) {
 function isFailedStatus(status) {
   return status === "failed" || status === "declined";
 }
-var CodexRequestIdSchema, CodexTurnStatusSchema, CodexUserMessageItemSchema, CodexAgentMessageItemSchema, CodexReasoningItemSchema, CodexCommandExecutionItemSchema, CodexFileChangeItemSchema, CodexMcpToolCallItemSchema, CodexItemSchema, OptionalCodexItemSchema, CodexItemEnvelopeSchema, CodexTurnEnvelopeSchema, CodexFrameSchema, APPROVE_OPTION_LABEL, DECLINE_OPTION_LABEL;
+var CodexRequestIdSchema, CodexTurnStatusSchema, CodexUserMessageItemSchema, CodexAgentMessageItemSchema, CodexReasoningItemSchema, CodexCommandExecutionItemSchema, CodexFileChangeItemSchema, CodexMcpToolCallItemSchema, CodexItemSchema, OptionalCodexItemSchema, CodexItemEnvelopeSchema, CodexTurnEnvelopeSchema, CodexTokenUsageSchema, CodexTokenUsageEnvelopeSchema, CodexFrameSchema, APPROVE_OPTION_LABEL, DECLINE_OPTION_LABEL;
 var init_codex = __esm({
   "../../packages/schemas/src/codex.ts"() {
     "use strict";
@@ -16516,6 +16581,21 @@ var init_codex = __esm({
         error: external_exports.object({ message: external_exports.string() }).passthrough().nullish()
       }).passthrough()
     }).passthrough();
+    CodexTokenUsageSchema = external_exports.object({
+      totalTokens: external_exports.number().int().nonnegative(),
+      inputTokens: external_exports.number().int().nonnegative(),
+      cachedInputTokens: external_exports.number().int().nonnegative(),
+      outputTokens: external_exports.number().int().nonnegative(),
+      reasoningOutputTokens: external_exports.number().int().nonnegative()
+    }).passthrough();
+    CodexTokenUsageEnvelopeSchema = external_exports.object({
+      threadId: external_exports.string(),
+      turnId: external_exports.string(),
+      tokenUsage: external_exports.object({
+        total: CodexTokenUsageSchema,
+        last: CodexTokenUsageSchema
+      }).passthrough()
+    }).passthrough();
     CodexFrameSchema = external_exports.object({
       id: CodexRequestIdSchema.optional(),
       method: external_exports.string().optional(),
@@ -22241,7 +22321,7 @@ var init_package = __esm({
   "package.json"() {
     package_default = {
       name: "@autohq/cli",
-      version: "0.1.229",
+      version: "0.1.231",
       license: "SEE LICENSE IN README.md",
       publishConfig: {
         access: "public"
@@ -26882,7 +26962,7 @@ function conversationEscapeAction(input) {
 function WorkingIndicator({
   word,
   startedAt,
-  tokenCount
+  tokenCount: tokenCount2
 }) {
   const [tick, setTick] = useState2(0);
   useEffect2(() => {
@@ -26910,7 +26990,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
       }) })
     ] })
   ] });
@@ -31666,6 +31746,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()
@@ -31848,7 +31943,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"])
@@ -32592,7 +32690,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) {
@@ -32654,6 +32753,7 @@ var ClaudeCodeProjector = class {
   }
 };
 function projectClaudeCodeResult(result) {
+  const usage = claudeCodeTurnUsage(result.usage);
   return {
     type: "entry",
     entry: {
@@ -32668,10 +32768,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") {
@@ -34649,6 +34766,40 @@ function errorMessage2(error51) {
   return error51 instanceof Error ? error51.message : String(error51);
 }
 
+// src/commands/agent-bridge/harness/codex/usage.ts
+function addCodexUsage(accumulated, next) {
+  if (!accumulated) {
+    return next;
+  }
+  return {
+    totalTokens: accumulated.totalTokens + next.totalTokens,
+    inputTokens: accumulated.inputTokens + next.inputTokens,
+    cachedInputTokens: accumulated.cachedInputTokens + next.cachedInputTokens,
+    outputTokens: accumulated.outputTokens + next.outputTokens,
+    reasoningOutputTokens: accumulated.reasoningOutputTokens + next.reasoningOutputTokens
+  };
+}
+function codexTurnUsage(usage) {
+  if (usage.totalTokens === 0) {
+    return void 0;
+  }
+  const cacheReadTokens = usage.cachedInputTokens;
+  const inputTokens = Math.max(0, usage.inputTokens - cacheReadTokens);
+  return {
+    harness: "codex",
+    models: [
+      {
+        model: CODEX_DEFAULT_MODEL,
+        inputTokens,
+        outputTokens: usage.outputTokens,
+        cacheCreationTokens: 0,
+        cacheReadTokens,
+        providerCostUsd: null
+      }
+    ]
+  };
+}
+
 // src/commands/agent-bridge/harness/codex/index.ts
 function createCodexCommandHandler(input) {
   return new CodexCommandHandler({
@@ -34670,6 +34821,11 @@ var CodexCommandHandler = class {
   pendingApprovals = /* @__PURE__ */ new Map();
   outputBuffer;
   projector = new CodexProjector();
+  // The active turn's running usage sum. codex emits one
+  // `thread/tokenUsage/updated` per model request; their `last` breakdowns are
+  // summed here and ride the turn-completion entry. Reset at each turn boundary
+  // so usage never leaks across turns.
+  turnTokenUsage = null;
   // ---------------------------------------------------------------------------
   // Lifecycle (public API)
   // ---------------------------------------------------------------------------
@@ -34686,6 +34842,7 @@ var CodexCommandHandler = class {
     this.session?.close();
     this.session = null;
     this.pendingApprovals.clear();
+    this.turnTokenUsage = null;
   }
   async handleCommand(rawDelivery) {
     const delivery = RuntimeBridgeCommandDeliverySchema.parse(rawDelivery);
@@ -34811,8 +34968,25 @@ var CodexCommandHandler = class {
     if (!activeContext) {
       return;
     }
+    if (notification.type === "tokenUsage") {
+      this.turnTokenUsage = addCodexUsage(
+        this.turnTokenUsage,
+        notification.last
+      );
+      return;
+    }
+    if (notification.type === "turnStarted") {
+      this.turnTokenUsage = null;
+    }
+    const turnUsage = notification.type === "turnCompleted" && this.turnTokenUsage ? codexTurnUsage(this.turnTokenUsage) : void 0;
     for (const projection of this.projector.project(notification)) {
-      await this.emit(activeContext, projection);
+      await this.emit(
+        activeContext,
+        attachTurnUsage(notification, projection, turnUsage)
+      );
+    }
+    if (notification.type === "turnCompleted") {
+      this.turnTokenUsage = null;
     }
   }
   async handleServerRequest(request) {
@@ -34930,6 +35104,15 @@ function deliveryMode2(delivery) {
 function errorMessage3(error51) {
   return error51 instanceof Error ? error51.message : String(error51);
 }
+function attachTurnUsage(notification, projection, turnUsage) {
+  if (notification.type !== "turnCompleted" || projection.type !== "entry" || !turnUsage) {
+    return projection;
+  }
+  return {
+    type: "entry",
+    entry: { ...projection.entry, usage: turnUsage }
+  };
+}
 
 // src/commands/agent-bridge/harness/index.ts
 async function runAgentBridgeHarness(options) {

package/package.json

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