feat: change default pricing fallback to openai/gpt-5 (then gpt-4o, then claude-3.5-sonnet); broaden token field keys; update README about fallback and tokens

Author: Effet

README.md

@@ -37,7 +37,10 @@ Examples:
 The CLI automatically fetches model pricing from the public OpenRouter models API and estimates cost based on input/output tokens per model.
 
 - API: `https://openrouter.ai/api/v1/models`
-- If pricing is unavailable (offline or unknown model), cost shows as `$0.00` for those rows.
+- Fallback: when a model name is missing (`unknown`), cxusage attempts a fallback chain: `openai/gpt-5` → `openai/gpt-4o` → `anthropic/claude-3.5-sonnet`. The first available price is used.
+- Disable fallback with `--no-fallback`. With fallback disabled, unknown models show `$0.00`.
+
+Notes about token counts: cxusage sums numeric fields commonly used for token counts (e.g., `input_tokens`, `output_tokens`, `promptTokenCount`, `completionTokenCount`, etc.). If older logs don’t include any of these fields, tokens will appear as zero even though events are counted. Use `--by model --debug` to inspect which model names are detected in your logs.
 
 ## Programmatic invocation
 

dist/daily.js

@@ -39,8 +39,28 @@ const path = __importStar(require("path"));
 const utils_1 = require("./utils");
 const pricing_1 = require("./pricing");
 const DEFAULT_ROOT = path.join(process.env.HOME || process.env.USERPROFILE || '', '.codex', 'sessions');
-const TOKEN_KEYS_IN = ["input_tokens", "prompt_tokens", "request_tokens"];
-const TOKEN_KEYS_OUT = ["output_tokens", "completion_tokens", "response_tokens"];
+const TOKEN_KEYS_IN = [
+    // common
+    "input_tokens", "prompt_tokens", "request_tokens",
+    // count variants
+    "input_token_count", "output_token_count", // sometimes misused
+    "prompt_token_count", "completion_token_count",
+    "inputTokenCount", "outputTokenCount",
+    "promptTokenCount", "completionTokenCount",
+    "num_input_tokens", "num_output_tokens",
+    // shorthand variants
+    "tokens_in", "tokensIn", "promptTokens",
+];
+const TOKEN_KEYS_OUT = [
+    // common
+    "output_tokens", "completion_tokens", "response_tokens",
+    // count variants
+    "output_token_count", "completion_token_count",
+    "outputTokenCount", "completionTokenCount",
+    "num_output_tokens",
+    // shorthand variants
+    "tokens_out", "tokensOut", "completionTokens",
+];
 const MODEL_KEYS = [
     "model",
     "model_name",
@@ -66,7 +86,11 @@ async function executeDaily(args) {
     const tz = args.tz;
     const by = args.by || 'day';
     const disableFallback = args.noFallback === true;
-    const fallbackModel = 'claude-3.5-sonnet';
+    const fallbackModels = [
+        'openai/gpt-5', 'gpt-5',
+        'openai/gpt-4o', 'gpt-4o',
+        'anthropic/claude-3.5-sonnet', 'claude-3.5-sonnet'
+    ];
     const files = await (0, utils_1.listJsonlFiles)(root);
     const agg = new Map();
     const aggModel = new Map();
@@ -155,7 +179,11 @@ async function executeDaily(args) {
                     for (const [m, inf] of mm.entries()) {
                         let c = (0, pricing_1.estimateCostFor)(m, inf.in, inf.out, prices);
                         if (!disableFallback && (!isFinite(c) || c === 0) && m === 'unknown') {
-                            c = (0, pricing_1.estimateCostFor)(fallbackModel, inf.in, inf.out, prices);
+                            for (const fb of fallbackModels) {
+                                c = (0, pricing_1.estimateCostFor)(fb, inf.in, inf.out, prices);
+                                if (c > 0)
+                                    break;
+                            }
                         }
                         cost += c;
                     }
@@ -191,7 +219,13 @@ async function executeDaily(args) {
                     const tot = info.in + info.out;
                     let cost = (0, pricing_1.estimateCostFor)(m, info.in, info.out, prices);
                     if (!disableFallback && (!isFinite(cost) || cost === 0) && m === 'unknown') {
-                        cost = (0, pricing_1.estimateCostFor)(fallbackModel, info.in, info.out, prices);
+                        for (const fb of fallbackModels) {
+                            const c2 = (0, pricing_1.estimateCostFor)(fb, info.in, info.out, prices);
+                            if (c2 > 0) {
+                                cost = c2;
+                                break;
+                            }
+                        }
                     }
                     rows.push({
                         date: curStr,

src/daily.ts

@@ -5,8 +5,28 @@ import { loadPricing, estimateCostFor } from './pricing'
 
 const DEFAULT_ROOT = path.join(process.env.HOME || process.env.USERPROFILE || '', '.codex', 'sessions')
 
-const TOKEN_KEYS_IN = ["input_tokens", "prompt_tokens", "request_tokens"]
-const TOKEN_KEYS_OUT = ["output_tokens", "completion_tokens", "response_tokens"]
+const TOKEN_KEYS_IN = [
+  // common
+  "input_tokens", "prompt_tokens", "request_tokens",
+  // count variants
+  "input_token_count", "output_token_count", // sometimes misused
+  "prompt_token_count", "completion_token_count",
+  "inputTokenCount", "outputTokenCount",
+  "promptTokenCount", "completionTokenCount",
+  "num_input_tokens", "num_output_tokens",
+  // shorthand variants
+  "tokens_in", "tokensIn", "promptTokens",
+]
+const TOKEN_KEYS_OUT = [
+  // common
+  "output_tokens", "completion_tokens", "response_tokens",
+  // count variants
+  "output_token_count", "completion_token_count",
+  "outputTokenCount", "completionTokenCount",
+  "num_output_tokens",
+  // shorthand variants
+  "tokens_out", "tokensOut", "completionTokens",
+]
 const MODEL_KEYS = [
   "model",
   "model_name",
@@ -55,7 +75,11 @@ export async function executeDaily(args: DailyArgs): Promise<number> {
   const tz = args.tz
   const by = args.by || 'day'
   const disableFallback = (args as any).noFallback === true
-  const fallbackModel = 'claude-3.5-sonnet'
+  const fallbackModels = [
+    'openai/gpt-5', 'gpt-5',
+    'openai/gpt-4o', 'gpt-4o',
+    'anthropic/claude-3.5-sonnet', 'claude-3.5-sonnet'
+  ]
 
   const files = await listJsonlFiles(root)
 
@@ -144,7 +168,10 @@ export async function executeDaily(args: DailyArgs): Promise<number> {
           for (const [m, inf] of mm.entries()) {
             let c = estimateCostFor(m, inf.in, inf.out, prices)
             if (!disableFallback && (!isFinite(c) || c === 0) && m === 'unknown') {
-              c = estimateCostFor(fallbackModel, inf.in, inf.out, prices)
+              for (const fb of fallbackModels) {
+                c = estimateCostFor(fb, inf.in, inf.out, prices)
+                if (c > 0) break
+              }
             }
             cost += c
           }
@@ -176,7 +203,10 @@ export async function executeDaily(args: DailyArgs): Promise<number> {
           const tot = info.in + info.out
           let cost = estimateCostFor(m, info.in, info.out, prices)
           if (!disableFallback && (!isFinite(cost) || cost === 0) && m === 'unknown') {
-            cost = estimateCostFor(fallbackModel, info.in, info.out, prices)
+            for (const fb of fallbackModels) {
+              const c2 = estimateCostFor(fb, info.in, info.out, prices)
+              if (c2 > 0) { cost = c2; break }
+            }
           }
           rows.push({
             date: curStr,