@krtclcdy/tersio 2.18.0 → 2.19.0

package/dashboard/styles.css

@@ -126,7 +126,7 @@
   .mrow:hover { background: var(--track); box-shadow: var(--shadow-xs); }
   .stripcell { transition: background .25s; }
   .stripcell:hover { box-shadow: var(--shadow-xs); }
-  button, .tilt, .cell, .stripcell { cursor: pointer; }
+  button, .tilt, .cell, .stripcell, .modelcard, .mrow { cursor: pointer; }
   .btn-push { transition: transform .12s, background .2s; }
   .btn-push:hover { background: var(--accent-soft); }
   .btn-push:active { transform: scale(.96); }
@@ -245,3 +245,60 @@ html[data-theme="dark"] .brandmark.placeholder { background: #fff !important; co
   .toast-desc { font-size: 12px; color: var(--dim); margin: 1px 0 0; }
   @keyframes toast-in { from { opacity: 0; transform: translateY(8px) scale(.98); } }
   @keyframes toast-out { to { opacity: 0; transform: translateY(6px) scale(.98); } }
+  /* Model detail dialog (shadcn chart language, native modal). KPI strip,
+     gradient area chart with range tabs, rounded bars, token-mix donut. */
+  .dlg.mdlg { width: min(880px, calc(100vw - 32px)); max-height: min(88vh, 960px); padding: 0; overflow: hidden; display: none; flex-direction: column; }
+  .dlg.mdlg[open] { display: flex; }
+  .dlg.mdlg .dlg-head { padding: 20px 20px 0; }
+  .md-body { overflow-y: auto; padding: 0 20px 20px; overscroll-behavior: contain; scrollbar-width: thin; scrollbar-color: var(--line) transparent; display: grid; gap: 12px; margin-top: 16px; }
+  .md-rankpill { border: 1px solid var(--line); background: var(--accent-soft); color: var(--accent); border-radius: 999px; padding: 4px 12px; font-size: 12px; font-weight: 700; white-space: nowrap; }
+  .md-kpis { display: grid; grid-template-columns: repeat(2, minmax(0, 1fr)); grid-auto-flow: dense; gap: 8px; }
+  @media (min-width: 640px) { .md-kpis { grid-template-columns: repeat(4, minmax(0, 1fr)); } }
+  .md-kpi { border: 1px solid var(--line); border-radius: 12px; padding: 12px 14px; background: var(--panel); }
+  .md-kpi p { margin: 0; }
+  .md-kpi .k { font-size: 10px; text-transform: uppercase; letter-spacing: .14em; color: var(--dim); }
+  .md-kpi .v { font-size: 22px; font-weight: 800; letter-spacing: -0.02em; margin-top: 4px; font-variant-numeric: tabular-nums; }
+  .md-kpi .d { font-size: 11px; margin-top: 2px; font-variant-numeric: tabular-nums; }
+  .md-kpi .d.up { color: var(--accent); }
+  .md-kpi .d.flat { color: var(--dim); }
+  .md-chart { position: relative; border: 1px solid var(--line); border-radius: 12px; padding: 14px; background: var(--panel); }
+  .md-chart-head { display: flex; align-items: flex-start; justify-content: space-between; gap: 12px; margin-bottom: 8px; }
+  .md-chart-title { font-size: 13px; font-weight: 700; letter-spacing: -0.01em; margin: 0; }
+  .md-chart-sub { font-size: 11px; color: var(--dim); margin: 2px 0 0; text-transform: uppercase; letter-spacing: .12em; }
+  .md-trend { font-size: 11px; font-weight: 700; white-space: nowrap; border-radius: 999px; padding: 3px 10px; background: var(--track); color: var(--dim); }
+  .md-trend.up { background: var(--accent-soft); color: var(--accent); }
+  #mdSpark { width: 100%; height: 190px; display: block; }
+  #mdSpark .grid { stroke: var(--line); stroke-width: 1; }
+  #mdSpark .area { fill: url(#mdGrad); stroke: none; }
+  #mdSpark .line { fill: none; stroke: var(--accent); stroke-width: 2; stroke-linejoin: round; stroke-linecap: round; }
+  #mdSpark .dot { fill: var(--accent); stroke: var(--panel); stroke-width: 2; }
+  #mdSpark .hoverdot { fill: var(--accent); stroke: var(--panel); stroke-width: 2; }
+  .md-tip { position: absolute; pointer-events: none; background: var(--panel); color: var(--ink); border: 1px solid var(--line); box-shadow: 0 8px 24px rgba(0, 0, 0, .28); border-radius: 8px; padding: 6px 10px; font-size: 11px; line-height: 1.5; white-space: nowrap; max-width: calc(100% - 28px); overflow: hidden; text-overflow: ellipsis; transform: translate(-50%, -110%); display: none; z-index: 5; font-variant-numeric: tabular-nums; }
+  .md-cols { display: grid; grid-template-columns: minmax(0, 1fr); grid-auto-flow: dense; gap: 12px; }
+  @media (min-width: 720px) { .md-cols { grid-template-columns: minmax(0, 1.5fr) minmax(0, 1fr); } }
+  .md-months { display: flex; justify-content: space-between; margin-top: 6px; font-size: 10px; color: var(--dim); text-transform: uppercase; letter-spacing: .12em; }
+  .md-bars { display: flex; align-items: flex-end; gap: 3px; height: 132px; background-image: linear-gradient(var(--line) 1px, transparent 1px); background-size: 100% 33px; background-position: 0 bottom; }
+  .md-bars > span { flex: 1; min-width: 3px; border-radius: 4px 4px 2px 2px; background: var(--accent); opacity: .4; cursor: default; }
+  .md-bars > span:hover { opacity: 1; }
+  .md-bars > span.top { opacity: 1; box-shadow: 0 0 8px var(--accent-soft); }
+  .md-bars > span.zero { background: var(--track); opacity: 1; box-shadow: none; }
+  .md-note { font-size: 11px; color: var(--dim); margin: 8px 0 0; font-variant-numeric: tabular-nums; }
+  .md-donut-wrap { position: relative; width: 150px; height: 150px; margin: 4px auto 8px; }
+  #mdMix { width: 150px; height: 150px; display: block; transform: rotate(-90deg); }
+  #mdMix circle { fill: none; stroke-width: 16; }
+  #mdMix .tk { stroke: var(--track); }
+  .md-donut-center { position: absolute; inset: 0; display: grid; place-items: center; text-align: center; }
+  .md-donut-center p { margin: 0; font-size: 17px; font-weight: 800; letter-spacing: -0.02em; font-variant-numeric: tabular-nums; }
+  .md-legend { display: grid; gap: 6px; font-size: 11px; }
+  .md-legend .row { display: flex; align-items: center; gap: 8px; }
+  .md-legend .dot { width: 8px; height: 8px; border-radius: 999px; flex-shrink: 0; }
+  .md-legend .pct { margin-left: auto; color: var(--dim); font-variant-numeric: tabular-nums; }
+  .md-grid { display: grid; grid-template-columns: repeat(2, minmax(0, 1fr)); grid-auto-flow: dense; gap: 8px; }
+  @media (min-width: 640px) { .md-grid { grid-template-columns: repeat(4, minmax(0, 1fr)); } }
+  .md-stat { border: 1px solid var(--line); border-radius: 12px; padding: 12px 14px; background: var(--panel); }
+  .md-stat p { margin: 0; }
+  .md-stat .k { font-size: 10px; text-transform: uppercase; letter-spacing: .14em; color: var(--dim); }
+  .md-stat .v { font-size: 20px; font-weight: 800; letter-spacing: -0.02em; margin-top: 4px; font-variant-numeric: tabular-nums; }
+  .md-stat .s { font-size: 11px; color: var(--dim); margin-top: 2px; }
+  #mdBadge .brandmark { width: 44px; height: 44px; border-radius: 12px; }
+  @media (prefers-reduced-motion: reduce) { .md-bars > span { transition: none; } }

package/dashboard/template.html

@@ -83,6 +83,10 @@
         <p class="dlg-name">Session transcripts <span class="dlg-own">host-owned · never touched</span></p>
         <p class="mono dlg-file" id="pathSessions" title="">–</p>
       </div>
+      <div class="dlg-path">
+        <p class="dlg-name">Usage DB <span class="dlg-own">tersio-owned · reset clears</span></p>
+        <p class="mono dlg-file" id="pathUsageDb" title="">–</p>
+      </div>
     </div>
     <div class="dlg-danger">
       <p class="dlg-label">Danger zone</p>
@@ -98,6 +102,76 @@
     </div>
   </dialog>
 
+  <!-- Model detail dialog (shadcn chart language, native modal): kpi strip,
+       gradient area chart with range tabs, rounded bars, token-mix donut. -->
+  <dialog id="modelDialog" class="dlg mdlg" aria-labelledby="mdTitle">
+    <div class="dlg-head">
+      <div class="min-w-0 flex items-center gap-3">
+        <span id="mdBadge"></span>
+        <div class="min-w-0">
+          <p class="dlg-title truncate" id="mdTitle">Model</p>
+          <p class="dlg-desc mono" id="mdSub">–</p>
+        </div>
+      </div>
+      <div class="flex shrink-0 items-center gap-2">
+        <span class="md-rankpill mono" id="mdRank">#–</span>
+        <button id="mdClose" class="btn-push flex shrink-0 items-center p-2 rounded-xl" style="border: 1px solid var(--line); color: var(--ink)" aria-label="Close model details">
+          <i data-lucide="x" class="size-4"></i>
+        </button>
+      </div>
+    </div>
+    <div class="md-body">
+    <div class="md-kpis" id="mdKpis"></div>
+    <div class="md-chart">
+      <div class="md-chart-head">
+        <div class="min-w-0">
+          <p class="md-chart-title">Token volume</p>
+          <p class="md-chart-sub mono" id="mdMomRange">–</p>
+        </div>
+        <div class="flex shrink-0 items-center gap-2">
+          <span class="md-trend mono" id="mdTrend"></span>
+          <span class="seg mono text-xs flex items-center gap-1 p-1 rounded-[10px]" style="border: 1px solid var(--line)" role="group" aria-label="Chart range">
+            <button data-mdspan="30" class="px-2.5 py-1" role="button">30D</button>
+            <button data-mdspan="90" class="px-2.5 py-1" role="button">90D</button>
+            <button data-mdspan="all" class="on px-2.5 py-1" role="button">ALL</button>
+          </span>
+        </div>
+      </div>
+      <svg id="mdSpark" viewBox="0 0 560 190" preserveAspectRatio="none" aria-hidden="true"></svg>
+      <div class="md-tip mono" id="mdTip"></div>
+      <div class="md-months mono" id="mdMonths" aria-hidden="true"></div>
+    </div>
+    <div class="md-cols">
+      <div class="md-chart">
+        <div class="md-chart-head">
+          <div class="min-w-0">
+            <p class="md-chart-title">Daily activity</p>
+            <p class="md-chart-sub mono" id="mdBarsSub">tokens per day</p>
+          </div>
+          <span class="md-trend mono" id="mdActive"></span>
+        </div>
+        <div class="md-bars" id="mdBars" aria-hidden="true"></div>
+        <div class="md-months mono" id="mdBarsMonths" aria-hidden="true"></div>
+        <div class="md-note mono" id="mdBarsNote"></div>
+      </div>
+      <div class="md-chart">
+        <div class="md-chart-head">
+          <div class="min-w-0">
+            <p class="md-chart-title">Token mix</p>
+            <p class="md-chart-sub mono">input vs output vs cache</p>
+          </div>
+        </div>
+        <div class="md-donut-wrap">
+          <svg id="mdMix" viewBox="0 0 140 140" aria-hidden="true"></svg>
+          <div class="md-donut-center"><p class="mono" id="mdMixTotal">–</p></div>
+        </div>
+        <div class="md-legend mono" id="mdMixLegend"></div>
+      </div>
+    </div>
+    <div class="md-grid" id="mdStats"></div>
+    </div>
+  </dialog>
+
   <!-- Hero: centered total -->
   <section class="mx-auto max-w-6xl text-center pt-14 pb-10 relative">
     <div class="hero-glow" aria-hidden="true"></div>
@@ -279,19 +353,17 @@
       <i data-lucide="terminal" class="size-4" style="color: var(--accent)"></i>
       <h2 class="display font-bold tracking-tight text-xl truncate min-w-0">Command tools</h2>
       <div class="flex items-center gap-2 ml-auto min-w-0">
-        <select id="cmdProject" class="mono text-xs px-2 py-1.5 rounded-[10px]" style="border: 1px solid var(--line); background: var(--panel); color: var(--ink); max-width: 190px" aria-label="Filter command tools by project"></select>
         <span class="mono text-xs truncate min-w-0" style="color: var(--dim)" id="toolsScope">tool calls in sessions</span>
       </div>
     </div>
     <p class="mono text-xs mb-4 truncate" style="color: var(--dim)">count · tokens saved · avg rate · avg time · share of executions</p>
     <div class="overflow-x-auto">
       <table class="w-full mono text-[13px]" id="cmdTable">
-        <colgroup><col style="width:40px"><col><col style="width:120px"><col style="width:90px"><col style="width:90px"><col style="width:90px"><col style="width:90px"><col style="width:140px"></colgroup>
+        <colgroup><col style="width:40px"><col><col style="width:90px"><col style="width:90px"><col style="width:90px"><col style="width:90px"><col style="width:140px"></colgroup>
         <thead>
           <tr class="text-left text-[11px] uppercase tracking-[0.14em]" style="color: var(--dim)">
             <th class="font-normal text-right pr-3 py-2 w-10">#</th>
             <th class="font-normal py-2 pr-3" aria-sort="none"><button class="thsort" data-sort="name">Tool / Command <span class="arr">⇅</span></button></th>
-            <th class="font-normal py-2 pr-3" aria-sort="none"><button class="thsort" data-sort="project">Project <span class="arr">⇅</span></button></th>
             <th class="font-normal text-right py-2 pr-3" aria-sort="descending"><button class="thsort num" data-sort="count">Count <span class="arr">↓</span></button></th>
             <th class="font-normal text-right py-2 pr-3" aria-sort="none"><button class="thsort num" data-sort="saved">Saved <span class="arr">⇅</span></button></th>
             <th class="font-normal text-right py-2 pr-3" aria-sort="none"><button class="thsort num" data-sort="avgPct">Avg% <span class="arr">⇅</span></button></th>

package/extensions/shared/rtk-gain.js

@@ -8,10 +8,8 @@
 // isn't metered); their gains are bench-measured in BENCHMARK.md and cited
 // as static figures wherever RTK rows appear.
 //
-// Rows are grouped by (command, project) rather than command alone: RTK's
-// history is machine-wide, so fusing projects made one busy repo's `rtk grep`
-// count as everyone's and let high-saving commands from other projects crowd
-// every other project out of the table entirely.
+// Rows group by command alone, machine-wide: one row per command no matter
+// which repo ran it. Project filtering stays out — wasted column, same logic.
 import { execFileSync } from 'node:child_process';
 import fs from 'node:fs';
 import os from 'node:os';
@@ -58,9 +56,8 @@ export function readRtkGain(limit = 10, cutoffMs) {
             ? `WHERE CAST(strftime('%s', timestamp) AS INTEGER) >= ${Math.floor(cutoffMs / 1000)}`
             : '';
         const [[commands = '0', saved = '0', input = '0', avgPct = '0', totalMs = '0'] = []] = query(rtkDbPath(), `SELECT COUNT(*), COALESCE(SUM(saved_tokens),0), COALESCE(SUM(input_tokens),0), COALESCE(AVG(savings_pct),0), COALESCE(SUM(exec_time_ms),0) FROM commands ${where};`);
-        const byCommand = query(rtkDbPath(), `SELECT substr(${CMD_ONE_LINE}, 1, ${MAX_CMD_CHARS}), COALESCE(project_path, ''), COUNT(*), COALESCE(SUM(saved_tokens),0), COALESCE(AVG(savings_pct),0), COALESCE(AVG(exec_time_ms),0) FROM commands ${where} GROUP BY rtk_cmd, project_path ORDER BY SUM(saved_tokens) DESC LIMIT ${Math.max(1, Math.floor(limit))};`).map(([command, project, count, savedRow, pct, ms]) => ({
+        const byCommand = query(rtkDbPath(), `SELECT substr(${CMD_ONE_LINE}, 1, ${MAX_CMD_CHARS}), COUNT(*), COALESCE(SUM(saved_tokens),0), COALESCE(AVG(savings_pct),0), COALESCE(AVG(exec_time_ms),0) FROM commands ${where} GROUP BY rtk_cmd ORDER BY SUM(saved_tokens) DESC LIMIT ${Math.max(1, Math.floor(limit))};`).map(([command, count, savedRow, pct, ms]) => ({
             command,
-            project,
             count: Number(count) || 0,
             saved: Number(savedRow) || 0,
             avgPct: Number(pct) || 0,

package/extensions/shared/usage-ledger.js

@@ -50,17 +50,14 @@ export function appendUsage(kind, detail) {
 function zeroBreakdown() {
     return { input: 0, output: 0, cacheRead: 0, cacheWrite: 0 };
 }
-// Message-level generation time in ms. OMP writes `duration` (ms, float);
-// codex token_count rows carry none. Non-positive/non-finite → undefined
-// so renderers print – instead of a fake 0.0s.
-function durOf(v) {
+export function durOf(v) {
     return typeof v === 'number' && Number.isFinite(v) && v > 0 ? v : undefined;
 }
 // Measured cost for one message. OMP writes usage.cost as
 // { input, output, cacheRead, cacheWrite, total }; a bare number shows up in
 // older fixtures. Anything else means "not recorded" — deliberately not 0, so
 // the dashboard can tell a genuinely free run from an unrecorded one.
-function costOf(usage) {
+export function costOf(usage) {
     const c = usage.cost;
     if (typeof c === 'number')
         return Number.isFinite(c) ? c : undefined;
@@ -73,7 +70,7 @@ function costOf(usage) {
 }
 // First line only: real messages carry multi-line provider errors, and this
 // ends up in a tooltip.
-function statusOf(msg) {
+export function statusOf(msg) {
     const stop = typeof msg.stopReason === 'string' ? msg.stopReason : '';
     const note = typeof msg.errorMessage === 'string' && msg.errorMessage.trim()
         ? msg.errorMessage.split('\n')[0].trim().slice(0, 180)
@@ -108,7 +105,7 @@ export function codexSessionsDir() {
         return path.join(codexHome, 'sessions');
     return path.join(os.homedir(), '.codex', 'sessions');
 }
-function dayKey(ts) {
+export function dayKey(ts) {
     const ms = typeof ts === 'number' ? ts : Date.parse(ts);
     if (!Number.isFinite(ms))
         return null;
@@ -116,7 +113,7 @@ function dayKey(ts) {
     const p = (n) => String(n).padStart(2, '0');
     return `${d.getFullYear()}-${p(d.getMonth() + 1)}-${p(d.getDate())}`;
 }
-function walkJsonl(dir, out, cap) {
+export function walkJsonl(dir, out, cap) {
     let entries;
     try {
         entries = fs.readdirSync(dir, { withFileTypes: true });
@@ -137,17 +134,101 @@ function walkJsonl(dir, out, cap) {
 // Recent requests are their own full-width table in the dashboard, so this is
 // a payload bound rather than a "few highlights" bound. Rows are small
 // (model, tokens, timing, status), so a few hundred cost little to ship.
-const RECENT_LIMIT = 200;
-export function importSessionTokens() {
+export const RECENT_LIMIT = 200;
+const FREE_SUFFIX = /(?::free|-free)$/i;
+export function newSessionAccum() {
+    return { byModel: {}, byDay: {}, byDayModel: {}, byTool: {}, byModelMessages: {}, totals: zeroBreakdown(), messages: 0, costMeasured: 0, recent: [] };
+}
+export function ingestSessionRow(accum, model, usage, ts, durMs, run, toolNames) {
     const watermark = readResetWatermark();
-    const byModel = {};
-    const byDay = {};
-    const byDayModel = {};
-    const byTool = {};
-    const byModelMessages = {};
-    const totals = zeroBreakdown();
-    let messages = 0;
-    let costMeasured = 0;
+    const ms = ts === undefined ? NaN : typeof ts === 'number' ? ts : Date.parse(ts);
+    if (watermark > 0 && (!Number.isFinite(ms) || ms < watermark))
+        return false;
+    addInto(accum.totals, usage);
+    const key = model.replace(FREE_SUFFIX, '').toLowerCase();
+    accum.byModel[key] ??= zeroBreakdown();
+    addInto(accum.byModel[key], usage);
+    accum.byModelMessages[key] = (accum.byModelMessages[key] ?? 0) + 1;
+    const num = (v) => (typeof v === 'number' && Number.isFinite(v) && v > 0 ? Math.floor(v) : 0);
+    if (Number.isFinite(ms)) {
+        const outcome = run ?? { st: 'completed' };
+        accum.recent.push({ m: key, i: num(usage.input), o: num(usage.output), t: ms, d: durOf(durMs), cr: num(usage.cacheRead), cw: num(usage.cacheWrite), usd: costOf(usage), st: outcome.st, code: outcome.code, note: outcome.note });
+    }
+    const day = ts !== undefined ? dayKey(ts) : null;
+    if (day) {
+        accum.byDay[day] ??= zeroBreakdown();
+        addInto(accum.byDay[day], usage);
+        const sum = ['input', 'output', 'cacheRead', 'cacheWrite'].reduce((a, k) => a + (typeof usage[k] === 'number' && Number.isFinite(usage[k]) ? Math.floor(usage[k]) : 0), 0);
+        if (sum > 0) {
+            accum.byDayModel[day] ??= {};
+            accum.byDayModel[day][key] = (accum.byDayModel[day][key] ?? 0) + sum;
+        }
+    }
+    accum.messages += 1;
+    const measured = costOf(usage);
+    if (measured !== undefined)
+        accum.costMeasured += measured;
+    for (const name of toolNames ?? [])
+        accum.byTool[name] = (accum.byTool[name] ?? 0) + 1;
+    return true;
+}
+export function classifySessionLine(row) {
+    const payload = row.payload;
+    if (payload && typeof payload === 'object') {
+        if (row.type === 'session_meta' && typeof payload.model_provider === 'string')
+            return { kind: 'codex_provider', provider: payload.model_provider };
+        if (payload.type === 'token_count') {
+            const last = payload.info?.last_token_usage;
+            if (last) {
+                const provider = typeof payload.model_provider === 'string' ? payload.model_provider : undefined;
+                const ts = row.timestamp === undefined ? NaN : typeof row.timestamp === 'number' ? row.timestamp : Date.parse(row.timestamp);
+                return { kind: 'token_row', provider, model: 'codex', usage: { input: last['input_tokens'], output: last['output_tokens'], cacheRead: last['cached_input_tokens'], cacheWrite: last['cache_write_input_tokens'] }, ms: Number.isFinite(ts) ? ts : undefined };
+            }
+        }
+    }
+    const msg = row.message;
+    if (!msg || msg.role !== 'assistant' || !msg.usage)
+        return { kind: 'skip' };
+    const model = typeof msg.model === 'string' && msg.model ? msg.model : 'unknown';
+    const computedDur = (typeof msg.completedAt === 'number' && typeof msg.timestamp === 'number') ? msg.completedAt - msg.timestamp : undefined;
+    const tools = [];
+    for (const part of msg.content ?? []) {
+        if (part?.type === 'toolCall' && typeof part.name === 'string' && part.name) {
+            tools.push(part.name === 'bash' ? `bash:${leadBinary(part.arguments?.command)}` : part.name);
+        }
+    }
+    return { kind: 'assistant_row', model, usage: msg.usage, durMs: typeof msg.duration === 'number' ? msg.duration : computedDur, run: statusOf(msg), tools };
+}
+// Fold `:free`/`-free` suffixes and case variants into one chart key, so the
+// same model from two providers stops splitting into separate rows.
+export function canonicalModelId(model) {
+    return model.replace(FREE_SUFFIX, '').toLowerCase();
+}
+// LiteLLM-style display: namespace stays lowercase, model segments title-case
+// with version dots kept (`deepseek-v4.1-flash` → `Deepseek-V4.1-Flash`).
+export function displayModelId(model) {
+    const bare = model.replace(FREE_SUFFIX, '');
+    const cap = (s) => {
+        const low = s.toLowerCase();
+        if (low === 'openai')
+            return 'OpenAI';
+        if (low === 'ai')
+            return 'AI';
+        if (/^\d+[a-z]+$/.test(low))
+            return low.toUpperCase();
+        if (s.length <= 2)
+            return s.toUpperCase();
+        return s[0].toUpperCase() + s.slice(1).toLowerCase();
+    };
+    const seg = (s) => s.split('.').map(cap).join('.');
+    const words = (s) => s.split(/[-_:]+/).filter(Boolean).map(seg).join('-');
+    const slash = bare.indexOf('/');
+    if (slash >= 0)
+        return `${bare.slice(0, slash).toLowerCase()}/${words(bare.slice(slash + 1))}`;
+    return words(bare);
+}
+export function importSessionTokens() {
+    const accum = newSessionAccum();
     const files = [];
     walkJsonl(sessionsDir(), files, 2000);
     // A sessions override signals an isolated environment (tests, fixtures):
@@ -156,46 +237,6 @@ export function importSessionTokens() {
         walkJsonl(codexSessionsDir(), files, 2000);
     }
     let codexProvider = null;
-    const recent = [];
-    // Rows from before the reset watermark (and rows with no usable timestamp,
-    function ingest(model, usage, ts, durMs, run) {
-        const ms = ts === undefined ? NaN : typeof ts === 'number' ? ts : Date.parse(ts);
-        if (watermark > 0 && (!Number.isFinite(ms) || ms < watermark))
-            return false;
-        addInto(totals, usage);
-        byModel[model] ??= zeroBreakdown();
-        addInto(byModel[model], usage);
-        byModelMessages[model] = (byModelMessages[model] ?? 0) + 1;
-        const num = (v) => (typeof v === 'number' && Number.isFinite(v) && v > 0 ? Math.floor(v) : 0);
-        if (Number.isFinite(ms)) {
-            const outcome = run ?? { st: 'completed' };
-            recent.push({
-                m: model,
-                i: num(usage.input),
-                o: num(usage.output),
-                t: ms,
-                d: durOf(durMs),
-                cr: num(usage.cacheRead),
-                cw: num(usage.cacheWrite),
-                usd: costOf(usage),
-                st: outcome.st,
-                code: outcome.code,
-                note: outcome.note,
-            });
-        }
-        const day = ts !== undefined ? dayKey(ts) : null;
-        if (day) {
-            byDay[day] ??= zeroBreakdown();
-            addInto(byDay[day], usage);
-            const sum = ['input', 'output', 'cacheRead', 'cacheWrite'].reduce((a, k) => a + (typeof usage[k] === 'number' && Number.isFinite(usage[k]) ? Math.floor(usage[k]) : 0), 0);
-            if (sum > 0) {
-                byDayModel[day] ??= {};
-                byDayModel[day][model] = (byDayModel[day][model] ?? 0) + sum;
-            }
-        }
-        messages += 1;
-        return true;
-    }
     for (const file of files) {
         let text;
         try {
@@ -204,59 +245,39 @@ export function importSessionTokens() {
         catch {
             continue;
         }
-        for (const line of text.split('\n')) {
-            if (!line.trim())
+        processSessionText(accum, { get codexProvider() { return codexProvider; }, set codexProvider(v) { codexProvider = v; } }, text);
+    }
+    accum.recent.sort((a, b) => b.t - a.t);
+    return { messages: accum.messages, totals: accum.totals, byModel: accum.byModel, byDay: accum.byDay, byDayModel: accum.byDayModel, byTool: accum.byTool, byModelMessages: accum.byModelMessages, costMeasured: accum.costMeasured, recent: accum.recent.slice(0, RECENT_LIMIT) };
+}
+export function processSessionText(accum, state, text) {
+    for (const line of text.split('\n')) {
+        if (!line.trim())
+            continue;
+        try {
+            const row = JSON.parse(line);
+            const parsed = classifySessionLine(row);
+            if (parsed.kind === 'codex_provider') {
+                if (parsed.provider)
+                    state.codexProvider = parsed.provider;
                 continue;
-            try {
-                const row = JSON.parse(line);
-                const codexRow = row;
-                const payload = codexRow.payload;
-                if (payload && typeof payload === 'object') {
-                    if (codexRow.type === 'session_meta' && typeof payload.model_provider === 'string') {
-                        codexProvider = payload.model_provider;
-                    }
-                    else if (payload.type === 'token_count') {
-                        const last = payload.info?.last_token_usage;
-                        if (last) {
-                            ingest(codexProvider ? `codex/${codexProvider}` : 'codex', {
-                                input: last['input_tokens'],
-                                output: last['output_tokens'],
-                                cacheRead: last['cached_input_tokens'],
-                                cacheWrite: last['cache_write_input_tokens'],
-                            }, row.timestamp);
-                            continue;
-                        }
-                    }
-                }
-                const msg = row.message;
-                if (!msg || msg.role !== 'assistant' || !msg.usage)
-                    continue;
-                const model = typeof msg.model === 'string' && msg.model ? msg.model : 'unknown';
-                const explicitDur = msg.duration;
-                const computedDur = (typeof msg.completedAt === 'number' && typeof msg.timestamp === 'number') ? msg.completedAt - msg.timestamp : undefined;
-                const counted = ingest(model, msg.usage, row.timestamp, typeof explicitDur === 'number' ? explicitDur : computedDur, statusOf(msg));
-                const measured = costOf(msg.usage);
-                if (counted && measured !== undefined)
-                    costMeasured += measured;
-                if (!counted)
-                    continue;
-                for (const part of msg.content ?? []) {
-                    if (part?.type === 'toolCall' && typeof part.name === 'string' && part.name) {
-                        const key = part.name === 'bash' ? `bash:${leadBinary(part.arguments?.command)}` : part.name;
-                        byTool[key] = (byTool[key] ?? 0) + 1;
-                    }
-                }
             }
-            catch { /* skip corrupt lines */ }
+            if (parsed.kind === 'token_row') {
+                const model = parsed.provider ? `codex/${parsed.provider}` : (state.codexProvider ? `codex/${state.codexProvider}` : 'codex');
+                ingestSessionRow(accum, model, parsed.usage ?? {}, row.timestamp, undefined, { st: 'completed' });
+                continue;
+            }
+            if (parsed.kind !== 'assistant_row' || !parsed.model || !parsed.usage)
+                continue;
+            ingestSessionRow(accum, parsed.model, parsed.usage, row.timestamp, parsed.durMs, parsed.run, parsed.tools);
         }
+        catch { /* skip corrupt lines */ }
     }
-    recent.sort((a, b) => b.t - a.t);
-    return { messages, totals, byModel, byDay, byDayModel, byTool, byModelMessages, costMeasured, recent: recent.slice(0, RECENT_LIMIT) };
 }
 // Lead binary of a shell string: first segment head past `cd` chains and
 // VAR=x assignments (`cd /x && git status` → `git`). Falls back to `bash`.
 const SKIP_HEADS = ['cd', 'echo', 'export', 'true', 'false'];
-function leadBinary(command) {
+export function leadBinary(command) {
     if (typeof command !== 'string' || !command.trim())
         return 'bash';
     for (const seg of command.split(/&&|;|\n|\|(?!\|)/)) {