@agentstrack/collector 0.2.1 → 0.4.1

package/dist/adapters/claude.js

@@ -1,7 +1,8 @@
 import { existsSync, readdirSync, readFileSync } from 'node:fs';
+import { deterministicEventId } from '../queue/event-id.js';
 import { homedir } from 'node:os';
 import { join } from 'node:path';
-import { num, safeJsonParse, str } from './types.js';
+import { newestJsonl, num, readHeadLines, safeJsonParse, str } from './types.js';
 import { readClaudeAccount } from './account.js';
 import { emptyUsage } from '../schema.js';
 import { deriveTitle } from '../sessions/title.js';
@@ -19,11 +20,30 @@ import { deriveTitle } from '../sessions/title.js';
  *             "output_tokens_details":{"thinking_tokens":257}}},"timestamp":"…"}
  *
  * Tool calls appear as tool_use / tool_result blocks inside message.content.
+ * One API response is written as SEVERAL assistant lines — one per content
+ * block (thinking, text, tool_use) — each repeating the same message.id and
+ * the same usage. Usage is therefore billed once per message.id, not per line.
+ *
+ * Sub-agents (the Agent tool, and Workflow scripts) write their own transcript
+ * under <session-uuid>/subagents/[workflows/<wf>/]agent-<id>.jsonl, with the
+ * parent's sessionId on every line, isSidechain: true and an agentId. A sibling
+ * agent-<id>.meta.json carries {"agentType","description","toolUseId",…}. Every
+ * event from such a line is stamped sidechain/agent_id/agent_kind/agent_type
+ * so the server can attribute the sub-agent's own usage to it.
  */
 export const CLAUDE_DIR = process.env['CLAUDE_CONFIG_DIR'] ?? join(homedir(), '.claude');
 const PROJECTS_DIR = join(CLAUDE_DIR, 'projects');
+/**
+ * Claude Code's own markup on a user line: slash-command echoes and background
+ * task completions. They are not typed by a human and must not count as
+ * prompts or as human-active time.
+ */
+const MARKUP_PROMPT = /^<(task-notification|local-command-stdout|command-message|command-name)[\s>]/;
+const ULTRACODE = /\bultracode\b/i;
 export class ClaudeCodeAdapter {
     id = 'claude_code';
+    /** Cross-line facts within one transcript: a message's lines are contiguous. */
+    fileState = new Map();
     async detect() {
         if (!existsSync(PROJECTS_DIR)) {
             return { installed: false, watchPaths: [], note: `No transcripts at ${PROJECTS_DIR}` };
@@ -33,12 +53,10 @@ export class ClaudeCodeAdapter {
             // The version is stamped on every transcript line; read one cheaply.
             const projects = readdirSync(PROJECTS_DIR).slice(0, 5);
             for (const project of projects) {
-                const files = readdirSync(join(PROJECTS_DIR, project)).filter((f) => f.endsWith('.jsonl'));
-                if (files.length === 0)
+                const file = newestJsonl(join(PROJECTS_DIR, project));
+                if (!file)
                     continue;
-                // The version is stamped on every transcript line; read the newest one
-                // rather than reporting a placeholder string as the agent version.
-                version = readVersionFromTranscript(join(PROJECTS_DIR, project, files[0]));
+                version = readVersionFromTranscript(file);
                 if (version)
                     break;
             }
@@ -94,49 +112,81 @@ export class ClaudeCodeAdapter {
             agent: 'claude_code',
             agent_version: agentVersion,
         };
-        const wrap = (event_type, payload) => ({ event: { ...base, event_type, payload }, cwd, repo });
-        void ctx;
+        let state = this.fileState.get(ctx.sourceFile);
+        if (!state) {
+            state = { tools: new Map() };
+            this.fileState.set(ctx.sourceFile, state);
+        }
+        state.agent ??= readAgentStamp(ctx.sourceFile);
+        // A sub-agent's line, whether in its own file or (older releases) inline.
+        const agent = state.agent ?? (raw['isSidechain'] === true ? { agent_kind: 'subagent' } : null);
+        const stamp = agent ? { sidechain: true, ...agent, agent_id: str(raw['agentId']) ?? agent.agent_id } : {};
+        const wrap = (event_type, payload) => ({ event: { ...base, event_type, payload: { ...payload, ...stamp } }, cwd, repo });
         if (type === 'user')
-            return this.normalizeUser(raw, wrap);
+            return this.normalizeUser(raw, state, wrap);
         if (type === 'assistant')
-            return this.normalizeAssistant(raw, wrap);
+            return this.normalizeAssistant(raw, state, wrap);
         return [];
     }
-    normalizeUser(raw, wrap) {
+    normalizeUser(raw, state, wrap) {
         const message = (raw['message'] ?? {});
         const content = message['content'];
         // A "user" line is either a real human prompt or a tool result the agent
-        // fed back to itself. Only the former is human interaction time.
-        if (Array.isArray(content)) {
+        // fed back to itself. Only the former is human interaction time. A prompt
+        // arrives as a string, or as text/image blocks when something was pasted.
+        let text;
+        if (typeof content === 'string')
+            text = content;
+        else if (Array.isArray(content)) {
             const events = [];
+            const texts = [];
             for (const block of content) {
                 if (!block || typeof block !== 'object')
                     continue;
                 const b = block;
+                if (b['type'] === 'text') {
+                    const t = str(b['text']);
+                    if (t)
+                        texts.push(t);
+                    continue;
+                }
                 if (b['type'] !== 'tool_result')
                     continue;
+                const id = str(b['tool_use_id']);
                 const failed = b['is_error'] === true;
+                const started = id ? state.tools.get(id) : undefined;
                 events.push(wrap(failed ? 'tool.failed' : 'tool.completed', {
-                    tool_name: str(b['name']) ?? 'unknown',
-                    tool_call_id: str(b['tool_use_id']),
+                    tool_name: started?.name ?? 'unknown',
+                    tool_call_id: id,
+                    ...started?.extra,
                 }));
+                if (id)
+                    state.tools.delete(id);
             }
-            return events;
+            if (events.length > 0)
+                return events;
+            text = texts.join('\n');
         }
-        if (typeof content !== 'string')
+        if (!text)
             return [];
-        // Meta lines (command output, system reminders) are not prompts.
+        // Meta lines (command output, system reminders) and Claude Code's own
+        // markup are not prompts.
         if (raw['isMeta'] === true || str(raw['promptSource']) === 'system')
             return [];
+        if (MARKUP_PROMPT.test(text.trimStart()))
+            return [];
         return [
             wrap('user.prompted', {
-                prompt_chars: content.length,
-                prompt_text: content,
-                derived_title: deriveTitle(content),
+                prompt_chars: text.length,
+                prompt_text: text,
+                derived_title: deriveTitle(text),
+                // A boolean computed here, before the privacy pipeline strips the
+                // text, so it survives metadata mode without the prompt travelling.
+                ...(ULTRACODE.test(text) ? { ultracode: true } : {}),
             }),
         ];
     }
-    normalizeAssistant(raw, wrap) {
+    normalizeAssistant(raw, state, wrap) {
         const message = (raw['message'] ?? {});
         const model = str(message['model']);
         // Claude Code stamps '<synthetic>' on locally generated messages (interrupts,
@@ -144,14 +194,23 @@ export class ClaudeCodeAdapter {
         // analytics or the cost table.
         if (!model || model.startsWith('<'))
             return [];
-        const events = [
-            wrap('model.response', {
-                model,
-                provider: 'anthropic',
-                usage: readUsage(message['usage']),
-                stop_reason: str(message['stop_reason']),
-            }),
-        ];
+        const events = [];
+        // Every line of one response repeats the same usage; bill it once.
+        const messageId = str(message['id']) ?? str(raw['requestId']);
+        if (!messageId || messageId !== state.lastMessageId) {
+            state.lastMessageId = messageId;
+            events.push({
+                ...wrap('model.response', {
+                    model,
+                    provider: 'anthropic',
+                    usage: readUsage(message['usage']),
+                    stop_reason: str(message['stop_reason']),
+                }),
+                // Keyed on the message, not the line: a restart between two lines of
+                // the same response must dedupe on the server, not bill twice.
+                eventId: messageId ? deterministicEventId(`claude_code\nmodel.response\n${messageId}`) : undefined,
+            });
+        }
         const content = message['content'];
         if (Array.isArray(content)) {
             for (const block of content) {
@@ -161,9 +220,13 @@ export class ClaudeCodeAdapter {
                 if (b['type'] !== 'tool_use')
                     continue;
                 const toolName = str(b['name']) ?? 'unknown';
-                events.push(wrap('tool.started', { tool_name: toolName, tool_call_id: str(b['id']) }));
-                // Bash invocations are the interesting ones for command analytics.
+                const toolId = str(b['id']);
                 const input = (b['input'] ?? {});
+                const extra = toolExtras(toolName, input);
+                if (toolId)
+                    state.tools.set(toolId, { name: toolName, extra });
+                events.push(wrap('tool.started', { tool_name: toolName, tool_call_id: toolId, ...extra }));
+                // Bash invocations are the interesting ones for command analytics.
                 const command = str(input['command']);
                 if (toolName === 'Bash' && command) {
                     events.push(wrap('command.executed', { command }));
@@ -185,26 +248,71 @@ export class ClaudeCodeAdapter {
     }
 }
 /**
- * Maps Claude Code's usage block onto the normalized shape.
- *
- * thinking_tokens sits under output_tokens_details and is a SUBSET of
- * output_tokens — it must not be added on top, or thinking gets billed twice.
+ * What a Skill, Agent or Workflow call invoked — the name only, never the
+ * prompt or the script body. Everything else has no extras.
  */
-/** Reads the `version` field off the first line that carries one. */
-function readVersionFromTranscript(file) {
+function toolExtras(toolName, input) {
+    const extra = {};
+    if (toolName === 'Skill')
+        extra['skill'] = str(input['skill']);
+    if (toolName === 'Agent') {
+        extra['subagent_type'] = str(input['subagent_type']);
+        extra['description'] = str(input['description']);
+    }
+    if (toolName === 'Workflow')
+        extra['workflow_name'] = workflowName(str(input['script']));
+    for (const key of Object.keys(extra))
+        if (extra[key] === undefined)
+            delete extra[key];
+    return extra;
+}
+/** `name: '…'` out of the script's `export const meta = {…}` header. Absent when it is not that simple. */
+function workflowName(script) {
+    // ponytail: a regex over the first 4 KB, not a parser — meta is by convention the first export.
+    const m = /\bname:\s*(['"`])([^'"`\r\n]{1,120})\1/.exec(script?.slice(0, 4096) ?? '');
+    return m?.[2];
+}
+/**
+ * Sub-agent identity of a transcript, from its path and sibling meta file.
+ * Null for a main transcript. Read once per file; the meta file is written
+ * when the agent is spawned, before its first line.
+ */
+function readAgentStamp(file) {
+    const m = /[\\/]subagents[\\/](?:.*[\\/])?agent-([^\\/]+)\.jsonl$/.exec(file);
+    if (!m)
+        return null;
+    const stamp = {
+        agent_id: m[1],
+        agent_kind: /[\\/]subagents[\\/]workflows[\\/]/.test(file) ? 'workflow' : 'subagent',
+    };
     try {
-        for (const line of readFileSync(file, 'utf8').split('\n', 40)) {
-            const parsed = safeJsonParse(line);
-            const version = parsed ? str(parsed['version']) : undefined;
-            if (version)
-                return version;
-        }
+        const meta = safeJsonParse(readFileSync(file.replace(/\.jsonl$/, '.meta.json'), 'utf8'));
+        // Real key is agentType (Claude Code 2.1.x); the rest are tolerated spellings.
+        const type = meta && (str(meta['agentType']) ?? str(meta['subagent_type']) ?? str(meta['type']) ?? str(meta['label']));
+        if (type)
+            stamp.agent_type = type;
     }
     catch {
-        // Unreadable transcript: absent version is better than a fabricated one.
+        // No meta file: kind and id still come from the path.
+    }
+    return stamp;
+}
+/** Reads the `version` field off the first line that carries one. */
+function readVersionFromTranscript(file) {
+    for (const line of readHeadLines(file)) {
+        const parsed = safeJsonParse(line);
+        const version = parsed ? str(parsed['version']) : undefined;
+        if (version)
+            return version;
     }
     return undefined;
 }
+/**
+ * Maps Claude Code's usage block onto the normalized shape.
+ *
+ * thinking_tokens sits under output_tokens_details and is a SUBSET of
+ * output_tokens — it must not be added on top, or thinking gets billed twice.
+ */
 export function readUsage(raw) {
     const usage = (raw ?? {});
     const details = (usage['output_tokens_details'] ?? {});

package/dist/adapters/claude.js.map

@@ -1 +1 @@
-{"version":3,"file":"claude.js","sourceRoot":"","sources":["../../src/adapters/claude.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"claude.js","sourceRoot":"","sources":["../../src/adapters/claude.ts"],"names":[],"mappings":"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"}

package/dist/adapters/codex.d.ts

@@ -11,11 +11,18 @@ import { type TokenUsage } from '../schema.js';
  *   {"type":"turn_context","payload":{"turn_id":"…","model":"gpt-5.4","effort":"high"}}
  *   {"type":"event_msg","payload":{"type":"token_count","info":{
  *      "total_token_usage":{…},"last_token_usage":{…}},"rate_limits":{"plan_type":"plus"}}}
- *   {"type":"response_item","payload":{"type":"function_call","name":"shell",…}}
+ *   {"type":"response_item","payload":{"type":"function_call","name":"exec_command",…}}
+ *   {"type":"event_msg","payload":{"type":"exec_command_end","call_id":"…",
+ *    "command":["/bin/zsh","-lc","…"],"exit_code":0,"duration":{"secs":1,"nanos":5e8},"status":"completed"}}
+ *   {"type":"response_item","payload":{"type":"function_call_output","call_id":"…","output":"…"}}
  *
  * The important subtlety: token_count reports RUNNING TOTALS. These are emitted
  * as cumulative snapshots so the server treats them as a gauge, not a counter —
  * summing them would multiply a session's tokens by the number of snapshots.
+ * Per-turn deltas from `last_token_usage` were checked against real rollouts
+ * and do NOT reconcile to the final total (duplicate snapshots, resets), so the
+ * gauge stays; the price is that a mid-session model switch reports the whole
+ * total under both models (see docs/EVENT_SCHEMA.md).
  */
 export declare const CODEX_DIR: string;
 export declare class CodexAdapter implements AgentAdapter {
@@ -29,6 +36,13 @@ export declare class CodexAdapter implements AgentAdapter {
     private normalizeResponseItem;
     private wrap;
 }
+/**
+ * Codex usage shape. reasoning_output_tokens is a SUBSET of output_tokens and
+ * must not be added on top. Likewise cached_input_tokens is a SUBSET of
+ * input_tokens (codex-rs: non_cached_input = input - cached), while the
+ * normalized shape keeps them exclusive the way Claude Code reports them —
+ * copying both verbatim billed every cached token twice.
+ */
 export declare function readCodexUsage(raw: unknown): TokenUsage;
 interface FileTouch {
     event_type: 'file.changed' | 'file.read';

package/dist/adapters/codex.js

@@ -1,9 +1,10 @@
-import { existsSync, readdirSync, readFileSync } from 'node:fs';
+import { existsSync, readdirSync } from 'node:fs';
 import { homedir } from 'node:os';
 import { join } from 'node:path';
-import { num, safeJsonParse, str } from './types.js';
+import { newestJsonl, num, readHeadLines, safeJsonParse, str } from './types.js';
 import { emptyUsage } from '../schema.js';
 import { deriveTitle } from '../sessions/title.js';
+import { redact } from '../privacy/redact.js';
 /**
  * OpenAI Codex CLI adapter.
  *
@@ -15,11 +16,18 @@ import { deriveTitle } from '../sessions/title.js';
  *   {"type":"turn_context","payload":{"turn_id":"…","model":"gpt-5.4","effort":"high"}}
  *   {"type":"event_msg","payload":{"type":"token_count","info":{
  *      "total_token_usage":{…},"last_token_usage":{…}},"rate_limits":{"plan_type":"plus"}}}
- *   {"type":"response_item","payload":{"type":"function_call","name":"shell",…}}
+ *   {"type":"response_item","payload":{"type":"function_call","name":"exec_command",…}}
+ *   {"type":"event_msg","payload":{"type":"exec_command_end","call_id":"…",
+ *    "command":["/bin/zsh","-lc","…"],"exit_code":0,"duration":{"secs":1,"nanos":5e8},"status":"completed"}}
+ *   {"type":"response_item","payload":{"type":"function_call_output","call_id":"…","output":"…"}}
  *
  * The important subtlety: token_count reports RUNNING TOTALS. These are emitted
  * as cumulative snapshots so the server treats them as a gauge, not a counter —
  * summing them would multiply a session's tokens by the number of snapshots.
+ * Per-turn deltas from `last_token_usage` were checked against real rollouts
+ * and do NOT reconcile to the final total (duplicate snapshots, resets), so the
+ * gauge stays; the price is that a mid-session model switch reports the whole
+ * total under both models (see docs/EVENT_SCHEMA.md).
  */
 export const CODEX_DIR = process.env['CODEX_HOME'] ?? join(homedir(), '.codex');
 const SESSIONS_DIR = join(CODEX_DIR, 'sessions');
@@ -65,12 +73,19 @@ export class CodexAdapter {
         const occurredAt = str(raw['timestamp']);
         if (!type || !occurredAt)
             return [];
-        const state = this.fileState.get(ctx.sourceFile) ?? {};
+        let state = this.fileState.get(ctx.sourceFile);
+        if (!state) {
+            // A daemon restart resumes mid-file, after session_meta was consumed.
+            // The rollout is named rollout-<ts>-<uuid>.jsonl and that uuid IS the
+            // session id (13/13 real files), so seed it from the name; model and
+            // cwd come back with the next turn_context.
+            state = { sessionId: /([0-9a-f-]{36})\.jsonl$/i.exec(ctx.sourceFile)?.[1], calls: new Map() };
+            this.fileState.set(ctx.sourceFile, state);
+        }
         if (type === 'session_meta') {
-            state.sessionId = str(payload['id']);
+            state.sessionId = str(payload['id']) ?? state.sessionId;
             state.version = str(payload['cli_version']);
             state.cwd = str(payload['cwd']);
-            this.fileState.set(ctx.sourceFile, state);
             if (!state.sessionId)
                 return [];
             return [
@@ -83,7 +98,7 @@ export class CodexAdapter {
         }
         if (type === 'turn_context') {
             state.model = str(payload['model']) ?? state.model;
-            this.fileState.set(ctx.sourceFile, state);
+            state.cwd ??= str(payload['cwd']);
             if (!state.sessionId || !state.model)
                 return [];
             return [
@@ -129,11 +144,27 @@ export class CodexAdapter {
             ];
         }
         if (kind === 'exec_command_end') {
+            // The real shape: argv list, {secs,nanos} duration, numeric exit_code.
+            // This is also where an exec_command call terminates — its
+            // function_call_output is a bare string with no exit status.
+            const callId = str(payload['call_id']);
+            const exitCode = num(payload['exit_code']);
+            const duration = (payload['duration'] ?? {});
+            const durationMs = num(duration['secs']) * 1000 + Math.round(num(duration['nanos']) / 1e6);
+            const failed = exitCode !== 0 || str(payload['status']) === 'failed';
+            // The entry stays in `calls`: the function_call_output that must be
+            // ignored below may still be on its way.
+            const toolName = (callId && state.calls.get(callId)) ?? 'exec_command';
             return [
+                this.wrap(state, occurredAt, failed ? 'tool.failed' : 'tool.completed', {
+                    tool_name: toolName,
+                    tool_call_id: callId,
+                    duration_ms: durationMs,
+                }),
                 this.wrap(state, occurredAt, 'command.executed', {
-                    command: str(payload['command']) ?? 'shell',
-                    exit_code: num(payload['exit_code']),
-                    duration_ms: num(payload['duration_ms']),
+                    command: joinCommand(payload['command']) ?? str(payload['command']) ?? 'shell',
+                    exit_code: exitCode,
+                    duration_ms: durationMs,
                 }),
             ];
         }
@@ -141,10 +172,14 @@ export class CodexAdapter {
             return [this.wrap(state, occurredAt, 'agent.turn.ended', { turn_id: str(payload['turn_id']) })];
         }
         if (kind === 'error' || kind === 'stream_error') {
+            const message = str(payload['message']);
             return [
                 this.wrap(state, occurredAt, 'error', {
                     error_kind: kind,
-                    message: str(payload['message'])?.slice(0, 1000),
+                    // Redacted before the truncation, for the same reason deriveTitle is:
+                    // a cut through a secret leaves two halves that match no pattern, so
+                    // the privacy pipeline's later pass over `message` ships the fragment.
+                    message: message === undefined ? undefined : redact(message).text.slice(0, 1000),
                 }),
             ];
         }
@@ -155,10 +190,14 @@ export class CodexAdapter {
         // Recent Codex builds report the same tool calls as `custom_tool_call`
         // (apply_patch and the JS `exec` tool both arrive that way).
         if (kind === 'function_call' || kind === 'custom_tool_call') {
+            const toolName = str(payload['name']) ?? 'unknown';
+            const callId = str(payload['call_id']);
+            if (callId)
+                state.calls.set(callId, toolName);
             const events = [
                 this.wrap(state, occurredAt, 'tool.started', {
-                    tool_name: str(payload['name']) ?? 'unknown',
-                    tool_call_id: str(payload['call_id']),
+                    tool_name: toolName,
+                    tool_call_id: callId,
                 }),
             ];
             for (const file of fileTouches(payload)) {
@@ -168,12 +207,22 @@ export class CodexAdapter {
             return events;
         }
         if (kind === 'function_call_output' || kind === 'custom_tool_call_output') {
-            const output = (payload['output'] ?? {});
-            const failed = output['success'] === false || num(output['exit_code']) !== 0;
+            const callId = str(payload['call_id']);
+            const toolName = (callId && state.calls.get(callId)) ?? str(payload['name']) ?? 'unknown';
+            // exec_command terminates on its exec_command_end (which carries the exit
+            // status); the two arrive in either order, so key on the tool, not on order.
+            if (toolName === 'exec_command')
+                return [];
+            if (callId)
+                state.calls.delete(callId);
+            // `output` is a string (or a content list for custom tools), never an
+            // object. Only the shell_command tool prefixes it with the exit status.
+            const exitHeader = /^Exit code: (\d+)/.exec(str(payload['output']) ?? '');
+            const failed = exitHeader !== null && exitHeader[1] !== '0';
             return [
                 this.wrap(state, occurredAt, failed ? 'tool.failed' : 'tool.completed', {
-                    tool_name: str(payload['name']) ?? 'unknown',
-                    tool_call_id: str(payload['call_id']),
+                    tool_name: toolName,
+                    tool_call_id: callId,
                 }),
             ];
         }
@@ -197,10 +246,6 @@ export class CodexAdapter {
         };
     }
 }
-/**
- * Codex usage shape. reasoning_output_tokens is a SUBSET of output_tokens and
- * must not be added on top.
- */
 /** Newest rollout's `session_meta.cli_version`, if one can be found cheaply. */
 function readCliVersion() {
     try {
@@ -208,17 +253,17 @@ function readCliVersion() {
         for (const year of years.slice(0, 2)) {
             for (const month of readdirSync(join(SESSIONS_DIR, year)).sort().reverse()) {
                 for (const day of readdirSync(join(SESSIONS_DIR, year, month)).sort().reverse()) {
-                    const dir = join(SESSIONS_DIR, year, month, day);
-                    for (const file of readdirSync(dir).filter((f) => f.endsWith('.jsonl')).sort().reverse()) {
-                        // session_meta is the first line of a rollout, so a short read suffices.
-                        for (const line of readFileSync(join(dir, file), 'utf8').split('\n', 5)) {
-                            const parsed = safeJsonParse(line);
-                            if (!parsed || str(parsed['type']) !== 'session_meta')
-                                continue;
-                            const version = str(parsed['payload']?.['cli_version']);
-                            if (version)
-                                return version;
-                        }
+                    const file = newestJsonl(join(SESSIONS_DIR, year, month, day));
+                    if (!file)
+                        continue;
+                    // session_meta is the first line of a rollout, so the head suffices.
+                    for (const line of readHeadLines(file)) {
+                        const parsed = safeJsonParse(line);
+                        if (!parsed || str(parsed['type']) !== 'session_meta')
+                            continue;
+                        const version = str(parsed['payload']?.['cli_version']);
+                        if (version)
+                            return version;
                     }
                 }
             }
@@ -229,12 +274,20 @@ function readCliVersion() {
     }
     return undefined;
 }
+/**
+ * Codex usage shape. reasoning_output_tokens is a SUBSET of output_tokens and
+ * must not be added on top. Likewise cached_input_tokens is a SUBSET of
+ * input_tokens (codex-rs: non_cached_input = input - cached), while the
+ * normalized shape keeps them exclusive the way Claude Code reports them —
+ * copying both verbatim billed every cached token twice.
+ */
 export function readCodexUsage(raw) {
     const usage = (raw ?? {});
+    const cached = num(usage['cached_input_tokens']);
     return {
         ...emptyUsage(),
-        input_tokens: num(usage['input_tokens']),
-        cached_input_tokens: num(usage['cached_input_tokens']),
+        input_tokens: Math.max(0, num(usage['input_tokens']) - cached),
+        cached_input_tokens: cached,
         output_tokens: num(usage['output_tokens']),
         reasoning_output_tokens: num(usage['reasoning_output_tokens']),
     };