@krtclcdy/tersio 2.9.0 → 2.11.0

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, ledgerPath, priceFor, readUsage, sessionsDir, usdCost, } from '../extensions/shared/usage-ledger.js';
+import { readRtkGain, rtkDbPath } 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,108 @@ export function summarizeUsage(rows) {
         messages: session.messages,
         tokens: session.totals,
         byModel: session.byModel,
+        byModelUsd,
+        byModelMessages: session.byModelMessages,
         byDay: session.byDay,
         byDayModel: session.byDayModel,
         byTool,
+        recent: session.recent,
+        rtkGain: readRtkGain(),
         usd,
         priced,
         savedUsd,
         costMeasured: session.costMeasured,
-        co2g: co2Grams(session.totals.output),
+        co2g,
+        energyWh,
         version: PACKAGE_VERSION,
+        paths: { ledger: ledgerPath(), sessions: sessionsDir(), rtk: rtkDbPath() },
     };
 }
 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);
         }
     }
 }