@krtclcdy/tersio 2.17.0 → 2.18.0

package/README.md

@@ -1,4 +1,4 @@
-![Banner](/TersioBanner.webp)
+![Banner](/assets/Banner.webp)
 
 # ✂️ Tersio — Token-saving OMP Add-ons
 
@@ -8,7 +8,7 @@
 [![Build](https://shieldcn.dev/github/ci/KurutoDenzeru/tersio.svg?variant=branded&size=xs&logo=githubactions&label=Build)](https://github.com/KurutoDenzeru/tersio/actions)
 [![MIT](https://shieldcn.dev/badge/license-MIT-2563eb.svg?variant=branded&size=xs&logo=opensourceinitiative)](./LICENSE)
 
-Terse replies, compact shell output, and minimal code decisions for [Oh My Pi (OMP)](https://github.com/can1357/oh-my-pi) — one-command combo presets.
+ Terse replies, compact shell output, and minimal code decisions for [Oh My Pi (OMP)](https://github.com/can1357/oh-my-pi) — one-command combo presets.
 
 ## ⚡ Getting Started
 
@@ -80,6 +80,22 @@ Measured savings against the same workload without the modes. Token counts are r
 
 Break-even math, balanced preset (caveman full + rtk + ponytail): a mixed turn costs 941 tok baseline vs 399 with Tersio (0.42×, **−57.6% per turn**). Overhead repays in turn 1 with the bundled floor (464 tok); turn 4 with the real installed Ponytail plugin (v4.9.0, 1,264 tok). RTK concentrates savings where noise lives — hook-wired sessions record **−97.5% on summarized test suites** (rtk `history.db`, 4 runs).
 
+## 📈 Gain Dashboard
+
+`tersio gain --open` serves a local dashboard (127.0.0.1 only) that charts your own savings from `~/.omp/plugins/tersio-usage.jsonl`. Three views:
+
+**Live feed and savings.** Token throughput, cost, savings bento, and recent activity — the top of the dashboard.
+
+![Gain dashboard: live token feed, cost, savings, and activity](/assets/GainHero.webp)
+
+**Top models and recent requests.** Per-model cost breakdown plus the last requests with elapsed time and token speed.
+
+![Gain dashboard: top models with per-model cost, recent requests with elapsed time and token speed](/assets/GainModels.webp)
+
+**Command tools.** Token savings, average rate, and timing per shell tool.
+
+![Gain dashboard: command tools with token savings, average rate, and timing](/assets/GainTools.webp)
+
 ## 🖥️ CLI
 
 | Command | Purpose |

package/cli/usage.js

@@ -1,8 +1,15 @@
 // cli/usage.ts — ledger + session-token usage report, tokscale-style.
+import path from 'node:path';
 import { co2GramsFor, energyWhFor, importSessionTokens, ledgerPath, priceFor, readResetWatermark, readUsage, refreshPricesIfStale, sessionsDir, usdCost, } from '../extensions/shared/usage-ledger.js';
 import { readRtkGain } from '../extensions/shared/rtk-gain.js';
 import { withInteractiveSpinner } from './interactive.js';
 import { PACKAGE_VERSION } from './common.js';
+// RTK's history is machine-wide, so every project's commands have to reach
+// the table or a busy repo silently stands in for all of them. The old cap of
+// 10 rows ranked by tokens saved hid whole projects whose commands save little
+// to nothing; 2000 groups covers a long history (~1.7k today) while still
+// bounding /data.json.
+const RTK_COMMAND_ROWS = 2000;
 export function summarizeUsage(rows) {
     refreshPricesIfStale();
     const byKind = {};
@@ -48,8 +55,11 @@ export function summarizeUsage(rows) {
         byDay: session.byDay,
         byDayModel: session.byDayModel,
         byTool,
-        recent: session.recent,
-        rtkGain: readRtkGain(10, watermark || undefined),
+        recent: session.recent.map((r) => ({
+            ...r,
+            est: usdCost({ input: r.i, output: r.o, cacheRead: r.cr ?? 0, cacheWrite: r.cw ?? 0 }, r.m).usd,
+        })),
+        rtkGain: readRtkGain(RTK_COMMAND_ROWS, watermark || undefined),
         usd,
         priced,
         savedUsd,
@@ -122,28 +132,30 @@ function printReport(report) {
             console.log(l);
         }
     }
-    const cmdRows = report.byTool.map(([tool, n]) => ({ name: tool, count: n, saved: null, avgPct: null, avgMs: null }));
+    const cmdRows = report.byTool.map(([tool, n]) => ({ name: tool, project: '', count: n, saved: null, avgPct: null, avgMs: null }));
     for (const r of report.rtkGain.byCommand) {
-        cmdRows.push({ name: r.command, count: r.count, saved: r.saved, avgPct: r.avgPct, avgMs: r.avgMs });
+        cmdRows.push({ name: r.command, project: r.project, count: r.count, saved: r.saved, avgPct: r.avgPct, avgMs: r.avgMs });
     }
     cmdRows.sort((a, b) => b.count - a.count);
     if (cmdRows.length) {
         const g = report.rtkGain;
+        const projects = new Set(g.byCommand.map((r) => r.project).filter(Boolean));
         const scope = g.commands
-            ? `  COMMAND TOOLS  ${fmt(report.byTool.length)} tools · ${fmt(g.commands)} commands · ${fmtShort(g.saved)} saved`
+            ? `  COMMAND TOOLS  ${fmt(report.byTool.length)} tools · ${fmt(g.commands)} commands · ${fmtShort(g.saved)} saved · ${fmt(projects.size)} projects`
             : '  COMMAND TOOLS';
         console.log(scope);
         const top = cmdRows.reduce((m, r) => Math.max(m, r.count), 1);
         const crows = cmdRows.slice(0, 15).map((r, idx) => [
             String(idx + 1),
             r.name,
+            r.project ? path.basename(r.project) : '–',
             fmt(r.count),
             r.saved === null ? '–' : fmtShort(r.saved),
             r.avgPct === null ? '–' : `${r.avgPct.toFixed(1)}%`,
             r.avgMs === null ? '–' : fmtMs(r.avgMs),
             bar(r.count / top, 8),
         ]);
-        for (const l of table(['#', 'Tool/Command', 'Count', 'Saved', 'Avg%', 'Time', 'Impact'], crows, [true, false, true, true, true, true, false], 30)) {
+        for (const l of table(['#', 'Tool/Command', 'Project', 'Count', 'Saved', 'Avg%', 'Time', 'Impact'], crows, [true, false, false, true, true, true, true, false], 30)) {
             console.log(l);
         }
     }

package/dashboard/app.js

@@ -27,9 +27,25 @@
     var savedFx = JSON.parse(localStorage.getItem('tersio-fx') || 'null');
     if (savedFx && savedFx.rates && savedFx.rates.USD === 1) fx.rates = savedFx.rates;
   } catch (e) { }
+  // Magnitude-aware decimals. Model prices keep falling, so a flat 2dp rounds
+  // real spend down to "$0.00"; small amounts keep enough digits to stay
+  // readable (0.000187, not 0). Larger amounts use the currency's own scale.
+  function moneyDecimals(v, base) {
+    var a = Math.abs(v);
+    if (a >= 0.1 || a === 0) return base;
+    if (a >= 0.001) return Math.max(base, 4);
+    if (a >= 0.00001) return Math.max(base, 6);
+    return Math.max(base, 8);
+  }
   function fxMoney(v) {
-    var c = CURS[fx.cur] || CURS.USD, r = fx.rates[fx.cur] || 1;
-    return c.s + (v * r).toLocaleString('en-US', { minimumFractionDigits: c.d, maximumFractionDigits: c.d });
+    var c = CURS[fx.cur] || CURS.USD, r = fx.rates[fx.cur] || 1, amt = v * r;
+    var d = moneyDecimals(amt, c.d);
+    return c.s + amt.toLocaleString('en-US', { minimumFractionDigits: d, maximumFractionDigits: d });
+  }
+  // Tooltips build innerHTML, and error notes come from providers, so they are
+  // never interpolated raw.
+  function esc(s) {
+    return String(s).replace(/&/g, '&amp;').replace(/</g, '&lt;').replace(/>/g, '&gt;').replace(/"/g, '&quot;');
   }
 
   function countUp(el, target, money) {
@@ -177,7 +193,7 @@
     [/nemotron|nvidia/i, 'NVIDIA', 'nvidia', '#76b900'],
     [/mistral/i, 'Mistral', 'mistralai', '#ff7000'],
     [/claude|anthropic/i, 'Anthropic', 'anthropic', '#d97757'],
-    [/gemini|google/i, 'Google', 'googlegemini', '#8E75B2'],
+    [/gemini|google|gemma/i, 'Google', 'google', '#4285F4'],
   ];
   function vendorOf(model) {
     for (var i = 0; i < PROVIDERS.length; i++) {
@@ -205,12 +221,12 @@
   function dayKey(d) {
     return d.getFullYear() + '-' + String(d.getMonth() + 1).padStart(2, '0') + '-' + String(d.getDate()).padStart(2, '0');
   }
-  function relTime(ts) {
-    var s = Math.max(0, Math.floor((Date.now() - ts) / 1000));
-    if (s < 60) return 'just now';
-    if (s < 3600) return Math.floor(s / 60) + 'm ago';
-    if (s < 86400) return Math.floor(s / 3600) + 'h ago';
-    return Math.floor(s / 86400) + 'd ago';
+  // Absolute local stamp for the When column: "Sep 18, 11:14:08 PM". The
+  // column is sortable, and a relative label made that ordering unreadable.
+  function whenStamp(ts) {
+    var d = new Date(ts);
+    return d.toLocaleString('en-US', { month: 'short', day: 'numeric' }) + ', ' +
+      d.toLocaleTimeString('en-US', { hour: 'numeric', minute: '2-digit', second: '2-digit' });
   }
   // Per-request generation time + output throughput from the message-level
   // `duration` (ms). Missing → '–'. Throughput uses output tokens since
@@ -307,15 +323,39 @@
     function p(n) { return String(n).padStart(2, '0'); }
     return d.getFullYear() + '-' + p(d.getMonth() + 1) + '-' + p(d.getDate()) + ' ' + p(d.getHours()) + ':' + p(d.getMinutes()) + ':' + p(d.getSeconds());
   }
+  // Per-request outcome. OMP records stopReason on every assistant turn and,
+  // on failure, the HTTP errorStatus + errorMessage; toolUse turns are
+  // ordinary completed turns, so only error and aborted stand apart.
+  var STATUS_RANK = { error: 0, aborted: 1, completed: 2 };
+  function statusRank(r) { var k = STATUS_RANK[r.st]; return k === undefined ? 2 : k; }
+  function statusLabel(r) {
+    if (r.st === 'error') return 'error' + (r.code ? ' ' + r.code : '');
+    return r.st === 'aborted' ? 'aborted' : 'completed';
+  }
+  function statusColor(r) { return r.st === 'error' ? '#f87171' : r.st === 'aborted' ? '#fbbf24' : 'var(--accent)'; }
+  // Cost precedence. A recorded charge > 0 is authoritative and shown bare.
+  // A recording of exactly 0 usually means a free/local provider (every row on
+  // a local model reports 0) and would blank the column, so those fall back to
+  // the modeled figure carrying the dashboard's usual "~" estimate marker.
+  // costRecorded() still reports the raw 0 so the tooltip can show both.
+  function costRecorded(r) { return typeof r.usd === 'number'; }
+  function costIsMeasured(r) { return costRecorded(r) && r.usd > 0; }
+  function displayCost(r) { return costIsMeasured(r) ? r.usd : (r.est || 0); }
+
   function tipRecentHTML(r) {
     var tps = r.d !== undefined && r.d > 0 ? r.o / (r.d / 1000) : 0;
-    var h = '<div class="tt">' + shortName(r.m) + '</div><div class="tv">' + stampLocal(r.t) + '</div>';
+    var isEst = !costIsMeasured(r);
+    var h = '<div class="tt">' + esc(shortName(r.m)) + '</div><div class="tv">' + stampLocal(r.t) + '</div>';
     h += '<div class="tr"><span class="sw" style="background:#fb923c"></span><span class="tn">input</span><span class="tvr">' + fmt(r.i) + '</span></div>';
     h += '<div class="tr"><span class="sw" style="background:var(--accent)"></span><span class="tn">output</span><span class="tvr">' + fmt(r.o) + '</span></div>';
-    if ((r.cr || 0) > 0) h += '<div class="tr"><span class="sw" style="background:var(--dim)"></span><span class="tn">cache</span><span class="tvr">' + fmtShort(r.cr) + '</span></div>';
-    if ((r.cw || 0) > 0) h += '<div class="tr"><span class="sw" style="background:var(--dim)"></span><span class="tn">cache write</span><span class="tvr">' + fmtShort(r.cw) + '</span></div>';
+    if ((r.cr || 0) > 0) h += '<div class="tr"><span class="sw" style="background:var(--dim)"></span><span class="tn">cache read</span><span class="tvr">' + fmt(r.cr) + '</span></div>';
+    if ((r.cw || 0) > 0) h += '<div class="tr"><span class="sw" style="background:var(--dim)"></span><span class="tn">cache write</span><span class="tvr">' + fmt(r.cw) + '</span></div>';
     h += '<div class="tr"><span class="sw" style="background:var(--dim)"></span><span class="tn">elapsed</span><span class="tvr">' + fmtDur(r.d) + '</span></div>';
     h += '<div class="tr"><span class="sw" style="background:var(--dim)"></span><span class="tn">speed</span><span class="tvr">' + (r.d !== undefined ? (tps < 10 ? tps.toFixed(1) : Math.round(tps)) + ' tok/s' : '–') + '</span></div>';
+    h += '<div class="tr"><span class="sw" style="background:' + statusColor(r) + '"></span><span class="tn">status</span><span class="tvr">' + statusLabel(r) + '</span></div>';
+    h += '<div class="tr"><span class="sw" style="background:var(--accent)"></span><span class="tn">cost ' + (isEst ? '(est.)' : '(measured)') + '</span><span class="tvr">' + (isEst ? '~' : '') + fxMoney(displayCost(r)) + '</span></div>';
+    if (costRecorded(r)) h += '<div class="tr"><span class="sw" style="background:var(--dim)"></span><span class="tn">charged</span><span class="tvr">' + fxMoney(r.usd) + '</span></div>';
+    if (r.note) h += '<div class="tnote">' + esc(r.note) + '</div>';
     return h;
   }
   // Zone indicators: Lucide face per savings-bento metric. Coarse by design;
@@ -537,18 +577,35 @@
     });
   }
 
-  // 30-day token line: daily totals, smoothed path, hover dot + per-model tip.
-  function wow(model) {
-    var days = allDays().slice(-14), cur = 0, prev = 0;
-    days.forEach(function(d, i) {
-      var v = ((DATA.byDayModel || {})[d] || {})[model] || 0;
-      if (i < days.length - 7) prev += v; else cur += v;
+  var modelPage = 1, modelPer = 10, recentPage = 1, recentPer = 25;
+  // Recent requests default to newest-first, which is how the transcript
+  // arrives; every column is sortable like the command table.
+  var recentSort = { key: 'when', dir: -1 }, recentRows = [];
+  function recentVal(r, key) {
+    if (key === 'model') return r.m.toLowerCase();
+    if (key === 'input') return r.i;
+    if (key === 'output') return r.o;
+    if (key === 'time') return r.d === undefined ? null : r.d;
+    if (key === 'status') return statusRank(r);
+    if (key === 'cost') return displayCost(r);
+    return r.t;
+  }
+  function sortRecent() {
+    var k = recentSort.key, d = recentSort.dir;
+    recentRows.sort(function(a, b) {
+      var av = recentVal(a, k), bv = recentVal(b, k);
+      if (av === null || av === undefined) return 1;
+      if (bv === null || bv === undefined) return -1;
+      if (av < bv) return -d;
+      if (av > bv) return d;
+      return b.t - a.t;
+    });
+    Array.prototype.forEach.call(document.querySelectorAll('#recentTable .thsort'), function(btn) {
+      var on = btn.dataset.sort === k;
+      btn.querySelector('.arr').textContent = on ? (d === 1 ? '↑' : '↓') : '⇅';
+      btn.closest('th').setAttribute('aria-sort', on ? (d === 1 ? 'ascending' : 'descending') : 'none');
     });
-    if (!prev) return cur ? 'new' : '-';
-    var p = Math.round((cur - prev) / prev * 100);
-    return (p >= 0 ? '+' : '') + p + '%';
   }
-  var modelPage = 1, modelPer = 10, recentPage = 1, recentPer = 15;
   function renderModels() {
     var byModel = DATA.byModel || {};
     var tops = topModels(byModel, Object.keys(byModel).length).filter(function(m) { return modelTotal(byModel, m) > 0; });
@@ -556,7 +613,7 @@
     cards.innerHTML = '';
     if (!tops.length) cards.innerHTML = '<div class="empty md:col-span-3">' + emptyState('boxes', 'No models yet', 'Model token totals will appear here once sessions report tokens.') + '</div>';
     tops.slice(0, 3).forEach(function(m, i) {
-      var v = vendorOf(m), d = wow(m);
+      var v = vendorOf(m);
       var card = document.createElement('div');
       card.className = 'modelcard relative p-4 rounded-xl overflow-hidden';
       if (v.svg) {
@@ -593,13 +650,6 @@
       var tot = document.createElement('p'); tot.className = 'mono font-bold text-lg shrink-0'; tot.textContent = fmtShort(modelTotal(byModel, m));
       row.appendChild(badge); row.appendChild(mid); row.appendChild(tot);
       card.appendChild(head); card.appendChild(row);
-      if (d !== 'new') {
-        var delta = document.createElement('p');
-        delta.className = 'mono text-xs mt-3';
-        delta.style.color = d.charAt(0) === '-' ? '#f87171' : 'var(--accent)';
-        delta.textContent = d;
-        card.appendChild(delta);
-      }
       hoverModel(card, m);
       cards.appendChild(card);
     });
@@ -662,8 +712,43 @@
 
   // Union of session tool calls + RTK-metered commands, sortable + paged.
   // Session tools were never metered per command: saved / avg / time show – and sort last.
-  var cmdSort = { key: 'count', dir: -1 }, cmdPage = 1, cmdPer = 15, cmdRows = [];
-  function cmdVal(r, key) { return key === 'name' ? r.name.toLowerCase() : r[key]; }
+  // RTK rows arrive per (command, project) because rtk's history is machine-wide:
+  // fusing projects let one repo's `rtk grep` stand in for every project's.
+  var cmdSort = { key: 'count', dir: -1 }, cmdPage = 1, cmdPer = 15, cmdRows = [], cmdProject = '';
+  function cmdVal(r, key) {
+    if (key === 'name') return r.name.toLowerCase();
+    if (key === 'project') return (r.project || '').toLowerCase();
+    return r[key];
+  }
+  function baseName(p) {
+    if (!p) return '–';
+    var parts = String(p).replace(/\/+$/, '').split('/');
+    return parts[parts.length - 1] || p;
+  }
+  // Options come from the rows themselves so the list follows the machine.
+  // Repaint is skipped while the option set is unchanged: render runs every
+  // 5s and a rebuild would close an open dropdown mid-selection.
+  function paintProjectFilter(all) {
+    var sel = document.getElementById('cmdProject');
+    if (!sel) return;
+    var seen = {};
+    all.forEach(function(r) { if (r.project) seen[r.project] = 1; });
+    var keys = Object.keys(seen).sort();
+    if (cmdProject && keys.indexOf(cmdProject) < 0) cmdProject = '';
+    var sig = keys.join('\n') + '\u0000' + cmdProject;
+    if (sel.dataset.sig === sig) return;
+    sel.dataset.sig = sig;
+    sel.innerHTML = '';
+    var any = document.createElement('option');
+    any.value = ''; any.textContent = 'All projects (' + keys.length + ')';
+    sel.appendChild(any);
+    keys.forEach(function(k) {
+      var o = document.createElement('option');
+      o.value = k; o.textContent = baseName(k); o.title = k;
+      sel.appendChild(o);
+    });
+    sel.value = cmdProject;
+  }
   function sortCmd() {
     var k = cmdSort.key, d = cmdSort.dir;
     cmdRows.sort(function(a, b) {
@@ -682,12 +767,14 @@
   }
   function renderCmd() {
     var g = (DATA.rtkGain || {});
-    cmdRows = (DATA.byTool || []).map(function(r) {
-      return { name: r[0], count: r[1], saved: null, avgPct: null, avgMs: null };
+    var all = (DATA.byTool || []).map(function(r) {
+      return { name: r[0], project: '', count: r[1], saved: null, avgPct: null, avgMs: null };
     });
     (g.byCommand || []).forEach(function(r) {
-      cmdRows.push({ name: r.command, count: r.count, saved: r.saved, avgPct: r.avgPct, avgMs: r.avgMs });
+      all.push({ name: r.command, project: r.project || '', count: r.count, saved: r.saved, avgPct: r.avgPct, avgMs: r.avgMs });
     });
+    paintProjectFilter(all);
+    cmdRows = cmdProject ? all.filter(function(r) { return r.project === cmdProject; }) : all;
     sortCmd();
     var pages = Math.max(1, Math.ceil(cmdRows.length / cmdPer));
     if (cmdPage > pages) cmdPage = pages;
@@ -702,6 +789,7 @@
       tr.className = 'mrow' + (i < Math.min(cmdRows.length - start, cmdPer) - 1 ? ' rowline' : '');
       tr.innerHTML = '<td class="text-right pr-3 py-2.5 mono text-xs w-10" style="color: var(--dim)"></td>' +
         '<td class="py-2.5 pr-3 truncate" style="max-width: 280px"></td>' +
+        '<td class="py-2.5 pr-3 truncate" style="max-width: 120px; color: var(--dim)"></td>' +
         '<td class="text-right py-2.5 pr-3 font-bold"></td>' +
         '<td class="text-right py-2.5 pr-3 font-bold"></td>' +
         '<td class="text-right py-2.5 pr-3" style="color: var(--accent)"></td>' +
@@ -711,11 +799,13 @@
       tds[0].textContent = String(n + 1).padStart(2, '0');
       tds[1].textContent = r.name;
       tds[1].title = r.name;
-      tds[2].textContent = fmt(r.count);
-      tds[3].textContent = r.saved === null ? '–' : fmtShort(r.saved);
-      tds[4].textContent = r.avgPct === null ? '–' : r.avgPct.toFixed(1) + '%';
-      tds[5].textContent = r.avgMs === null || r.avgMs === undefined ? '–' : fmtMs(r.avgMs);
-      tds[6].firstChild.firstChild.style.width = r.count ? Math.round(r.count / max * 100) + '%' : '0';
+      tds[2].textContent = baseName(r.project);
+      tds[2].title = r.project || 'session tool call (no project recorded)';
+      tds[3].textContent = fmt(r.count);
+      tds[4].textContent = r.saved === null ? '–' : fmtShort(r.saved);
+      tds[5].textContent = r.avgPct === null ? '–' : r.avgPct.toFixed(1) + '%';
+      tds[6].textContent = r.avgMs === null || r.avgMs === undefined ? '–' : fmtMs(r.avgMs);
+      tds[7].firstChild.firstChild.style.width = r.count ? Math.round(r.count / max * 100) + '%' : '0';
       body.appendChild(tr);
     });
     document.getElementById('cmdTable').style.display = cmdRows.length ? '' : 'none';
@@ -792,9 +882,24 @@
       });
     });
     bindPerPage('#cmdPager', function() { return cmdPer; }, function(n) { cmdPer = n; cmdPage = 1; }, renderCmd);
+    var pf = document.getElementById('cmdProject');
+    if (pf) pf.addEventListener('change', function() { cmdProject = pf.value; cmdPage = 1; renderCmd(); });
     bindPerPage('section[aria-label="All models"]', function() { return modelPer; }, function(n) { modelPer = n; modelPage = 1; }, renderModels);
     bindPerPage('section[aria-label="Recent requests"]', function() { return recentPer; }, function(n) { recentPer = n; recentPage = 1; }, renderRecent);
   }
+  function bindRecentTable() {
+    if (bindRecentTable.done) return;
+    bindRecentTable.done = true;
+    Array.prototype.forEach.call(document.querySelectorAll('#recentTable .thsort'), function(btn) {
+      btn.addEventListener('click', function() {
+        var k = btn.dataset.sort;
+        if (recentSort.key === k) recentSort.dir = -recentSort.dir;
+        else { recentSort.key = k; recentSort.dir = k === 'model' || k === 'status' ? 1 : -1; }
+        recentPage = 1;
+        renderRecent();
+      });
+    });
+  }
   function fmtMs(ms) {
     if (ms < 1000) return Math.round(ms) + 'ms';
     return (ms / 1000).toFixed(1) + 's';
@@ -981,6 +1086,7 @@
     renderStrip(t);
     bindGraphTabs();
     bindCmdTable();
+    bindRecentTable();
     renderGraph(d.byDay || {});
     renderModels();
     renderRecent();
@@ -993,36 +1099,71 @@
     }
     observe();
   }
+  // shadcn/ui badge: default/secondary/destructive/outline carry the meaning,
+  // the label carries the detail. Built as DOM nodes so provider error notes
+  // never reach innerHTML.
+  function statusBadge(r) {
+    var b = document.createElement('span');
+    b.className = 'badge';
+    if (r.st === 'error') {
+      b.classList.add('destructive');
+      b.textContent = statusLabel(r);
+      b.title = 'error' + (r.code ? ' ' + r.code : '') + (r.note ? ' — ' + r.note : '');
+    } else if (r.st === 'aborted') {
+      b.classList.add('outline');
+      b.textContent = 'aborted';
+      b.title = r.note || 'Interrupted by user';
+    } else {
+      b.classList.add('secondary');
+      b.textContent = 'completed';
+      if (r.note) b.title = r.note;
+    }
+    return b;
+  }
   function renderRecent() {
     var body = document.getElementById('recent');
     body.innerHTML = '';
     var all = DATA.recent || [];
-    var recentPages = Math.max(1, Math.ceil(all.length / recentPer));
+    recentRows = all.slice();
+    sortRecent();
+    var recentPages = Math.max(1, Math.ceil(recentRows.length / recentPer));
     if (recentPage > recentPages) recentPage = recentPages;
     var recentStart = (recentPage - 1) * recentPer;
-    var rows = all.slice(recentStart, recentStart + recentPer);
+    var rows = recentRows.slice(recentStart, recentStart + recentPer);
     rows.forEach(function(r, i) {
       var v = vendorOf(r.m);
+      var measured = costIsMeasured(r);
       var tr = document.createElement('tr');
-      tr.className = 'rrow' + (i < Math.min(all.length - recentStart, recentPer) - 1 ? ' rowline' : '');
-      var dot = '<span style="display:inline-block;width:8px;height:8px;border-radius:99px;background:' + v.color + ';margin-right:8px"></span>';
+      tr.className = 'rrow' + (i < Math.min(recentRows.length - recentStart, recentPer) - 1 ? ' rowline' : '');
       tr.innerHTML = '<td class="py-2.5 pr-3 truncate" style="min-width: 0"></td>' +
-        '<td class="text-right py-2.5 pr-3 whitespace-nowrap"></td>' +
+        '<td class="text-right py-2.5 pr-3 whitespace-nowrap" style="color:#fb923c"></td>' +
+        '<td class="text-right py-2.5 pr-3 whitespace-nowrap" style="color:var(--accent)"></td>' +
+        '<td class="text-right py-2.5 pr-3 whitespace-nowrap" style="color:var(--dim)">–</td>' +
+        '<td class="py-2.5 pr-3 whitespace-nowrap"></td>' +
         '<td class="text-right py-2.5 pr-3 whitespace-nowrap"></td>' +
         '<td class="text-right py-2.5 whitespace-nowrap" style="color: var(--dim)"></td>';
       var tds = tr.children;
+      var dot = '<span style="display:inline-block;width:8px;height:8px;border-radius:99px;background:' + v.color + ';margin-right:8px"></span>';
       tds[0].innerHTML = dot + '<span></span>';
       tds[0].querySelector('span:last-child').textContent = r.m;
-      tds[1].innerHTML = '<span style="color:#fb923c"></span> <span style="color:var(--accent)"></span>';
-      tds[1].children[0].textContent = fmt(r.i) + '↑';
-      tds[1].children[1].textContent = fmt(r.o) + '↓';
-      tds[2].textContent = speedText(r);
-      tds[3].textContent = relTime(r.t);
+      tds[1].textContent = fmt(r.i);
+      tds[2].textContent = fmt(r.o);
+      tds[3].textContent = speedText(r);
+      tds[4].appendChild(statusBadge(r));
+      tds[5].textContent = (measured ? '' : '~') + fxMoney(displayCost(r));
+      tds[5].title = measured
+        ? 'measured — charged by the provider'
+        : (costRecorded(r)
+          ? 'est. — provider charged ' + fxMoney(r.usd) + ' (free or local), modeled from tokens'
+          : 'est. — modeled from tokens');
+      if (measured) tds[5].style.color = 'var(--ink)';
+      tds[6].textContent = whenStamp(r.t);
+      tds[6].title = stampLocal(r.t);
       hoverRecent(tr, r);
       body.appendChild(tr);
     });
-    document.getElementById('recentCount').textContent = all.length ? all.length + ' requests' : '';
-    paintPager('recentPages', 'recentRange', recentPage, recentPer, all.length, function(p) { recentPage = p; renderRecent(); });
+    document.getElementById('recentCount').textContent = all.length ? recentRows.length + ' requests' : '';
+    paintPager('recentPages', 'recentRange', recentPage, recentPer, recentRows.length, function(p) { recentPage = p; renderRecent(); });
     document.getElementById('recentTable').style.display = all.length ? '' : 'none';
     document.getElementById('emptyRecent').classList.toggle('hidden', all.length > 0);
   }

package/dashboard/styles.css

@@ -41,6 +41,18 @@
     --danger: #f87171; --danger-border: rgba(248, 113, 113, .3); --danger-soft: rgba(248, 113, 113, .07);
     --shadow-xs: 0 1px 2px 0 rgb(0 0 0 / 0.55);
   }
+  html[data-theme="dark"] .modelsSection {
+    --panel: #ffffff;
+    --ink: #18181b;
+    --dim: #52525b;
+    --line: rgba(24, 24, 27, .12);
+    --track: rgba(24, 24, 27, .08);
+    --cell-0: rgba(24, 24, 27, .07);
+    --accent-soft: rgba(4, 120, 87, .12);
+    --accent: #047857;
+    color-scheme: light;
+  }
+  html[data-theme="dark"] .modelsSection .brandmark.placeholder { background: #fff !important; color: #000 !important; }
   .ticker { animation: tick 36s linear infinite; will-change: transform; }
   .ticker:hover { animation-play-state: paused; }
   @keyframes tick { from { transform: translateX(0); } to { transform: translateX(-50%); } }
@@ -58,6 +70,16 @@
   .pill { display: inline-flex; align-items: center; gap: 4px; border-radius: 999px; padding: 3px 10px; font-size: 11px; white-space: nowrap; }
   .pill.good { background: var(--accent-soft); color: var(--accent); }
   .pill.bad { background: rgba(248, 113, 113, .12); color: #f87171; }
+  /* .pill.flat was referenced by the est. / served chips but never defined, so
+     they rendered as bare text. Muted fill matches the badge family. */
+  .pill.flat { background: var(--track); color: var(--dim); }
+  /* shadcn/ui badge variants, used for per-request run status. Neutral by
+     default so the destructive (error) badge is the only thing that shouts. */
+  .badge { display: inline-flex; align-items: center; border-radius: 999px; padding: 2px 9px; font-size: 11px; line-height: 1.55; white-space: nowrap; border: 1px solid transparent; }
+  .badge.secondary { background: var(--track); color: var(--dim); }
+  .badge.outline { border-color: var(--line); color: var(--ink); background: transparent; }
+  .badge.destructive { background: var(--danger-soft); color: var(--danger); border-color: var(--danger-border); }
+  #tip .tnote { margin-top: 8px; padding-top: 8px; border-top: 1px solid var(--line); font-size: 11px; line-height: 1.5; color: var(--dim); white-space: normal; word-break: break-word; }
   .zface { display: inline-block; vertical-align: -2px; width: 14px; height: 14px; }
   .zface.good { color: var(--accent); }
   .zface.warn { color: #fbbf24; }
@@ -101,7 +123,7 @@
   .seg button.on { background: var(--accent-soft); color: var(--ink); }
   .seg button:not(.on):hover { color: var(--ink); }
   .mrow { transition: background .25s; }
-  .mrow:hover { box-shadow: var(--shadow-xs); }
+  .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; }
@@ -122,6 +144,7 @@
   .cell.l3 { background: var(--cell-3); } .cell.l4 { background: var(--cell-4); }
   .brandmark { width: 34px; height: 34px; border-radius: 10px; display: grid; place-items: center; flex-shrink: 0; color: #fff; }
   .brandmark.placeholder { background: transparent !important; border: 1px solid var(--line); color: var(--dim); }
+html[data-theme="dark"] .brandmark.placeholder { background: #fff !important; color: #000 !important; }
   .brandmark img { width: 18px; height: 18px; }
   .brandmark svg { width: 18px; height: 18px; display: block; }
   .brandmark.sm { width: 28px; height: 28px; border-radius: 8px; }
@@ -154,7 +177,7 @@
   .scrollarea::-webkit-scrollbar-thumb { background: var(--line); border-radius: 99px; }
   .scrollarea::-webkit-scrollbar-track { background: transparent; }
   .rrow { transition: background .2s; cursor: pointer; }
-  .rrow:hover { box-shadow: var(--shadow-xs); }
+  .rrow:hover { background: var(--track); box-shadow: var(--shadow-xs); }
   #recentTable thead th { position: sticky; top: 0; background: var(--panel); z-index: 1; }
   #tip .tvr { flex-shrink: 0; white-space: nowrap; font-variant-numeric: tabular-nums; }
   .modelcard { transition: background .25s; }

package/dashboard/template.html

@@ -193,20 +193,18 @@
   </section>
 
   <!-- Top models: 3 columns -->
-  <section class="mt-8" aria-label="Top models">
+  <section class="mt-8 modelsSection" aria-label="Top models">
     <div class="flex items-center gap-2 mb-1">
       <i data-lucide="cpu" class="size-4" style="color: var(--accent)"></i>
       <h2 class="display font-bold tracking-tight text-xl truncate min-w-0">Top models</h2>
       <span class="mono text-xs ml-auto" style="color: var(--dim)">usage across sessions</span>
     </div>
-    <p class="mono text-xs mb-4" style="color: var(--dim)">week-over-week vs prior 7 days</p>
     <div class="grid grid-cols-1 md:grid-cols-3 gap-3" id="modelCards"></div>
   </section>
 
 
-  <!-- Models + recent: twin cards -->
-  <div class="rise grid grid-cols-12 grid-flow-dense gap-3 mt-8">
-  <section class="col-span-12 lg:col-span-6 rounded-xl p-5 overflow-hidden flex flex-col" style="border: 1px solid var(--line); background: var(--panel)" aria-label="All models">
+  <!-- Models: own full-width section (split out of the old 50/50 twin card) -->
+<section class="rise mt-8 rounded-xl p-5 overflow-hidden flex flex-col modelsSection" style="border: 1px solid var(--line); background: var(--panel)" aria-label="All models">
     <div class="flex items-center gap-2 mb-1">
       <i data-lucide="layers" class="size-4" style="color: var(--accent)"></i>
       <h2 class="display font-bold tracking-tight text-xl truncate min-w-0">Models</h2>
@@ -230,22 +228,29 @@
       <p class="empty-desc">Model token totals will appear here once sessions report tokens.</p>
     </div>
   </section>
-  <section class="col-span-12 lg:col-span-6 rounded-xl p-5 overflow-hidden flex flex-col" style="border: 1px solid var(--line); background: var(--panel)" aria-label="Recent requests">
+
+  <!-- Recent requests: full-width, sitting with the other per-request views
+       right after Models. When is absolutely stamped, so the column reads as
+       a real timeline and sorts honestly against Time. -->
+  <section class="rise mt-8 rounded-xl p-5 overflow-hidden flex flex-col" style="border: 1px solid var(--line); background: var(--panel); scroll-margin-top: 90px" aria-label="Recent requests">
     <div class="flex items-center gap-2 mb-1">
       <i data-lucide="history" class="size-4" style="color: var(--accent)"></i>
       <h2 class="display font-bold tracking-tight text-xl truncate min-w-0">Recent requests</h2>
       <span class="mono text-xs ml-auto truncate shrink-0" style="color: var(--dim)" id="recentCount"></span>
     </div>
-    <p class="mono text-xs mb-4 truncate" style="color: var(--dim)" title="Time = elapsed time with the model; Speed = output tokens per second">latest assistant messages · ⏱ elapsed · ⚡ tok/s</p>
-    <div class="scrollarea overflow-x-auto">
+    <p class="mono text-xs mb-4 truncate" style="color: var(--dim)" title="Time = elapsed time with the model; Speed = output tokens per second">latest assistant messages · local time · sort any column · cost is measured when the host recorded it</p>
+    <div class="scrollarea overflow-x-auto" style="max-height: 560px">
       <table class="w-full mono text-[13px]" id="recentTable">
-        <colgroup><col><col style="width:120px"><col style="width:110px"><col style="width:80px"></colgroup>
+        <colgroup><col><col style="width:96px"><col style="width:96px"><col style="width:120px"><col style="width:116px"><col style="width:120px"><col style="width:158px"></colgroup>
         <thead>
           <tr class="text-left text-[11px] uppercase tracking-[0.14em]" style="color: var(--dim)">
-            <th class="font-normal py-2 pr-3">Model</th>
-            <th class="font-normal text-right py-2 pr-3">In / Out</th>
-            <th class="font-normal text-right py-2 pr-3" title="Elapsed time with the model / output token speed">Time</th>
-            <th class="font-normal text-right py-2">When</th>
+            <th class="font-normal py-2 pr-3" aria-sort="none"><button class="thsort" data-sort="model">Model <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="input">Input <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="output">Output <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="time" title="Elapsed time with the model / output token speed">Time <span class="arr">⇅</span></button></th>
+            <th class="font-normal py-2 pr-3" aria-sort="none"><button class="thsort" data-sort="status">Status <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="cost">Cost <span class="arr">⇅</span></button></th>
+            <th class="font-normal text-right py-2" aria-sort="none"><button class="thsort num" data-sort="when" title="Local timestamp: month day, hour:minute:second">When <span class="arr">⇅</span></button></th>
           </tr>
         </thead>
         <tbody id="recent"></tbody>
@@ -260,30 +265,33 @@
       <span id="recentRange">Showing 0 of 0</span>
       <span class="seg flex items-center gap-1 p-1 rounded-[10px]" style="border: 1px solid var(--line)" role="group" aria-label="Requests per page">
         <button data-pp="10" class="px-2.5 py-1" role="button">10</button>
-        <button data-pp="15" class="on px-2.5 py-1" role="button">15</button>
-        <button data-pp="25" class="px-2.5 py-1" role="button">25</button>
+        <button data-pp="15" class="px-2.5 py-1" role="button">15</button>
+        <button data-pp="25" class="on px-2.5 py-1" role="button">25</button>
         <button data-pp="50" class="px-2.5 py-1" role="button">50</button>
       </span>
       <span class="ml-auto flex items-center gap-1" id="recentPages" role="navigation" aria-label="Recent pages"></span>
     </div>
   </section>
-  </div>
 
   <!-- Command tools: own card, header outside like Models -->
   <section id="tools" class="rise mt-8 rounded-xl p-5 overflow-hidden" style="border: 1px solid var(--line); background: var(--panel); scroll-margin-top: 90px" aria-label="Command tools">
     <div class="flex items-center gap-2 mb-1">
       <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>
-      <span class="mono text-xs ml-auto truncate min-w-0" style="color: var(--dim)" id="toolsScope">tool calls in sessions</span>
+      <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: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:120px"><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/caveman-session/index.js

@@ -1,6 +1,6 @@
 import { readFileSync } from 'node:fs';
 import { fileURLToPath } from 'node:url';
-import { activeModesSummary, asPromptArray, getSharedComboState, isComboPresetActive, isOmpSubagentPrompt, lastCustomValue, normalizeInputCommand, normalizeMode, paintStatusBar, reconcileSharedComboEntries, sessionEntries, setSharedComboListener, setSharedComboMode } from '../shared/session-state.js';
+import { activeModesSummary, asPromptArray, getSharedComboState, isComboPresetActive, isOmpSubagentPrompt, lastCustomValue, normalizeInputCommand, normalizeMode, paintStatusBar, paintableCtx, reconcileSharedComboEntries, sessionEntries, setSharedComboListener, setSharedComboMode } from '../shared/session-state.js';
 import { dirname, join } from 'node:path';
 import { readCavemanDefault } from '../shared/plugin-settings.js';
 const CAVERN_DIR = dirname(fileURLToPath(import.meta.url));
@@ -46,9 +46,8 @@ export default function cavemanSessionExtension(pi) {
     let isActive = false;
     let lastCtx = undefined;
     function syncStatus(ctx) {
-        if (ctx)
-            lastCtx = ctx;
-        const c = ctx || lastCtx;
+        lastCtx = paintableCtx(lastCtx, ctx);
+        const c = lastCtx;
         if (!c?.ui?.setStatus)
             return;
         // Combo owns the bar when any preset is active; keep ours empty to avoid duplication.

package/extensions/combo-toggle/index.js

@@ -3,7 +3,7 @@
 import os from 'node:os';
 import path from 'node:path';
 import { createRequire } from 'node:module';
-import { activeModesSummary, asPromptArray, COMBO_LEVELS, getSharedComboState, isComboPresetActive, isOmpSubagentPrompt, normalizeComboLevel, reconcileSharedComboEntries, sessionEntries, setSharedComboLevel, setSharedComboListener, setSharedComboMode, systemPromptIncludes, } from '../shared/session-state.js';
+import { activeModesSummary, asPromptArray, COMBO_LEVELS, getSharedComboState, isComboPresetActive, isOmpSubagentPrompt, normalizeComboLevel, paintableCtx, reconcileSharedComboEntries, sessionEntries, setSharedComboLevel, setSharedComboListener, setSharedComboMode, systemPromptIncludes, } from '../shared/session-state.js';
 import { readComboDefault, readPonytailDefault } from '../shared/plugin-settings.js';
 const require = createRequire(import.meta.url);
 const PONYTAIL_FALLBACK_INTENSITY = {
@@ -31,9 +31,8 @@ export default function comboToggleExtension(pi) {
     pi.setLabel?.('Combo session toggle (all 3 add-ons)');
     let lastCtx = undefined;
     function syncStatus(ctx) {
-        if (ctx)
-            lastCtx = ctx;
-        const c = ctx || lastCtx;
+        lastCtx = paintableCtx(lastCtx, ctx);
+        const c = lastCtx;
         if (!c?.ui?.setStatus)
             return;
         // Single unified bar replaces the three per-extension bars while a preset is

package/extensions/rtk-session/index.js

@@ -1,6 +1,6 @@
 import os from 'node:os';
 import path from 'node:path';
-import { activeModesSummary, asPromptArray, getSharedComboState, isComboPresetActive, isOmpSubagentPrompt, lastCustomValue, normalizeInputCommand, paintStatusBar, reconcileSharedComboEntries, sessionEntries, setSharedComboListener, setSharedComboMode } from '../shared/session-state.js';
+import { activeModesSummary, asPromptArray, getSharedComboState, isComboPresetActive, isOmpSubagentPrompt, lastCustomValue, normalizeInputCommand, paintStatusBar, paintableCtx, reconcileSharedComboEntries, sessionEntries, setSharedComboListener, setSharedComboMode } from '../shared/session-state.js';
 import { readRtkDefault } from '../shared/plugin-settings.js';
 const DEFAULT_ENABLED = false;
 function asBoolean(value) {
@@ -27,9 +27,8 @@ export default function rtkSessionExtension(pi) {
     let isActive = false;
     let lastCtx = undefined;
     function syncStatus(ctx) {
-        if (ctx)
-            lastCtx = ctx;
-        const c = ctx || lastCtx;
+        lastCtx = paintableCtx(lastCtx, ctx);
+        const c = lastCtx;
         if (!c?.ui?.setStatus)
             return;
         // Combo owns the bar when any preset is active; keep ours empty to avoid duplication.

package/extensions/shared/rtk-gain.js

@@ -7,11 +7,25 @@
 // Caveman and Ponytail have no per-command counters (instruction-following
 // 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.
 import { execFileSync } from 'node:child_process';
 import fs from 'node:fs';
 import os from 'node:os';
 import path from 'node:path';
 const EMPTY = { commands: 0, saved: 0, input: 0, avgPct: 0, totalMs: 0, byCommand: [] };
+// RTK stores the whole command line, and `rtk ls -d` with a long path list
+// runs to tens of KB. The table shows one clipped cell, so bound the string
+// before it crosses the sqlite3 CLI and lands in every /data.json poll.
+const MAX_CMD_CHARS = 200;
+// The query() reader is line- and tab-delimited, and RTK stores heredocs and
+// `node -e` scripts verbatim (~67 rows here), so one logical row can arrive as
+// several lines and derail every row after it. Fold whitespace into spaces
+// first: the stored command keeps its newlines, only the read view flattens.
+const CMD_ONE_LINE = `replace(replace(replace(rtk_cmd, char(10), ' '), char(13), ' '), char(9), ' ')`;
 export function rtkDbPath() {
     const override = process.env.TERSIO_RTK_DB;
     if (override)
@@ -44,8 +58,9 @@ 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 rtk_cmd, COUNT(*), SUM(saved_tokens), AVG(savings_pct), AVG(exec_time_ms) 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]) => ({
+        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]) => ({
             command,
+            project,
             count: Number(count) || 0,
             saved: Number(savedRow) || 0,
             avgPct: Number(pct) || 0,

package/extensions/shared/session-state.js

@@ -79,6 +79,21 @@ export function paintStatusBar(ui, key, emoji, label, isActive) {
     const indicator = isActive && theme?.fg ? theme.fg('accent', emoji) : emoji;
     ui?.setStatus?.(key, theme?.fg ? `${indicator} ${theme.fg('muted', label)}` : `${indicator} ${label}`);
 }
+// Which context a status bar should remember to paint through.
+//
+// A UI-less event — a headless child session_start, or a top-level
+// session_start that fires before the TUI attaches — must never become the
+// remembered context. Two things went wrong when it did: the old
+// `ctx || lastCtx` fallback only triggered for a *falsy* ctx, so a truthy
+// ctx without `ui` returned early anyway, and remembering it destroyed the one
+// paintable context we had. Every later bare syncStatus() then went mute —
+// and the bare call is the bridge-listener path, which is how a mode change
+// made by a sibling extension reaches this bar. The symptom is a bar frozen on
+// a preset the session no longer has: it shows "combo BALANCED" while caveman
+// and rtk are already off.
+export function paintableCtx(remembered, next) {
+    return next?.ui?.setStatus ? next : remembered;
+}
 // Last-wins scan for a custom session entry; skips entries whose value fails
 // to parse so a corrupt write never shadows an older valid one.
 export function lastCustomValue(entries, customType, pick) {

package/extensions/shared/usage-ledger.js

@@ -56,6 +56,36 @@ function zeroBreakdown() {
 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) {
+    const c = usage.cost;
+    if (typeof c === 'number')
+        return Number.isFinite(c) ? c : undefined;
+    if (c && typeof c === 'object') {
+        const total = c.total;
+        if (typeof total === 'number' && Number.isFinite(total))
+            return total;
+    }
+    return undefined;
+}
+// First line only: real messages carry multi-line provider errors, and this
+// ends up in a tooltip.
+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)
+        : undefined;
+    if (stop === 'error' || msg.isError === true) {
+        const code = typeof msg.errorStatus === 'number' && Number.isFinite(msg.errorStatus) ? msg.errorStatus : undefined;
+        return { st: 'error', code, note };
+    }
+    if (stop === 'aborted')
+        return { st: 'aborted', note };
+    return { st: 'completed', note };
+}
 function addInto(into, u) {
     for (const k of ['input', 'output', 'cacheRead', 'cacheWrite']) {
         const v = u[k];
@@ -104,6 +134,10 @@ function walkJsonl(dir, out, cap) {
             out.push(full);
     }
 }
+// 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() {
     const watermark = readResetWatermark();
     const byModel = {};
@@ -124,7 +158,7 @@ export function importSessionTokens() {
     let codexProvider = null;
     const recent = [];
     // Rows from before the reset watermark (and rows with no usable timestamp,
-    function ingest(model, usage, ts, durMs) {
+    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;
@@ -133,8 +167,22 @@ export function importSessionTokens() {
         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))
-            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) });
+        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();
@@ -184,9 +232,12 @@ export function importSessionTokens() {
                 if (!msg || msg.role !== 'assistant' || !msg.usage)
                     continue;
                 const model = typeof msg.model === 'string' && msg.model ? msg.model : 'unknown';
-                const counted = ingest(model, msg.usage, row.timestamp, msg.duration);
-                if (counted && typeof msg.usage.cost === 'number' && Number.isFinite(msg.usage.cost))
-                    costMeasured += msg.usage.cost;
+                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 ?? []) {
@@ -200,7 +251,7 @@ export function importSessionTokens() {
         }
     }
     recent.sort((a, b) => b.t - a.t);
-    return { messages, totals, byModel, byDay, byDayModel, byTool, byModelMessages, costMeasured, recent: recent.slice(0, 25) };
+    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`.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@krtclcdy/tersio",
-  "version": "2.17.0",
+  "version": "2.18.0",
   "description": "✂️ Token-saving OMP add-ons: terse Caveman replies, compact RTK shell output, lean Ponytail code calls — one-command combo presets.",
   "keywords": [
     "omp",