@krtclcdy/tersio 2.18.0 → 2.20.0

package/cli/reset.js

@@ -7,13 +7,14 @@ import { cancel as clackCancel, confirm as clackConfirm } from '@clack/prompts';
 import { dryRun, yes } from './common.js';
 import { ask, closeRL, tty } from './interactive.js';
 import { clearUsageLedger, importSessionTokens, ledgerPath, markReset, readUsage, sessionsDir } from '../extensions/shared/usage-ledger.js';
+import { clearUsageDb, usageDbPath } from '../extensions/shared/usage-store.js';
 import { readRtkGain, rtkDbPath } from '../extensions/shared/rtk-gain.js';
 async function runReset() {
     console.log('\n=== Tersio Reset ===\n');
     const rows = readUsage().length;
     const sessions = importSessionTokens();
     const rtk = readRtkGain(1);
-    console.log(`Will clear: ${rows} usage ledger rows · ${ledgerPath()}`);
+    console.log(`Will clear: ${rows} usage ledger rows · ${ledgerPath()} + usage.db ${usageDbPath()}`);
     console.log(`Will hide (view-level watermark): session-derived statistics (${sessions.messages} messages) · RTK metered rows (${rtk.commands})`);
     console.log(`Left intact on disk: sessions ${sessionsDir()}, rtk ${rtkDbPath()}`);
     if (dryRun) {
@@ -49,8 +50,9 @@ async function runReset() {
         }
     }
     const cleared = clearUsageLedger();
+    const dbCleared = clearUsageDb();
     const ts = markReset();
-    console.log(`[ok] reset — removed ${cleared} usage rows; statistics view starts at ${new Date(ts).toISOString()}`);
+    console.log(`[ok] reset — removed ${cleared} usage rows${dbCleared ? ' + usage.db' : ''}; statistics view starts at ${new Date(ts).toISOString()}`);
     return true;
 }
 export { runReset };

package/cli/settings.js

@@ -0,0 +1,122 @@
+// cli/settings.ts — view/edit session-start defaults (combo/caveman/rtk/ponytail)
+// plus the display-currency default for usage/gain reports.
+// Non-interactive: `tersio settings --combo-default balanced` (plus per-mode
+// override flags and --currency). Interactive: clack selects seeded from the
+// stored profile.
+import path from 'node:path';
+import { CAVEMAN_DEFAULTS, COMBO_DEFAULTS, COMBO_PRESET_MODES, OMP_PLUGINS_DIR, PACKAGE_NAME, PONYTAIL_DEFAULTS, cavemanDefaultFlag, comboDefaultFlag, currency, currencyGiven, dryRun, ponytailDefaultFlag, profileFlagsGiven, rtkDefaultFlag, } from './common.js';
+import { CURRENCY_CODES } from './currency.js';
+import { textTable } from './usage.js';
+import { askInteractiveChoice, closeRL, tty } from './interactive.js';
+import { formatProfile, storedProfile, writePluginSettings } from './profile.js';
+function applyFlags(base) {
+    const next = { ...base };
+    if (comboDefaultFlag !== undefined)
+        next.comboDefault = comboDefaultFlag;
+    const preset = COMBO_PRESET_MODES[next.comboDefault] ?? COMBO_PRESET_MODES.off;
+    next.cavemanDefault = preset.caveman;
+    next.rtkDefault = preset.rtk;
+    next.ponytailDefault = preset.ponytail;
+    if (cavemanDefaultFlag !== undefined)
+        next.cavemanDefault = cavemanDefaultFlag;
+    if (rtkDefaultFlag !== undefined)
+        next.rtkDefault = rtkDefaultFlag === 'on';
+    if (ponytailDefaultFlag !== undefined)
+        next.ponytailDefault = ponytailDefaultFlag;
+    if (currencyGiven)
+        next.currency = currency;
+    return next;
+}
+async function askProfile(current) {
+    const combo = await askInteractiveChoice('Session-start defaults — Combo preset', [
+        { value: 'off', label: 'off' },
+        { value: 'medium', label: 'medium', hint: 'caveman=lite, rtk=on, ponytail=lite' },
+        { value: 'balanced', label: 'balanced', hint: 'caveman=full, rtk=on, ponytail=full' },
+        { value: 'max', label: 'max', hint: 'caveman=ultra, rtk=on, ponytail=ultra' },
+    ], current.comboDefault);
+    if (combo.status !== 'selected')
+        return null;
+    const preset = COMBO_PRESET_MODES[combo.value] ?? COMBO_PRESET_MODES.off;
+    const next = {
+        comboDefault: combo.value,
+        cavemanDefault: preset.caveman,
+        rtkDefault: preset.rtk,
+        ponytailDefault: preset.ponytail,
+        currency: current.currency,
+    };
+    const caveman = await askInteractiveChoice('Caveman default', [...CAVEMAN_DEFAULTS].map((v) => ({
+        value: v, label: v,
+    })), next.cavemanDefault);
+    if (caveman.status !== 'selected')
+        return null;
+    next.cavemanDefault = caveman.value;
+    const rtk = await askInteractiveChoice('RTK default', [
+        { value: 'on', label: 'on' },
+        { value: 'off', label: 'off' },
+    ], next.rtkDefault ? 'on' : 'off');
+    if (rtk.status !== 'selected')
+        return null;
+    next.rtkDefault = rtk.value === 'on';
+    const ponytail = await askInteractiveChoice('Ponytail default', [...PONYTAIL_DEFAULTS].map((v) => ({
+        value: v, label: v,
+    })), next.ponytailDefault);
+    if (ponytail.status !== 'selected')
+        return null;
+    next.ponytailDefault = ponytail.value;
+    const cur = await askInteractiveChoice('Display currency (usage/gain reports)', CURRENCY_CODES.map((v) => ({
+        value: v, label: v,
+    })), next.currency);
+    if (cur.status !== 'selected')
+        return null;
+    next.currency = cur.value;
+    return next;
+}
+function printSettingsTable(current) {
+    console.log('\n=== Tersio Settings ===');
+    // Currency lives here no longer: the gain dashboard owns displaying and
+    // persisting it (its picker POSTs to /currency); settings can still set
+    // the stored default via --currency or the prompt below.
+    const rows = [
+        ['combo', current.comboDefault, [...COMBO_DEFAULTS].join(' | ')],
+        ['caveman', current.cavemanDefault, [...CAVEMAN_DEFAULTS].join(' | ')],
+        ['rtk', current.rtkDefault ? 'on' : 'off', 'on | off'],
+        ['ponytail', current.ponytailDefault, [...PONYTAIL_DEFAULTS].join(' | ')],
+    ];
+    for (const l of textTable(['Setting', 'Current', 'Valid values'], rows, [false, false, false], 64)) {
+        console.log(l);
+    }
+    console.log(`  Stored: ${PACKAGE_NAME} in ${path.join(OMP_PLUGINS_DIR, 'omp-plugins.lock.json')}`);
+}
+async function runSettings() {
+    const current = await storedProfile();
+    printSettingsTable(current);
+    let next;
+    if (profileFlagsGiven || currencyGiven) {
+        next = applyFlags(current);
+    }
+    else if (tty()) {
+        next = await askProfile(current);
+        if (next === null) {
+            closeRL();
+            process.exit(130);
+            return;
+        }
+    }
+    else {
+        console.log('\n  No flags given and no TTY — nothing to change.');
+        console.log('  Usage: tersio settings [--combo-default off|medium|balanced|max] [--caveman-default off|lite|full|ultra|wenyan] [--rtk-default on|off] [--ponytail-default off|lite|full|ultra|review] [--currency USD|PHP|EUR|GBP|JPY|KRW|SGD|AUD|CAD|INR] [--dry-run]');
+        closeRL();
+        return;
+    }
+    if (dryRun) {
+        console.log(`\n  [dry-run] would set defaults: ${formatProfile(next)}`);
+        closeRL();
+        return;
+    }
+    await writePluginSettings(next, {});
+    console.log(`  Defaults: ${formatProfile(next)}`);
+    console.log('  Applies to fresh sessions only — anything persisted with /combo, /caveman, or /rtk wins.');
+    console.log('  Currency applies to usage/gain reports; --currency overrides it per run.');
+    closeRL();
+}
+export { runSettings };

package/cli/usage.js

@@ -1,14 +1,11 @@
-// cli/usage.ts — ledger + session-token usage report, tokscale-style.
-import path from 'node:path';
-import { co2GramsFor, energyWhFor, importSessionTokens, ledgerPath, priceFor, readResetWatermark, readUsage, refreshPricesIfStale, sessionsDir, usdCost, } from '../extensions/shared/usage-ledger.js';
+import { co2GramsFor, displayModelId, energyWhFor, importSessionTokens, ledgerPath, priceFor, readResetWatermark, readUsage, refreshPricesIfStale, sessionsDir, usdCost, } from '../extensions/shared/usage-ledger.js';
 import { readRtkGain } from '../extensions/shared/rtk-gain.js';
+import { readUsageDb, syncUsageDb, usageDbPath } from '../extensions/shared/usage-store.js';
 import { withInteractiveSpinner } from './interactive.js';
-import { PACKAGE_VERSION } from './common.js';
-// RTK's history is machine-wide, so every project's commands have to reach
-// the table or a busy repo silently stands in for all of them. The old cap of
-// 10 rows ranked by tokens saved hid whole projects whose commands save little
-// to nothing; 2000 groups covers a long history (~1.7k today) while still
-// bounding /data.json.
+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.
 const RTK_COMMAND_ROWS = 2000;
 export function summarizeUsage(rows) {
     refreshPricesIfStale();
@@ -19,7 +16,24 @@ 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);
-    const session = importSessionTokens();
+    // 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();
+    }
+    catch {
+        synced = false;
+    }
+    let stored = null;
+    try {
+        stored = readUsageDb()?.tokens ?? null;
+    }
+    catch {
+        stored = null;
+    }
+    const session = stored ?? importSessionTokens();
+    const source = stored ? (synced ? 'stored' : 'stored-stale') : 'live';
     const watermark = readResetWatermark();
     let usd = 0;
     let priced = true;
@@ -67,7 +81,9 @@ export function summarizeUsage(rows) {
         co2g,
         energyWh,
         version: PACKAGE_VERSION,
-        paths: { ledger: ledgerPath(), sessions: sessionsDir() },
+        currency,
+        source,
+        paths: { ledger: ledgerPath(), sessions: sessionsDir(), usageDb: usageDbPath() },
     };
 }
 function fmt(n) {
@@ -97,8 +113,8 @@ 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) {
+// 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)));
     const line = (l, m, r) => l + widths.map((w) => '─'.repeat(w + 2)).join(m) + r;
@@ -110,14 +126,14 @@ function table(headers, rows, right = [], maxW = 32) {
     return out.map((l) => '  ' + l);
 }
 function printReport(report) {
-    console.log(`\n=== Tersio Usage v${report.version} · ${fmt(report.messages)} msgs ===`);
+    console.log(`\n=== Tersio Usage v${report.version} · ${fmt(report.messages)} msgs · ${report.source} ===`);
     if (report.empty) {
         console.log('  No ledger rows or session tokens yet — run session commands first.');
         return;
     }
     const t = report.tokens;
     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.)`);
+    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.)`);
     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');
@@ -126,36 +142,34 @@ 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 [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)}`];
+            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)}`];
         });
-        for (const l of table(['Model', 'Input', 'Output', 'Cache r/w', 'USD', 'Hit', 'Share'], mrows, [false, true, true, true, true, true, false])) {
+        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);
         }
     }
-    const cmdRows = report.byTool.map(([tool, n]) => ({ name: tool, project: '', count: n, saved: null, avgPct: null, avgMs: null }));
+    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, project: r.project, count: r.count, saved: r.saved, avgPct: r.avgPct, avgMs: r.avgMs });
+        cmdRows.push({ name: r.command, count: r.count, saved: r.saved, avgPct: r.avgPct, avgMs: r.avgMs });
     }
     cmdRows.sort((a, b) => b.count - a.count);
     if (cmdRows.length) {
         const g = report.rtkGain;
-        const projects = new Set(g.byCommand.map((r) => r.project).filter(Boolean));
         const scope = g.commands
-            ? `  COMMAND TOOLS  ${fmt(report.byTool.length)} tools · ${fmt(g.commands)} commands · ${fmtShort(g.saved)} saved · ${fmt(projects.size)} projects`
+            ? `  COMMAND TOOLS  ${fmt(cmdRows.length)} commands · ${fmt(g.commands)} runs · ${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,
-            r.project ? path.basename(r.project) : '–',
             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', 'Project', 'Count', 'Saved', 'Avg%', 'Time', 'Impact'], crows, [true, false, false, true, true, true, true, false], 30)) {
+        for (const l of textTable(['#', 'Tool/Command', 'Count', 'Saved', 'Avg%', 'Time', 'Impact'], crows, [true, false, true, true, true, true, false], 30)) {
             console.log(l);
         }
     }
@@ -164,4 +178,4 @@ async function runUsage() {
     const report = await withInteractiveSpinner('Reading usage ledger', async () => summarizeUsage(readUsage()));
     printReport(report);
 }
-export { runUsage };
+export { runUsage, textTable };