@yansigit/opencodex 2.33.0 → 2.33.1

package/src/smoke/fingerprint-cache.ts

@@ -0,0 +1,133 @@
+import { createHash } from "node:crypto";
+import { existsSync, mkdirSync, readFileSync, readdirSync, writeFileSync } from "node:fs";
+import { dirname, join, resolve } from "node:path";
+import { homedir } from "node:os";
+
+export interface SmokeCacheEntry {
+  fingerprint: string;
+  timestamp: number;
+  status: "passed" | "skipped" | "failed";
+  reason?: string;
+  modelsTested?: string[];
+}
+
+export interface SmokeCacheData {
+  version: number;
+  providers: Record<string, SmokeCacheEntry>;
+}
+
+const CACHE_VERSION = 1;
+
+export function defaultSmokeCachePath(): string {
+  return join(homedir(), ".opencodex", "live-inference-cache.json");
+}
+
+function defaultCachePath(customPath?: string): string {
+  return customPath ?? defaultSmokeCachePath();
+}
+
+function emptyCache(): SmokeCacheData {
+  return { version: CACHE_VERSION, providers: {} };
+}
+
+function walkTs(root: string, relDir: string): string[] {
+  const paths: string[] = [];
+  const fullDir = join(root, relDir);
+  if (!existsSync(fullDir)) return paths;
+  for (const entry of readdirSync(fullDir, { withFileTypes: true })) {
+    const relPath = join(relDir, entry.name);
+    if (entry.isDirectory()) {
+      paths.push(...walkTs(root, relPath));
+      continue;
+    }
+    if (entry.isFile() && entry.name.endsWith(".ts")) {
+      paths.push(relPath);
+    }
+  }
+  return paths;
+}
+
+function collectProviderSourcePaths(provider: string, root: string): string[] {
+  const smokePaths = ["src/smoke/runner.ts", "src/smoke/live-scenarios.ts"];
+  let paths: string[];
+  switch (provider) {
+    case "google":
+    case "google-antigravity":
+    case "google-aistudio":
+      paths = [...smokePaths, "src/adapters/google.ts", "src/adapters/google-wire-compiler.ts", "src/adapters/google-tool-schema.ts", "src/adapters/google-antigravity-wire.ts", "src/types/tools.ts", "src/server/responses-undeclared-tool-guard.ts"];
+      break;
+    case "cursor":
+      paths = [...smokePaths, "src/adapters/cursor.ts", ...walkTs(root, "src/adapters/cursor")];
+      break;
+    case "command-code":
+      paths = [...smokePaths, "src/adapters/command-code.ts", "src/adapters/command-code-project-context.ts", "src/providers/command-code-efforts.ts"];
+      break;
+    case "openai":
+    case "openai-responses":
+      paths = [...smokePaths, "src/adapters/openai-responses.ts", "src/adapters/responses-tool-schema.ts"];
+      break;
+    default:
+      paths = [...smokePaths, `src/adapters/${provider}.ts`];
+      break;
+  }
+  return [...new Set(paths)].filter(path => existsSync(join(root, path))).sort();
+}
+
+export async function computeProviderSourceFingerprint(
+  provider: string,
+  projectRoot?: string,
+): Promise<string> {
+  const root = resolve(projectRoot ?? process.cwd());
+  const hash = createHash("sha256");
+  const paths = collectProviderSourcePaths(provider, root);
+  if (paths.length === 0) return hash.update(`empty:${provider}`, "utf8").digest("hex");
+  for (const relPath of paths) {
+    hash.update(`${relPath}\0`, "utf8");
+    hash.update(readFileSync(join(root, relPath)));
+    hash.update("\0");
+  }
+  return hash.digest("hex");
+}
+
+export async function loadSmokeCache(customPath?: string): Promise<SmokeCacheData> {
+  const cachePath = defaultCachePath(customPath);
+  if (!existsSync(cachePath)) return emptyCache();
+  try {
+    const parsed = JSON.parse(readFileSync(cachePath, "utf8")) as SmokeCacheData;
+    if (typeof parsed !== "object" || parsed === null) return emptyCache();
+    return {
+      version: typeof parsed.version === "number" ? parsed.version : CACHE_VERSION,
+      providers: typeof parsed.providers === "object" && parsed.providers !== null ? parsed.providers : {},
+    };
+  } catch {
+    return emptyCache();
+  }
+}
+
+export async function saveSmokeCache(data: SmokeCacheData, customPath?: string): Promise<void> {
+  const cachePath = defaultCachePath(customPath);
+  mkdirSync(dirname(cachePath), { recursive: true });
+  writeFileSync(cachePath, `${JSON.stringify(data, null, 2)}\n`, "utf8");
+}
+
+export function shouldRunSmokeForProvider(
+  provider: string,
+  currentFingerprint: string,
+  options?: { force?: boolean; cache?: SmokeCacheData },
+): boolean {
+  if (options?.force) return true;
+  const entry = options?.cache?.providers[provider];
+  if (!entry) return true;
+  if (entry.fingerprint !== currentFingerprint) return true;
+  return entry.status !== "passed";
+}
+
+export async function recordSmokeResult(
+  provider: string,
+  entry: SmokeCacheEntry,
+  customPath?: string,
+): Promise<void> {
+  const cache = await loadSmokeCache(customPath);
+  cache.providers[provider] = entry;
+  await saveSmokeCache(cache, customPath);
+}

package/src/smoke/live-scenarios.ts

@@ -0,0 +1,33 @@
+export type SmokeLevel = 1 | 2 | 3;
+
+export interface SmokeScenario {
+  level: SmokeLevel;
+  name: string;
+  buildRequest: (modelId: string, options?: { previousResponseId?: string; toolResult?: string }) => Record<string, unknown>;
+}
+
+export function buildSmokeScenarioRequest(
+  level: SmokeLevel,
+  modelId: string,
+  options: { previousResponseId?: string; toolCallId?: string; toolResult?: string } = {},
+): Record<string, unknown> {
+  const common = { model: modelId, stream: true };
+  if (level === 1) return {
+    ...common,
+    input: [{ role: "user", content: [{ type: "input_text", text: "Reply with exactly five words and include a brief reasoning process." }] }],
+  };
+  if (level === 2) return {
+    ...common,
+    input: [{ role: "user", content: [{ type: "input_text", text: "Use the provided exec_command tool to run echo \"smoke_test_123\"." }] }],
+    tools: [{ type: "function", name: "exec_command", description: "Execute a shell command.", parameters: { type: "object", properties: { cmd: { type: "string" } }, required: ["cmd"] } }],
+  };
+  return {
+    ...common,
+    ...(options.previousResponseId ? { previous_response_id: options.previousResponseId } : {}),
+    input: [{ type: "function_call_output", call_id: options.toolCallId ?? "smoke_call", output: options.toolResult ?? "smoke_test_123" }],
+  };
+}
+
+export const BasicStreamingTurn: SmokeScenario = { level: 1, name: "BasicStreamingTurn", buildRequest: (model, options) => buildSmokeScenarioRequest(1, model, options) };
+export const ToolCallingTurn: SmokeScenario = { level: 2, name: "ToolCallingTurn", buildRequest: (model, options) => buildSmokeScenarioRequest(2, model, options) };
+export const MultiTurnContinuity: SmokeScenario = { level: 3, name: "MultiTurnContinuity", buildRequest: (model, options) => buildSmokeScenarioRequest(3, model, options) };

package/src/smoke/runner.ts

@@ -0,0 +1,119 @@
+import { loadConfig, resolveEnvValue } from "../config";
+import { getCredential } from "../oauth/store";
+import type { OAuthCredentials } from "../oauth/types";
+import type { OcxProviderConfig } from "../types";
+import { computeProviderSourceFingerprint, loadSmokeCache, recordSmokeResult, shouldRunSmokeForProvider } from "./fingerprint-cache";
+import { buildSmokeScenarioRequest } from "./live-scenarios";
+
+export interface ProviderSmokeResult {
+  provider: string;
+  modelId: string;
+  status: "passed" | "skipped" | "failed";
+  reason?: string;
+  level1Passed: boolean;
+  level2Passed: boolean;
+  level3Passed: boolean;
+  durationMs: number;
+  error?: string;
+}
+
+function result(provider: string, modelId: string, started: number, extra: Partial<ProviderSmokeResult>): ProviderSmokeResult {
+  return { provider, modelId, status: "failed", level1Passed: false, level2Passed: false, level3Passed: false, durationMs: Date.now() - started, ...extra };
+}
+
+export function providerHasSmokeCredential(
+  provider: Partial<Pick<OcxProviderConfig, "apiKey" | "authMode" | "headers">>,
+  credential?: OAuthCredentials | null,
+): boolean {
+  if (resolveEnvValue(provider.apiKey)?.trim()) return true;
+  if (Object.entries(provider.headers ?? {}).some(([name, value]) => /authorization|cookie|api[-_]?key/i.test(name) && typeof value === "string" && value.trim().length > 0)) return true;
+  if (provider.authMode === "forward") return true;
+  return provider.authMode === "oauth" && Boolean(credential?.access?.trim() || credential?.refresh?.trim());
+}
+
+function classifyHttp(status: number, body: string): "not_authenticated" | "quota_exhausted" | undefined {
+  if (status === 401 || status === 403) return "not_authenticated";
+  if (status === 429 || /credit|quota|insufficient.?balance|billing/i.test(body)) return "quota_exhausted";
+  return undefined;
+}
+
+export async function runProviderSmoke(options: { provider: string; modelId?: string; proxyUrl?: string; force?: boolean; cachePath?: string }): Promise<ProviderSmokeResult> {
+  const started = Date.now();
+  const config = loadConfig();
+  const providerConfig = config.providers[options.provider];
+  const modelId = options.modelId ?? config.subagentModels?.[0] ?? "gpt-5";
+  if (!providerConfig || providerConfig.disabled === true) return result(options.provider, modelId, started, { status: "skipped", reason: "not_authenticated" });
+  const credential = providerConfig.authMode === "oauth" ? getCredential(options.provider) : null;
+  if (!providerHasSmokeCredential(providerConfig, credential)) return result(options.provider, modelId, started, { status: "skipped", reason: "not_authenticated" });
+  const fingerprint = await computeProviderSourceFingerprint(options.provider);
+  const cache = await loadSmokeCache(options.cachePath);
+  if (!shouldRunSmokeForProvider(options.provider, fingerprint, { force: options.force, cache })) return result(options.provider, modelId, started, { status: "skipped", reason: "cached_pass" });
+
+  const baseUrl = options.proxyUrl ?? "http://127.0.0.1:10100/v1/responses";
+  let level1Passed = false, level2Passed = false, level3Passed = false;
+  let previousResponseId: string | undefined;
+  let emittedToolCallId: string | undefined;
+  try {
+    for (const level of [1, 2, 3] as const) {
+      const reqBody = buildSmokeScenarioRequest(level, modelId, {
+        previousResponseId,
+        toolCallId: emittedToolCallId,
+        toolResult: "smoke_test_123",
+      });
+      const response = await fetch(baseUrl, {
+        method: "POST",
+        headers: { "content-type": "application/json" },
+        body: JSON.stringify(reqBody),
+        signal: AbortSignal.timeout(30000),
+      });
+      const body = await response.text();
+      if (!response.ok) {
+        const reason = classifyHttp(response.status, body);
+        if (reason) {
+          const skipped = result(options.provider, modelId, started, { status: "skipped", reason, level1Passed, level2Passed, level3Passed });
+          await recordSmokeResult(options.provider, { fingerprint, timestamp: Date.now(), status: "skipped", reason, modelsTested: [modelId] }, options.cachePath);
+          return skipped;
+        }
+        throw new Error(`HTTP ${response.status}: ${body.slice(0, 200)}`);
+      }
+      const events = body.split(/\r?\n/).filter(line => line.startsWith("data: ")).flatMap(line => { try { return [JSON.parse(line.slice(6)) as Record<string, unknown>]; } catch { return []; } });
+      let jsonPayload: Record<string, unknown> | undefined;
+      try {
+        jsonPayload = JSON.parse(body) as Record<string, unknown>;
+      } catch {
+        jsonPayload = undefined;
+      }
+      const completed = events.find(event => event.type === "response.completed");
+      const responseData = (completed?.response as Record<string, unknown> | undefined) ?? (jsonPayload?.status === "completed" ? jsonPayload : undefined);
+      if (level === 1) level1Passed = events.some(event => event.type === "response.output_text.delta" || event.type === "response.output_item.added") || responseData?.status === "completed";
+      if (level === 2) {
+        const itemsFromEvents = events.flatMap(event => {
+          const item = event.item as Record<string, unknown> | undefined;
+          const output = (event.response as Record<string, unknown> | undefined)?.output;
+          return [item, ...(Array.isArray(output) ? output : [])].filter(value => value?.type === "function_call") as Record<string, unknown>[];
+        });
+        const itemsFromJson = Array.isArray(jsonPayload?.output) ? (jsonPayload!.output as Record<string, unknown>[]).filter(v => v?.type === "function_call") : [];
+        const calls = [...itemsFromEvents, ...itemsFromJson];
+        level2Passed = calls.some(call => {
+          try {
+            const rawArgs = typeof call.arguments === "string" ? JSON.parse(call.arguments) : call.arguments;
+            const args = rawArgs && typeof rawArgs === "object" ? rawArgs as Record<string, unknown> : {};
+            if (call.call_id || call.id) {
+              emittedToolCallId = String(call.call_id ?? call.id);
+            }
+            return typeof args.cmd === "string" && args.cmd.includes("echo") && args.cmd.includes("smoke_test_123");
+          } catch { return false; }
+        });
+      }
+      if (level === 3) level3Passed = (Boolean(completed) || responseData?.status === "completed") && !/400|thought.?signature|continuity/i.test(body);
+      if (responseData?.id) previousResponseId = String(responseData.id);
+      if (![level1Passed, level2Passed, level3Passed][level - 1]) throw new Error(`level ${level} assertion failed`);
+    }
+    await recordSmokeResult(options.provider, { fingerprint, timestamp: Date.now(), status: "passed", modelsTested: [modelId] }, options.cachePath);
+    return result(options.provider, modelId, started, { status: "passed", level1Passed, level2Passed, level3Passed });
+  } catch (error) {
+    const message = error instanceof Error ? error.message : String(error);
+    await recordSmokeResult(options.provider, { fingerprint, timestamp: Date.now(), status: "failed", reason: message, modelsTested: [modelId] }, options.cachePath);
+    return result(options.provider, modelId, started, { status: "failed", level1Passed, level2Passed, level3Passed, error: message });
+  }
+}

package/src/types/provider.ts

@@ -526,8 +526,9 @@ export interface OcxProviderConfig {
    * Google adapter mode. "ai-studio" (default) = Generative Language API + x-goog-api-key.
    * "vertex" = Vertex AI project/location endpoints with GCP ADC (or x-goog-api-key).
    * "cloud-code-assist" = Google Antigravity (Cloud Code Assist) OAuth + CCA envelope.
+   * "ai-studio-web" = browser-relayed AI Studio Playground/Build session.
    */
-  googleMode?: "ai-studio" | "vertex" | "cloud-code-assist";
+  googleMode?: "ai-studio" | "vertex" | "cloud-code-assist" | "ai-studio-web";
   /** Vertex AI GCP project id (or GOOGLE_CLOUD_PROJECT / GCLOUD_PROJECT env). */
   project?: string;
   /** Vertex AI location, e.g. "us-central1" or "global" (or GOOGLE_CLOUD_LOCATION env). */

package/src/types/request.ts

@@ -70,6 +70,8 @@ export interface OcxParsedRequest {
   _clientThreadId?: string;
   /** True when promptCacheKey is a shared cache cohort rather than a conversation identity. */
   _promptCacheKeyIsSharedCohort?: boolean;
+  /** Provider-private Command Code session affinity id, stable across in-process request mutation. */
+  _commandCodeSessionId?: string;
   /** Conversation/provider/account/model-bound namespace for reasoning replay state. */
   _reasoningReplayScope?: OcxReasoningReplayScopeRef;
   /**

package/src/types/tools.ts

@@ -47,15 +47,39 @@ export function normalizeDeclaredToolName(
   name: string,
   declared: ReadonlySet<string> | undefined,
 ): string {
-  if (!declared || !declared.has("exec")) return name;
+  if (!declared) return name;
   if (declared.has(name)) return name;
-  // When the catalog explicitly declares any legacy shell bridge name, the environment
-  // genuinely exposes that tool — turn normalization off so a call is never mis-routed
-  // to `exec`.
-  if ((LEGACY_SHELL_BRIDGE_TOOL_NAMES as readonly string[]).some(legacy => declared.has(legacy))) {
-    return name;
+  if (declared.has("exec")) {
+    // When the catalog explicitly declares any legacy shell bridge name, the environment
+    // genuinely exposes that tool — turn normalization off so a call is never mis-routed
+    // to exec.
+    if ((LEGACY_SHELL_BRIDGE_TOOL_NAMES as readonly string[]).some(legacy => declared.has(legacy))) {
+      return name;
+    }
+    if ((LEGACY_SHELL_BRIDGE_TOOL_NAMES as readonly string[]).includes(name)) {
+      return "exec";
+    }
   }
-  return (LEGACY_SHELL_BRIDGE_TOOL_NAMES as readonly string[]).includes(name) ? "exec" : name;
+  // When a model strips the namespace prefix (e.g. Gemini calling bare exec for default_api:exec),
+  // or replaces non-alphanumeric separators with underscores, resolve it if and only if exactly
+  // one declared tool matches.
+  {
+    let matched: string | undefined;
+    for (const dec of declared) {
+      const matchesSuffix = !name.includes(":") && !name.includes("__") && (dec.endsWith(":" + name) || dec.endsWith("__" + name));
+      const matchesSanitized = dec.replace(/[^A-Za-z0-9_-]/g, "_") === name;
+      if (matchesSuffix || matchesSanitized) {
+        if (matched !== undefined) {
+          return name;
+        }
+        matched = dec;
+      }
+    }
+    if (matched !== undefined) {
+      return matched;
+    }
+  }
+  return name;
 }
 
 export function toolChoiceAliases(tool: Pick<OcxTool, "namespace" | "name">): string[] {

package/src/usage/command-code-manifest.ts

@@ -0,0 +1,116 @@
+import type { Cost4, ExpectedPriceOverlay } from "./expected-prices";
+
+export interface CommandCodeModelPricing {
+  id: string;
+  name: string;
+  slug?: string;
+  contextWindow?: number;
+  cost4: Cost4;
+}
+
+export const COMMAND_CODE_MODELS_DATA_URL = "https://commandcode.ai/models.data";
+export const COMMAND_CODE_PRICING_SOURCE = "https://commandcode.ai/models + https://commandcode.ai/models.data";
+
+/**
+ * Parse Command Code models and 4-tuple per-1M token rates from the Turbo-stream
+ * payload served by https://commandcode.ai/models.data.
+ */
+export function parseCommandCodeModelsData(raw: unknown): CommandCodeModelPricing[] {
+  if (!Array.isArray(raw) || raw.length < 10) return [];
+  const modelIndices = raw[9];
+  if (!Array.isArray(modelIndices)) return [];
+
+  const resolve = (val: unknown): unknown => {
+    if (typeof val === "number") {
+      if (val < 0) return val === -5 ? null : undefined;
+      if (val < raw.length) return raw[val];
+    }
+    return val;
+  };
+
+  const results: CommandCodeModelPricing[] = [];
+  for (const idx of modelIndices) {
+    if (typeof idx !== "number" || idx < 0 || idx >= raw.length) continue;
+    const obj = raw[idx];
+    if (!obj || typeof obj !== "object" || Array.isArray(obj)) continue;
+
+    const fields: Record<string, unknown> = {};
+    for (const [k, v] of Object.entries(obj)) {
+      if (!k.startsWith("_")) continue;
+      const keyIdx = Number.parseInt(k.slice(1), 10);
+      if (!Number.isFinite(keyIdx) || keyIdx < 0 || keyIdx >= raw.length) continue;
+      const keyName = raw[keyIdx];
+      if (typeof keyName === "string" && keyName.length > 0) {
+        fields[keyName] = resolve(v);
+      }
+    }
+
+    const id = typeof fields.id === "string" ? fields.id.trim() : "";
+    if (!id) continue;
+
+    const name = typeof fields.name === "string" && fields.name.trim() ? fields.name.trim() : id;
+    const slug = typeof fields.slug === "string" && fields.slug.trim() ? fields.slug.trim() : undefined;
+    const contextWindow = typeof fields.contextWindow === "number" && Number.isFinite(fields.contextWindow)
+      ? fields.contextWindow
+      : undefined;
+
+    const input = typeof fields.inputCost === "number" && Number.isFinite(fields.inputCost) && fields.inputCost >= 0
+      ? fields.inputCost
+      : 0;
+    const output = typeof fields.outputCost === "number" && Number.isFinite(fields.outputCost) && fields.outputCost >= 0
+      ? fields.outputCost
+      : 0;
+    const cacheRead = typeof fields.cacheReadCost === "number" && Number.isFinite(fields.cacheReadCost) && fields.cacheReadCost >= 0
+      ? fields.cacheReadCost
+      : 0;
+    const cacheWrite = typeof fields.cacheWriteCost === "number" && Number.isFinite(fields.cacheWriteCost) && fields.cacheWriteCost >= 0
+      ? fields.cacheWriteCost
+      : 0;
+
+    results.push({
+      id,
+      name,
+      ...(slug ? { slug } : {}),
+      ...(contextWindow !== undefined ? { contextWindow } : {}),
+      cost4: { input, output, cacheRead, cacheWrite },
+    });
+  }
+
+  return results;
+}
+
+/**
+ * Fetch and decode the latest Command Code model pricing from commandcode.ai.
+ */
+export async function fetchCommandCodeModelPricing(options?: {
+  url?: string;
+  signal?: AbortSignal;
+  fetchFn?: typeof fetch;
+}): Promise<CommandCodeModelPricing[]> {
+  const fetcher = options?.fetchFn ?? fetch;
+  const url = options?.url ?? COMMAND_CODE_MODELS_DATA_URL;
+  const res = await fetcher(url, { signal: options?.signal });
+  if (!res.ok) throw new Error(`Failed to fetch Command Code models data: ${res.status}`);
+  const data = await res.json();
+  return parseCommandCodeModelsData(data);
+}
+
+/**
+ * Convert parsed Command Code models to opencodex ExpectedPriceOverlay entries.
+ */
+export function commandCodePricingToExpectedOverlays(
+  models: readonly CommandCodeModelPricing[],
+  verifiedAt = "2026-08-26",
+): ExpectedPriceOverlay[] {
+  return models
+    .filter(m => m.cost4.input > 0 || m.cost4.output > 0 || m.cost4.cacheRead > 0 || m.cost4.cacheWrite > 0)
+    .map(m => ({
+      provider: "command-code",
+      modelId: m.id,
+      cost4: m.cost4,
+      source: COMMAND_CODE_PRICING_SOURCE,
+      verifiedAt,
+      status: "verified",
+    }));
+}
+

package/src/usage/cost.ts

@@ -253,7 +253,7 @@ function resolveMatchedPriceExact(
   const verifiedOverride = overlays === EXPECTED_PRICE_OVERLAYS
     ? findVerifiedPriceOverride(provider, modelId)
     : undefined;
-  if (verifiedOverride && validCost4(verifiedOverride.cost4) && hasNonZeroCost(verifiedOverride.cost4)) {
+  if (verifiedOverride && verifiedOverride.status !== "unverified" && validCost4(verifiedOverride.cost4) && hasNonZeroCost(verifiedOverride.cost4)) {
     return {
       provider,
       modelId,
@@ -261,7 +261,7 @@ function resolveMatchedPriceExact(
       source: "expected",
       sourceRef: verifiedOverride.source,
       verifiedAt: verifiedOverride.verifiedAt,
-      status: "verified",
+      status: verifiedOverride.status,
     };
   }
   const metadataProvider = resolveMetadataProvider(provider);

package/src/usage/expected-prices.ts

@@ -89,6 +89,17 @@ const KIMI_PRICING = "https://platform.kimi.ai/docs/pricing (official table; cac
 // anywhere. Cache stays 0 rather than inheriting the reseller's 0.15 — a reseller number
 // under a vendor-price label would be a wrong value wearing a verified badge.
 const QWEN38_MAX_PRICING = "https://qwen.ai/blog?id=qwen3.8 (Qwen release announcement; no Model Studio billing row yet; cache rates unpublished -> 0)";
+const COMMAND_CODE_PRICING = "https://commandcode.ai/models + https://commandcode.ai/models.data (official model manifest)";
+const COMMAND_CODE_VERIFIED_AT = "2026-08-26";
+const CURSOR_DOCS_PRICING = "https://cursor.com/docs/models-and-pricing";
+const CURSOR_GROK_46: Cost4 = { input: 2, output: 6, cacheRead: 0.5, cacheWrite: 0 };
+const CURSOR_GROK_45: Cost4 = { input: 2, output: 6, cacheRead: 0.5, cacheWrite: 0 };
+const CURSOR_COMPOSER_1: Cost4 = { input: 1.25, output: 10, cacheRead: 0.125, cacheWrite: 0 };
+const CURSOR_COMPOSER_25: Cost4 = { input: 0.5, output: 2.5, cacheRead: 0.2, cacheWrite: 0 };
+const CURSOR_COMPOSER_25_FAST: Cost4 = { input: 3, output: 15, cacheRead: 0.5, cacheWrite: 0 };
+const CURSOR_GROK_46_FAST: Cost4 = { input: 4, output: 12, cacheRead: 1, cacheWrite: 0 };
+const CURSOR_GROK_45_FAST: Cost4 = { input: 4, output: 18, cacheRead: 1, cacheWrite: 0 };
+const CLAUDE_OPUS_FAST: Cost4 = { input: 10, output: 50, cacheRead: 1, cacheWrite: 12.5 };
 
 export const EXPECTED_PRICE_OVERLAYS: readonly ExpectedPriceOverlay[] = [
   // claude-opus-5 is exposed by three providers but absent from the jawcode bundle, so
@@ -179,6 +190,16 @@ export const EXPECTED_PRICE_OVERLAYS: readonly ExpectedPriceOverlay[] = [
   { provider: "alibaba-token-plan-intl", modelId: "qwen3.8-max", cost4: QWEN38_MAX, source: QWEN38_MAX_PRICING, verifiedAt: "2026-08-04", status: "verified" },
   // Cursor Auto router — Cursor's published fixed token price (verified).
   { provider: "cursor", modelId: "auto", cost4: { input: 1.25, output: 6, cacheRead: 0.25, cacheWrite: 1.25 }, source: "https://docs.cursor.com/account/pricing + https://cursor.com/blog/aug-2025-pricing", verifiedAt: "2026-07-20", status: "verified" },
+  // Cursor-specific native models (verified from official docs).
+  { provider: "cursor", modelId: "grok-4.6", cost4: CURSOR_GROK_46, source: CURSOR_DOCS_PRICING, verifiedAt: "2026-08-26", status: "verified" },
+  { provider: "cursor", modelId: "grok-4.5", cost4: CURSOR_GROK_45, source: CURSOR_DOCS_PRICING, verifiedAt: "2026-08-26", status: "verified" },
+  { provider: "cursor", modelId: "composer-1", cost4: CURSOR_COMPOSER_1, source: CURSOR_DOCS_PRICING, verifiedAt: "2026-08-26", status: "verified" },
+  { provider: "cursor", modelId: "composer-2.5", cost4: CURSOR_COMPOSER_25, source: CURSOR_DOCS_PRICING, verifiedAt: "2026-08-26", status: "verified" },
+  { provider: "cursor", modelId: "composer-2.5-fast", cost4: CURSOR_COMPOSER_25_FAST, source: CURSOR_DOCS_PRICING, verifiedAt: "2026-08-26", status: "verified" },
+  { provider: "cursor", modelId: "grok-4.6-fast", cost4: CURSOR_GROK_46_FAST, source: CURSOR_DOCS_PRICING, verifiedAt: "2026-08-26", status: "verified" },
+  { provider: "cursor", modelId: "grok-4.5-fast", cost4: CURSOR_GROK_45_FAST, source: CURSOR_DOCS_PRICING, verifiedAt: "2026-08-26", status: "verified" },
+  { provider: "cursor", modelId: "claude-opus-5-fast", cost4: CLAUDE_OPUS_FAST, source: CURSOR_DOCS_PRICING, verifiedAt: "2026-08-26", status: "verified" },
+  { provider: "cursor", modelId: "claude-opus-4-8-fast", cost4: CLAUDE_OPUS_FAST, source: CURSOR_DOCS_PRICING, verifiedAt: "2026-08-26", status: "verified" },
 ];
 
 /**
@@ -195,6 +216,68 @@ export const VERIFIED_PRICE_OVERRIDES: readonly ExpectedPriceOverlay[] = [
     verifiedAt: "2026-08-18",
     status: "verified",
   },
+  // Command Code official model catalog rates (sourced from https://commandcode.ai/models.data).
+  { provider: "command-code", modelId: "zai-org/GLM-5.3", cost4: { input: 1.4, output: 4.4, cacheRead: 0.26, cacheWrite: 0 }, source: COMMAND_CODE_PRICING, verifiedAt: COMMAND_CODE_VERIFIED_AT, status: "verified" },
+  { provider: "command-code", modelId: "zai-org/glm-5.3", cost4: { input: 1.4, output: 4.4, cacheRead: 0.26, cacheWrite: 0 }, source: COMMAND_CODE_PRICING, verifiedAt: COMMAND_CODE_VERIFIED_AT, status: "verified-derived" },
+  { provider: "command-code", modelId: "zai-org/GLM-5.2", cost4: { input: 1.4, output: 4.4, cacheRead: 0.26, cacheWrite: 0 }, source: COMMAND_CODE_PRICING, verifiedAt: COMMAND_CODE_VERIFIED_AT, status: "verified" },
+  { provider: "command-code", modelId: "zai-org/glm-5.2", cost4: { input: 1.4, output: 4.4, cacheRead: 0.26, cacheWrite: 0 }, source: COMMAND_CODE_PRICING, verifiedAt: COMMAND_CODE_VERIFIED_AT, status: "verified-derived" },
+  { provider: "command-code", modelId: "zai-org/GLM-5.2-Fast", cost4: { input: 3, output: 10.25, cacheRead: 0.5, cacheWrite: 0 }, source: COMMAND_CODE_PRICING, verifiedAt: COMMAND_CODE_VERIFIED_AT, status: "verified" },
+  { provider: "command-code", modelId: "zai-org/glm-5.2-fast", cost4: { input: 3, output: 10.25, cacheRead: 0.5, cacheWrite: 0 }, source: COMMAND_CODE_PRICING, verifiedAt: COMMAND_CODE_VERIFIED_AT, status: "verified-derived" },
+  { provider: "command-code", modelId: "zai-org/GLM-5.1", cost4: { input: 1.4, output: 4.4, cacheRead: 0.26, cacheWrite: 0 }, source: COMMAND_CODE_PRICING, verifiedAt: COMMAND_CODE_VERIFIED_AT, status: "verified" },
+  { provider: "command-code", modelId: "zai-org/glm-5.1", cost4: { input: 1.4, output: 4.4, cacheRead: 0.26, cacheWrite: 0 }, source: COMMAND_CODE_PRICING, verifiedAt: COMMAND_CODE_VERIFIED_AT, status: "verified-derived" },
+  { provider: "command-code", modelId: "zai-org/GLM-5", cost4: { input: 1, output: 3.2, cacheRead: 0.2, cacheWrite: 0 }, source: COMMAND_CODE_PRICING, verifiedAt: COMMAND_CODE_VERIFIED_AT, status: "verified" },
+  { provider: "command-code", modelId: "zai-org/glm-5", cost4: { input: 1, output: 3.2, cacheRead: 0.2, cacheWrite: 0 }, source: COMMAND_CODE_PRICING, verifiedAt: COMMAND_CODE_VERIFIED_AT, status: "verified-derived" },
+  { provider: "command-code", modelId: "meta/muse-spark-1.2-contributor", cost4: { input: 0.1, output: 0.2, cacheRead: 0.002, cacheWrite: 0 }, source: COMMAND_CODE_PRICING, verifiedAt: COMMAND_CODE_VERIFIED_AT, status: "verified" },
+  { provider: "command-code", modelId: "meta/muse-spark-1.2", cost4: { input: 1.25, output: 4.25, cacheRead: 0.15, cacheWrite: 0 }, source: COMMAND_CODE_PRICING, verifiedAt: COMMAND_CODE_VERIFIED_AT, status: "verified" },
+  { provider: "command-code", modelId: "meta/muse-spark-1.1", cost4: { input: 1.25, output: 4.25, cacheRead: 0.15, cacheWrite: 0 }, source: COMMAND_CODE_PRICING, verifiedAt: COMMAND_CODE_VERIFIED_AT, status: "verified" },
+  { provider: "command-code", modelId: "google/gemini-3.7-flash", cost4: { input: 0.75, output: 3.75, cacheRead: 0.075, cacheWrite: 0.04167 }, source: COMMAND_CODE_PRICING, verifiedAt: COMMAND_CODE_VERIFIED_AT, status: "verified" },
+  { provider: "command-code", modelId: "google/gemini-3.6-flash", cost4: { input: 1.5, output: 7.5, cacheRead: 0.15, cacheWrite: 0 }, source: COMMAND_CODE_PRICING, verifiedAt: COMMAND_CODE_VERIFIED_AT, status: "verified" },
+  { provider: "command-code", modelId: "google/gemini-3.5-flash", cost4: { input: 1.5, output: 9, cacheRead: 0.15, cacheWrite: 0 }, source: COMMAND_CODE_PRICING, verifiedAt: COMMAND_CODE_VERIFIED_AT, status: "verified" },
+  { provider: "command-code", modelId: "google/gemini-3.5-flash-lite", cost4: { input: 0.3, output: 2.5, cacheRead: 0.03, cacheWrite: 0 }, source: COMMAND_CODE_PRICING, verifiedAt: COMMAND_CODE_VERIFIED_AT, status: "verified" },
+  { provider: "command-code", modelId: "google/gemini-3.1-flash-lite", cost4: { input: 0.25, output: 1.5, cacheRead: 0.03, cacheWrite: 0 }, source: COMMAND_CODE_PRICING, verifiedAt: COMMAND_CODE_VERIFIED_AT, status: "verified" },
+  { provider: "command-code", modelId: "deepseek/deepseek-v4-pro", cost4: { input: 0.66, output: 1.98, cacheRead: 0.022, cacheWrite: 0 }, source: COMMAND_CODE_PRICING, verifiedAt: COMMAND_CODE_VERIFIED_AT, status: "verified" },
+  { provider: "command-code", modelId: "deepseek/deepseek-v4-flash", cost4: { input: 0.22, output: 0.66, cacheRead: 0.007, cacheWrite: 0 }, source: COMMAND_CODE_PRICING, verifiedAt: COMMAND_CODE_VERIFIED_AT, status: "verified" },
+  { provider: "command-code", modelId: "deepseek/deepseek-v4-flash-vision-exp", cost4: { input: 0.22, output: 0.66, cacheRead: 0.007, cacheWrite: 0 }, source: COMMAND_CODE_PRICING, verifiedAt: COMMAND_CODE_VERIFIED_AT, status: "verified" },
+  { provider: "command-code", modelId: "Qwen/Qwen3.8-Max", cost4: { input: 2, output: 6, cacheRead: 0.25, cacheWrite: 2.5 }, source: COMMAND_CODE_PRICING, verifiedAt: COMMAND_CODE_VERIFIED_AT, status: "verified" },
+  { provider: "command-code", modelId: "Qwen/Qwen3.8-27B", cost4: { input: 0.4, output: 3, cacheRead: 0.04, cacheWrite: 0 }, source: COMMAND_CODE_PRICING, verifiedAt: COMMAND_CODE_VERIFIED_AT, status: "verified" },
+  { provider: "command-code", modelId: "Qwen/Qwen3.7-Max", cost4: { input: 2.5, output: 7.5, cacheRead: 0.5, cacheWrite: 3.13 }, source: COMMAND_CODE_PRICING, verifiedAt: COMMAND_CODE_VERIFIED_AT, status: "verified" },
+  { provider: "command-code", modelId: "Qwen/Qwen3.7-Plus", cost4: { input: 0.4, output: 1.6, cacheRead: 0.08, cacheWrite: 0.5 }, source: COMMAND_CODE_PRICING, verifiedAt: COMMAND_CODE_VERIFIED_AT, status: "verified" },
+  { provider: "command-code", modelId: "Qwen/Qwen3.7-Flash", cost4: { input: 0.03, output: 0.13, cacheRead: 0.006, cacheWrite: 0.038 }, source: COMMAND_CODE_PRICING, verifiedAt: COMMAND_CODE_VERIFIED_AT, status: "verified" },
+  { provider: "command-code", modelId: "Qwen/Qwen3.6-Max-Preview", cost4: { input: 1.3, output: 7.8, cacheRead: 0.26, cacheWrite: 1.63 }, source: COMMAND_CODE_PRICING, verifiedAt: COMMAND_CODE_VERIFIED_AT, status: "verified" },
+  { provider: "command-code", modelId: "Qwen/Qwen3.6-Plus", cost4: { input: 0.5, output: 3, cacheRead: 0.1, cacheWrite: 0 }, source: COMMAND_CODE_PRICING, verifiedAt: COMMAND_CODE_VERIFIED_AT, status: "verified" },
+  { provider: "command-code", modelId: "MiniMaxAI/MiniMax-M3", cost4: { input: 0.3, output: 1.2, cacheRead: 0.06, cacheWrite: 0 }, source: COMMAND_CODE_PRICING, verifiedAt: COMMAND_CODE_VERIFIED_AT, status: "verified" },
+  { provider: "command-code", modelId: "MiniMaxAI/MiniMax-M2.7", cost4: { input: 0.3, output: 1.2, cacheRead: 0.06, cacheWrite: 0 }, source: COMMAND_CODE_PRICING, verifiedAt: COMMAND_CODE_VERIFIED_AT, status: "verified" },
+  { provider: "command-code", modelId: "MiniMaxAI/MiniMax-M2.5", cost4: { input: 0.3, output: 1.2, cacheRead: 0.03, cacheWrite: 0 }, source: COMMAND_CODE_PRICING, verifiedAt: COMMAND_CODE_VERIFIED_AT, status: "verified" },
+  { provider: "command-code", modelId: "stepfun/Step-3.7-Flash", cost4: { input: 0.2, output: 1.15, cacheRead: 0.04, cacheWrite: 0 }, source: COMMAND_CODE_PRICING, verifiedAt: COMMAND_CODE_VERIFIED_AT, status: "verified" },
+  { provider: "command-code", modelId: "stepfun/Step-3.5-Flash", cost4: { input: 0.1, output: 0.3, cacheRead: 0.02, cacheWrite: 0 }, source: COMMAND_CODE_PRICING, verifiedAt: COMMAND_CODE_VERIFIED_AT, status: "verified" },
+  { provider: "command-code", modelId: "xiaomi/mimo-v2.5-pro", cost4: { input: 0.435, output: 0.87, cacheRead: 0.0036, cacheWrite: 0 }, source: COMMAND_CODE_PRICING, verifiedAt: COMMAND_CODE_VERIFIED_AT, status: "verified" },
+  { provider: "command-code", modelId: "xiaomi/mimo-v2.5", cost4: { input: 0.14, output: 0.28, cacheRead: 0.0028, cacheWrite: 0 }, source: COMMAND_CODE_PRICING, verifiedAt: COMMAND_CODE_VERIFIED_AT, status: "verified" },
+  { provider: "command-code", modelId: "nvidia/nemotron-3-ultra-550b-a55b", cost4: { input: 0.6, output: 2.4, cacheRead: 0.12, cacheWrite: 0 }, source: COMMAND_CODE_PRICING, verifiedAt: COMMAND_CODE_VERIFIED_AT, status: "verified" },
+  { provider: "command-code", modelId: "tencent/hy3-paid", cost4: { input: 0.14, output: 0.58, cacheRead: 0.035, cacheWrite: 0 }, source: COMMAND_CODE_PRICING, verifiedAt: COMMAND_CODE_VERIFIED_AT, status: "verified" },
+  { provider: "command-code", modelId: "moonshotai/Kimi-K3", cost4: { input: 3, output: 15, cacheRead: 0.3, cacheWrite: 0 }, source: COMMAND_CODE_PRICING, verifiedAt: COMMAND_CODE_VERIFIED_AT, status: "verified" },
+  { provider: "command-code", modelId: "moonshotai/Kimi-K2.7-Code", cost4: { input: 0.95, output: 4, cacheRead: 0.19, cacheWrite: 0 }, source: COMMAND_CODE_PRICING, verifiedAt: COMMAND_CODE_VERIFIED_AT, status: "verified" },
+  { provider: "command-code", modelId: "moonshotai/Kimi-K2.7-Code-Highspeed", cost4: { input: 1.9, output: 8, cacheRead: 0.38, cacheWrite: 0 }, source: COMMAND_CODE_PRICING, verifiedAt: COMMAND_CODE_VERIFIED_AT, status: "verified" },
+  { provider: "command-code", modelId: "moonshotai/Kimi-K2.6", cost4: { input: 0.95, output: 4, cacheRead: 0.16, cacheWrite: 0 }, source: COMMAND_CODE_PRICING, verifiedAt: COMMAND_CODE_VERIFIED_AT, status: "verified" },
+  { provider: "command-code", modelId: "moonshotai/Kimi-K2.5", cost4: { input: 0.6, output: 3, cacheRead: 0.1, cacheWrite: 0 }, source: COMMAND_CODE_PRICING, verifiedAt: COMMAND_CODE_VERIFIED_AT, status: "verified" },
+  { provider: "command-code", modelId: "claude-fable-5", cost4: { input: 10, output: 50, cacheRead: 1, cacheWrite: 12.5 }, source: COMMAND_CODE_PRICING, verifiedAt: COMMAND_CODE_VERIFIED_AT, status: "verified" },
+  { provider: "command-code", modelId: "claude-opus-5", cost4: { input: 5, output: 25, cacheRead: 0.5, cacheWrite: 6.25 }, source: COMMAND_CODE_PRICING, verifiedAt: COMMAND_CODE_VERIFIED_AT, status: "verified" },
+  { provider: "command-code", modelId: "claude-opus-4-8", cost4: { input: 5, output: 25, cacheRead: 0.5, cacheWrite: 6.25 }, source: COMMAND_CODE_PRICING, verifiedAt: COMMAND_CODE_VERIFIED_AT, status: "verified" },
+  { provider: "command-code", modelId: "claude-opus-4-7", cost4: { input: 5, output: 25, cacheRead: 0.5, cacheWrite: 6.25 }, source: COMMAND_CODE_PRICING, verifiedAt: COMMAND_CODE_VERIFIED_AT, status: "verified" },
+  { provider: "command-code", modelId: "claude-sonnet-5", cost4: { input: 2, output: 10, cacheRead: 0.2, cacheWrite: 2.5 }, source: COMMAND_CODE_PRICING, verifiedAt: COMMAND_CODE_VERIFIED_AT, status: "verified" },
+  { provider: "command-code", modelId: "claude-sonnet-4-6", cost4: { input: 3, output: 15, cacheRead: 0.3, cacheWrite: 3.75 }, source: COMMAND_CODE_PRICING, verifiedAt: COMMAND_CODE_VERIFIED_AT, status: "verified" },
+  { provider: "command-code", modelId: "claude-haiku-4-5", cost4: { input: 1, output: 5, cacheRead: 0.1, cacheWrite: 1.25 }, source: COMMAND_CODE_PRICING, verifiedAt: COMMAND_CODE_VERIFIED_AT, status: "verified" },
+  { provider: "command-code", modelId: "gpt-5.6-sol", cost4: { input: 5, output: 30, cacheRead: 0.5, cacheWrite: 6.25 }, source: COMMAND_CODE_PRICING, verifiedAt: COMMAND_CODE_VERIFIED_AT, status: "verified" },
+  { provider: "command-code", modelId: "gpt-5.6-terra", cost4: { input: 2, output: 12, cacheRead: 0.2, cacheWrite: 2.5 }, source: COMMAND_CODE_PRICING, verifiedAt: COMMAND_CODE_VERIFIED_AT, status: "verified" },
+  { provider: "command-code", modelId: "gpt-5.6-luna", cost4: { input: 0.2, output: 1.2, cacheRead: 0.02, cacheWrite: 0.25 }, source: COMMAND_CODE_PRICING, verifiedAt: COMMAND_CODE_VERIFIED_AT, status: "verified" },
+  { provider: "command-code", modelId: "gpt-5.5", cost4: { input: 5, output: 30, cacheRead: 0.5, cacheWrite: 0 }, source: COMMAND_CODE_PRICING, verifiedAt: COMMAND_CODE_VERIFIED_AT, status: "verified" },
+  { provider: "command-code", modelId: "gpt-5.4", cost4: { input: 2.5, output: 15, cacheRead: 0.25, cacheWrite: 0 }, source: COMMAND_CODE_PRICING, verifiedAt: COMMAND_CODE_VERIFIED_AT, status: "verified" },
+  { provider: "command-code", modelId: "gpt-5.4-mini", cost4: { input: 0.75, output: 4.5, cacheRead: 0.075, cacheWrite: 0 }, source: COMMAND_CODE_PRICING, verifiedAt: COMMAND_CODE_VERIFIED_AT, status: "verified" },
+  { provider: "command-code", modelId: "gpt-5.3-codex", cost4: { input: 2, output: 8, cacheRead: 0.5, cacheWrite: 0 }, source: COMMAND_CODE_PRICING, verifiedAt: COMMAND_CODE_VERIFIED_AT, status: "verified" },
+  { provider: "command-code", modelId: "sakana/fugu-ultra", cost4: { input: 5, output: 30, cacheRead: 0.5, cacheWrite: 0 }, source: COMMAND_CODE_PRICING, verifiedAt: COMMAND_CODE_VERIFIED_AT, status: "verified" },
+  { provider: "command-code", modelId: "xai/grok-4.6", cost4: { input: 2, output: 6, cacheRead: 0.5, cacheWrite: 0 }, source: COMMAND_CODE_PRICING, verifiedAt: COMMAND_CODE_VERIFIED_AT, status: "verified" },
+  { provider: "command-code", modelId: "xai/grok-4.5", cost4: { input: 2, output: 6, cacheRead: 0.5, cacheWrite: 0 }, source: COMMAND_CODE_PRICING, verifiedAt: COMMAND_CODE_VERIFIED_AT, status: "verified" },
+  { provider: "command-code", modelId: "thinkingmachines/inkling", cost4: { input: 1, output: 4.05, cacheRead: 0.17, cacheWrite: 0 }, source: COMMAND_CODE_PRICING, verifiedAt: COMMAND_CODE_VERIFIED_AT, status: "verified" },
+  { provider: "command-code", modelId: "thinkingmachines/inkling-small", cost4: { input: 0.5, output: 1.2, cacheRead: 0.1, cacheWrite: 0 }, source: COMMAND_CODE_PRICING, verifiedAt: COMMAND_CODE_VERIFIED_AT, status: "verified" },
 ];
 
 export function findVerifiedPriceOverride(

package/src/usage/log.ts

@@ -52,7 +52,7 @@ export interface PersistedUsageAttempt {
   sendCount: number;
   recoveryKinds: AttemptRecoveryKind[];
   usageStatus: UsageStatus;
-  /** Stable non-PII identity for the Codex pool account that served this attempt. */
+  /** Stable non-PII identity for the account that served this attempt. */
   accountLogLabel?: CodexUsageAccountLogLabel;
   inputTokenEstimate?: number;
   usage?: OcxUsage;
@@ -81,7 +81,7 @@ export interface PersistedUsageEntry {
   admissionKind?: "configured" | "environment" | "loopback";
   /** The inbound wire, not the client product — see `surface`. */
   inboundProtocol?: "responses" | "chat" | "messages";
-  /** Stable non-PII identity for Codex Pool usage; absent for Direct/non-Codex traffic. */
+  /** Stable non-PII identity for account usage; absent for unauthenticated traffic. */
   accountLogLabel?: CodexUsageAccountLogLabel;
   /** Best-effort chat/session correlation for Logs grouping (#330). */
   conversationId?: string;