@krtclcdy/tersio 2.23.0 → 2.24.1

package/cli/uninstall.js

@@ -1,12 +1,98 @@
 // cli/uninstall.ts — remove managed extensions, plugins, and binaries.
 import { promises as fs } from 'node:fs';
 import path from 'node:path';
-import { cancel as clackCancel, confirm as clackConfirm } from '@clack/prompts';
-import { BUN_BIN_DIR, OMP_AGENT_DIR, OMP_PLUGINS_DIR, PACKAGE_NAME, RTK_BINARY_NAME, dryRun, keepPonytail, removePonytail, removeRtk, yes, debug, writeConfigLines, } from './common.js';
-import { ask, closeRL, tty } from './interactive.js';
-import { readTextIfExists } from '../extensions/lib/utils.js';
-// Read-modify-write a JSON file. mutate returns true when it changed
-// something; no change (or unreadable file) means no output at all.
+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, 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.
+const PONYTAIL_PKG = '@dietrichgebert/ponytail';
+const PI_TREE_DIRS = [
+    'caveman-session',
+    'rtk-session',
+    'ai-addons-updater',
+    'combo-toggle',
+    'tersio-commands',
+    'shared',
+    'lib',
+];
+// One `pi remove`, for both packages the installer adds there.
+async function piRemove(spec, shouldDryRun) {
+    if (shouldDryRun) {
+        sayTagged(`  [dry-run] would run: pi remove ${spec}`);
+        return;
+    }
+    try {
+        const { execFile } = await import('node:child_process');
+        await new Promise((resolve, reject) => {
+            execFile('pi', ['remove', spec], { timeout: 120000 }, (err, _out, errOut) => {
+                if (err)
+                    reject(new Error(String(errOut).trim() || err.message));
+                else
+                    resolve();
+            });
+        });
+        sayTagged(`  [ok] removed the pi package ${spec}`);
+    }
+    catch (e) {
+        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.
+async function removeCopiedPonytailSkills(shouldDryRun) {
+    const source = findHoistedPackage(PONYTAIL_PKG, path.dirname(fileURLToPath(import.meta.url)), 'skills');
+    if (!source)
+        return;
+    for (const entry of await fs.readdir(source, { withFileTypes: true })) {
+        if (entry.isDirectory())
+            await removeUninstallTarget(path.join(piAgentDir(), 'skills', entry.name), shouldDryRun);
+    }
+}
+// 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) {
+        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)
+        await piRemove(`npm:${PACKAGE_NAME}`, shouldDryRun);
+    if (shouldRemovePonytail) {
+        await piRemove(`npm:${PONYTAIL_PKG}`, shouldDryRun);
+        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;
+}
+// ~/.tersio/settings.json holds nothing but Tersio's values, so it goes whole.
+async function clearSessionDefaults(shouldDryRun) {
+    await removeUninstallTarget(tersioSettingsFile(), shouldDryRun, false);
+}
+// Read-modify-write a JSON file; mutate returning false prints nothing.
 async function updateJsonFile(filePath, mutate, dryRunNote, writeNote, dryRun) {
     const raw = await readTextIfExists(filePath);
     if (!raw)
@@ -22,11 +108,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')
@@ -40,14 +126,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}`);
@@ -56,11 +142,52 @@ async function removeUninstallTarget(target, shouldDryRun, recursive = true) {
 async function runUninstall(options = {}) {
     const shouldDryRun = options.dryRun ?? dryRun;
     const confirmed = (options.yes ?? yes) || shouldDryRun;
-    // Ponytail is bundled with Tersio's presets, so a full uninstall removes
-    // its copy too; --keep-ponytail opts out and reinstall always preserves it.
+    // Ponytail ships with Tersio, so a full uninstall removes it.
     const shouldRemovePonytail = options.removePonytail ?? (removePonytail || !keepPonytail);
     const shouldRemoveRtk = options.removeRtk ?? removeRtk;
     console.log('\n=== Tersio Uninstall ===\n');
+    // A TTY user picks the host; only hosts with tersio on them are offered.
+    const installed = detectHosts().filter((host) => host.installed);
+    let host = options.host ?? 'omp';
+    try {
+        host = parseHostArg(args) ?? host;
+    }
+    catch (e) {
+        console.error(`[fail] ${e.message}`);
+        process.exit(1);
+    }
+    if (!options.host && tty() && !confirmed) {
+        if (installed.length === 0) {
+            console.log('Tersio is not installed for any agent on this machine. Nothing to remove.');
+            closeRL();
+            return false;
+        }
+        if (installed.length > 1) {
+            const choice = await askInteractiveChoice('Uninstall Tersio from which agent?', installed.map((h) => ({
+                value: h.id,
+                label: hostLabel(h),
+                hint: hostHint(h),
+            })), host);
+            if (choice.status !== 'selected') {
+                closeRL();
+                return false;
+            }
+            host = choice.value;
+        }
+        else {
+            host = installed[0].id;
+        }
+    }
+    const selected = detectHosts().find((h) => h.id === host);
+    if (host === 'pi') {
+        const removed = await removePiLayer(selected, shouldDryRun, shouldRemovePonytail, shouldRemoveRtk, confirmed);
+        if (removed)
+            console.log('\nDone. Restart pi, then /combo medium.');
+        closeRL();
+        return removed;
+    }
+    if (!selected.installed)
+        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);
@@ -73,10 +200,9 @@ async function runUninstall(options = {}) {
         'combo-toggle',
         'tersio-commands',
         'shared',
-        // Only consumed by ai-addons-updater (removed above); otherwise orphaned.
+        // Only the updater reads it, and it runs before this.
         'lib',
-        // Legacy always-on combo helper; imports shared/session-state.js, so it
-        // breaks with a module-not-found warning once the shared dir is removed.
+        // Legacy: imports session-state.js, so it warns once that module is gone.
         'aaa-combo-boot',
     ].map((dir) => path.join(extDir, dir));
     console.log('Will remove:');
@@ -90,33 +216,11 @@ async function runUninstall(options = {}) {
         console.log(`  ${rtkBin}`);
         console.log(`  ${path.join(extDir, 'rtk.ts')} (rtk OMP wiring)`);
     }
-    if (!confirmed) {
-        if (tty()) {
-            closeRL();
-            const confirmedChoice = await clackConfirm({ message: 'Remove the listed Tersio files?', initialValue: false });
-            if (typeof confirmedChoice !== 'boolean') {
-                clackCancel('Aborted.');
-                closeRL();
-                return false;
-            }
-            if (!confirmedChoice) {
-                console.log('Aborted.');
-                closeRL();
-                return false;
-            }
-        }
-        else {
-            const answer = await ask('\nProceed? [y/N]: ');
-            if (!answer.toLowerCase().startsWith('y')) {
-                console.log('Aborted.');
-                closeRL();
-                return false;
-            }
-        }
-    }
+    if (!confirmed && !(await confirmDestructive('Remove the listed Tersio files?')))
+        return false;
     // Remove extension directories (independent paths, so concurrently).
     await Promise.all(targets.map((t) => removeUninstallTarget(t, shouldDryRun)));
-    // Remove Combo and mode-reinforcement registrations; Ponytail only when requested.
+    // Remove Combo, mode-reinforcement, and rtk registrations; Ponytail on request.
     const configRaw = await readTextIfExists(configPath);
     if (configRaw) {
         let lines = configRaw.split('\n');
@@ -126,28 +230,36 @@ 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.
+            const entry = l.trim().replace(/^-\s*/, '').replace(/^['"]|['"]$/g, '');
+            if (entry.endsWith(`extensions${path.sep}rtk.ts`) || entry.endsWith('extensions/rtk.ts'))
+                return false;
             return true;
         });
         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)`);
         }
     }
-    // Remove the bundled Ponytail copy (dep entry exists only on
-    // pre-bundle installs); the config.yml entry was filtered above.
+    // 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 {
@@ -163,13 +275,11 @@ async function runUninstall(options = {}) {
     if ((await readTextIfExists(path.join(selfPluginDir, 'package.json'))) !== null) {
         await removeUninstallTarget(selfPluginDir, shouldDryRun);
     }
-    // Remove RTK binary if requested. rtk.ts is rtk-owned but installed by our
-    // wiring step; with the binary gone it would pass through harmlessly, so
-    // only drop it on a full rtk removal.
-    if (shouldRemoveRtk) {
+    // 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);
-        await removeUninstallTarget(path.join(extDir, 'rtk.ts'), shouldDryRun);
-    }
+    await clearSessionDefaults(shouldDryRun);
     console.log('\nDone. Restart OMP for changes to take effect.');
     return true;
 }

package/cli/update.js

@@ -3,7 +3,7 @@ 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 { 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';
@@ -34,10 +34,8 @@ async function latestPublishedVersion() {
         return null;
     }
 }
-// Returns a newer published version, null when up to date, or 'unknown' when
-// the registry cannot be reached. Reads the registry at most once per TTL
-// (cached under OMP_PLUGINS_DIR) unless force skips the cache — an explicit
-// "check for updates" must never trust a stale 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));
@@ -50,12 +48,11 @@ 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;
     }
-    // Registry unreachable: a stale cache naming a newer release is still
-    // actionable; otherwise report unknown so callers never claim "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; slow or failing probes resolve null so the
-// update plan stays best-effort and never blocks the update itself.
+// Race a probe against a timeout; failures resolve null so nothing blocks.
 async function settle(work, ms) {
     let timer;
     try {
@@ -68,9 +65,7 @@ async function settle(work, ms) {
         clearTimeout(timer);
     }
 }
-// Run a child with inherited stdio for live output. Used when the child
-// renders its own interactive UI (the delegated installer runs Clack
-// spinners), which a concurrent outer spinner would corrupt into stray bars.
+// Inherited stdio, so a child spinner cannot corrupt this parent's.
 async function execInherit(cmd, args) {
     const code = await new Promise((resolve, reject) => {
         const child = spawn(cmd, args, { stdio: 'inherit' });
@@ -80,8 +75,8 @@ 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; the plan
-// prints `unknown` for anything unreachable and the update proceeds anyway.
+// 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');
@@ -102,8 +97,8 @@ async function probeUpdatePlan(cliLatest) {
         ponytail: ponytailLocalText ? parseJsonObject(ponytailLocalText)?.version ?? null : null,
     };
 }
-// Every add-on prints its status: version jump when stale, "up to date"
-// otherwise, honest "unknown" when the probe cannot reach its source.
+// 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 = [];
@@ -137,18 +132,16 @@ async function runLatestUpdate() {
     if (verbose)
         forwardedArgs.push('--verbose');
     const npmCommand = IS_WINDOWS ? process.env.ComSpec || 'cmd.exe' : 'npm';
-    // Resolve the target explicitly: `npm view --prefer-online` beats the local
-    // metadata cache, so a stale `@latest` can never pin an older release.
+    // `--prefer-online` beats the local cache, so a stale @latest cannot pin down.
     const cliLatest = await latestPublishedVersion();
     const target = cliLatest && /^\d+\.\d+\.\d+$/.test(cliLatest) ? `@${cliLatest}` : '@latest';
-    // Current → latest per add-on. Best-effort; unreachable probes print as
-    // unknown and never block the update.
+    // Best-effort: unreachable probes print as unknown.
     const plan = await probeUpdatePlan(cliLatest);
     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  ')}`);
@@ -193,8 +186,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',
@@ -207,9 +200,8 @@ 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.`);

package/cli/usage.js

@@ -113,6 +113,7 @@ 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);
 }
@@ -136,10 +137,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);
@@ -152,6 +158,8 @@ function printReport(report) {
         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 +173,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 +185,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() {