@krtclcdy/tersio 2.24.0 → 2.25.0

package/cli/uninstall.js

@@ -1,14 +1,13 @@
 // cli/uninstall.ts — remove managed extensions, plugins, and binaries.
 import { promises as fs } from 'node:fs';
 import path from 'node:path';
-import { BUN_BIN_DIR, OMP_AGENT_DIR, OMP_PLUGINS_DIR, PACKAGE_NAME, RTK_BINARY_NAME, args, dryRun, keepPonytail, removePonytail, removeRtk, yes, debug, writeConfigLines, } from './common.js';
-import { askInteractiveChoice, closeRL, confirmDestructive, tty } from './interactive.js';
+import { BUN_BIN_DIR, HOME, OMP_AGENT_DIR, OMP_PLUGINS_DIR, PACKAGE_NAME, RTK_BINARY_NAME, args, dryRun, keepPonytail, removePonytail, removeRtk, yes, debug, writeConfigLines, } from './common.js';
+import { askInteractiveChoice, closeRL, confirmDestructive, tty, sayTagged } from './interactive.js';
 import { detectHosts, hostHint, hostLabel, parseHostArg } from './hosts.js';
 import { findHoistedPackage, piAgentDir, readTextIfExists } from '../extensions/lib/utils.js';
 import { fileURLToPath } from 'node:url';
 import { tersioSettingsFile } from '../extensions/shared/plugin-settings.js';
-// The pi tree mirrors the OMP one. Ponytail and rtk stay: a package and a
-// shared binary are not ours to delete.
+// The pi tree mirrors the OMP one. Ponytail and rtk stay: a package and a shared binary are not ours to delete.
 const PONYTAIL_PKG = '@dietrichgebert/ponytail';
 const PI_TREE_DIRS = [
     'caveman-session',
@@ -18,11 +17,12 @@ const PI_TREE_DIRS = [
     'tersio-commands',
     'shared',
     'lib',
+    'opencode',
 ];
 // One `pi remove`, for both packages the installer adds there.
 async function piRemove(spec, shouldDryRun) {
     if (shouldDryRun) {
-        console.log(`  [dry-run] would run: pi remove ${spec}`);
+        sayTagged(`  [dry-run] would run: pi remove ${spec}`);
         return;
     }
     try {
@@ -35,11 +35,11 @@ async function piRemove(spec, shouldDryRun) {
                     resolve();
             });
         });
-        console.log(`  [ok] removed the pi package ${spec}`);
+        sayTagged(`  [ok] removed the pi package ${spec}`);
     }
     catch (e) {
-        console.log(`  [fail] pi remove: ${e.message}`);
-        console.log(`  [hint] Manual: pi remove ${spec}`);
+        sayTagged(`  [fail] pi remove: ${e.message}`);
+        sayTagged(`  [hint] Manual: pi remove ${spec}`);
     }
 }
 // Only the skill directories the installer copied, never pi's own skills dir.
@@ -52,13 +52,24 @@ async function removeCopiedPonytailSkills(shouldDryRun) {
             await removeUninstallTarget(path.join(piAgentDir(), 'skills', entry.name), shouldDryRun);
     }
 }
-// pi owns its package dir, so removal is `pi remove`; the tree and the defaults
-// file are ours. Ponytail goes too unless --keep-ponytail, matching the OMP
-// route, so neither host keeps a package we installed on its behalf.
-async function removePiLayer(host, shouldDryRun, shouldRemovePonytail) {
+// pi removal delegates to pi remove; always list and confirm first.
+async function removePiLayer(host, shouldDryRun, shouldRemovePonytail, shouldRemoveRtk, confirmed) {
     const targets = PI_TREE_DIRS.map((dir) => path.join(piAgentDir(), 'extensions', dir));
+    const rtkWiring = path.join(piAgentDir(), 'extensions', 'rtk.ts');
     if (!host.installed && !host.declared) {
-        console.log(`  [skip] ${host.label} — nothing installed (${host.installCmd})`);
+        sayTagged(`  [skip] ${host.label} — nothing installed (${host.installCmd})`);
+        return false;
+    }
+    console.log('Will remove:');
+    for (const t of targets)
+        console.log(`  ${t}`);
+    if (shouldRemovePonytail)
+        console.log(`  npm:${PONYTAIL_PKG} (pi package)`);
+    if (shouldRemoveRtk)
+        console.log(`  ${rtkWiring} (rtk wiring)`);
+    console.log(`  ${tersioSettingsFile()} (session defaults)`);
+    if (!confirmed && !(await confirmDestructive(`Remove Tersio from ${host.label}?`))) {
+        closeRL();
         return false;
     }
     if (host.declared)
@@ -68,6 +79,11 @@ async function removePiLayer(host, shouldDryRun, shouldRemovePonytail) {
         await removeCopiedPonytailSkills(shouldDryRun);
     }
     await Promise.all(targets.map((t) => removeUninstallTarget(t, shouldDryRun)));
+    // rtk's wiring is a loose file, not one of the tree dirs, so it survived --remove-rtk on pi while OMP removed its copy.
+    if (shouldRemoveRtk) {
+        await removeUninstallTarget(rtkWiring, shouldDryRun, false);
+        await removeUninstallTarget(path.join(BUN_BIN_DIR, RTK_BINARY_NAME), shouldDryRun, false);
+    }
     await clearSessionDefaults(shouldDryRun);
     return true;
 }
@@ -91,11 +107,11 @@ async function updateJsonFile(filePath, mutate, dryRunNote, writeNote, dryRun) {
     if (!mutate(data))
         return;
     if (dryRun) {
-        console.log(`  [dry-run] ${dryRunNote}`);
+        sayTagged(`  [dry-run] ${dryRunNote}`);
         return;
     }
     await fs.writeFile(filePath, JSON.stringify(data, null, 2) + '\n', 'utf8');
-    console.log(`  [write] ${writeNote}`);
+    sayTagged(`  [write] ${writeNote}`);
 }
 function dropKey(section, key) {
     if (!section || typeof section !== 'object')
@@ -109,14 +125,14 @@ function dropKey(section, key) {
 async function removeUninstallTarget(target, shouldDryRun, recursive = true) {
     try {
         if (shouldDryRun) {
-            console.log(`  [dry-run] would remove ${target}`);
+            sayTagged(`  [dry-run] would remove ${target}`);
             return;
         }
         if (recursive)
             await fs.rm(target, { recursive: true, force: true });
         else
             await fs.unlink(target);
-        console.log(`  [rm] ${target}`);
+        sayTagged(`  [rm] ${target}`);
     }
     catch {
         debug(`Could not remove ${target}`);
@@ -163,14 +179,45 @@ async function runUninstall(options = {}) {
     }
     const selected = detectHosts().find((h) => h.id === host);
     if (host === 'pi') {
-        const removed = await removePiLayer(selected, shouldDryRun, shouldRemovePonytail);
+        const removed = await removePiLayer(selected, shouldDryRun, shouldRemovePonytail, shouldRemoveRtk, confirmed);
         if (removed)
-            console.log('\nDone. Restart pi for changes to take effect.');
+            console.log('\nDone. Restart pi, then /combo medium.');
         closeRL();
         return removed;
     }
+    if (host === 'opencode') {
+        const dir = path.join(HOME, '.config', 'opencode', 'plugins', 'tersio');
+        const configPath = path.join(HOME, '.config', 'opencode', 'opencode.json');
+        if (!selected.installed && !selected.declared) {
+            sayTagged(`  [skip] ${selected.label} — nothing installed (${selected.installCmd})`);
+            closeRL();
+            return false;
+        }
+        console.log('Will remove:');
+        console.log(`  ${dir}`);
+        console.log(`  the tersio entry in ${configPath}`);
+        if (!confirmed && !(await confirmDestructive('Remove these Tersio files?'))) {
+            closeRL();
+            return false;
+        }
+        await removeUninstallTarget(dir, shouldDryRun);
+        if (!shouldDryRun) {
+            try {
+                const raw = await readTextIfExists(configPath);
+                const config = raw ? JSON.parse(raw) : {};
+                if (Array.isArray(config.plugins)) {
+                    config.plugins = config.plugins.filter((p) => typeof p !== 'string' || !p.includes('/opencode/plugins/tersio/'));
+                    await fs.writeFile(configPath, `${JSON.stringify(config, null, 2)}\n`, 'utf8');
+                }
+            }
+            catch { /* config missing or not JSON; nothing to scrub */ }
+        }
+        console.log('\nDone. Restart OpenCode to drop the plugin.');
+        closeRL();
+        return true;
+    }
     if (!selected.installed)
-        console.log(`  [note] ${selected.label} has no tersio install; removing what is left behind.`);
+        sayTagged(`  [note] ${selected.label} has no tersio install; removing what is left behind.`);
     const extDir = path.join(OMP_AGENT_DIR, 'extensions');
     const configPath = path.join(OMP_AGENT_DIR, 'config.yml');
     const rtkBin = path.join(BUN_BIN_DIR, RTK_BINARY_NAME);
@@ -187,6 +234,8 @@ async function runUninstall(options = {}) {
         'lib',
         // Legacy: imports session-state.js, so it warns once that module is gone.
         'aaa-combo-boot',
+        // Foreign to the OMP loader; never shipped here on purpose.
+        'opencode',
     ].map((dir) => path.join(extDir, dir));
     console.log('Will remove:');
     for (const t of targets) {
@@ -213,8 +262,7 @@ async function runUninstall(options = {}) {
                 return false;
             if (shouldRemovePonytail && l.includes('ponytail') && l.includes('pi-extension'))
                 return false;
-            // Our rtk wiring, absolute or relative. Leaving it listed would keep
-            // OMP loading a hook for a package that is no longer installed.
+            // Our rtk wiring, absolute or relative. Leaving it listed would keep OMP loading a hook for a package that is no longer installed.
             const entry = l.trim().replace(/^-\s*/, '').replace(/^['"]|['"]$/g, '');
             if (entry.endsWith(`extensions${path.sep}rtk.ts`) || entry.endsWith('extensions/rtk.ts'))
                 return false;
@@ -222,23 +270,27 @@ async function runUninstall(options = {}) {
         });
         if (lines.length !== before) {
             if (shouldDryRun)
-                console.log(`  [dry-run] would remove ${before - lines.length} config.yml entries`);
+                sayTagged(`  [dry-run] would remove ${before - lines.length} config.yml entries`);
             else
                 await writeConfigLines(configPath, lines, `  [write] Updated config.yml (removed ${before - lines.length} entries)`);
         }
     }
+    // Cleared last: writeConfigLines above would just make a fresh one.
+    for (const backup of [`${configPath}.bak`, path.join(pluginsDir, 'node_modules', PACKAGE_NAME, 'extensions', 'caveman-session', 'rule.md.bak')]) {
+        await removeUninstallTarget(backup, shouldDryRun, false);
+    }
     // Remove the bundled Ponytail copy; its config.yml entry is already filtered.
     if (shouldRemovePonytail) {
         const pluginsPkgPath = path.join(pluginsDir, 'package.json');
         await updateJsonFile(pluginsPkgPath, (data) => dropKey(data.dependencies, '@dietrichgebert/ponytail'), `would remove @dietrichgebert/ponytail from ${pluginsPkgPath}`, 'Removed @dietrichgebert/ponytail from plugins/package.json', shouldDryRun);
         try {
             if (shouldDryRun)
-                console.log(`  [dry-run] would remove ${ponytailPkgDir}`);
+                sayTagged(`  [dry-run] would remove ${ponytailPkgDir}`);
             else {
                 await fs.rm(ponytailPkgDir, { recursive: true, force: true });
-                console.log(`  [rm] ${ponytailPkgDir}`);
+                sayTagged(`  [rm] ${ponytailPkgDir}`);
                 await fs.rm(path.dirname(ponytailPkgDir));
-                console.log(`  [rm] ${path.dirname(ponytailPkgDir)} (empty scope)`);
+                sayTagged(`  [rm] ${path.dirname(ponytailPkgDir)} (empty scope)`);
             }
         }
         catch {
@@ -254,9 +306,7 @@ async function runUninstall(options = {}) {
     if ((await readTextIfExists(path.join(selfPluginDir, 'package.json'))) !== null) {
         await removeUninstallTarget(selfPluginDir, shouldDryRun);
     }
-    // Our rtk wiring goes with the rest: leaving the file would keep OMP
-    // rewriting bash calls to a package this uninstall just removed. The binary
-    // stays unless --remove-rtk, since it is a shared tool on PATH.
+    // Our rtk wiring goes too, or OMP keeps rewriting for a removed package.
     await removeUninstallTarget(path.join(extDir, 'rtk.ts'), shouldDryRun);
     if (shouldRemoveRtk)
         await removeUninstallTarget(rtkBin, shouldDryRun, false);

package/cli/update.js

@@ -2,11 +2,12 @@
 import { promises as fs } from 'node:fs';
 import path from 'node:path';
 import { spawn } from 'node:child_process';
-import { IS_WINDOWS, OMP_PLUGINS_DIR, PACKAGE_BIN, PACKAGE_NAME, PACKAGE_VERSION, dryRun, execP, parseJsonObject, verbose, } from './common.js';
-import { execNetwork } from './interactive.js';
+import { IS_WINDOWS, OMP_PLUGINS_DIR, PACKAGE_BIN, PACKAGE_NAME, PACKAGE_VERSION, args, dryRun, execP, parseJsonObject, verbose, } from './common.js';
+import { execNetwork, sayTagged } from './interactive.js';
 import { readTextIfExists, resolveRtkBinary, tersioDataPath } from '../extensions/lib/utils.js';
 import { refreshPrices } from '../extensions/shared/pricing.js';
 import { CAVEMAN_REMOTE_RULE, RTK_RELEASE_API, httpsGet, normalizeRtkVersion, sha256Hex, } from '../extensions/lib/utils.js';
+import { parseHostArg } from './hosts.js';
 const UPDATE_CHECK_TTL_MS = 6 * 60 * 60 * 1000;
 function newerThan(a, b) {
     const pa = a.replace(/^v/, '').split('.').map((n) => parseInt(n, 10) || 0);
@@ -34,8 +35,7 @@ async function latestPublishedVersion() {
         return null;
     }
 }
-// A newer published version, null when up to date, 'unknown' when the registry
-// is unreachable. Cached for a TTL unless force, which must not trust a cache.
+// A newer published version, null when up to date, 'unknown' when the registry is unreachable. Cached for a TTL unless force, which must not trust a cache.
 async function checkForUpdate(force = false) {
     const cachePath = tersioDataPath('update-check.json', 'tersio-update-check.json');
     const cached = parseJsonObject(await readTextIfExists(cachePath));
@@ -48,8 +48,7 @@ async function checkForUpdate(force = false) {
         await fs.writeFile(cachePath, JSON.stringify({ latest, lastCheck: Date.now() }) + '\n', 'utf8').catch(() => { });
         return newerThan(latest, PACKAGE_VERSION) ? latest : null;
     }
-    // Unreachable registry: a stale cache naming a newer release is still
-    // actionable, else report unknown so nobody claims "latest".
+    // Unreachable registry: a stale cache naming a newer release is still actionable, else report unknown so nobody claims "latest".
     return cached?.latest && newerThan(cached.latest, PACKAGE_VERSION) ? cached.latest : 'unknown';
 }
 // Race a probe against a timeout; failures resolve null so nothing blocks.
@@ -75,8 +74,7 @@ async function execInherit(cmd, args) {
     if (code !== 0)
         throw new Error(`${cmd} exited with code ${code}`);
 }
-// Current → latest per add-on. Every probe is capped and nullable, and the
-// plan prints `unknown` for anything unreachable.
+// Current → latest per add-on. Every probe is capped and nullable, and the plan prints `unknown` for anything unreachable.
 async function probeUpdatePlan(cliLatest) {
     const rtkBin = resolveRtkBinary();
     const ponytailPkg = path.join(OMP_PLUGINS_DIR, 'node_modules', '@dietrichgebert', 'ponytail', 'package.json');
@@ -97,8 +95,7 @@ async function probeUpdatePlan(cliLatest) {
         ponytail: ponytailLocalText ? parseJsonObject(ponytailLocalText)?.version ?? null : null,
     };
 }
-// Every add-on prints a version jump when stale, "up to date" otherwise, and
-// "unknown" when its source cannot be reached.
+// Every add-on prints a version jump when stale, "up to date" otherwise, and "unknown" when its source cannot be reached.
 function planLines(plan) {
     const stale = [];
     const status = [];
@@ -131,6 +128,18 @@ async function runLatestUpdate() {
         forwardedArgs.push('--dry-run');
     if (verbose)
         forwardedArgs.push('--verbose');
+    // A pinned host refreshes that host's tree; bare update keeps the OMP default.
+    let pinned;
+    try {
+        pinned = parseHostArg(args);
+    }
+    catch (e) {
+        console.error(`[fail] ${e.message}`);
+        process.exitCode = 1;
+        return;
+    }
+    if (pinned)
+        forwardedArgs.push('--host', pinned);
     const npmCommand = IS_WINDOWS ? process.env.ComSpec || 'cmd.exe' : 'npm';
     // `--prefer-online` beats the local cache, so a stale @latest cannot pin down.
     const cliLatest = await latestPublishedVersion();
@@ -140,8 +149,8 @@ async function runLatestUpdate() {
     const { stale, status } = planLines(plan);
     if (dryRun) {
         console.log(`tersio update (dry-run):\n  ${status.join('\n  ')}`);
-        console.log(`  [dry-run] would run: npm install -g ${PACKAGE_NAME}${target} --no-audit --no-fund --prefer-online`);
-        console.log(`  [dry-run] would delegate: npm exec --yes --prefer-online --package=${PACKAGE_NAME}${target} -- tersio --apply-update ${forwardedArgs.join(' ')}`);
+        sayTagged(`  [dry-run] would run: npm install -g ${PACKAGE_NAME}${target} --no-audit --no-fund --prefer-online`);
+        sayTagged(`  [dry-run] would delegate: npm exec --yes --prefer-online --package=${PACKAGE_NAME}${target} -- tersio --apply-update ${forwardedArgs.join(' ')}`);
         return;
     }
     console.log(`Checking for updates:\n  ${status.join('\n  ')}`);
@@ -169,8 +178,7 @@ async function runLatestUpdate() {
         process.exitCode = 1;
         return;
     }
-    // The npx delegation below only refreshes the OMP-side files; the globally
-    // installed CLI keeps its old version until npm -g runs. Refresh both.
+    // The npx delegation below only refreshes the OMP-side files; the globally installed CLI keeps its old version until npm -g runs. Refresh both.
     const globalArgs = IS_WINDOWS
         ? ['/d', '/s', '/c', 'npm', 'install', '-g', `${PACKAGE_NAME}${target}`, '--no-audit', '--no-fund', '--prefer-online']
         : ['install', '-g', `${PACKAGE_NAME}${target}`, '--no-audit', '--no-fund', '--prefer-online'];
@@ -186,8 +194,8 @@ async function runLatestUpdate() {
             process.stderr.write(globalResult.stderr);
     }
     catch (e) {
-        console.log(`  [warn] Global CLI update skipped: ${e.message}`);
-        console.log(`  [hint] Manual: npm install -g ${PACKAGE_NAME}${target} --no-audit --no-fund --prefer-online`);
+        sayTagged(`  [warn] Global CLI update skipped: ${e.message}`);
+        sayTagged(`  [hint] Manual: npm install -g ${PACKAGE_NAME}${target} --no-audit --no-fund --prefer-online`);
     }
     const npmArgs = [
         'exec',
@@ -200,12 +208,11 @@ async function runLatestUpdate() {
         ...forwardedArgs,
     ];
     const npmCommandArgs = IS_WINDOWS ? ['/d', '/s', '/c', 'npm', ...npmArgs] : npmArgs;
-    // Inherited stdio, no outer spinner. The delegated installer runs quiet
-    // (banner and per-file writes suppressed); this parent owns both the plan
-    // line above and the closing summary below — one voice, no repeats.
+    // Inherited stdio, no outer spinner; the delegated installer runs quiet and this parent owns both the plan line and the closing summary.
     try {
         await execInherit(npmCommand, npmCommandArgs);
-        console.log(`Done — tersio ${plan.cli ?? PACKAGE_VERSION}. Restart OMP.`);
+        const hostName = pinned === 'pi' ? 'pi' : pinned === 'opencode' ? 'OpenCode' : 'OMP';
+        console.log(`Done — tersio ${plan.cli ?? PACKAGE_VERSION}. Restart ${hostName}.`);
         if (!dryRun) {
             try {
                 await refreshPrices();

package/cli/usage.js

@@ -1,13 +1,12 @@
 // cli/usage.ts — ledger + session-token usage report, tokscale-style.
-import { co2GramsFor, displayModelId, energyWhFor, importSessionTokens, ledgerPath, priceFor, readResetWatermark, readRtkAdoption, readRtkRecallDiagnostics, readUsage, refreshPricesIfStale, sessionsDir, usdCost, } from '../extensions/shared/usage-ledger.js';
+import { co2GramsFor, displayModelId, energyWhFor, foldModelsByLabel, importSessionTokens, ledgerPath, priceFor, readResetWatermark, readRtkAdoption, readRtkRecallDiagnostics, readUsage, refreshPricesIfStale, sessionsDir, usdCost, } from '../extensions/shared/usage-ledger.js';
 import { resolveRtkBinary } from '../extensions/lib/utils.js';
 import { readRtkGain } from '../extensions/shared/rtk-gain.js';
-import { readUsageDb, syncUsageDb, usageDbPath } from '../extensions/shared/usage-store.js';
+import { readUsageDb, reparseGuardReport, syncUsageDb, usageDbPath } from '../extensions/shared/usage-store.js';
 import { withInteractiveSpinner } from './interactive.js';
 import { PACKAGE_VERSION, currency } from './common.js';
 import { formatCurrency } from './currency.js';
-// RTK's history is machine-wide; rows group by command alone. 2000 groups
-// covers a long history while still bounding /data.json.
+// RTK's history is machine-wide; rows group by command alone. 2000 groups covers a long history while still bounding /data.json.
 const RTK_COMMAND_ROWS = 2000;
 export function summarizeUsage(rows) {
     refreshPricesIfStale();
@@ -18,8 +17,7 @@ export function summarizeUsage(rows) {
         detailCounts[r.detail] = (detailCounts[r.detail] ?? 0) + 1;
     }
     const byDetail = Object.entries(detailCounts).sort((a, b) => b[1] - a[1]).slice(0, 10);
-    // usage.db is a cache of the same per-message rows: sync best-effort, read
-    // stored, fall back to the live parse when the store is missing or stale.
+    // usage.db is a cache of the same per-message rows: sync best-effort, read stored, fall back to the live parse when the store is missing or stale.
     let synced = false;
     try {
         synced = syncUsageDb();
@@ -27,6 +25,9 @@ export function summarizeUsage(rows) {
     catch {
         synced = false;
     }
+    const guard = reparseGuardReport();
+    if (guard)
+        console.warn(`[warn] usage mirror: ${guard}`);
     let stored = null;
     try {
         stored = readUsageDb()?.tokens ?? null;
@@ -42,19 +43,43 @@ export function summarizeUsage(rows) {
     let savedUsd = 0;
     const byModelUsd = {};
     const byModelBucketUsd = {};
+    const byHost = {};
+    const byDayModel = {};
     let co2g = 0;
     let energyWh = 0;
+    const addTok = (into, t) => {
+        into.input += t.input;
+        into.output += t.output;
+        into.cacheRead += t.cacheRead;
+        into.cacheWrite += t.cacheWrite;
+    };
+    // Price by exact key first (gateways can differ), then fold every map under the display label.
+    const folded = foldModelsByLabel(session.byModel, session.byModelMessages);
     for (const [model, t] of Object.entries(session.byModel)) {
         const c = usdCost(t, model);
         usd += c.usd;
-        byModelUsd[model] = c.usd;
-        byModelBucketUsd[model] = c.buckets;
+        const label = displayModelId(model);
+        byModelUsd[label] = (byModelUsd[label] ?? 0) + c.usd;
+        byModelBucketUsd[label] ??= { input: 0, output: 0, cacheRead: 0, cacheWrite: 0 };
+        addTok(byModelBucketUsd[label], c.buckets);
+        for (const [host, hb] of Object.entries(session.byHost[model] ?? {})) {
+            byHost[label] ??= {};
+            byHost[label][host] ??= { input: 0, output: 0, cacheRead: 0, cacheWrite: 0 };
+            addTok(byHost[label][host], hb);
+        }
         co2g += co2GramsFor(model, t.output);
         energyWh += energyWhFor(model, t.output);
         if (!c.priced)
             priced = false;
         savedUsd += (t.cacheRead / 1e6) * priceFor(model).price.input;
     }
+    for (const [day, per] of Object.entries(session.byDayModel)) {
+        for (const [model, n] of Object.entries(per)) {
+            const label = displayModelId(model);
+            byDayModel[day] ??= {};
+            byDayModel[day][label] = (byDayModel[day][label] ?? 0) + n;
+        }
+    }
     const byTool = Object.entries(session.byTool).sort((a, b) => b[1] - a[1]).slice(0, 10);
     return {
         total: rows.length,
@@ -64,12 +89,13 @@ export function summarizeUsage(rows) {
         empty: rows.length === 0 && session.messages === 0,
         messages: session.messages,
         tokens: session.totals,
-        byModel: session.byModel,
+        byModel: folded.byModel,
         byModelUsd,
         byModelBucketUsd,
-        byModelMessages: session.byModelMessages,
+        byModelMessages: folded.byModelMessages,
+        byHost,
         byDay: session.byDay,
-        byDayModel: session.byDayModel,
+        byDayModel,
         byTool,
         recent: session.recent.map((r) => ({
             ...r,
@@ -113,11 +139,11 @@ function bar(frac, width = 12) {
     const filled = Math.max(0, Math.min(width, Math.round(frac * width)));
     return '█'.repeat(filled) + '░'.repeat(width - filled);
 }
+const ROW_CAP = 15;
 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. Shared with cli/settings.ts.
+// Box-drawing table, plain text (piped-safe, byte-stable). Numeric columns right-align; long cells truncate with an ellipsis. Shared with cli/settings.ts.
 function textTable(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)));
@@ -136,10 +162,15 @@ function printReport(report) {
         return;
     }
     const t = report.tokens;
-    console.log(`  TOKENS  ${fmt(t.input)} in · ${fmt(t.output)} out · ${fmt(t.cacheRead)} cache read · ${fmt(t.cacheWrite)} cache write`);
-    console.log(`  COST    ${formatCurrency(report.usd, report.currency)}${report.priced ? '' : ' (includes default pricing)'} · ~${formatCurrency(report.savedUsd, report.currency)} cache-saved (est.) · ~${report.co2g.toFixed(1)}g CO2 (est.)`);
-    console.log(`  RTK      ${fmt(report.rtkAdoption.rtkCalls)}/${fmt(report.rtkAdoption.eligibleCalls)} eligible OMP Bash calls use RTK (${report.rtkAdoption.adoptionPct.toFixed(1)}%) · ${fmt(report.rtkAdoption.missedCalls)} missed · recall ${report.rtkRecall.available ? `${report.rtkRecall.mode} (${report.rtkRecall.entries})` : 'unavailable'}`);
-    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);
+    const a = report.rtkAdoption;
+    for (const l of textTable(['Metric', 'Value'], [
+        ['Tokens', `${fmt(t.input)} in · ${fmt(t.output)} out · ${fmt(t.cacheRead)} cache read · ${fmt(t.cacheWrite)} cache write`],
+        ['Cost', `${formatCurrency(report.usd, report.currency)}${report.priced ? '' : ' (includes default pricing)'} · ~${formatCurrency(report.savedUsd, report.currency)} cache-saved (est.) · ~${report.co2g.toFixed(1)}g CO2 (est.)`],
+        ['RTK adoption', `${fmt(a.rtkCalls)}/${fmt(a.eligibleCalls)} eligible Bash calls use RTK (${a.adoptionPct.toFixed(1)}%) · ${fmt(a.missedCalls)} missed · recall ${report.rtkRecall.available ? `${report.rtkRecall.mode} (${report.rtkRecall.entries})` : 'unavailable'}`],
+    ], [false, false], 118))
+        console.log(l);
+    const allModels = 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));
+    const models = allModels.slice(0, ROW_CAP);
     if (models.length) {
         console.log('  BY MODEL');
         const top = models.reduce((m, [, b]) => Math.max(m, b.input + b.output + b.cacheRead + b.cacheWrite), 1);
@@ -147,11 +178,13 @@ function printReport(report) {
             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 [displayModelId(model), fmt(b.input), fmt(b.output), `${fmt(b.cacheRead)}/${fmt(b.cacheWrite)}`, formatCurrency(usd, report.currency), `${hit.toFixed(1)}%`, `${bar(mt / top, 8)} ${fmtShort(mt)}`];
+            return [model, fmt(b.input), fmt(b.output), `${fmt(b.cacheRead)}/${fmt(b.cacheWrite)}`, formatCurrency(usd, report.currency), `${hit.toFixed(1)}%`, `${bar(mt / top, 8)} ${fmtShort(mt)}`];
         });
         for (const l of textTable(['Model', 'Input', 'Output', 'Cache r/w', report.currency, 'Hit', 'Share'], mrows, [false, true, true, true, true, true, false])) {
             console.log(l);
         }
+        if (allModels.length > ROW_CAP)
+            console.log(`  showing top ${ROW_CAP} of ${fmt(allModels.length)} models — full set in the dashboard`);
     }
     const cmdRows = report.byTool.map(([tool, n]) => ({ name: tool, count: n, saved: null, avgPct: null, avgMs: null }));
     for (const r of report.rtkGain.byCommand) {
@@ -165,7 +198,7 @@ function printReport(report) {
             : '  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) => [
+        const crows = cmdRows.slice(0, ROW_CAP).map((r, idx) => [
             String(idx + 1),
             r.name,
             fmt(r.count),
@@ -177,6 +210,8 @@ function printReport(report) {
         for (const l of textTable(['#', 'Tool/Command', 'Count', 'Saved', 'Avg%', 'Time', 'Impact'], crows, [true, false, true, true, true, true, false], 30)) {
             console.log(l);
         }
+        if (cmdRows.length > ROW_CAP)
+            console.log(`  showing top ${ROW_CAP} of ${fmt(cmdRows.length)} commands — full set in the dashboard`);
     }
 }
 async function runUsage() {