@krtclcdy/tersio 2.7.0 → 2.9.0

package/cli/dashboard.js

@@ -1,4 +1,4 @@
-// cli/dashboard.ts — localhost gain dashboard. Serves the single plain-HTML
+// cli/dashboard.ts — gain dashboard. Serves the single plain-HTML
 // template (no deps, no build) plus a /data.json endpoint from the ledger.
 // Binds 127.0.0.1 only; --export writes a file://-ready file instead.
 // Note: no Promise.withResolvers here — engines still allow Node 20.12,
@@ -31,11 +31,11 @@ async function runDashboard(options) {
     if (options.exportFile) {
         const html = await templateHtml();
         const inline = html
-            .replace("fetch('data.json')", `Promise.resolve({ json: function () { return ${dataJson()}; } }).then(function (r) { return r.json(); }).then`)
+            .replace("fetch('data.json')", `Promise.resolve({ json: function () { return ${dataJson()}; } })`)
             .replace('href="brand.webp"', `href="${await faviconDataUri()}"`)
             .replace('src="brand.webp"', `src="${await faviconDataUri()}"`);
         await fs.writeFile(options.exportFile, inline, 'utf8');
-        console.log(`[ok] dashboard exported → ${options.exportFile}`);
+        console.log(`[ok] gain exported → ${options.exportFile}`);
         return;
     }
     const html = await withInteractiveSpinner('Loading dashboard template', templateHtml);
@@ -64,7 +64,7 @@ async function runDashboard(options) {
         const address = server.address();
         const port = typeof address === 'object' && address ? address.port : options.port;
         const url = `http://127.0.0.1:${port}`;
-        console.log(`[ok] dashboard live → ${url} (Ctrl-C to stop)`);
+        console.log(`[ok] gain live → ${url} (Ctrl-C to stop)`);
         if (options.open)
             openBrowser(url);
     });

package/cli/doctor.js

@@ -101,8 +101,10 @@ async function runDoctor() {
     section('Environment');
     check('Node', true, process.version);
     check('OMP CLI', ompVersion !== null, ompVersion ?? '');
-    if (updateVersion)
+    if (typeof updateVersion === 'string')
         warnLine('Tersio CLI', `${updateVersion} available — run tersio update`);
+    else if (updateVersion === 'unknown')
+        warnLine('Tersio CLI', `${PACKAGE_VERSION} (version check unreachable)`);
     else
         check('Tersio CLI', true, PACKAGE_VERSION);
     console.log(`  Home: ${HOME}`);

package/cli/install.js

@@ -3,7 +3,7 @@ import { promises as fs } from 'node:fs';
 import os from 'node:os';
 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, dashboardOpen, dashboardPort, debug, ensureExtensionAfterConfigEntry, ensureExtensionInConfig, ensurePonytailConfigValue, execP, parseJsonObject, readPluginsPackage, writeIfChanged, } from './common.js';
+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 { checkForUpdate, runLatestUpdate } from './update.js';
 import { runUninstall } from './uninstall.js';
@@ -550,7 +550,7 @@ let updatePromptDone = false;
 // Scripts, pipes, --yes, and --dry-run keep the old straight-to-install path.
 async function runCommandMenu() {
     const newer = await checkForUpdate();
-    if (newer && !dryRun) {
+    if (typeof newer === 'string' && !dryRun) {
         const answer = await askInteractiveConfirm(`tersio ${newer} is available (installed ${PACKAGE_VERSION}). Install it now?`);
         if (answer.status === 'confirmed' && answer.value) {
             await runLatestUpdate();
@@ -571,7 +571,6 @@ async function runCommandMenu() {
         { value: 'doctor', label: 'Doctor', hint: 'verify the installation' },
         { value: 'usage', label: 'Usage', hint: 'token usage and savings report' },
         { value: 'gain', label: 'Gain dashboard', hint: 'open the report in your browser' },
-        { value: 'dashboard', label: 'Serve dashboard', hint: 'localhost server, no browser' },
         { value: 'uninstall', label: 'Uninstall', hint: 'remove tersio' },
     ], 'install');
     if (choice.status !== 'selected') {
@@ -583,8 +582,13 @@ async function runCommandMenu() {
             await runInstall();
             break;
         case 'check': {
-            const latest = await checkForUpdate();
-            console.log(latest ? `  [update] tersio ${latest} available (installed ${PACKAGE_VERSION})` : `  [ok] tersio ${PACKAGE_VERSION} is the latest`);
+            const latest = await checkForUpdate(true);
+            if (typeof latest === 'string')
+                console.log(`  [update] tersio ${latest} available (installed ${PACKAGE_VERSION})`);
+            else if (latest === 'unknown')
+                console.log(`  [warn] could not reach the npm registry — run \`tersio update\` to retry`);
+            else
+                console.log(`  [ok] tersio ${PACKAGE_VERSION} is the latest`);
             closeRL();
             break;
         }
@@ -601,11 +605,7 @@ async function runCommandMenu() {
             closeRL();
             break;
         case 'gain':
-            await runDashboard({ port: dashboardPort, open: true, exportFile: null });
-            closeRL();
-            break;
-        case 'dashboard':
-            await runDashboard({ port: dashboardPort, open: dashboardOpen, exportFile: dashboardExport });
+            await runDashboard({ port: dashboardPort, open: true, exportFile: dashboardExport });
             closeRL();
             break;
         case 'uninstall':
@@ -632,7 +632,7 @@ async function runInstall() {
     // the apply-update payload, which is itself an update run.
     if (tty() && !applyUpdate && command !== 'uninstall') {
         const newer = await checkForUpdate();
-        if (newer) {
+        if (typeof newer === 'string') {
             // Bare `tersio` with an update pending: offer it now (Y/n) instead of
             // burying the banner above the install prompts. Yes runs the full
             // update and stops here — the fresh binary owns what follows.

package/cli/update.js

@@ -33,13 +33,15 @@ async function latestPublishedVersion() {
         return null;
     }
 }
-// Returns a newer published version, or null. Reads the registry at most once
-// per TTL (cached under OMP_PLUGINS_DIR) and stays silent on failure.
-async function checkForUpdate() {
+// 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.
+async function checkForUpdate(force = false) {
     const cachePath = path.join(OMP_PLUGINS_DIR, 'tersio-update-check.json');
     const cached = parseJsonObject(await readTextIfExists(cachePath));
     const cacheFresh = typeof cached?.lastCheck === 'number' && Date.now() - cached.lastCheck < UPDATE_CHECK_TTL_MS;
-    if (cacheFresh && cached?.latest)
+    if (!force && cacheFresh && cached?.latest)
         return newerThan(cached.latest, PACKAGE_VERSION) ? cached.latest : null;
     const latest = await latestPublishedVersion();
     if (latest) {
@@ -47,8 +49,9 @@ async function checkForUpdate() {
         await fs.writeFile(cachePath, JSON.stringify({ latest, lastCheck: Date.now() }) + '\n', 'utf8').catch(() => { });
         return newerThan(latest, PACKAGE_VERSION) ? latest : null;
     }
-    // Registry unreachable: fall back to a stale cache rather than staying silent.
-    return cached?.latest && newerThan(cached.latest, PACKAGE_VERSION) ? cached.latest : null;
+    // Registry unreachable: a stale cache naming a newer release is still
+    // actionable; otherwise report unknown so callers never claim "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.

package/cli/usage.js

@@ -1,6 +1,7 @@
 // cli/usage.ts — ledger + session-token usage report, tokscale-style.
-import { co2Grams, importSessionTokens, readUsage, usdCost, } from '../extensions/shared/usage-ledger.js';
+import { co2Grams, importSessionTokens, priceFor, readUsage, usdCost, } from '../extensions/shared/usage-ledger.js';
 import { withInteractiveSpinner } from './interactive.js';
+import { PACKAGE_VERSION } from './common.js';
 export function summarizeUsage(rows) {
     const byKind = {};
     const detailCounts = {};
@@ -12,12 +13,15 @@ export function summarizeUsage(rows) {
     const session = importSessionTokens();
     let usd = 0;
     let priced = true;
+    let savedUsd = 0;
     for (const [model, t] of Object.entries(session.byModel)) {
         const c = usdCost(t, model);
         usd += c.usd;
         if (!c.priced)
             priced = false;
+        savedUsd += (t.cacheRead / 1e6) * priceFor(model).price.input;
     }
+    const byTool = Object.entries(session.byTool).sort((a, b) => b[1] - a[1]).slice(0, 10);
     return {
         total: rows.length,
         byKind,
@@ -28,9 +32,14 @@ export function summarizeUsage(rows) {
         tokens: session.totals,
         byModel: session.byModel,
         byDay: session.byDay,
+        byDayModel: session.byDayModel,
+        byTool,
         usd,
         priced,
+        savedUsd,
+        costMeasured: session.costMeasured,
         co2g: co2Grams(session.totals.output),
+        version: PACKAGE_VERSION,
     };
 }
 function fmt(n) {
@@ -44,7 +53,7 @@ function printReport(report) {
     }
     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)'} · CO2 ~${report.co2g.toFixed(1)}g (est.)`);
+    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);
     if (models.length) {
         console.log('  By model');
@@ -52,6 +61,12 @@ function printReport(report) {
             console.log(`    ${model}: in ${fmt(b.input)} · out ${fmt(b.output)} · cache r/w ${fmt(b.cacheRead)}/${fmt(b.cacheWrite)}`);
         }
     }
+    if (report.byTool.length) {
+        console.log('  Top tools');
+        for (const [tool, n] of report.byTool) {
+            console.log(`    ${n}× ${tool}`);
+        }
+    }
     if (report.total) {
         console.log('  Activity');
         for (const [kind, n] of Object.entries(report.byKind)) {
@@ -61,7 +76,6 @@ function printReport(report) {
         for (const [detail, n] of report.byDetail) {
             console.log(`    ${n}× ${detail}`);
         }
-        console.log(`  Total rows: ${report.total} · last write: ${report.lastWrite}`);
     }
 }
 async function runUsage() {

package/extensions/shared/usage-ledger.js

@@ -64,8 +64,11 @@ function walkJsonl(dir, out, cap) {
 export function importSessionTokens() {
     const byModel = {};
     const byDay = {};
+    const byDayModel = {};
+    const byTool = {};
     const totals = zeroBreakdown();
     let messages = 0;
+    let costMeasured = 0;
     const files = [];
     walkJsonl(sessionsDir(), files, 2000);
     for (const file of files) {
@@ -92,13 +95,44 @@ export function importSessionTokens() {
                 if (day) {
                     byDay[day] ??= zeroBreakdown();
                     addInto(byDay[day], msg.usage);
+                    const n = msg.usage;
+                    const sum = ['input', 'output', 'cacheRead', 'cacheWrite'].reduce((a, k) => a + (typeof n[k] === 'number' && Number.isFinite(n[k]) ? Math.floor(n[k]) : 0), 0);
+                    if (sum > 0) {
+                        byDayModel[day] ??= {};
+                        byDayModel[day][model] = (byDayModel[day][model] ?? 0) + sum;
+                    }
+                }
+                if (typeof msg.usage.cost === 'number' && Number.isFinite(msg.usage.cost))
+                    costMeasured += msg.usage.cost;
+                for (const part of msg.content ?? []) {
+                    if (part?.type === 'toolCall' && typeof part.name === 'string' && part.name) {
+                        const key = part.name === 'bash' ? `bash:${leadBinary(part.arguments?.command)}` : part.name;
+                        byTool[key] = (byTool[key] ?? 0) + 1;
+                    }
                 }
                 messages += 1;
             }
             catch { /* skip corrupt lines */ }
         }
     }
-    return { messages, totals, byModel, byDay };
+    return { messages, totals, byModel, byDay, byDayModel, byTool, costMeasured };
+}
+// Lead binary of a shell string: first segment head past `cd` chains and
+// VAR=x assignments (`cd /x && git status` → `git`). Falls back to `bash`.
+const SKIP_HEADS = ['cd', 'echo', 'export', 'true', 'false'];
+function leadBinary(command) {
+    if (typeof command !== 'string' || !command.trim())
+        return 'bash';
+    for (const seg of command.split(/&&|;|\n|\|(?!\|)/)) {
+        const toks = seg.trim().split(/\s+/).filter(Boolean);
+        let i = 0;
+        while (i < toks.length && (toks[i] === 'sudo' || /^[A-Za-z_][A-Za-z0-9_]*=/.test(toks[i])))
+            i++;
+        const head = (toks[i] ?? '').replace(/^['"]|['"]$/g, '').split('/').pop() ?? '';
+        if (head && !SKIP_HEADS.includes(head))
+            return head;
+    }
+    return 'bash';
 }
 const PRICE_TABLE = [
     { match: ':free', price: { input: 0, output: 0, cacheRead: 0, cacheWrite: 0 } },

package/extensions/tersio-commands/index.js

@@ -43,7 +43,7 @@ function usageSummary() {
 async function openGainDashboard(pi, ctx) {
     const file = path.join(os.tmpdir(), `tersio-gain-${Date.now()}.html`);
     try {
-        const exported = await pi.exec?.('tersio', ['dashboard', '--export', file], { cwd: ctx?.cwd });
+        const exported = await pi.exec?.('tersio', ['gain', '--export', file], { cwd: ctx?.cwd });
         if (!exported || exported.code !== 0)
             throw new Error((exported?.stderr || 'export failed').trim());
         const openCmd = process.platform === 'darwin' ? 'open' : process.platform === 'win32' ? 'start' : 'xdg-open';
@@ -51,7 +51,7 @@ async function openGainDashboard(pi, ctx) {
         ctx?.ui?.notify?.(`tersio gain: dashboard opened in your browser.`, 'info');
     }
     catch (e) {
-        ctx?.ui?.notify?.(`tersio gain: could not open dashboard (${e.message}). Run 'tersio dashboard --open' in a shell.`, 'warning');
+        ctx?.ui?.notify?.(`tersio gain: could not open dashboard (${e.message}). Run 'tersio gain --open' in a shell.`, 'warning');
     }
 }
 export default function tersioCommandsExtension(pi) {

package/package.json

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

package/tersio.js

@@ -2,7 +2,7 @@
 // tersio.ts — Install Tersio (caveman/rtk/ponytail) add-ons on any OMP device.
 // Usage: node tersio.js [install|update|reinstall|doctor|uninstall|version|help] [options]
 // Requires: node/npm and omp CLI
-import { PACKAGE_BIN, PACKAGE_VERSION, applyUpdate, commandArg, dashboard, dashboardExport, dashboardOpen, dashboardPort, doctor, showHelp, showVersion, uninstall, unknownCommand, update, usage, } from './cli/common.js';
+import { PACKAGE_BIN, PACKAGE_VERSION, applyUpdate, commandArg, gain, dashboardExport, dashboardOpen, dashboardPort, doctor, showHelp, showVersion, uninstall, unknownCommand, update, usage, } from './cli/common.js';
 import { closeRL } from './cli/interactive.js';
 import { runInstall } from './cli/install.js';
 import { runDoctor } from './cli/doctor.js';
@@ -19,7 +19,7 @@ Commands:
   reinstall    Clean and reinstall the user-scope add-ons
   doctor       Check the current installation
   usage        Ledger-backed usage + savings report
-  dashboard    Serve the gain dashboard (localhost only)
+  gain         Open the gain dashboard (localhost only)
   uninstall    Remove the managed extensions
   version      Print the package version
   help         Show this help
@@ -35,9 +35,9 @@ Options:
   --yes, -y
   --dry-run
   --verbose
-  --port <n> (dashboard: pin port, default ephemeral)
-  --open (dashboard: open browser)
-  --export <file> (dashboard: write HTML file instead of serving)
+  --port <n> (gain: pin port, default ephemeral)
+  --open (gain: open browser)
+  --export <file> (gain: write HTML file instead of serving)
   --version, -v
   --help, -h`);
 }
@@ -74,7 +74,7 @@ async function main() {
         closeRL();
         return;
     }
-    if (dashboard) {
+    if (gain) {
         await runDashboard({ port: dashboardPort, open: dashboardOpen, exportFile: dashboardExport });
         closeRL();
         return;