tokentracker-cli 1.1.13 → 1.2.1

package/src/lib/rollout.js

@@ -24617,6 +24617,7 @@ module.exports = {
   toUtcHalfHourStart,
   totalsKey,
   claudeMessageDedupKey,
+  normalizeClaudeUsage,
   groupBucketKey,
   // Exposed for regression tests covering nested-group remote URLs.
   canonicalizeProjectRef,

package/src/lib/session-analytics.js

@@ -28,9 +28,10 @@ const fsp = require("node:fs/promises");
 const os = require("node:os");
 const path = require("node:path");
 const readline = require("node:readline");
-const { listClaudeProjectFiles, listRolloutFilesDeep, claudeMessageDedupKey } = require("./rollout");
+const { listClaudeProjectFiles, listRolloutFilesDeep, claudeMessageDedupKey, normalizeClaudeUsage } = require("./rollout");
 const { parseCodexRolloutFile } = require("./codex-rollout-parser");
-const { computeRowCost, getModelPricing } = require("./pricing");
+const { computeRowCost, getModelPricingInfo } = require("./pricing");
+const { normalizePerformance, mergePerformance, createClaudePerformanceCollector, createCodexPerformanceCollector } = require("./session-performance");
 const { USD_TICKS_PER_USD, normalizeGrokUsage } = require("./grok-usage");
 const wsl = require("./wsl-probe");
 const {
@@ -68,7 +69,8 @@ const {
 // v13 stores per-model Codex usage (including observed reroutes and the exact
 // long-context subset) and folds delivery signals into the token parser's
 // single pass instead of parsing every Codex file twice.
-const SIDECAR_VERSION = 13;
+// v14 adds request-level estimated performance and Claude model usage.
+const SIDECAR_VERSION = 14;
 const EDIT_TOOLS = new Set([
   "apply_patch",
   "edit",
@@ -172,10 +174,12 @@ function normalizeModelUsageRows(rows) {
         selected_models: new Set(),
         reroute_reasons: new Set(),
         model_attribution: "selected",
+        performance: normalizePerformance(),
       };
       byModel.set(model, row);
     }
     for (const field of MODEL_USAGE_SUM_FIELDS) row[field] += finite(value?.[field]);
+    row.performance = mergePerformance(row.performance, value?.performance);
     if (Array.isArray(value?.selected_models)) {
       for (const selected of value.selected_models) {
         const normalized = normalizeSessionModel(selected);
@@ -195,6 +199,8 @@ function normalizeModelUsageRows(rows) {
     }
   }
   return [...byModel.values()]
+    .filter((row) => ["total_tokens", "input_tokens", "cached_input_tokens", "cache_creation_input_tokens", "output_tokens", "reasoning_output_tokens"]
+      .some((field) => row[field] > 0))
     .map((row) => ({
       ...row,
       selected_models: [...row.selected_models].sort(),
@@ -205,9 +211,9 @@ function normalizeModelUsageRows(rows) {
 
 // The sidecar is re-read on every dashboard request, so keep it small: omit
 // the model_usage fields that normalizeModelUsageRows() reconstructs on read.
-// All four omissions are lossless - zero counters default to 0, an absent
+// These omissions are lossless - zero counters default to 0, an absent
 // selected_models re-seeds from `model`, model_attribution is derived from
-// rerouted_usage_events, and cost_usd is always recomputed by
+// rerouted_usage_events, and cost_usd/pricing are always recomputed by
 // repriceSessionRecord(). Worth ~19% of the file on a 6.8k-session history,
 // most of it the long_context_* counters for sessions with no requests over
 // OPENAI_LONG_CONTEXT_INPUT_THRESHOLD in src/lib/pricing/index.js.
@@ -223,6 +229,7 @@ function serializeModelUsageRow(row) {
     out.reroute_reasons = row.reroute_reasons;
   }
   if (row.model_attribution === "effective") out.model_attribution = "effective";
+  if (row.performance?.estimated_request_count || row.performance?.first_response_sample_count) out.performance = row.performance;
   return out;
 }
 
@@ -239,22 +246,22 @@ function repriceSessionRecord(record) {
     let hasUnpricedUsage = false;
     for (const row of modelUsage) {
       row.cost_usd = computeRowCost({ source: record.source, ...row });
-      if (record.source === "codex" && row.total_tokens > 0) {
-        const pricing = getModelPricing(row.model, { source: record.source });
-        if (![pricing.input, pricing.output, pricing.cache_read, pricing.cache_write]
-          .some((value) => finite(value) > 0)) {
-          hasUnpricedUsage = true;
-        }
-      }
+      row.pricing = getModelPricingInfo(row.model, { source: record.source });
+      if (row.total_tokens > 0 && row.pricing.status === "unpriced") hasUnpricedUsage = true;
     }
     record.model_usage = modelUsage;
     record.model = modelUsage.length > 1 ? "mixed" : modelUsage[0].model;
-    record.cost_usd = modelUsage.reduce((sum, row) => sum + finite(row.cost_usd), 0);
-    record.cost_source = "model_pricing";
+    if (record.cost_source === "provider_reported" && Number.isFinite(Number(record.provider_cost_usd)) && Number(record.provider_cost_usd) >= 0) {
+      record.cost_usd = Number(record.provider_cost_usd);
+      if (modelUsage.length === 1) modelUsage[0].cost_usd = record.cost_usd;
+    } else {
+      record.cost_usd = modelUsage.reduce((sum, row) => sum + finite(row.cost_usd), 0);
+      record.cost_source = "model_pricing";
+      record.cost_is_partial = hasUnpricedUsage;
+    }
     // Internal labels such as `codex-auto-review` expose token usage but not
     // an underlying public model/rate. Keep their tokens, leave their cost at
     // zero, and explicitly mark the session estimate as a known lower bound.
-    record.cost_is_partial = hasUnpricedUsage;
   } else {
     const providerCost = Number(record.provider_cost_usd);
     record.cost_usd = record.cost_source === "provider_reported"
@@ -262,6 +269,8 @@ function repriceSessionRecord(record) {
       && providerCost >= 0
       ? providerCost
       : computeRowCost({ source: record.source, model: record.model, ...record.tokens });
+    if (record.cost_source !== "provider_reported" && finite(record.total_tokens || record.tokens?.total_tokens) > 0
+      && getModelPricingInfo(record.model, { source: record.source }).status === "unpriced") record.cost_is_partial = true;
   }
   record.cost_per_edit = record.edit_turns > 0 ? record.cost_usd / record.edit_turns : null;
   return record;
@@ -270,7 +279,7 @@ function repriceSessionRecord(record) {
 // The model_usage wire contract is DENSE: every field dashboard/src/lib/
 // sessions-api.ts declares is present on every row. Storage is free to be
 // sparse - serializeModelUsageRow() drops zero counters, and a record with no
-// model_usage at all (every claude/grok session, plus codex sessions written
+// model_usage at all (Grok sessions and sessions written
 // by an older sidecar) has nothing to trim in the first place - but neither
 // shape may leak into an API response, or the declared type describes a row
 // that does not exist. Densify here, the one point both the by_model
@@ -283,6 +292,7 @@ function denseModelUsageRow(overrides = {}) {
     reroute_reasons: [],
     model_attribution: "selected",
     cost_usd: 0,
+    performance: normalizePerformance(),
     ...overrides,
   };
 }
@@ -293,17 +303,22 @@ function modelUsageForAggregation(record) {
   if (rows.length === 0) {
     return [denseModelUsageRow({
       model: normalizeSessionModel(record?.model) || "unknown",
+      ...record?.tokens,
       total_tokens: finite(record?.total_tokens || record?.tokens?.total_tokens),
       cost_usd: finite(record?.cost_usd),
       edit_turns: editTurns,
+      performance: normalizePerformance(record?.performance),
+      pricing: getModelPricingInfo(record?.model, { source: record?.source }),
     })];
   }
   const priced = rows.map((row) => denseModelUsageRow({
     ...row,
+    pricing: getModelPricingInfo(row.model, { source: record.source }),
     cost_usd: Number.isFinite(Number(row.cost_usd))
       ? Number(row.cost_usd)
       : computeRowCost({ source: record.source, ...row }),
   }));
+  if (record.cost_source === "provider_reported" && priced.length === 1) priced[0].cost_usd = finite(record.cost_usd);
   // Sum(rows.edit_turns) has to equal record.edit_turns or the by_model column
   // stops summing to summary.edit_turns. It can fall short two ways: a sidecar
   // written before model_usage carried edit_turns, and an edit turn whose model
@@ -441,6 +456,7 @@ function finalizeRecord(record) {
   record.active_ms = Math.max(0, finite(record.active_ms));
   record.duration_ms = record.active_ms;
   record.total_tokens = finite(record.total_tokens || record.tokens?.total_tokens);
+  record.performance = normalizePerformance(record.performance);
   repriceSessionRecord(record);
   record.productive = record.edit_turns > 0;
   // A first-pass delivery has exactly one user turn containing an observed
@@ -476,6 +492,9 @@ async function scanClaudeSession(filePath) {
   // this set across that group stays deterministic. Unrelated files (including
   // same-UUID siblings inside one root) are never grouped here.
   const seenMessages = new Set();
+  const performanceCollector = createClaudePerformanceCollector();
+  const modelUsageByModel = new Map();
+  const editTurnsByModel = new Map();
   const bounds = emptyBounds();
   // The basename keeps grouping stable for files that never write a sessionId
   // record, but only an *observed* sessionId may become a resumable
@@ -491,12 +510,15 @@ async function scanClaudeSession(filePath) {
   let editTurns = 0;
   let retryTurns = 0;
   let currentHadEdit = false;
+  let currentTurnModel = null;
   let subagentCalls = 0;
   const subagentTypes = new Map();
 
   function closeTurn() {
     if (currentHadEdit) {
       editTurns += 1;
+      const key = currentTurnModel || "unknown";
+      editTurnsByModel.set(key, (editTurnsByModel.get(key) || 0) + 1);
     }
     currentHadEdit = false;
   }
@@ -521,6 +543,10 @@ async function scanClaudeSession(filePath) {
         }
         let obj;
         try { obj = JSON.parse(line); } catch { continue; }
+        const timingKey = claudeMessageDedupKey(obj);
+        const countedUsage = obj.type === "assistant" && obj.message && (!timingKey || !seenMessages.has(timingKey))
+          ? normalizeClaudeUsage(obj.message.usage) : null;
+        performanceCollector.consume(obj, timingKey, countedUsage, normalizeSessionModel(obj.message?.model) || model);
         updateBounds(bounds, obj.timestamp || obj.message?.timestamp);
         if (typeof obj.sessionId === "string" && obj.sessionId) {
           rawSessionId = obj.sessionId;
@@ -554,7 +580,15 @@ async function scanClaudeSession(filePath) {
         // model instead of letting that marker overwrite it.
         const candidateModel = normalizeSessionModel(obj.message.model);
         if (candidateModel) model = candidateModel;
-        addTotals(tokens, tokenTotals(obj.message.usage));
+        currentTurnModel = model;
+        const usage = normalizeClaudeUsage(obj.message.usage);
+        addTotals(tokens, usage);
+        if (usage.total_tokens > 0) {
+          const modelUsage = modelUsageByModel.get(model) || { model, ...emptyTotals(), usage_events: 0 };
+          addTotals(modelUsage, usage);
+          modelUsage.usage_events += 1;
+          modelUsageByModel.set(model, modelUsage);
+        }
         const content = Array.isArray(obj.message.content) ? obj.message.content : [];
         for (const block of content) {
           if (!block || block.type !== "tool_use") continue;
@@ -578,6 +612,7 @@ async function scanClaudeSession(filePath) {
   }
   if (!scannedFiles) throw new Error("all grouped Claude session files failed during read");
   closeTurn();
+  const performance = performanceCollector.finish();
   return finalizeRecord({
     version: SIDECAR_VERSION,
     session_hash: sessionHash("claude", rawSessionId),
@@ -591,6 +626,12 @@ async function scanClaudeSession(filePath) {
     project_key: projectKey(cwd, primaryFilePath),
     project_ref: cwd || null,
     model,
+    model_usage: [...modelUsageByModel.values()].map((row) => ({
+      ...row,
+      edit_turns: finite(editTurnsByModel.get(row.model)),
+      performance: performance.byModel.get(row.model) || normalizePerformance(),
+    })),
+    performance: performance.performance,
     ...bounds,
     turns,
     edit_turns: editTurns,
@@ -693,13 +734,19 @@ async function scanCodexSession(filePath) {
   const filePaths = readableSessionPaths(filePath);
   const primaryFilePath = filePaths[0] || String(filePath || "");
   const signalCollector = createCodexDeliverySignalCollector();
+  const performanceCollector = createCodexPerformanceCollector();
   const parsed = await parseCodexRolloutFile(filePaths, {
     seenTokenEvents: new Set(),
     collectBreakdowns: false,
     collectModelUsage: true,
-    onObject: signalCollector.consume,
+    onObject(obj, model) {
+      signalCollector.consume(obj, model);
+      performanceCollector.consume(obj, model);
+    },
+    onUsage: performanceCollector.consumeUsage,
   });
   const signals = signalCollector.finish();
+  const performance = performanceCollector.finish();
   // The collector keyed edit turns by the model the parser handed it, so the
   // keys are the same raw model ids parsed.modelUsage rows carry. A model whose
   // edit turns produced no billable delta has no row to land on;
@@ -709,6 +756,7 @@ async function scanCodexSession(filePath) {
   const modelUsage = (parsed.modelUsage || []).map((row) => ({
     ...row,
     edit_turns: finite(editTurnsByModel[row.model]),
+    performance: performance.byModel.get(row.model) || normalizePerformance(),
   }));
   const parsedModel = normalizeSessionModel(parsed.model);
   const provider = normalizeSessionModel(parsed.provider);
@@ -754,6 +802,7 @@ async function scanCodexSession(filePath) {
     project_ref: parsed.cwd || null,
     model,
     model_usage: modelUsage,
+    performance: performance.performance,
     ...signals.bounds,
     turns: signals.turns || finite(parsed.turnCount),
     edit_turns: signals.editTurns,
@@ -1590,6 +1639,7 @@ function summarizeSessions(sessions, { from = "", to = "", includeSessions = tru
     retries: 0,
     total_tokens: 0,
     cost_usd: 0,
+    performance: normalizePerformance(),
     edit_tokens: 0,
     edit_cost_usd: 0,
   };
@@ -1601,6 +1651,7 @@ function summarizeSessions(sessions, { from = "", to = "", includeSessions = tru
     totals.retries += finite(row.retry_turns);
     totals.total_tokens += finite(row.total_tokens);
     totals.cost_usd += finite(row.cost_usd);
+    totals.performance = mergePerformance(totals.performance, row.performance);
     if (row.productive) {
       totals.edit_tokens += finite(row.total_tokens);
       totals.edit_cost_usd += finite(row.cost_usd);
@@ -1626,6 +1677,7 @@ function summarizeSessions(sessions, { from = "", to = "", includeSessions = tru
         retries: 0,
         total_tokens: 0,
         cost_usd: 0,
+        performance: normalizePerformance(),
         edit_tokens: 0,
         edit_cost_usd: 0,
         usage_events: 0,
@@ -1638,6 +1690,7 @@ function summarizeSessions(sessions, { from = "", to = "", includeSessions = tru
       if (row.first_pass ?? row.one_shot) agg.one_shot_sessions += 1;
       agg.total_tokens += finite(usage.total_tokens);
       agg.cost_usd += finite(usage.cost_usd);
+      agg.performance = mergePerformance(agg.performance, usage.performance);
       agg.usage_events += finite(usage.usage_events);
       agg.rerouted_usage_events += finite(usage.rerouted_usage_events);
       agg.long_context_usage_events += finite(usage.long_context_usage_events);
@@ -1791,6 +1844,7 @@ function toSessionBrowserRow(row) {
     project_ref: row.project_ref || null,
     model: row.model,
     model_usage: modelUsageForAggregation(row),
+    performance: normalizePerformance(row.performance),
     started_at: row.started_at || null,
     ended_at: row.ended_at || null,
     duration_ms: finite(row.duration_ms),
@@ -1849,6 +1903,7 @@ function mergeSessionFragments(rows) {
         ...row,
         tokens: row.tokens && typeof row.tokens === "object" ? { ...row.tokens } : emptyTotals(),
         model_usage: normalizeModelUsageRows(row.model_usage),
+        performance: normalizePerformance(row.performance),
         _repr_tokens: finite(row.total_tokens),
       });
       continue;
@@ -1856,6 +1911,7 @@ function mergeSessionFragments(rows) {
     cur.turns = finite(cur.turns) + finite(row.turns);
     cur.edit_turns = finite(cur.edit_turns) + finite(row.edit_turns);
     cur.retry_turns = finite(cur.retry_turns) + finite(row.retry_turns);
+    cur.performance = mergePerformance(cur.performance, row.performance);
     cur.subagent_calls = finite(cur.subagent_calls) + finite(row.subagent_calls);
     addTotals(cur.tokens, row.tokens);
     cur.model_usage = normalizeModelUsageRows([

package/src/lib/session-performance.js

@@ -0,0 +1,214 @@
+"use strict";
+
+const { canonicalUsage } = require("./codex-token-usage");
+
+const SUM_FIELDS = [
+  "estimated_output_tokens", "estimated_duration_ms", "estimated_request_count",
+  "first_response_total_ms", "first_response_sample_count",
+];
+const MIN_OUTPUT = 200;
+const MIN_DURATION_MS = 1000;
+const MAX_DURATION_MS = 60 * 60 * 1000;
+const SAME_FLUSH_MS = 100;
+
+function nonNegative(value) {
+  const number = Number(value);
+  return Number.isFinite(number) && number >= 0 ? number : 0;
+}
+
+function normalizePerformance(value) {
+  const out = Object.fromEntries(SUM_FIELDS.map((field) => [field, nonNegative(value?.[field])]));
+  out.estimated_tokens_per_second = out.estimated_request_count > 0 && out.estimated_output_tokens > 0 && out.estimated_duration_ms > 0
+    ? out.estimated_output_tokens / (out.estimated_duration_ms / 1000) : null;
+  out.first_response_ms = out.first_response_sample_count > 0
+    ? out.first_response_total_ms / out.first_response_sample_count : null;
+  return out;
+}
+
+function mergePerformance(...values) {
+  const out = normalizePerformance();
+  for (const value of values) {
+    for (const field of SUM_FIELDS) out[field] += nonNegative(value?.[field]);
+  }
+  return normalizePerformance(out);
+}
+
+function timestampMs(value) {
+  if (typeof value !== "string") return null;
+  const number = Date.parse(value);
+  return Number.isFinite(number) ? number : null;
+}
+
+function accumulator() {
+  let total = normalizePerformance();
+  const byModel = new Map();
+  function add(model, delta) {
+    total = mergePerformance(total, delta);
+    if (model) byModel.set(model, mergePerformance(byModel.get(model), delta));
+  }
+  function request(model, outputTokens, start, end) {
+    const duration = start !== null && end !== null ? end - start : 0;
+    if (outputTokens < MIN_OUTPUT || duration < MIN_DURATION_MS || duration > MAX_DURATION_MS) return;
+    add(model, { estimated_output_tokens: outputTokens, estimated_duration_ms: duration, estimated_request_count: 1 });
+  }
+  return { add, request, finish: () => ({ performance: total, byModel }) };
+}
+
+function createClaudePerformanceCollector() {
+  const nodes = new Map();
+  const messages = new Map();
+  const totals = accumulator();
+
+  function consume(obj, key, countedUsage, model) {
+    const timestamp = timestampMs(obj?.timestamp || obj?.message?.timestamp);
+    if (typeof obj?.uuid === "string" && !nodes.has(obj.uuid)) {
+      nodes.set(obj.uuid, {
+        parent: obj.parentUuid, timestamp, type: obj.type,
+        invalid: Boolean(obj.isApiErrorMessage || obj.isMeta),
+      });
+    }
+    if (obj?.type !== "assistant" || !key) return;
+    let timing = messages.get(key);
+    if (!timing) {
+      // Tokens come from scanClaudeSession's canonical, once-counted delta.
+      // Later content blocks extend only the timing, never the numerator.
+      timing = {
+        parent: obj.parentUuid, startsAtFirstBlock: obj.apiBlockIndex == null || obj.apiBlockIndex === 0,
+        end: null, complete: false, invalid: false, model,
+        output: nonNegative(countedUsage?.output_tokens) + nonNegative(countedUsage?.reasoning_output_tokens),
+      };
+      messages.set(key, timing);
+    }
+    if (timestamp !== null) timing.end = timing.end === null ? timestamp : Math.max(timing.end, timestamp);
+    timing.complete ||= ["end_turn", "tool_use", "max_tokens", "stop_sequence"].includes(obj.message?.stop_reason);
+    timing.invalid ||= Boolean(obj.isApiErrorMessage || obj.message?.error);
+  }
+
+  function finish() {
+    for (const timing of messages.values()) {
+      if (!timing.complete || timing.invalid || !timing.startsAtFirstBlock) continue;
+      let parent = timing.parent;
+      for (let hop = 0; hop < 32 && parent; hop += 1) {
+        const node = nodes.get(parent);
+        if (!node) break;
+        if (node.type === "attachment") { parent = node.parent; continue; }
+        // A user row includes tool results. Their completion timestamp keeps
+        // time spent executing the tool outside the next inference window.
+        if (node.type === "user" && !node.invalid) totals.request(timing.model, timing.output, node.timestamp, timing.end);
+        break;
+      }
+    }
+    return totals.finish();
+  }
+  return { consume, finish };
+}
+
+function createCodexPerformanceCollector() {
+  const totals = accumulator();
+  let boundary = null;
+  let lastTokenCount = null;
+  let start = null;
+  let lastOutput = null;
+  let toolAfterOutput = null;
+  let usageRecord = null;
+  let invalid = false;
+  let turnKey = null;
+  let turnModels = new Set();
+  const seenFirstResponses = new Set();
+
+  function reset() {
+    start = null;
+    lastOutput = null;
+    toolAfterOutput = null;
+    usageRecord = null;
+    invalid = false;
+  }
+  function noteBoundary(ms) {
+    if (ms !== null) boundary = boundary === null ? ms : Math.max(boundary, ms);
+  }
+  function consume(obj, model) {
+    const ms = timestampMs(obj?.timestamp);
+    const payload = obj?.payload || {};
+    if (obj?.type === "compacted") {
+      reset();
+      noteBoundary(ms);
+      return;
+    }
+    if (obj?.type === "event_msg" && ["task_started", "turn_aborted"].includes(payload.type)) {
+      reset();
+      noteBoundary(ms);
+      turnModels = new Set();
+      turnKey = payload.turn_id || null;
+      if (payload.type === "turn_aborted") invalid = true;
+    }
+    if (obj?.type === "turn_context") {
+      const nextKey = payload.turn_id || null;
+      if (turnKey && nextKey && turnKey !== nextKey) { reset(); turnModels = new Set(); }
+      turnKey = nextKey || turnKey;
+      noteBoundary(ms);
+    }
+    const responseType = String(payload.type || "");
+    const isModelOutput = obj?.type === "response_item" && (responseType === "reasoning"
+      || responseType === "agent_message" || responseType.endsWith("_call")
+      || (responseType === "message" && payload.role === "assistant"));
+    if (model && (obj?.type === "turn_context" || isModelOutput
+      || payload.type === "model_rerouted")) turnModels.add(model);
+    if (obj?.type === "event_msg" && ["error", "api_error"].includes(payload.type)) invalid = true;
+    if (obj?.type === "event_msg" && payload.type === "task_complete") {
+      const raw = payload.time_to_first_token_ms;
+      const key = payload.turn_id || turnKey || obj.timestamp;
+      if (!invalid && typeof raw === "number" && Number.isFinite(raw) && raw >= 0 && !seenFirstResponses.has(key)) {
+        seenFirstResponses.add(key);
+        totals.add(turnModels.size === 1 ? [...turnModels][0] : null, { first_response_total_ms: raw, first_response_sample_count: 1 });
+      }
+      reset();
+      return;
+    }
+    if (obj?.type === "token_usage_record") {
+      usageRecord = { end: ms, usage: canonicalUsage(payload.usage) };
+      return;
+    }
+    if (obj?.type !== "response_item") return;
+    const type = String(payload.type || "");
+    if (type.endsWith("_output")) {
+      noteBoundary(ms);
+      if (lastOutput !== null) toolAfterOutput = ms;
+    } else if ((type === "message" && payload.role !== "assistant") || type === "user_message") {
+      noteBoundary(ms);
+    } else if (type === "reasoning" || type === "agent_message" || type.endsWith("_call") || (type === "message" && payload.role === "assistant")) {
+      // Old rollouts flush an output item just after its token_count.
+      if (ms === null || (start === null && lastTokenCount !== null && ms >= lastTokenCount && ms - lastTokenCount <= SAME_FLUSH_MS)) return;
+      if (start === null) start = boundary;
+      lastOutput = ms;
+      toolAfterOutput = null;
+    }
+  }
+  function consumeUsage({ timestamp, delta, rawUsage, model }) {
+    // A repeated cumulative snapshot can be written while the next response
+    // is still generating. It is not a completion boundary for that response.
+    if (!delta || delta.total_tokens <= 0) return;
+    const ms = timestampMs(timestamp);
+    const raw = canonicalUsage(rawUsage);
+    const matches = raw && usageRecord?.usage && ["input_tokens", "cached_input_tokens", "output_tokens"]
+      .every((field) => raw[field] === usageRecord.usage[field]);
+    const waitedForTools = toolAfterOutput !== null && ms !== null && ms >= toolAfterOutput;
+    // Once a tool result follows the final output marker, the token_count's
+    // timestamp contains execution time. The output marker is the available
+    // response boundary even if the count was flushed much later.
+    const end = matches ? usageRecord.end : waitedForTools ? lastOutput : ms;
+    // Missing output markers cannot distinguish response timing from a
+    // snapshot or inherited context, so even a positive token delta is skipped.
+    if (!invalid && lastOutput !== null) totals.request(model, nonNegative(delta.output_tokens), start, end);
+    noteBoundary(ms);
+    lastTokenCount = ms;
+    reset();
+  }
+  return { consume, consumeUsage, finish: totals.finish };
+}
+
+module.exports = {
+  normalizePerformance,
+  mergePerformance,
+  createClaudePerformanceCollector,
+  createCodexPerformanceCollector,
+};

package/dashboard/dist/assets/CommunityStatsModal-Cb1vefLE.js

@@ -1 +0,0 @@
-import{m as R,j as e,a1 as P,o as z,r as D,c as n,X as S,l as K}from"./__vite-browser-external-CPMSmJgP.js";import{m as M}from"./react-CZdcuJ28.js";import{A as U,W as B}from"./icons-Dn9vA9Qu.js";import{u as F}from"./useTokenFormat-CoGcVhPP.js";import{P as G}from"./ProviderIcon-aLwclDsD.js";import{T as W}from"./TrendMonitor-DWxtbzyQ.js";import{T as V}from"./AchievementBadge-DHCKPAgO.js";import{T as X}from"./terminal-CFQOW2Ey.js";import{D as Y,a as Z,b as H,c as q,d as J,e as Q}from"./DialogTitle-DuAY9sfZ.js";import{D as ee}from"./DialogDescription-GXslTq2z.js";import{D as ae}from"./DialogClose-Dn-nxOSp.js";import"./useCurrency-Dh9pUzDO.js";import"./use-latest-request-guard-viIhH7H5.js";import"./PopoverPopup-Btcu7vU0.js";import"./store-DvdXwk-7.js";import"./composite-BN1UKLj0.js";import"./ToolbarRootContext-B0cqyD1i.js";import"./maximize-2-BmtIBzLu.js";import"./use-reduced-motion-Dpq-cKyM.js";import"./zap-BdeAxq64.js";import"./flame-f7119ZMd.js";const C={name:"trending-down",size:24,node:[["path",{d:"M16 17h6v-6",key:"t6n2it"}],["path",{d:"m22 17-8.5-8.5-5 5L2 7",key:"x473p"}]]};C.node;const te=R(C),O=10,_={input:"var(--community-token-input)",cache_read:"var(--community-token-cache-read)",cache_write:"var(--community-token-cache-write)",output:"var(--community-token-output)",reasoning:"var(--community-token-reasoning)"},re={CLAUDE:"var(--community-claude)",CODEX:"var(--community-codex)",GEMINI:"var(--community-gemini)",CURSOR:"var(--community-cursor)",OPENCODE:"var(--community-opencode)",HERMES:"var(--community-hermes)",KIMI:"var(--community-kimi)",MIMO:"var(--community-mimo)",COPILOT:"var(--community-copilot)",KIRO:"var(--community-kiro)",GROK:"var(--community-grok)",DEEPSEEK:"var(--community-deepseek)",ZCODE:"var(--community-zcode)",WORKBUDDY:"var(--community-workbuddy)",MINIMAX:"var(--community-minimax)",DROID:"var(--community-droid)"};function ie(t){return re[String(t||"").toUpperCase()]||"var(--community-muted)"}const se=[[/claude|fable|opus|sonnet|haiku/,"CLAUDE"],[/gpt|codex|o3|o4/,"CODEX"],[/gemini/,"GEMINI"],[/composer|cursor/,"CURSOR"],[/kimi/,"KIMI"],[/mimo/,"MIMO"],[/copilot/,"COPILOT"],[/kiro/,"KIRO"],[/grok/,"GROK"],[/deepseek/,"DEEPSEEK"],[/glm/,"ZCODE"],[/hy3/,"WORKBUDDY"],[/minimax/,"MINIMAX"]],g=["overview","providers","community","models"];function oe(t){const s=String(t||"").toLowerCase(),a=se.find(([i])=>i.test(s));return a?a[1]:""}function u(t){const s=Number(t);return Number.isFinite(s)?`${s.toFixed(1)}%`:"—"}function p(t){return K(Number(t)||0)}function ne(t){return t?new Date(`${t}T00:00:00Z`).toLocaleDateString(void 0,{month:"short",day:"numeric",timeZone:"UTC"}):""}function k(){return e.jsx("div",{className:"flex h-full min-h-40 items-center justify-center text-xs text-oai-gray-400",children:n("leaderboard.community.modal.no_data")})}function b({children:t,detail:s}){return e.jsxs("div",{className:"mb-3 flex items-baseline justify-between gap-4",children:[e.jsx("h3",{className:"text-xs font-medium uppercase tracking-wide text-oai-gray-500 dark:text-oai-gray-400",children:t}),s?e.jsx("span",{className:"text-xs text-oai-gray-400",children:s}):null]})}function I({value:t,label:s}){const a=Number(t);if(!Number.isFinite(a))return null;const i=Math.sign(a)!==-1,r=i?V:te;return e.jsxs("span",{className:`inline-flex items-center gap-1 text-xs font-medium tabular-nums ${i?"text-emerald-600 dark:text-emerald-400":"text-rose-600 dark:text-rose-400"}`,title:s,children:[e.jsx(r,{className:"size-3","aria-hidden":"true"}),i?"+":"",a.toFixed(1),"%"]})}function j({label:t,value:s,title:a,delta:i,deltaLabel:r}){return e.jsxs("div",{className:"min-w-0",children:[e.jsx("div",{className:"truncate text-xs font-medium text-oai-gray-500 dark:text-oai-gray-400",children:t}),e.jsxs("div",{className:"mt-1 flex min-w-0 items-baseline gap-2",children:[e.jsx("span",{className:"truncate text-xl font-semibold leading-none tracking-tight text-oai-black tabular-nums dark:text-white",title:a,children:s}),e.jsx(I,{value:i,label:r})]})]})}function A({fillWidth:t,share:s,color:a="var(--oai-blue)",ariaLabel:i,dataAttrs:r,children:o}){return e.jsxs("div",{...r,className:"group relative grid min-h-11 grid-cols-[minmax(0,1fr)_auto] items-center gap-3 overflow-hidden px-2.5 transition-colors hover:bg-oai-gray-50 dark:hover:bg-oai-gray-900/60",children:[e.jsx("div",{className:"pointer-events-none absolute inset-y-0 left-0 opacity-[0.15] transition-opacity group-hover:opacity-[0.22] dark:opacity-[0.24] dark:group-hover:opacity-[0.32]",style:{width:`${t}%`,backgroundColor:a},role:"progressbar","aria-label":i,"aria-valuemin":"0","aria-valuemax":"100","aria-valuenow":Number(s)||0}),o]})}function T({rank:t,provider:s,name:a,fillWidth:i,share:r,tokens:o,tokensTitle:l,dataAttrs:c}){return e.jsxs(A,{fillWidth:i,share:r,color:ie(s),ariaLabel:`${a} ${u(r)}`,dataAttrs:c,children:[e.jsxs("div",{className:"relative flex min-w-0 items-center gap-2.5",children:[e.jsx("span",{className:`w-5 shrink-0 text-xs tabular-nums ${t<=3?"font-semibold text-oai-gray-700 dark:text-oai-gray-200":"text-oai-gray-400"}`,children:t}),e.jsx("span",{className:"grid size-6 shrink-0 place-items-center text-oai-gray-700 dark:text-oai-gray-200",children:e.jsx(G,{provider:s,size:15})}),e.jsx("span",{className:"truncate text-xs font-medium text-oai-gray-700 dark:text-oai-gray-200",title:a,children:a})]}),e.jsxs("div",{className:"relative min-w-[4.5rem] text-right",children:[e.jsx("div",{className:"text-xs font-semibold text-oai-black tabular-nums dark:text-white",title:l,children:o}),e.jsx("div",{className:"text-xs text-oai-gray-500 tabular-nums dark:text-oai-gray-400",children:u(r)})]})]})}function le({rows:t,formatTokensTooltip:s}){return t.length?e.jsxs("div",{className:"mt-7",children:[e.jsx(b,{children:n("leaderboard.community.modal.token_mix")}),e.jsx("div",{className:"flex h-1.5 overflow-hidden bg-oai-gray-100 dark:bg-oai-gray-800",children:t.map(a=>e.jsx("div",{style:{width:`${Math.max(Number(a.share)||0,0)}%`,backgroundColor:_[a.key]||"var(--community-muted)"},title:`${n(`leaderboard.community.modal.token_mix.${a.key}`)} · ${u(a.share)}`},a.key))}),e.jsx("div",{className:"mt-3 flex flex-wrap gap-x-5 gap-y-1.5",children:t.map(a=>e.jsxs("span",{className:"inline-flex items-center gap-1.5 text-xs text-oai-gray-500 dark:text-oai-gray-400",title:s(a.tokens),children:[e.jsx("span",{className:"size-2",style:{backgroundColor:_[a.key]||"var(--community-muted)"}}),n(`leaderboard.community.modal.token_mix.${a.key}`),e.jsx("span",{className:"tabular-nums text-oai-gray-700 dark:text-oai-gray-200",children:u(a.share)})]},a.key))})]}):null}function f({label:t,value:s,title:a,delta:i,deltaLabel:r,className:o=""}){return e.jsxs("div",{className:`min-w-0 ${o}`,children:[e.jsx("div",{className:"truncate text-xs text-oai-gray-500 dark:text-oai-gray-400",children:t}),e.jsxs("div",{className:"mt-1 flex min-w-0 items-baseline gap-2",children:[e.jsx("span",{className:"truncate text-base font-semibold leading-none tracking-tight tabular-nums text-oai-black dark:text-white",title:a,children:s}),e.jsx(I,{value:i,label:r})]})]})}function de({trendRows:t,activeDevelopers30d:s,developerGrowthPct:a,formatTokens:i,formatTokensTooltip:r}){if(!t.length)return null;const o=t.reduce((m,h)=>m+h.value,0),l=t.reduce((m,h)=>m.value<h.value?h:m,t[0]),c=o/t.length;return e.jsxs("div",{className:"mt-5 grid grid-cols-3 divide-x divide-oai-gray-100 border-y border-oai-gray-100 py-3.5 dark:divide-oai-gray-800/80 dark:border-oai-gray-800/80",children:[e.jsx(f,{className:"pr-4",label:n("leaderboard.community.modal.daily_average"),value:i(c),title:r(c)}),e.jsx(f,{className:"px-4",label:`${n("leaderboard.community.modal.peak_day")} · ${l.day}`,value:i(l.value),title:r(l.value)}),e.jsx(f,{className:"pl-4",label:n("leaderboard.community.modal.active_30d"),value:p(s),title:Number(s).toLocaleString(),delta:a,deltaLabel:n("leaderboard.community.modal.vs_previous_week")})]})}function me({trendRows:t,mix:s,activeDevelopers30d:a,developerGrowthPct:i,formatTokens:r,formatTokensTooltip:o}){return!t.length&&!s.length?e.jsx(k,{}):e.jsxs("div",{children:[e.jsx(b,{detail:n("leaderboard.community.modal.utc_note"),children:n("leaderboard.community.modal.community_activity")}),e.jsx(W,{embedded:!0,rows:t,from:t[0]?.day,to:t.at(-1)?.day,chartHeightClass:"h-44"}),e.jsx(de,{trendRows:t,activeDevelopers30d:a,developerGrowthPct:i,formatTokens:r,formatTokensTooltip:o}),e.jsx(le,{rows:s,formatTokensTooltip:o})]})}function ce({rows:t,maxShare:s,formatTokens:a,formatTokensTooltip:i}){return t.length?e.jsx("div",{className:"space-y-0.5",children:t.map((r,o)=>e.jsx(T,{rank:o+1,dataAttrs:{"data-provider-rank":o+1,"data-provider-name":r.name},provider:String(r.name).toUpperCase(),name:r.name,fillWidth:Math.max((Number(r.share)||0)/s*100,2),share:r.share,tokens:a(r.tokens),tokensTitle:i(r.tokens)},r.name))}):e.jsx(k,{})}function xe({rows:t,maxShare:s,formatTokens:a,formatTokensTooltip:i}){return t.length?e.jsx("div",{className:"space-y-0.5",children:t.map((r,o)=>{const l=Number(r.share)||0;return e.jsx(T,{rank:o+1,dataAttrs:{"data-model-rank":o+1,"data-model-name":r.name},provider:oe(r.name),name:r.name,fillWidth:Math.max(l/s*100,2),share:l,tokens:a(r.tokens),tokensTitle:i(r.tokens)},r.name)})}):e.jsx(k,{})}function ue({name:t}){const s=String(t||"").toLowerCase();return s==="darwin"?e.jsx(U,{className:"size-3.5"}):s==="win32"?e.jsx(B,{className:"size-3.5"}):e.jsx(X,{className:"size-4","aria-hidden":"true"})}const he=.175,ye=.3;function ge({bands:t,formatTokensTooltip:s}){const a=t.reduce((r,o)=>Math.max(r,Number(o.developer_share)||0),0)||1,i=r=>`${n(`leaderboard.community.modal.band.${r.key}`)} · ${n("leaderboard.community.modal.developer_count",{count:p(r.developers)})} (${s(r.tokens)})`;return e.jsxs("div",{children:[e.jsx("div",{className:"flex gap-2 border-b border-oai-gray-200 dark:border-oai-gray-800",children:t.map((r,o)=>{const l=Number(r.developer_share)||0,c=Math.max(l/a*80,2);return e.jsxs("div",{className:"relative h-32 min-w-0 flex-1",title:i(r),children:[e.jsx("div",{role:"progressbar","aria-label":n("leaderboard.community.modal.developer_share_title",{share:u(l)}),"aria-valuemin":"0","aria-valuemax":"100","aria-valuenow":l,className:"absolute inset-x-0 bottom-0",style:{height:`${c}%`,backgroundColor:"var(--oai-blue)",opacity:ye+o*he}}),e.jsx("div",{className:"absolute inset-x-0 text-center text-xs font-medium tabular-nums text-oai-gray-700 dark:text-oai-gray-200",style:{bottom:`calc(${c}% + 4px)`},children:u(l)})]},r.key)})}),e.jsx("div",{className:"mt-2 flex gap-2",children:t.map(r=>e.jsxs("div",{className:"min-w-0 flex-1 text-center",title:i(r),children:[e.jsx("div",{className:"truncate text-xs font-medium text-oai-gray-700 dark:text-oai-gray-200",children:n(`leaderboard.community.modal.band.${r.key}`)}),e.jsx("div",{className:"truncate text-xs tabular-nums text-oai-gray-500 dark:text-oai-gray-400",children:p(r.developers)})]},r.key))})]})}function pe({bands:t,platforms:s,formatTokensTooltip:a}){return!t.length&&!s.length?e.jsx(k,{}):e.jsxs("div",{className:"space-y-8",children:[t.length?e.jsxs("div",{children:[e.jsx(b,{children:n("leaderboard.community.modal.usage_distribution")}),e.jsx(ge,{bands:t,formatTokensTooltip:a})]}):null,s.length?e.jsxs("div",{children:[e.jsx(b,{children:n("leaderboard.community.modal.platforms")}),e.jsx("div",{className:"space-y-0.5",children:s.map(i=>e.jsxs(A,{fillWidth:Math.max(Number(i.share)||0,1),share:i.share,ariaLabel:`${n(`leaderboard.community.modal.platform.${i.name}`)} ${u(i.share)}`,children:[e.jsxs("div",{className:"relative flex min-w-0 items-center gap-2.5",children:[e.jsx("span",{className:"grid size-6 shrink-0 place-items-center text-oai-gray-700 dark:text-oai-gray-200",children:e.jsx(ue,{name:i.name})}),e.jsx("span",{className:"truncate text-xs font-medium text-oai-gray-700 dark:text-oai-gray-200",children:n(`leaderboard.community.modal.platform.${i.name}`)})]}),e.jsxs("div",{className:"relative min-w-[4.5rem] text-right",children:[e.jsx("div",{className:"text-xs font-semibold text-oai-black tabular-nums dark:text-white",children:u(i.share)}),e.jsx("div",{className:"text-xs text-oai-gray-500 tabular-nums dark:text-oai-gray-400",title:Number(i.machines||0).toLocaleString(),children:n("leaderboard.community.modal.machine_count",{count:p(i.machines)})})]})]},i.name))})]}):null]})}function ve({isOpen:t,onClose:s,communityStats:a}){const{formatTokens:i,formatTokensTooltip:r}=F(),[o,l]=D.useState("overview"),c=a?.status==="ready",m=D.useMemo(()=>{if(!c)return null;const d=(Array.isArray(a.providers)?a.providers:[]).slice(0,O),x=(Array.isArray(a.topModels)?a.topModels:[]).slice(0,O),y=v=>v.reduce(($,L)=>Math.max($,Number(L.share)||0),0)||1;return{providers:d,models:x,providersMaxShare:y(d),modelsMaxShare:y(x),trendRows:(Array.isArray(a.dailyGrowth)?a.dailyGrowth:[]).map(v=>({day:ne(v.day),value:Number(v.tokens)||0})),mix:Array.isArray(a.tokenMix)?a.tokenMix:[],bands:Array.isArray(a.userDistribution)?a.userDistribution:[],platforms:Array.isArray(a.platforms)?a.platforms:[]}},[c,a]);if(!m)return null;const h=Number(a.tokenFloor)||0,N=Number(a.activeDevelopersTotal)||Number(a.totalEntries)||0,w=Number(a.tokens30d)||0,E=d=>{if(d.key!=="ArrowRight"&&d.key!=="ArrowLeft")return;d.preventDefault();const x=d.key==="ArrowRight"?1:-1,y=g[(g.indexOf(o)+x+g.length)%g.length];l(y),d.currentTarget.querySelector(`[data-tab-id="${y}"]`)?.focus()};return e.jsx(Y,{open:t,onOpenChange:d=>!d&&s(),children:e.jsxs(Z,{children:[e.jsx(H,{className:"fixed inset-0 z-[100] bg-black/50 backdrop-blur-[3px] transition-opacity duration-200 ease-out data-[ending-style]:opacity-0 data-[starting-style]:opacity-0"}),e.jsx(q,{className:"fixed inset-0 z-[101] flex items-center justify-center p-2 sm:p-5",children:e.jsxs(J,{className:"relative flex h-[min(42rem,92vh)] w-full max-w-xl flex-col overflow-hidden rounded-2xl bg-white shadow-2xl ring-1 ring-black/10 transition-[opacity,transform] duration-[220ms] ease-[cubic-bezier(0.16,1,0.3,1)] data-[ending-style]:translate-y-3 data-[ending-style]:scale-[0.98] data-[ending-style]:opacity-0 data-[starting-style]:translate-y-3 data-[starting-style]:scale-[0.98] data-[starting-style]:opacity-0 dark:bg-oai-gray-950 dark:ring-white/10",children:[e.jsxs("header",{"data-testid":"community-metrics-header",className:"shrink-0 px-5 pt-5 sm:px-6",children:[e.jsxs("div",{className:"flex items-start justify-between gap-4",children:[e.jsxs("div",{children:[e.jsx(Q,{className:"text-lg font-semibold tracking-[-0.02em] text-oai-black dark:text-white",children:n("leaderboard.community.modal.title")}),e.jsx(ee,{className:"sr-only",children:n("leaderboard.community.modal.description")})]}),e.jsx(ae,{className:"-mr-1 -mt-1 grid size-8 place-items-center rounded-full text-oai-gray-400 transition-colors hover:bg-black/5 hover:text-oai-black dark:hover:bg-white/10 dark:hover:text-white","aria-label":n("shared.dialog.close"),children:e.jsx(S,{className:"size-4"})})]}),e.jsxs("div",{className:"mt-4 grid grid-cols-3 gap-x-5",children:[e.jsx(j,{label:n("leaderboard.community.modal.total_tokens"),value:i(h),title:r(h)}),e.jsx(j,{label:n("leaderboard.community.modal.tokens_30d"),value:i(w),title:r(w),delta:a.tokenGrowthPct,deltaLabel:n("leaderboard.community.modal.vs_previous_week")}),e.jsx(j,{label:n("leaderboard.community.modal.contributors"),value:p(N),title:N.toLocaleString()})]}),e.jsx("div",{className:"mt-4 flex items-end overflow-x-auto border-b border-oai-gray-100 dark:border-oai-gray-900",role:"tablist","aria-label":n("leaderboard.community.modal.views"),onKeyDown:E,children:g.map(d=>{const x=o===d;return e.jsxs("button",{type:"button",role:"tab","data-tab-id":d,"aria-selected":x,tabIndex:x?0:-1,onClick:()=>l(d),className:`relative mr-5 h-10 shrink-0 text-sm font-medium transition-colors last:mr-0 ${x?"text-oai-black dark:text-white":"text-oai-gray-500 hover:text-oai-gray-700 dark:text-oai-gray-400 dark:hover:text-oai-gray-200"}`,children:[n(`leaderboard.community.modal.tab.${d}`),x?e.jsx(M.span,{layoutId:"community-metrics-tab-underline",className:"absolute inset-x-0 -bottom-px h-0.5 rounded-full bg-oai-black dark:bg-white",transition:{type:"spring",stiffness:420,damping:34}}):null]},d)})})]}),e.jsx("div",{"data-testid":"community-metrics-content",className:"min-h-0 flex-1 overflow-y-auto px-5 py-5 sm:px-6",children:e.jsxs(M.div,{initial:{opacity:0,y:4},animate:{opacity:1,y:0},transition:{duration:.18,ease:[.16,1,.3,1]},className:"h-full",children:[o==="overview"?e.jsx(me,{trendRows:m.trendRows,mix:m.mix,activeDevelopers30d:Number(a.activeDevelopers30d)||0,developerGrowthPct:a.developerGrowthPct,formatTokens:i,formatTokensTooltip:r}):null,o==="providers"?e.jsx(ce,{rows:m.providers,maxShare:m.providersMaxShare,formatTokens:i,formatTokensTooltip:r}):null,o==="community"?e.jsx(pe,{bands:m.bands,platforms:m.platforms,formatTokensTooltip:r}):null,o==="models"?e.jsx(xe,{rows:m.models,maxShare:m.modelsMaxShare,formatTokens:i,formatTokensTooltip:r}):null]},o)})]})})]})})}function Ke(t){return e.jsx(P,{mode:z.COMPACT,children:e.jsx(ve,{...t})})}export{Ke as CommunityStatsModal};