@krtclcdy/tersio 2.9.0 → 2.10.0

package/README.md

@@ -1,15 +1,34 @@
-# Tersio ✂️
+![Fontora](/TersioBanner.webp)
 
-[![npm version](https://img.shields.io/npm/v/@krtclcdy%2Ftersio?color=cb0000)](https://www.npmjs.com/package/@krtclcdy/tersio)
-[![release](https://img.shields.io/github/v/release/KurutoDenzeru/tersio?color=7c3aed)](https://github.com/KurutoDenzeru/tersio/releases)
-[![license](https://img.shields.io/badge/license-MIT-6e7681)](./LICENSE)
-[![node](https://img.shields.io/node/v/@krtclcdy%2Ftersio?color=30363d)](https://nodejs.org)
-[![CI](https://github.com/KurutoDenzeru/tersio/actions/workflows/ci.yml/badge.svg)](https://github.com/KurutoDenzeru/tersio/actions)
-[![issues](https://img.shields.io/github/issues/KurutoDenzeru/tersio?color=d97706)](https://github.com/KurutoDenzeru/tersio/issues)
+# ✂️ Tersio — Token-saving OMP Add-ons
 
-Terse replies, compact shell output, and minimal code decisions for [Oh My Pi (OMP)](https://github.com/can1357/oh-my-pi).
+[![npm version](https://shieldcn.dev/npm/@krtclcdy%2Ftersio.svg?variant=branded&size=xs&logo=npm)](https://www.npmjs.com/package/@krtclcdy/tersio)
+[![node](https://shieldcn.dev/badge/node-%3E%3D20.12-22c55e.svg?variant=branded&size=xs&logo=nodedotjs)](https://nodejs.org)
+[![npm downloads](https://shieldcn.dev/npm/dm/@krtclcdy%2Ftersio.svg?variant=branded&size=xs&logo=npm)](https://www.npmjs.com/package/@krtclcdy/tersio)
+[![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)
 
-## Install
+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.
+
+## ✨ Features
+
+- **Caveman** — Shortens replies, keeps technical substance. Modes: `lite`, `full`, `ultra`, `wenyan`.
+- **RTK** — Routes noisy shell commands through the RTK binary for compact output; exact bytes bypass it by policy.
+- **Ponytail** — Minimal, YAGNI-oriented code decisions, from nudge (`lite`) to requirement-challenger (`ultra`).
+- **Combo** — Toggles all three at once. Presets: `off`, `medium`, `balanced`, `max`.
+- **Updater** — `/tersio check` and `/tersio update` cover Ponytail, RTK, and Caveman in-session, with dry-run and backups.
+- **Gain dashboard** — `tersio gain` serves a local-only savings dashboard: cost with currency conversion, activity graph, command tools, and model breakdowns.
+- **Usage ledger** — `tersio usage` prints a ledger-backed savings report for the machine, local only.
+
+## 🧱 Tech Stack
+
+- [TypeScript](https://www.typescriptlang.org/) + [Node.js](https://nodejs.org/): CLI and OMP extensions, compiled to dependency-free JS for install.
+- Vanilla dashboard: dependency-free HTML/CSS/JS export — no build step, no runtime deps.
+- [js-tiktoken](https://github.com/dqbd/tiktoken): Real `o200k_base` BPE token counts for benchmarks (dev only).
+ - [tokscale](https://github.com/junhoyeo/tokscale): Token-bucket convention (input / output / cache read / cache write) for parsing OMP session transcripts.
+ - [EcoLogits](https://github.com/genai-impact/ecologits): CO2 model (v0.8.2 port — per-model params, provider grids, served ÷32 amortization).
+
+## ⚡ Getting Started
 
 **Default** (macOS/Linux/WSL) — one line. Installs the CLI via npm, then runs the main installer (scope + Combo preset menus) in the same pass:
 
@@ -46,19 +65,20 @@ tersio install --combo-default balanced --caveman-default lite --rtk-default on
 
 Defaults apply to fresh sessions only — anything persisted with `/tersio combo`, `/tersio caveman`, or `/tersio rtk` wins. Stored as plugin settings (`omp plugin config get @krtclcdy/tersio comboDefault`).
 
-## What it installs
+One-off use without installing:
 
-| Add-on | What it does |
-|---|---|
-| **Caveman** | Shortens replies, keeps technical substance. Modes: `lite`, `full`, `ultra`, `wenyan` |
-| **RTK** | Routes noisy shell commands through the RTK binary for compact output |
-| **Ponytail** | Minimal, YAGNI-oriented code decisions |
-| **Combo** | Toggles all three at once. Presets: `off`, `medium`, `balanced`, `max` |
-| **Updater** | `/tersio check` and `/tersio update` cover Ponytail, RTK, and Caveman in-session, with dry-run and backups |
+```bash
+npm exec --yes --prefer-online --package=@krtclcdy/tersio@latest -- tersio install
+```
 
-User-level installs also register the package in `~/.omp/plugins` (visible in OMP **Settings → Plugins**), directly through the plugin manifest. Active modes reassert after Ponytail's prompt block on every top-level turn, including after history compaction.
+### Requirements
+
+- [OMP](https://github.com/can1357/oh-my-pi)
+- Node.js 20.12+ with npm
+
+Windows/WSL have separate OMP homes — install from the environment where OMP runs. Inside WSL, `command -v npm` must resolve to a Linux path, not `/mnt/c/`.
 
-## Benchmarks
+## 📊 Benchmarks
 
 Measured savings against the same workload without the modes. Token counts are real `o200k_base` BPE tokens (js-tiktoken), not chars÷4 estimates. Sample protocol, per-sample data, and caveats in [BENCHMARK.md](./BENCHMARK.md).
 
@@ -73,7 +93,7 @@ Measured savings against the same workload without the modes. Token counts are r
 
 Break-even math, balanced preset (caveman full + rtk + ponytail): `⌈overhead ÷ saving-per-turn⌉ = ⌈480 ÷ 306⌉ = 2 turns`, where a mixed turn (reply + `git status`-class command + code task) costs 944 tok baseline vs 638 tok with Tersio — a 0.68× ratio. Every turn after turn 2 nets ≈ −32%. RTK keeps diffs and failing-test output exact by design (−0.4% and −1.5% there), concentrating savings where noise lives.
 
-## CLI
+## 🖥️ CLI
 
 | Command | Purpose |
 |---|---|
@@ -88,7 +108,7 @@ Break-even math, balanced preset (caveman full + rtk + ponytail): `⌈overhead
 
 Flags: `--dry-run`, `--yes`/`-y`, `--verbose`, `--scope`, `--combo-default`/`--caveman-default`/`--rtk-default`/`--ponytail-default`. Legacy `--doctor` / `--uninstall` forms still work.
 
-## Commands reference
+## ⌨️ Commands reference
 
 Everything runs under one root. Bare `/tersio` prints status.
 
@@ -106,7 +126,7 @@ Everything runs under one root. Bare `/tersio` prints status.
 | `/tersio help` | This table |
 | `/caveman`, `/rtk`, `/combo`, `/ai-addons` | Legacy aliases, still work; prefer `/tersio`. |
 
-## Files and backups
+## 🗂️ Files and backups
 
 | What | Path |
 |---|---|
@@ -117,27 +137,24 @@ Everything runs under one root. Bare `/tersio` prints status.
 
 The installer writes `<file>.bak` before replacing an extension source; the updater keeps `rtk.bak` / `rule.md.bak` and restores them if the replacement fails validation.
 
-## Requirements
+User-level installs also register the package in `~/.omp/plugins` (visible in OMP **Settings → Plugins**), directly through the plugin manifest. Active modes reassert after Ponytail's prompt block on every top-level turn, including after history compaction.
 
-- [OMP](https://github.com/can1357/oh-my-pi)
-- Node.js 20.12+ with npm
+## 🛠️ Troubleshooting
 
-Windows/WSL have separate OMP homes — install from the environment where OMP runs. Inside WSL, `command -v npm` must resolve to a Linux path, not `/mnt/c/`.
+**Ponytail or Combo command missing:** run `tersio reinstall` in OMP's environment, restart OMP, then `tersio doctor` (repairs `config.yml` registrations).
 
-One-off use without installing:
+**RTK missing or not executable:** run `tersio reinstall`, then `tersio doctor`. On Linux/macOS: `chmod +x ~/.bun/bin/rtk`.
 
-```bash
-npm exec --yes --prefer-online --package=@krtclcdy/tersio@latest -- tersio install
-```
+**Checksum warning or failure:** the installer aborts on RTK checksum mismatch but warns and continues when checksum metadata is unavailable; `/tersio update rtk` aborts when metadata is missing.
 
-## Troubleshooting
+## 🤝🏻 Contributing
 
-**Ponytail or Combo command missing:** run `tersio reinstall` in OMP's environment, restart OMP, then `tersio doctor` (repairs `config.yml` registrations).
+Contributions are always welcome, whether you're fixing bugs, improving docs, or shipping new features that make the project better for everyone.
 
-**RTK missing or not executable:** run `tersio reinstall`, then `tersio doctor`. On Linux/macOS: `chmod +x ~/.bun/bin/rtk`.
+Check out [Contributing.md](Contributing.md) to learn how to get started and follow the recommended workflow.
 
-**Checksum warning or failure:** the installer aborts on RTK checksum mismatch but warns and continues when checksum metadata is unavailable; `/tersio update rtk` aborts when metadata is missing.
+## ⚖️ License
 
-## License
+This project is released under the MIT License, giving you the freedom to use, modify, and distribute the code with minimal restrictions.
 
-[MIT](./LICENSE)
+For the full legal text, see the [LICENSE](LICENSE) file.

package/cli/banner.js

@@ -0,0 +1,82 @@
+// cli/banner.ts — mini pixel-scissor welcome (16x10 px -> 5 half-block rows).
+// OMP-style launch moment for interactive runs: clack intro + note box.
+// TTY-only and skipped on --dry-run, so piped output stays byte-identical.
+import { intro as clackIntro, note as clackNote } from '@clack/prompts';
+import { PACKAGE_VERSION, dryRun } from './common.js';
+function tty() {
+    return Boolean(process.stdin.isTTY && process.stdout.isTTY);
+}
+// Pixel classes: B/b blades, P pivot, L/R handle rings, l shafts.
+const GRID = [
+    '..BB........bb..',
+    '..BBB......bbb..',
+    '....BB....bb....',
+    '.....BBBbbb.....',
+    '......BPPb......',
+    '....L.lPPl..R...',
+    '..LLLLLl.lRRRRR.',
+    '..LL.LL...RR.RR.',
+    '.LL...LL.RR...RR',
+    '..LL.LL...RR.RR.',
+];
+// [truecolor rgb, ansi256] per class. Left ring red, right ring yellow.
+const PALETTE = {
+    B: ['190;200;210', '252'],
+    b: ['190;200;210', '252'],
+    P: ['212;175;55', '172'],
+    L: ['239;68;68', '196'],
+    R: ['250;204;21', '220'],
+    l: ['190;200;210', '252'],
+};
+function bannerTier() {
+    if (process.env.NO_COLOR !== undefined)
+        return 'plain';
+    if (/truecolor|24bit/i.test(process.env.COLORTERM ?? ''))
+        return 'true';
+    if (/256color/i.test(process.env.TERM ?? ''))
+        return '256';
+    return 'plain';
+}
+function paint(ka, kb, tier) {
+    if (!ka && !kb)
+        return ' ';
+    if (tier === 'plain') {
+        if (ka && kb)
+            return '█';
+        return ka ? '▀' : '▄';
+    }
+    const fg = (k) => (tier === 'true' ? `\x1b[38;2;${PALETTE[k][0]}m` : `\x1b[38;5;${PALETTE[k][1]}m`);
+    const bg = (k) => (tier === 'true' ? `\x1b[48;2;${PALETTE[k][0]}m` : `\x1b[48;5;${PALETTE[k][1]}m`);
+    if (ka && kb && ka === kb)
+        return `${fg(ka)}█\x1b[0m`;
+    if (ka && kb)
+        return `${fg(ka)}${bg(kb)}▀\x1b[0m`;
+    if (ka)
+        return `${fg(ka)}▀\x1b[0m`;
+    return `${fg(kb)}▄\x1b[0m`;
+}
+// Five 16-wide rows. Pure: unit-testable without a TTY.
+function bannerLines(tier = bannerTier()) {
+    const out = [];
+    for (let r = 0; r < GRID.length; r += 2) {
+        let line = '';
+        for (let x = 0; x < GRID[r].length; x++) {
+            const ka = GRID[r][x] === '.' ? null : GRID[r][x];
+            const kb = GRID[r + 1][x] === '.' ? null : GRID[r + 1][x];
+            line += paint(ka, kb, tier);
+        }
+        out.push(line);
+    }
+    return out;
+}
+let shown = false;
+// OMP-style welcome: intro line + note box with art and tips.
+// No-op unless interactive (and never on --dry-run).
+function printWelcome() {
+    if (shown || dryRun || !tty())
+        return;
+    shown = true;
+    clackIntro(`✂ tersio v${PACKAGE_VERSION}`);
+    clackNote(`${bannerLines().join('\n')}\n\n  /tersio combo medium   toggle all three\n  /tersio caveman full    terse replies\n  /tersio rtk on          compact shell output`, 'cut token bloat');
+}
+export { bannerLines, bannerTier, printWelcome };

package/cli/dashboard.js

@@ -11,10 +11,13 @@ import { fileURLToPath } from 'node:url';
 import { readUsage } from '../extensions/shared/usage-ledger.js';
 import { summarizeUsage } from './usage.js';
 import { withInteractiveSpinner } from './interactive.js';
-const TEMPLATE = path.join(path.dirname(fileURLToPath(import.meta.url)), 'dashboard.html');
-const BRAND = path.join(path.dirname(fileURLToPath(import.meta.url)), 'brand.webp');
-async function templateHtml() {
-    return fs.readFile(TEMPLATE, 'utf8');
+const DASH_DIR = path.join(path.dirname(fileURLToPath(import.meta.url)), '..', 'dashboard');
+const TEMPLATE = path.join(DASH_DIR, 'template.html');
+const STYLES = path.join(DASH_DIR, 'styles.css');
+const APP = path.join(DASH_DIR, 'app.js');
+const BRAND = path.join(DASH_DIR, 'brand.webp');
+async function readSegment(file) {
+    return fs.readFile(file, 'utf8');
 }
 async function faviconDataUri() {
     const png = await fs.readFile(BRAND);
@@ -29,22 +32,39 @@ function openBrowser(url) {
 }
 async function runDashboard(options) {
     if (options.exportFile) {
-        const html = await templateHtml();
-        const inline = html
-            .replace("fetch('data.json')", `Promise.resolve({ json: function () { return ${dataJson()}; } })`)
-            .replace('href="brand.webp"', `href="${await faviconDataUri()}"`)
-            .replace('src="brand.webp"', `src="${await faviconDataUri()}"`);
+        const [template, css, js, icon] = await Promise.all([
+            readSegment(TEMPLATE), readSegment(STYLES), readSegment(APP), faviconDataUri(),
+        ]);
+        // Replacer functions throughout: session data routinely contains `$'`
+        // sequences (shell quoting in tool details), which String.replace would
+        // expand as match-suffix patterns and corrupt the file.
+        const inline = template
+            .replace('<link rel="stylesheet" href="styles.css">', () => `<style>\n${css}</style>`)
+            .replace('<script src="app.js" defer></script>', () => `<script>\n${js}</script>`)
+            .replace("fetch('data.json')", () => `Promise.resolve({ json: function () { return ${dataJson()}; } })`)
+            .replace('href="brand.webp"', () => `href="${icon}"`)
+            .replace('src="brand.webp"', () => `src="${icon}"`);
         await fs.writeFile(options.exportFile, inline, 'utf8');
         console.log(`[ok] gain exported → ${options.exportFile}`);
         return;
     }
-    const html = await withInteractiveSpinner('Loading dashboard template', templateHtml);
+    const html = await withInteractiveSpinner('Loading dashboard template', () => readSegment(TEMPLATE));
     const server = http.createServer(async (req, res) => {
         if (req.url === '/data.json') {
             res.writeHead(200, { 'Content-Type': 'application/json' });
             res.end(dataJson());
             return;
         }
+        if (req.url === '/styles.css') {
+            res.writeHead(200, { 'Content-Type': 'text/css; charset=utf-8' });
+            res.end(await readSegment(STYLES));
+            return;
+        }
+        if (req.url === '/app.js') {
+            res.writeHead(200, { 'Content-Type': 'text/javascript; charset=utf-8' });
+            res.end(await readSegment(APP));
+            return;
+        }
         if (req.url === '/brand.webp') {
             try {
                 const png = await fs.readFile(BRAND);

package/cli/install.js

@@ -5,6 +5,7 @@ import path from 'node:path';
 import { fileURLToPath } from 'node:url';
 import { BUN_BIN_DIR, COMBO_PRESET_MODES, EXTENSIONS_KEY_RE, HOME, IS_WINDOWS, OMP_AGENT_DIR, OMP_PLUGINS_DIR, OMP_BIN, PACKAGE_NAME, PACKAGE_VERSION, RTK_BINARY_NAME, SCOPE_MAP, applyUpdate, cavemanDefaultFlag, comboDefaultFlag, command, dryRun, install, ponytailDefaultFlag, profileFlagsGiven, reinstall, rtkDefaultFlag, scopeFlag, verbose, yes, dashboardExport, dashboardPort, debug, ensureExtensionAfterConfigEntry, ensureExtensionInConfig, ensurePonytailConfigValue, execP, parseJsonObject, readPluginsPackage, writeIfChanged, } from './common.js';
 import { ask, askInteractiveChoice, askInteractiveConfirm, closeRL, execNetwork, tty, withInteractiveSpinner, } from './interactive.js';
+import { printWelcome } from './banner.js';
 import { checkForUpdate, runLatestUpdate } from './update.js';
 import { runUninstall } from './uninstall.js';
 import { runDoctor } from './doctor.js';
@@ -549,6 +550,7 @@ let updatePromptDone = false;
 // update offer first (when pending), then a Clack menu over every command.
 // Scripts, pipes, --yes, and --dry-run keep the old straight-to-install path.
 async function runCommandMenu() {
+    printWelcome();
     const newer = await checkForUpdate();
     if (typeof newer === 'string' && !dryRun) {
         const answer = await askInteractiveConfirm(`tersio ${newer} is available (installed ${PACKAGE_VERSION}). Install it now?`);
@@ -619,6 +621,7 @@ async function runInstall() {
         await runCommandMenu();
         return;
     }
+    printWelcome();
     if (reinstall) {
         await runUninstall({ yes: true, removePonytail: false, removeRtk: true });
     }

package/cli/update.js

@@ -5,6 +5,7 @@ import { spawn } from 'node:child_process';
 import { BUN_BIN_DIR, IS_WINDOWS, OMP_AGENT_DIR, OMP_PLUGINS_DIR, PACKAGE_BIN, PACKAGE_NAME, PACKAGE_VERSION, RTK_BINARY_NAME, SCOPE_MAP, dryRun, execP, parseJsonObject, scopeFlag, verbose, } from './common.js';
 import { execNetwork } from './interactive.js';
 import { readTextIfExists } from '../extensions/lib/utils.js';
+import { refreshPrices } from '../extensions/shared/pricing.js';
 import { CAVEMAN_REMOTE_RULE, RTK_RELEASE_API, fetchJson, httpsGet, normalizeRtkVersion, sha256Hex, } from '../extensions/lib/utils.js';
 const UPDATE_CHECK_TTL_MS = 6 * 60 * 60 * 1000;
 function newerThan(a, b) {
@@ -195,6 +196,13 @@ async function runLatestUpdate() {
     try {
         await execInherit(npmCommand, npmCommandArgs);
         console.log('\n=== Update complete ===');
+        if (!dryRun) {
+            try {
+                if (await refreshPrices())
+                    console.log('  [ok] model price table refreshed');
+            }
+            catch { /* pricing is best-effort; update already succeeded */ }
+        }
     }
     catch (e) {
         const err = e;

package/cli/usage.js

@@ -1,5 +1,6 @@
 // cli/usage.ts — ledger + session-token usage report, tokscale-style.
-import { co2Grams, importSessionTokens, priceFor, readUsage, usdCost, } from '../extensions/shared/usage-ledger.js';
+import { co2GramsFor, energyWhFor, importSessionTokens, priceFor, readUsage, 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';
 export function summarizeUsage(rows) {
@@ -14,9 +15,15 @@ export function summarizeUsage(rows) {
     let usd = 0;
     let priced = true;
     let savedUsd = 0;
+    const byModelUsd = {};
+    let co2g = 0;
+    let energyWh = 0;
     for (const [model, t] of Object.entries(session.byModel)) {
         const c = usdCost(t, model);
         usd += c.usd;
+        byModelUsd[model] = c.usd;
+        co2g += co2GramsFor(model, t.output);
+        energyWh += energyWhFor(model, t.output);
         if (!c.priced)
             priced = false;
         savedUsd += (t.cacheRead / 1e6) * priceFor(model).price.input;
@@ -31,50 +38,106 @@ export function summarizeUsage(rows) {
         messages: session.messages,
         tokens: session.totals,
         byModel: session.byModel,
+        byModelUsd,
+        byModelMessages: session.byModelMessages,
         byDay: session.byDay,
         byDayModel: session.byDayModel,
         byTool,
+        rtkGain: readRtkGain(),
         usd,
         priced,
         savedUsd,
         costMeasured: session.costMeasured,
-        co2g: co2Grams(session.totals.output),
+        co2g,
+        energyWh,
         version: PACKAGE_VERSION,
     };
 }
 function fmt(n) {
     return n.toLocaleString('en-US');
 }
+function fmtShort(n) {
+    if (n >= 1e12)
+        return (n / 1e12).toFixed(1) + 'T';
+    if (n >= 1e9)
+        return (n / 1e9).toFixed(1) + 'B';
+    if (n >= 1e6)
+        return (n / 1e6).toFixed(1) + 'M';
+    if (n >= 1e3)
+        return (n / 1e3).toFixed(1) + 'K';
+    return String(Math.round(n));
+}
+function fmtMs(ms) {
+    if (ms < 1000)
+        return `${Math.round(ms)}ms`;
+    return `${(ms / 1000).toFixed(1)}s`;
+}
+function bar(frac, width = 12) {
+    const filled = Math.max(0, Math.min(width, Math.round(frac * width)));
+    return '█'.repeat(filled) + '░'.repeat(width - filled);
+}
+function pad(s, n) {
+    return s.length >= n ? s : s + ' '.repeat(n - s.length);
+}
+// Box-drawing table, plain text (piped-safe, byte-stable). Numeric columns
+// right-align; long cells truncate with an ellipsis.
+function table(headers, rows, right = [], maxW = 32) {
+    const cells = [headers, ...rows].map((r) => r.map((c) => (c.length > maxW ? c.slice(0, maxW - 1) + '…' : c)));
+    const widths = headers.map((_, i) => Math.max(...cells.map((r) => r[i].length)));
+    const line = (l, m, r) => l + widths.map((w) => '─'.repeat(w + 2)).join(m) + r;
+    const row = (cs) => '│ ' + cs.map((c, i) => (right[i] ? c.padStart(widths[i]) : pad(c, widths[i]))).join(' │ ') + ' │';
+    const out = [line('┌', '┬', '┐'), row(cells[0]), line('├', '┼', '┤')];
+    for (const r of cells.slice(1))
+        out.push(row(r));
+    out.push(line('└', '┴', '┘'));
+    return out.map((l) => '  ' + l);
+}
 function printReport(report) {
-    console.log('\n=== Tersio Usage ===');
+    console.log(`\n=== Tersio Usage v${report.version} · ${fmt(report.messages)} msgs ===`);
     if (report.empty) {
         console.log('  No ledger rows or session tokens yet — run session commands first.');
         return;
     }
     const t = report.tokens;
-    console.log(`  Tokens  input ${fmt(t.input)} · output ${fmt(t.output)} · cache read ${fmt(t.cacheRead)} · cache write ${fmt(t.cacheWrite)} (${report.messages} assistant messages)`);
-    console.log(`  Cost    $${report.usd.toFixed(2)}${report.priced ? '' : ' (includes default pricing for unknown models)'} · ~$${report.savedUsd.toFixed(2)} saved by cache (est.) · CO2 ~${report.co2g.toFixed(1)}g (est.)`);
-    const models = Object.entries(report.byModel).sort((a, b) => (b[1].input + b[1].output) - (a[1].input + a[1].output)).slice(0, 5);
+    console.log(`  TOKENS  ${fmt(t.input)} in · ${fmt(t.output)} out · ${fmt(t.cacheRead)} cache read${t.cacheWrite > 0 ? ` · ${fmt(t.cacheWrite)} written` : ''}`);
+    console.log(`  COST    $${report.usd.toFixed(2)}${report.priced ? '' : ' (includes default pricing)'} · ~$${report.savedUsd.toFixed(2)} cache-saved (est.) · ~${report.co2g.toFixed(1)}g CO2 (est.)`);
+    const models = Object.entries(report.byModel).filter(([, b]) => b.input + b.output + b.cacheRead + b.cacheWrite > 0).sort((a, b) => (b[1].input + b[1].output) - (a[1].input + a[1].output)).slice(0, 8);
     if (models.length) {
-        console.log('  By model');
-        for (const [model, b] of models) {
-            console.log(`    ${model}: in ${fmt(b.input)} · out ${fmt(b.output)} · cache r/w ${fmt(b.cacheRead)}/${fmt(b.cacheWrite)}`);
+        console.log('  BY MODEL');
+        const top = models.reduce((m, [, b]) => Math.max(m, b.input + b.output + b.cacheRead + b.cacheWrite), 1);
+        const mrows = models.map(([model, b]) => {
+            const mt = b.input + b.output + b.cacheRead + b.cacheWrite;
+            const hit = b.input + b.cacheRead ? (b.cacheRead / (b.input + b.cacheRead)) * 100 : 0;
+            const usd = report.byModelUsd[model] ?? 0;
+            return [model, `in ${fmt(b.input)}`, `out ${fmt(b.output)}`, `${fmt(b.cacheRead)}/${fmt(b.cacheWrite)}`, `$${usd.toFixed(2)}`, `${hit.toFixed(1)}%`, `${bar(mt / top, 8)} ${fmtShort(mt)}`];
+        });
+        for (const l of table(['Model', 'Input', 'Output', 'Cache r/w', 'USD', 'Hit', 'Share'], mrows, [false, true, true, true, true, true, false])) {
+            console.log(l);
         }
     }
-    if (report.byTool.length) {
-        console.log('  Top tools');
-        for (const [tool, n] of report.byTool) {
-            console.log(`    ${n}× ${tool}`);
-        }
+    const cmdRows = report.byTool.map(([tool, n]) => ({ name: tool, 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 });
     }
-    if (report.total) {
-        console.log('  Activity');
-        for (const [kind, n] of Object.entries(report.byKind)) {
-            console.log(`    ${kind}: ${n}`);
-        }
-        console.log('  Top commands');
-        for (const [detail, n] of report.byDetail) {
-            console.log(`    ${n}× ${detail}`);
+    cmdRows.sort((a, b) => b.count - a.count);
+    if (cmdRows.length) {
+        const g = report.rtkGain;
+        const scope = g.commands
+            ? `  COMMAND TOOLS  ${fmt(report.byTool.length)} tools · ${fmt(g.commands)} commands · ${fmtShort(g.saved)} saved`
+            : '  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,
+            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)) {
+            console.log(l);
         }
     }
 }