@autohq/cli 0.1.230 → 0.1.231

package/dist/agent-bridge.js

@@ -23340,7 +23340,7 @@ Object.assign(lookup, {
 // package.json
 var package_default = {
   name: "@autohq/cli",
-  version: "0.1.230",
+  version: "0.1.231",
   license: "SEE LICENSE IN README.md",
   publishConfig: {
     access: "public"
@@ -24885,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(),
@@ -25024,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 ? {
@@ -49588,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({
@@ -49609,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)
   // ---------------------------------------------------------------------------
@@ -49625,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);
@@ -49750,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) {
@@ -49869,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

@@ -16385,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 ? {
@@ -16497,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";
@@ -16571,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(),
@@ -22296,7 +22321,7 @@ var init_package = __esm({
   "package.json"() {
     package_default = {
       name: "@autohq/cli",
-      version: "0.1.230",
+      version: "0.1.231",
       license: "SEE LICENSE IN README.md",
       publishConfig: {
         access: "public"
@@ -34741,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({
@@ -34762,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)
   // ---------------------------------------------------------------------------
@@ -34778,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);
@@ -34903,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) {
@@ -35022,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.230",
+  "version": "0.1.231",
   "license": "SEE LICENSE IN README.md",
   "publishConfig": {
     "access": "public"