tokentrace 0.8.1 → 0.8.2

package/CHANGELOG.md

@@ -2,6 +2,18 @@
 
 All notable changes to TokenTrace are documented here.
 
+## [0.8.2] - 2026-05-13
+
+### Fixed
+
+- Codex CLI `token_count` imports now preserve non-cached input tokens and add cached input tokens to processed totals, matching Codex's `input (+ cached)` session summary.
+- Codex parser provenance is bumped to version 3 so previously imported Codex session files are reprocessed on the next scan instead of keeping stale undercounted rows.
+- Generic text-log parsing now recognizes Codex `Token usage: total=... input=... (+ ... cached) output=...` summary lines as structured usage instead of weak text estimates.
+- Overview and evidence token totals now switch to billions at large scales instead of displaying multi-thousand million values.
+- Scan, settings, pricing, and pricing-refresh API writes now reject malformed JSON and avoid JavaScript truthiness coercion for boolean flags.
+- Settings and scan custom folders are trimmed and blank entries are discarded before persistence or scan execution.
+- Pricing manifest imports now ignore invalid, boolean, array, blank, and negative price values instead of coercing them into trusted numeric prices.
+
 ## [0.8.1] - 2026-05-13
 
 ### Fixed

package/app/api/prices/refresh/route.ts

@@ -1,18 +1,28 @@
 import { NextResponse } from "next/server";
-import { readJsonObject } from "@/src/lib/api-json";
+import { jsonBooleanFlag, readOptionalJsonObject } from "@/src/lib/api-json";
 import { refreshPricing } from "@/src/lib/pricing-refresh";
 
 export const dynamic = "force-dynamic";
 
+function refreshSource(value: unknown) {
+  if (value == null) return "remote";
+  if (value === "remote" || value === "bundled") return value;
+  return null;
+}
+
 export async function POST(request: Request) {
-  const parsed = await readJsonObject(request);
+  const parsed = await readOptionalJsonObject(request);
   if (!parsed.ok) {
     return NextResponse.json({ error: parsed.error }, { status: 400 });
   }
   const body = parsed.body;
+  const source = refreshSource(body.source);
+  if (!source) {
+    return NextResponse.json({ error: "source must be remote or bundled" }, { status: 400 });
+  }
   const result = await refreshPricing({
-    source: body?.source === "bundled" ? "bundled" : "remote",
-    force: Boolean(body?.force)
+    source,
+    force: jsonBooleanFlag(body.force)
   });
   return NextResponse.json(result);
 }

package/app/api/prices/route.ts

@@ -11,6 +11,9 @@ function requiredText(value: unknown) {
 function nullablePrice(value: unknown, field: string) {
   if (value == null) return { ok: true as const, value: null };
   if (typeof value === "string" && value.trim() === "") return { ok: true as const, value: null };
+  if (typeof value !== "number" && typeof value !== "string") {
+    return { ok: false as const, error: `${field} must be a non-negative number or empty` };
+  }
   const number = Number(value);
   if (!Number.isFinite(number) || number < 0) {
     return { ok: false as const, error: `${field} must be a non-negative number or empty` };

package/app/api/scan/route.ts

@@ -1,20 +1,27 @@
 import { NextResponse } from "next/server";
 import { runScan } from "@/src/ingestion/scan";
-import { readJsonObject } from "@/src/lib/api-json";
+import { jsonBooleanFlag, readOptionalJsonObject } from "@/src/lib/api-json";
 
 export const dynamic = "force-dynamic";
 
+function stringList(value: unknown) {
+  return Array.isArray(value)
+    ? value
+        .filter((folder): folder is string => typeof folder === "string")
+        .map((folder) => folder.trim())
+        .filter(Boolean)
+    : undefined;
+}
+
 export async function POST(request: Request) {
-  const parsed = await readJsonObject(request);
+  const parsed = await readOptionalJsonObject(request);
   if (!parsed.ok) {
     return NextResponse.json({ error: parsed.error }, { status: 400 });
   }
   const body = parsed.body;
   const result = await runScan({
-    folders: Array.isArray(body.folders)
-      ? body.folders.filter((folder: unknown): folder is string => typeof folder === "string")
-      : undefined,
-    force: Boolean(body.force)
+    folders: stringList(body.folders),
+    force: jsonBooleanFlag(body.force)
   });
   return NextResponse.json(result);
 }

package/app/api/settings/route.ts

@@ -1,7 +1,7 @@
 import { NextResponse } from "next/server";
 import { getDatabasePath } from "@/src/db/client";
 import { getAppSettings, normalizeUsageGuardrails, saveAppSettings } from "@/src/db/settings";
-import { readJsonObject } from "@/src/lib/api-json";
+import { jsonBooleanFlag, readJsonObject } from "@/src/lib/api-json";
 
 export const dynamic = "force-dynamic";
 
@@ -19,11 +19,14 @@ export async function PUT(request: Request) {
   }
   const body = parsed.body;
   const customFolders = Array.isArray(body.customFolders)
-    ? body.customFolders.filter((folder: unknown): folder is string => typeof folder === "string")
+    ? body.customFolders
+        .filter((folder: unknown): folder is string => typeof folder === "string")
+        .map((folder) => folder.trim())
+        .filter(Boolean)
     : [];
   const saved = saveAppSettings({
     customFolders,
-    storeRawMessageContent: Boolean(body.storeRawMessageContent),
+    storeRawMessageContent: jsonBooleanFlag(body.storeRawMessageContent),
     usageGuardrails: normalizeUsageGuardrails(body.usageGuardrails)
   });
 

package/app/evidence/page.tsx

@@ -6,7 +6,7 @@ import { Card, CardContent, CardDescription, CardHeader, CardTitle } from "@/com
 import { Table, TableBody, TableCell, TableHead, TableHeader, TableRow } from "@/components/ui/table";
 import { DataValue, FieldLabel, MonoText, PageHeader } from "@/components/ui/typography";
 import { buildEvidenceTrail, parseEvidenceMetric } from "@/src/lib/evidence-trail";
-import { formatCurrency, formatTokens, percent } from "@/src/lib/format";
+import { formatCurrency, formatExactTokens, percent } from "@/src/lib/format";
 
 export const dynamic = "force-dynamic";
 
@@ -57,7 +57,7 @@ export default async function EvidencePage({ searchParams }: EvidencePageProps)
           <div className="grid divide-y border-t sm:grid-cols-2 sm:divide-x sm:divide-y-0 lg:grid-cols-5">
             <div className="p-3">
               <FieldLabel>Tokens</FieldLabel>
-              <DataValue className="mt-1" size="md">{formatTokens(trail.totals.tokens)}</DataValue>
+              <DataValue className="mt-1" size="md">{formatExactTokens(trail.totals.tokens)}</DataValue>
             </div>
             <div className="p-3">
               <FieldLabel>Cost</FieldLabel>
@@ -111,7 +111,7 @@ export default async function EvidencePage({ searchParams }: EvidencePageProps)
                         {session.tool} / {session.provider} / {session.project}
                       </div>
                     </TableCell>
-                    <TableCell>{formatTokens(session.totalTokens)}</TableCell>
+                    <TableCell>{formatExactTokens(session.totalTokens)}</TableCell>
                     <TableCell>{formatCurrency(session.cost)}</TableCell>
                     <TableCell className="max-w-80">
                       <Link href={session.sourceHref} title={session.sourceFile}>

package/app/page.tsx

@@ -15,7 +15,7 @@ import { getDefaultSearchRoots } from "@/src/ingestion/discovery";
 import { buildFirstRunStatus, type FirstRunStatus } from "@/src/lib/first-run-status";
 import { buildUnknownCostRepairWorkbench } from "@/src/lib/unknown-cost-repair";
 import { resolveDateRange } from "@/src/lib/date-range";
-import { formatCurrency, formatTokens, percent } from "@/src/lib/format";
+import { formatCurrency, formatSignedTokens, formatTokens, percent } from "@/src/lib/format";
 import { cn } from "@/src/lib/utils";
 import type { UsageGuardrailMetric } from "@/src/lib/usage-guardrails";
 
@@ -74,16 +74,16 @@ function MetricCard({
   );
 }
 
-function formatSignedNumber(value: number) {
-  if (value === 0) return "0";
-  return `${value > 0 ? "+" : "-"}${Math.abs(value).toLocaleString()}`;
-}
-
 function formatSignedCurrency(value: number) {
   if (value === 0) return "$0.00";
   return `${value > 0 ? "+" : "-"}${formatCurrency(Math.abs(value))}`;
 }
 
+function formatSignedNumber(value: number) {
+  if (value === 0) return "0";
+  return `${value > 0 ? "+" : "-"}${Math.abs(value).toLocaleString()}`;
+}
+
 function formatPercentValue(value: number | null) {
   if (value == null) return "new";
   if (value === 0) return "flat";
@@ -319,7 +319,7 @@ export default async function OverviewPage({ searchParams }: OverviewPageProps)
             <DeltaMetric
               label="Tokens"
               value={formatTokens(data.comparison.current.totalTokens)}
-              delta={formatSignedNumber(data.comparison.delta.totalTokens)}
+              delta={formatSignedTokens(data.comparison.delta.totalTokens)}
               percentValue={data.comparison.delta.totalTokensPercent}
               previous={formatTokens(data.comparison.previous.totalTokens)}
             />

package/dist/runtime/db-seed.mjs

@@ -1193,8 +1193,16 @@ var default_model_prices_default = {
 // src/lib/pricing-manifest.ts
 function nullableNumber(value) {
   if (value == null) return null;
-  const number = Number(value);
-  return Number.isFinite(number) ? number : null;
+  if (typeof value === "number") {
+    return Number.isFinite(value) && value >= 0 ? value : null;
+  }
+  if (typeof value === "string") {
+    const trimmed = value.trim();
+    if (!trimmed) return null;
+    const number = Number(trimmed);
+    return Number.isFinite(number) && number >= 0 ? number : null;
+  }
+  return null;
 }
 function validModel(value) {
   if (!value || typeof value !== "object") return null;

package/dist/runtime/digest.mjs

@@ -775,7 +775,8 @@ var init_model_aliases = __esm({
 // src/lib/format.ts
 function formatTokens(value) {
   const number3 = value ?? 0;
-  if (number3 >= 1e6) return `${(number3 / 1e6).toFixed(2)}M`;
+  if (number3 >= 999995e3) return `${(number3 / 1e9).toFixed(2)}B`;
+  if (number3 >= 999950) return `${(number3 / 1e6).toFixed(2)}M`;
   if (number3 >= 1e3) return `${(number3 / 1e3).toFixed(1)}K`;
   return number3.toLocaleString();
 }
@@ -964,8 +965,8 @@ function normalizeSettings(value) {
   if (!value || typeof value !== "object") return defaultSettings;
   const candidate = value;
   return {
-    customFolders: Array.isArray(candidate.customFolders) ? candidate.customFolders.filter((item) => typeof item === "string") : [],
-    storeRawMessageContent: Boolean(candidate.storeRawMessageContent),
+    customFolders: Array.isArray(candidate.customFolders) ? candidate.customFolders.filter((item) => typeof item === "string").map((item) => item.trim()).filter(Boolean) : [],
+    storeRawMessageContent: candidate.storeRawMessageContent === true,
     usageGuardrails: normalizeUsageGuardrails(candidate.usageGuardrails)
   };
 }

package/dist/runtime/doctor.mjs

@@ -775,7 +775,8 @@ var init_model_aliases = __esm({
 // src/lib/format.ts
 function formatTokens(value) {
   const number4 = value ?? 0;
-  if (number4 >= 1e6) return `${(number4 / 1e6).toFixed(2)}M`;
+  if (number4 >= 999995e3) return `${(number4 / 1e9).toFixed(2)}B`;
+  if (number4 >= 999950) return `${(number4 / 1e6).toFixed(2)}M`;
   if (number4 >= 1e3) return `${(number4 / 1e3).toFixed(1)}K`;
   return number4.toLocaleString();
 }
@@ -949,8 +950,8 @@ function normalizeSettings(value) {
   if (!value || typeof value !== "object") return defaultSettings;
   const candidate = value;
   return {
-    customFolders: Array.isArray(candidate.customFolders) ? candidate.customFolders.filter((item) => typeof item === "string") : [],
-    storeRawMessageContent: Boolean(candidate.storeRawMessageContent),
+    customFolders: Array.isArray(candidate.customFolders) ? candidate.customFolders.filter((item) => typeof item === "string").map((item) => item.trim()).filter(Boolean) : [],
+    storeRawMessageContent: candidate.storeRawMessageContent === true,
     usageGuardrails: normalizeUsageGuardrails(candidate.usageGuardrails)
   };
 }

package/dist/runtime/insights.mjs

@@ -775,7 +775,8 @@ var init_model_aliases = __esm({
 // src/lib/format.ts
 function formatTokens(value) {
   const number3 = value ?? 0;
-  if (number3 >= 1e6) return `${(number3 / 1e6).toFixed(2)}M`;
+  if (number3 >= 999995e3) return `${(number3 / 1e9).toFixed(2)}B`;
+  if (number3 >= 999950) return `${(number3 / 1e6).toFixed(2)}M`;
   if (number3 >= 1e3) return `${(number3 / 1e3).toFixed(1)}K`;
   return number3.toLocaleString();
 }
@@ -949,8 +950,8 @@ function normalizeSettings(value) {
   if (!value || typeof value !== "object") return defaultSettings;
   const candidate = value;
   return {
-    customFolders: Array.isArray(candidate.customFolders) ? candidate.customFolders.filter((item) => typeof item === "string") : [],
-    storeRawMessageContent: Boolean(candidate.storeRawMessageContent),
+    customFolders: Array.isArray(candidate.customFolders) ? candidate.customFolders.filter((item) => typeof item === "string").map((item) => item.trim()).filter(Boolean) : [],
+    storeRawMessageContent: candidate.storeRawMessageContent === true,
     usageGuardrails: normalizeUsageGuardrails(candidate.usageGuardrails)
   };
 }

package/dist/runtime/pricing-refresh.mjs

@@ -1470,8 +1470,16 @@ var init_default_model_prices = __esm({
 // src/lib/pricing-manifest.ts
 function nullableNumber(value) {
   if (value == null) return null;
-  const number = Number(value);
-  return Number.isFinite(number) ? number : null;
+  if (typeof value === "number") {
+    return Number.isFinite(value) && value >= 0 ? value : null;
+  }
+  if (typeof value === "string") {
+    const trimmed = value.trim();
+    if (!trimmed) return null;
+    const number = Number(trimmed);
+    return Number.isFinite(number) && number >= 0 ? number : null;
+  }
+  return null;
 }
 function validModel(value) {
   if (!value || typeof value !== "object") return null;

package/dist/runtime/reset.mjs

@@ -1193,8 +1193,16 @@ var default_model_prices_default = {
 // src/lib/pricing-manifest.ts
 function nullableNumber(value) {
   if (value == null) return null;
-  const number = Number(value);
-  return Number.isFinite(number) ? number : null;
+  if (typeof value === "number") {
+    return Number.isFinite(value) && value >= 0 ? value : null;
+  }
+  if (typeof value === "string") {
+    const trimmed = value.trim();
+    if (!trimmed) return null;
+    const number = Number(trimmed);
+    return Number.isFinite(number) && number >= 0 ? number : null;
+  }
+  return null;
 }
 function validModel(value) {
   if (!value || typeof value !== "object") return null;

package/dist/runtime/scan.mjs

@@ -532,8 +532,8 @@ function normalizeSettings(value) {
   if (!value || typeof value !== "object") return defaultSettings;
   const candidate = value;
   return {
-    customFolders: Array.isArray(candidate.customFolders) ? candidate.customFolders.filter((item) => typeof item === "string") : [],
-    storeRawMessageContent: Boolean(candidate.storeRawMessageContent),
+    customFolders: Array.isArray(candidate.customFolders) ? candidate.customFolders.filter((item) => typeof item === "string").map((item) => item.trim()).filter(Boolean) : [],
+    storeRawMessageContent: candidate.storeRawMessageContent === true,
     usageGuardrails: normalizeUsageGuardrails(candidate.usageGuardrails)
   };
 }
@@ -1566,15 +1566,16 @@ function deltaFromUsage(current, previous) {
   return delta.inputTokens + delta.cachedInputTokens + delta.outputTokens + delta.reasoningOutputTokens + delta.totalTokens > 0 ? delta : null;
 }
 function normalizedUsageFromDelta(delta) {
-  const inputTokens = Math.max(0, delta.inputTokens - delta.cachedInputTokens);
+  const inputTokens = delta.inputTokens;
   const outputTokens = Math.max(0, delta.outputTokens - delta.reasoningOutputTokens);
+  const displayedTotalWithCache = delta.totalTokens + delta.cachedInputTokens;
   const computedTotal = inputTokens + delta.cachedInputTokens + outputTokens + delta.reasoningOutputTokens;
   return {
     input_tokens: inputTokens,
     output_tokens: outputTokens,
     cache_read_input_tokens: delta.cachedInputTokens,
     reasoning_tokens: delta.reasoningOutputTokens,
-    total_tokens: Math.max(delta.totalTokens, computedTotal)
+    total_tokens: Math.max(displayedTotalWithCache, computedTotal)
   };
 }
 function exactTokenCountRecords(records, fallbackSessionId) {
@@ -1617,7 +1618,7 @@ var init_codex_cli = __esm({
     codexCliAdapter = {
       id: "codex-cli",
       displayName: "Codex CLI",
-      version: 2,
+      version: 3,
       async detect(file) {
         const extension = path5.extname(file.path).toLowerCase();
         if (isCodexCliUsagePath(file.path)) {
@@ -1879,23 +1880,31 @@ var init_generic_log = __esm({
           const session = textAfter(line, [/session(?:_id)?\s*[:=]\s*([^\s,]+)/i]);
           if (session) currentSession = session;
           projectPath = projectPath ?? textAfter(line, [/(?:cwd|project|path)\s*[:=]\s*(.+)$/i]);
+          const codexSummaryLine = /\bToken usage:/i.test(line) || /\(\s*\+\s*[0-9,]+\s+cached\s*\)/i.test(line);
           const model = textAfter(line, [/model\s*[:=]\s*([A-Za-z0-9_.:/-]+)/i]);
           const inputTokens = numberAfter(line, [
+            /\binput\s*[:=]\s*([0-9,]+)/i,
             /(?:input_tokens|prompt_tokens|input tokens|prompt tokens)\s*[:=]\s*([0-9,]+)/i
           ]);
           const outputTokens = numberAfter(line, [
+            /\boutput\s*[:=]\s*([0-9,]+)/i,
             /(?:output_tokens|completion_tokens|output tokens|completion tokens)\s*[:=]\s*([0-9,]+)/i
           ]);
           const cacheReadTokens = numberAfter(line, [
+            /\(\s*\+\s*([0-9,]+)\s+cached\s*\)/i,
+            /\bcached\s*[:=]\s*([0-9,]+)/i,
             /(?:cache_read_input_tokens|cached_input_tokens|cache read tokens|cached tokens)\s*[:=]\s*([0-9,]+)/i
           ]);
           const cacheWriteTokens = numberAfter(line, [
             /(?:cache_creation_input_tokens|cache_write_input_tokens|cache write tokens|cache creation tokens)\s*[:=]\s*([0-9,]+)/i
           ]);
           const reasoningTokens = numberAfter(line, [
+            /\(\s*reasoning\s+([0-9,]+)\s*\)/i,
+            /\breasoning\s*[:=]\s*([0-9,]+)/i,
             /(?:reasoning_output_tokens|reasoning_tokens|reasoning output tokens|reasoning tokens)\s*[:=]\s*([0-9,]+)/i
           ]);
           const explicitTotalTokens = numberAfter(line, [
+            /\btotal\s*[:=]\s*([0-9,]+)/i,
             /(?:total_tokens|total tokens)\s*[:=]\s*([0-9,]+)/i
           ]);
           const fallbackTotalTokens = inputTokens == null && outputTokens == null && cacheReadTokens == null && cacheWriteTokens == null && reasoningTokens == null ? numberAfter(line, [/\btokens\s*[:=]\s*([0-9,]+)/i]) : null;
@@ -1911,7 +1920,7 @@ var init_generic_log = __esm({
           const normalizedCacheWriteTokens = cacheWriteTokens ?? 0;
           const normalizedReasoningTokens = reasoningTokens ?? 0;
           const partSum = () => normalizedInputTokens + normalizedOutputTokens + normalizedCacheReadTokens + normalizedCacheWriteTokens + normalizedReasoningTokens;
-          if (inputTokens != null && totalTokens != null && normalizedCacheReadTokens + normalizedCacheWriteTokens > 0 && partSum() > totalTokens) {
+          if (!codexSummaryLine && inputTokens != null && totalTokens != null && normalizedCacheReadTokens + normalizedCacheWriteTokens > 0 && partSum() > totalTokens) {
             normalizedInputTokens = Math.max(
               0,
               normalizedInputTokens - normalizedCacheReadTokens - normalizedCacheWriteTokens
@@ -1920,7 +1929,7 @@ var init_generic_log = __esm({
           if (outputTokens != null && totalTokens != null && normalizedReasoningTokens > 0 && partSum() > totalTokens) {
             normalizedOutputTokens = Math.max(0, normalizedOutputTokens - normalizedReasoningTokens);
           }
-          const structuredTotal = totalTokens ?? partSum();
+          const structuredTotal = codexSummaryLine && totalTokens != null ? Math.max(totalTokens + normalizedCacheReadTokens + normalizedCacheWriteTokens, partSum()) : totalTokens ?? partSum();
           interactions2.push({
             externalId: `${currentSession}-${index2}`,
             timestamp,

package/dist/runtime/status.mjs

@@ -170,7 +170,8 @@ var init_helpers = __esm({
 // src/lib/format.ts
 function formatTokens(value) {
   const number2 = value ?? 0;
-  if (number2 >= 1e6) return `${(number2 / 1e6).toFixed(2)}M`;
+  if (number2 >= 999995e3) return `${(number2 / 1e9).toFixed(2)}B`;
+  if (number2 >= 999950) return `${(number2 / 1e6).toFixed(2)}M`;
   if (number2 >= 1e3) return `${(number2 / 1e3).toFixed(1)}K`;
   return number2.toLocaleString();
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tokentrace",
-  "version": "0.8.1",
+  "version": "0.8.2",
   "description": "Local-first dashboard for AI CLI token, cost, and session analytics.",
   "author": {
     "name": "Abhi Yoheswaran",

package/src/db/settings.ts

@@ -45,9 +45,12 @@ function normalizeSettings(value: unknown): AppSettings {
   const candidate = value as Partial<AppSettings>;
   return {
     customFolders: Array.isArray(candidate.customFolders)
-      ? candidate.customFolders.filter((item): item is string => typeof item === "string")
+      ? candidate.customFolders
+          .filter((item): item is string => typeof item === "string")
+          .map((item) => item.trim())
+          .filter(Boolean)
       : [],
-    storeRawMessageContent: Boolean(candidate.storeRawMessageContent),
+    storeRawMessageContent: candidate.storeRawMessageContent === true,
     usageGuardrails: normalizeUsageGuardrails(candidate.usageGuardrails)
   };
 }

package/src/ingestion/adapters/codex-cli.ts

@@ -155,8 +155,9 @@ function deltaFromUsage(current: CodexUsageTotal, previous: CodexUsageTotal | nu
 }
 
 function normalizedUsageFromDelta(delta: CodexUsageTotal) {
-  const inputTokens = Math.max(0, delta.inputTokens - delta.cachedInputTokens);
+  const inputTokens = delta.inputTokens;
   const outputTokens = Math.max(0, delta.outputTokens - delta.reasoningOutputTokens);
+  const displayedTotalWithCache = delta.totalTokens + delta.cachedInputTokens;
   const computedTotal =
     inputTokens + delta.cachedInputTokens + outputTokens + delta.reasoningOutputTokens;
 
@@ -165,7 +166,7 @@ function normalizedUsageFromDelta(delta: CodexUsageTotal) {
     output_tokens: outputTokens,
     cache_read_input_tokens: delta.cachedInputTokens,
     reasoning_tokens: delta.reasoningOutputTokens,
-    total_tokens: Math.max(delta.totalTokens, computedTotal)
+    total_tokens: Math.max(displayedTotalWithCache, computedTotal)
   };
 }
 
@@ -207,7 +208,7 @@ function exactTokenCountRecords(records: Record<string, unknown>[], fallbackSess
 export const codexCliAdapter: IngestionAdapter = {
   id: "codex-cli",
   displayName: "Codex CLI",
-  version: 2,
+  version: 3,
 
   async detect(file) {
     const extension = path.extname(file.path).toLowerCase();

package/src/ingestion/adapters/generic-log.ts

@@ -57,23 +57,32 @@ export const genericLogAdapter: IngestionAdapter = {
       projectPath =
         projectPath ?? textAfter(line, [/(?:cwd|project|path)\s*[:=]\s*(.+)$/i]);
 
+      const codexSummaryLine =
+        /\bToken usage:/i.test(line) || /\(\s*\+\s*[0-9,]+\s+cached\s*\)/i.test(line);
       const model = textAfter(line, [/model\s*[:=]\s*([A-Za-z0-9_.:/-]+)/i]);
       const inputTokens = numberAfter(line, [
+        /\binput\s*[:=]\s*([0-9,]+)/i,
         /(?:input_tokens|prompt_tokens|input tokens|prompt tokens)\s*[:=]\s*([0-9,]+)/i
       ]);
       const outputTokens = numberAfter(line, [
+        /\boutput\s*[:=]\s*([0-9,]+)/i,
         /(?:output_tokens|completion_tokens|output tokens|completion tokens)\s*[:=]\s*([0-9,]+)/i
       ]);
       const cacheReadTokens = numberAfter(line, [
+        /\(\s*\+\s*([0-9,]+)\s+cached\s*\)/i,
+        /\bcached\s*[:=]\s*([0-9,]+)/i,
         /(?:cache_read_input_tokens|cached_input_tokens|cache read tokens|cached tokens)\s*[:=]\s*([0-9,]+)/i
       ]);
       const cacheWriteTokens = numberAfter(line, [
         /(?:cache_creation_input_tokens|cache_write_input_tokens|cache write tokens|cache creation tokens)\s*[:=]\s*([0-9,]+)/i
       ]);
       const reasoningTokens = numberAfter(line, [
+        /\(\s*reasoning\s+([0-9,]+)\s*\)/i,
+        /\breasoning\s*[:=]\s*([0-9,]+)/i,
         /(?:reasoning_output_tokens|reasoning_tokens|reasoning output tokens|reasoning tokens)\s*[:=]\s*([0-9,]+)/i
       ]);
       const explicitTotalTokens = numberAfter(line, [
+        /\btotal\s*[:=]\s*([0-9,]+)/i,
         /(?:total_tokens|total tokens)\s*[:=]\s*([0-9,]+)/i
       ]);
       const fallbackTotalTokens =
@@ -109,6 +118,7 @@ export const genericLogAdapter: IngestionAdapter = {
         normalizedCacheWriteTokens +
         normalizedReasoningTokens;
       if (
+        !codexSummaryLine &&
         inputTokens != null &&
         totalTokens != null &&
         normalizedCacheReadTokens + normalizedCacheWriteTokens > 0 &&
@@ -128,7 +138,9 @@ export const genericLogAdapter: IngestionAdapter = {
         normalizedOutputTokens = Math.max(0, normalizedOutputTokens - normalizedReasoningTokens);
       }
       const structuredTotal =
-        totalTokens ?? partSum();
+        codexSummaryLine && totalTokens != null
+          ? Math.max(totalTokens + normalizedCacheReadTokens + normalizedCacheWriteTokens, partSum())
+          : totalTokens ?? partSum();
       interactions.push({
         externalId: `${currentSession}-${index}`,
         timestamp,

package/src/lib/api-json.ts

@@ -4,11 +4,24 @@ export type JsonObjectResult =
   | { ok: true; body: JsonObject }
   | { ok: false; error: string };
 
-export async function readJsonObject(request: Request): Promise<JsonObjectResult> {
-  let body: unknown;
+async function readJsonObjectText(request: Request, allowEmpty: boolean): Promise<JsonObjectResult> {
+  let text: string;
 
   try {
-    body = await request.json();
+    text = await request.text();
+  } catch {
+    return { ok: false, error: "request body must be valid JSON" };
+  }
+
+  if (!text.trim()) {
+    return allowEmpty
+      ? { ok: true, body: {} }
+      : { ok: false, error: "request body must be valid JSON" };
+  }
+
+  let body: unknown;
+  try {
+    body = JSON.parse(text);
   } catch {
     return { ok: false, error: "request body must be valid JSON" };
   }
@@ -19,3 +32,15 @@ export async function readJsonObject(request: Request): Promise<JsonObjectResult
 
   return { ok: true, body: body as JsonObject };
 }
+
+export function readJsonObject(request: Request): Promise<JsonObjectResult> {
+  return readJsonObjectText(request, false);
+}
+
+export function readOptionalJsonObject(request: Request): Promise<JsonObjectResult> {
+  return readJsonObjectText(request, true);
+}
+
+export function jsonBooleanFlag(value: unknown) {
+  return value === true;
+}

package/src/lib/format.ts

@@ -1,10 +1,21 @@
 export function formatTokens(value: number | null | undefined) {
   const number = value ?? 0;
-  if (number >= 1_000_000) return `${(number / 1_000_000).toFixed(2)}M`;
+  if (number >= 999_995_000) return `${(number / 1_000_000_000).toFixed(2)}B`;
+  if (number >= 999_950) return `${(number / 1_000_000).toFixed(2)}M`;
   if (number >= 1_000) return `${(number / 1_000).toFixed(1)}K`;
   return number.toLocaleString();
 }
 
+export function formatSignedTokens(value: number | null | undefined) {
+  const number = value ?? 0;
+  if (number === 0) return "0";
+  return `${number > 0 ? "+" : "-"}${formatTokens(Math.abs(number))}`;
+}
+
+export function formatExactTokens(value: number | null | undefined) {
+  return (value ?? 0).toLocaleString();
+}
+
 export function formatCurrency(value: number | null | undefined, currency = "USD") {
   if (value == null) return "Unknown";
   return new Intl.NumberFormat("en-US", {

package/src/lib/pricing-manifest.ts

@@ -31,8 +31,16 @@ export type PricingManifest = {
 
 function nullableNumber(value: unknown) {
   if (value == null) return null;
-  const number = Number(value);
-  return Number.isFinite(number) ? number : null;
+  if (typeof value === "number") {
+    return Number.isFinite(value) && value >= 0 ? value : null;
+  }
+  if (typeof value === "string") {
+    const trimmed = value.trim();
+    if (!trimmed) return null;
+    const number = Number(trimmed);
+    return Number.isFinite(number) && number >= 0 ? number : null;
+  }
+  return null;
 }
 
 function validModel(value: unknown): PricingManifestModel | null {