@runuai/host 0.8.28 → 0.8.29

package/lib/agents/claude.ts

@@ -23,12 +23,12 @@
 import { newId } from "../ulid";
 import { createAgentTransport, type LineTransport } from "./transport";
 import { register } from "./registry";
+import { extractResultUsage } from "./usage";
 import type {
   AgentEvent,
   AgentEventHandler,
   AgentKind,
   AgentSession,
-  AgentUsage,
   RosterAgent,
 } from "./types";
 
@@ -60,32 +60,6 @@ function isObj(v: unknown): v is Record<string, unknown> {
   return typeof v === "object" && v !== null;
 }
 
-function num(v: unknown): number | undefined {
-  return typeof v === "number" && Number.isFinite(v) ? v : undefined;
-}
-
-/**
- * Token + cost accounting from a Claude `result` line. Claude Code reports the
- * exact `total_cost_usd` (no estimation needed) plus a token `usage` breakdown
- * and per-model `modelUsage`. The billed model is the single modelUsage key
- * (or, on a multi-model turn, joined).
- */
-function claudeUsage(json: Record<string, unknown>): AgentUsage | undefined {
-  const u = isObj(json.usage) ? json.usage : {};
-  const cost = num(json.total_cost_usd);
-  const models = isObj(json.modelUsage) ? Object.keys(json.modelUsage) : [];
-  const usage: AgentUsage = {
-    model: models.length ? models.join(", ") : undefined,
-    inputTokens: num(u.input_tokens),
-    outputTokens: num(u.output_tokens),
-    cacheReadTokens: num(u.cache_read_input_tokens),
-    cacheCreateTokens: num(u.cache_creation_input_tokens),
-    costUsd: cost,
-  };
-  // Nothing usable reported → omit rather than send an empty object.
-  return Object.values(usage).some((v) => v !== undefined) ? usage : undefined;
-}
-
 /**
  * Map one stream-json stdout line to zero or more AgentEvents.
  *
@@ -146,7 +120,7 @@ export function mapClaudeLine(raw: string): AgentEvent[] {
   // --- turn result ------------------------------------------------------
   if (type === "result") {
     const text = typeof json.result === "string" ? json.result : "";
-    const usage = claudeUsage(json);
+    const usage = extractResultUsage(json);
     if (json.is_error === true) {
       // An errored turn still cost tokens — meter it.
       return [

package/lib/agents/cursor.ts

@@ -31,11 +31,13 @@ import { spawn, type ChildProcess } from "node:child_process";
 
 import { newId } from "../ulid";
 import { register } from "./registry";
+import { extractResultUsage } from "./usage";
 import type {
   AgentEvent,
   AgentEventHandler,
   AgentKind,
   AgentSession,
+  AgentUsage,
   RosterAgent,
 } from "./types";
 
@@ -83,6 +85,9 @@ export interface MappedCursorLine {
   finalText?: string;
   sessionId?: string;
   errorText?: string;
+  /** Token/cost from the result envelope — Cursor uses the Claude-compatible
+   *  shape (usage + total_cost_usd + modelUsage). ADR-071 metering. */
+  usage?: AgentUsage;
 }
 
 export function mapCursorLine(line: string): MappedCursorLine {
@@ -131,6 +136,7 @@ export function mapCursorLine(line: string): MappedCursorLine {
           ? m.result
           : "cursor turn failed"
         : undefined,
+      usage: extractResultUsage(m),
     };
   }
   // thinking / user / other → nothing.
@@ -235,6 +241,9 @@ export class CursorSession implements AgentSession {
     let acc = "";
     let sawText = false;
     let buf = "";
+    // Usage rides the result line but turn_complete fires on process exit;
+    // capture it here and attach it below (ADR-071 metering).
+    let turnUsage: AgentUsage | undefined;
     const consume = (chunk: string): void => {
       buf += chunk;
       let nl: number;
@@ -279,6 +288,7 @@ export class CursorSession implements AgentSession {
           });
         }
         if (m.end) {
+          if (m.usage) turnUsage = m.usage;
           if (m.errorText) this.emit({ type: "error", message: m.errorText });
           const finalText = m.finalText ?? acc;
           if (sawText || finalText) {
@@ -307,7 +317,7 @@ export class CursorSession implements AgentSession {
             message: `cursor exited ${code ?? "null"}${tail ? `: ${tail}` : ""}`,
           });
         }
-        this.emit({ type: "turn_complete" });
+        this.emit({ type: "turn_complete", usage: turnUsage });
         resolve();
       };
       child.on("exit", (code) => finish(code));

package/lib/agents/usage.ts

@@ -0,0 +1,37 @@
+/**
+ * Shared token/cost extraction for the Claude-Code-compatible stream-json
+ * `result` envelope (ADR-071 metering). Claude Code AND Cursor Agent both emit
+ * this exact shape — `usage` token breakdown, an exact `total_cost_usd`, and
+ * per-model `modelUsage` — so both engines share this one extractor.
+ *
+ * Codex (app-server protocol) and Kimi/Grok (plain text streams) report no
+ * token/cost data, so they have no extractor.
+ */
+
+import type { AgentUsage } from "./types";
+
+function isObj(v: unknown): v is Record<string, unknown> {
+  return typeof v === "object" && v !== null;
+}
+
+function num(v: unknown): number | undefined {
+  return typeof v === "number" && Number.isFinite(v) ? v : undefined;
+}
+
+/** Pull AgentUsage from a `result` line, or undefined when none is reported. */
+export function extractResultUsage(
+  json: Record<string, unknown>,
+): AgentUsage | undefined {
+  const u = isObj(json.usage) ? json.usage : {};
+  const models = isObj(json.modelUsage) ? Object.keys(json.modelUsage) : [];
+  const usage: AgentUsage = {
+    model: models.length ? models.join(", ") : undefined,
+    inputTokens: num(u.input_tokens),
+    outputTokens: num(u.output_tokens),
+    cacheReadTokens: num(u.cache_read_input_tokens),
+    cacheCreateTokens: num(u.cache_creation_input_tokens),
+    costUsd: num(json.total_cost_usd),
+  };
+  // Nothing usable reported → omit rather than send an empty object.
+  return Object.values(usage).some((v) => v !== undefined) ? usage : undefined;
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@runuai/host",
-  "version": "0.8.28",
+  "version": "0.8.29",
   "description": "Uai host — runs ephemeral AI coding tasks in Docker on a machine you control.",
   "license": "MIT",
   "author": "Diogo Perillo <diogo.perillo@gmail.com>",