@krtclcdy/tersio 2.13.0 → 2.15.0

package/README.md

@@ -52,10 +52,10 @@ omp plugin features @krtclcdy/tersio --disable rtk
 Then restart OMP and enable a preset:
 
 ```text
-/tersio combo medium
+/combo balanced
 ```
 
-Individual toggles: `/tersio caveman full` · `/tersio rtk on` · `/tersio ponytail full`. Everything starts off until you enable it.
+Individual toggles: `/caveman full` · `/rtk on` · `/ponytail full`. Everything starts off until you enable it.
 
 Session-start defaults (prompted during `install`, or flags):
 
@@ -63,7 +63,7 @@ Session-start defaults (prompted during `install`, or flags):
 tersio install --combo-default balanced --caveman-default lite --rtk-default on
 ```
 
-Defaults apply to fresh sessions only — anything persisted with `/tersio combo`, `/tersio caveman`, or `/tersio rtk` wins. Stored as plugin settings (`omp plugin config get @krtclcdy/tersio comboDefault`).
+Defaults apply to fresh sessions only — anything persisted with `/combo`, `/caveman`, or `/rtk` wins. Stored as plugin settings (`omp plugin config get @krtclcdy/tersio comboDefault`).
 
 One-off use without installing:
 
@@ -108,7 +108,7 @@ Break-even math, balanced preset (caveman full + rtk + ponytail): a mixed turn c
 | `tersio doctor` | Check OMP, extension, Ponytail, and RTK health |
 | `tersio usage` | Ledger-backed usage + savings report |
 | `tersio gain` | Open the gain dashboard (`--open`, `--export <file>`, `--port <n>`; serves localhost only) |
-| `tersio reset` | Clear tersio statistics (usage ledger; `--dry-run`, `--yes`) — sessions and RTK history stay intact |
+| `tersio reset` | Clear tersio statistics: usage ledger + a watermark that hides pre-reset rows from every derived view (Y/N confirm, `--dry-run`, `--yes`) — session transcripts and RTK history stay intact on disk |
 | `tersio uninstall` | Remove extensions, registration, and the Ponytail plugin (`--keep-ponytail` keeps Ponytail; `--remove-rtk` also removes the RTK binary and its `rtk.ts` OMP wiring) |
 | `tersio version` | Print version |
 
@@ -116,21 +116,21 @@ Flags: `--dry-run`, `--yes`/`-y`, `--verbose`, `--combo-default`/`--caveman-defa
 
 ## ⌨️ Commands reference
 
-Everything runs under one root. Bare `/tersio` prints status.
+Mode switches live on their own commands; bare `/tersio` prints status.
 
 | Command | Purpose |
 |---|---|
-| `/tersio combo off\|medium\|balanced\|max\|status` | One preset for all three (start here): medium = lite/lite/on, balanced = full/full/on, max = ultra/ultra/on; per-mode tweaks drop to `custom`. |
-| `/tersio caveman lite\|full\|ultra\|wenyan\|off\|status` | Terse replies (substance stays); `ultra` uses fragments only, `wenyan` a compressed classical-Chinese-inspired register. |
-| `/tersio rtk on\|off\|status` | Compact shell output via the real `rtk` binary; exact bytes (checksums, patches) bypass it by policy. |
-| `/tersio ponytail off\|lite\|full\|ultra\|review\|status` | Minimal code (YAGNI): `lite` nudges, `full` enforces, `ultra` challenges the requirement, `review` audits for over-engineering. |
+| `/combo off\|medium\|balanced\|max\|status` | One preset for all three (start here): medium = lite/lite/on, balanced = full/full/on, max = ultra/ultra/on; per-mode tweaks drop to `custom`. |
+| `/caveman lite\|full\|ultra\|wenyan\|off\|status` | Terse replies (substance stays); `ultra` uses fragments only, `wenyan` a compressed classical-Chinese-inspired register. |
+| `/rtk on\|off\|status` | Compact shell output via the real `rtk` binary; exact bytes (checksums, patches) bypass it by policy. |
+| `/ponytail off\|lite\|full\|ultra\|review\|status` | Minimal code (YAGNI): `lite` nudges, `full` enforces, `ultra` challenges the requirement, `review` audits for over-engineering (upstream command). |
 | `/tersio status` | Active modes + combo level; state persists, propagates to subagents, and lights the Combo footer indicator. |
 | `/tersio check` | Add-on version check |
 | `/tersio update <ponytail\|rtk\|caveman\|all> [--dry-run]` | Update add-ons, preview with dry-run |
 | `/tersio gain` | Savings summary; the gain dashboard charts `~/.omp/plugins/tersio-usage.jsonl` (`tersio gain --open` serves on 127.0.0.1, `--export` writes one file). |
 | `/tersio usage` | Ledger report for this machine (rows in `~/.omp/plugins/tersio-usage.jsonl`, local only) |
 | `/tersio help` | This table |
-| `/caveman`, `/rtk`, `/combo`, `/ai-addons` | Legacy aliases, still work; prefer `/tersio`. |
+| `/ai-addons` | Add-on updater alias, still works. |
 
 ## 🗂️ Files and backups
 

package/cli/banner.js

@@ -72,13 +72,20 @@ function bannerLines(tier = bannerTier()) {
     return out;
 }
 let shown = false;
-// OMP-style welcome: intro line + note box with art and tips.
+// OMP-style welcome: intro line + note box with art left, commands right.
 // No-op unless interactive (and never on --dry-run).
 function printWelcome() {
     if (shown || dryRun || !tty())
         return;
     shown = true;
     clackIntro(`✂ tersio v${PACKAGE_VERSION}`);
-    clackNote(`${bannerLines().join('\n')}\n\n  tersio install   set up add-ons\n  tersio update    refresh CLI + add-ons\n  tersio doctor    verify the install`, 'cut token bloat');
+    const tips = [
+        'tersio install   set up add-ons',
+        'tersio update    refresh CLI + add-ons',
+        'tersio doctor    verify the install',
+    ];
+    const art = bannerLines();
+    const rows = art.map((line, i) => (i >= 1 && i <= 3 ? `${line}  ${tips[i - 1]}` : line));
+    clackNote(rows.join('\n'));
 }
 export { bannerLines, bannerTier, printWelcome };

package/cli/dashboard.js

@@ -8,7 +8,7 @@ import { promises as fs } from 'node:fs';
 import http from 'node:http';
 import path from 'node:path';
 import { fileURLToPath } from 'node:url';
-import { clearUsageLedger, readUsage } from '../extensions/shared/usage-ledger.js';
+import { clearUsageLedger, markReset, readUsage } from '../extensions/shared/usage-ledger.js';
 import { summarizeUsage } from './usage.js';
 import { withInteractiveSpinner } from './interactive.js';
 const DASH_DIR = path.join(path.dirname(fileURLToPath(import.meta.url)), '..', 'dashboard');
@@ -52,6 +52,7 @@ async function runDashboard(options) {
     const server = http.createServer(async (req, res) => {
         if (req.url === '/reset' && req.method === 'POST') {
             const rows = clearUsageLedger();
+            markReset();
             res.writeHead(200, { 'Content-Type': 'application/json' });
             res.end(JSON.stringify({ ok: true, rows }));
             return;

package/cli/doctor.js

@@ -1,7 +1,7 @@
 // cli/doctor.ts — installation health checks.
 import { promises as fs } from 'node:fs';
 import path from 'node:path';
-import { BUN_BIN_DIR, HOME, OMP_AGENT_DIR, OMP_PLUGINS_DIR, OMP_BIN, PACKAGE_NAME, PACKAGE_VERSION, RTK_BINARY_NAME, execP, parseJsonObject, relTime, } from './common.js';
+import { BUN_BIN_DIR, OMP_AGENT_DIR, OMP_PLUGINS_DIR, OMP_BIN, PACKAGE_NAME, PACKAGE_VERSION, RTK_BINARY_NAME, execP, parseJsonObject, relTime, } from './common.js';
 import { runInteractivePhase } from './interactive.js';
 import { ledgerPath, readUsage, sessionsDir } from '../extensions/shared/usage-ledger.js';
 import { readRtkGain, rtkDbPath } from '../extensions/shared/rtk-gain.js';
@@ -56,50 +56,53 @@ async function runDoctor() {
         const err = e;
         return err.stdout?.trim() || err.stderr?.trim() || null;
     }));
-    const [ompVersion, agentEntries, extEntries, sharedStateText, configText, updateVersion] = await runInteractivePhase('Checking environment and installation', () => Promise.all([
-        probes.ompVersion,
-        probes.agentEntries,
-        probes.extEntries,
-        probes.sharedStateText,
-        probes.configText,
-        probes.updateVersion,
+    const [[ompVersion, agentEntries, extEntries, sharedStateText, configText, updateVersion], [cavemanIndexText, rtkIndexText, updaterIndexText, comboIndexText, tersioIndexText, modeReinforcementText, ponytailPkgText, ponytailExtText, pluginsPkgRaw, selfPkgText], [cavemanRuleText, ruleMtime, rtkBinText, rtkMtime, rtkVersion, rtkOmpText, ponytailMtime]] = await runInteractivePhase('Checking installation', () => Promise.all([
+        Promise.all([
+            probes.ompVersion,
+            probes.agentEntries,
+            probes.extEntries,
+            probes.sharedStateText,
+            probes.configText,
+            probes.updateVersion,
+        ]),
+        Promise.all([
+            probes.cavemanIndexText,
+            probes.rtkIndexText,
+            probes.updaterIndexText,
+            probes.comboIndexText,
+            probes.tersioIndexText,
+            probes.modeReinforcementText,
+            probes.ponytailPkgText,
+            probes.ponytailExtText,
+            probes.pluginsPkgRaw,
+            probes.selfPkgText,
+        ]),
+        Promise.all([
+            probes.cavemanRuleText,
+            probes.ruleMtime,
+            probes.rtkBinText,
+            probes.rtkMtime,
+            rtkVersionProbe,
+            probes.rtkOmpText,
+            probes.ponytailMtime,
+        ]),
     ]));
-    const [cavemanIndexText, rtkIndexText, updaterIndexText, comboIndexText, tersioIndexText, modeReinforcementText, ponytailPkgText, ponytailExtText, pluginsPkgRaw, selfPkgText] = await runInteractivePhase('Checking extensions and plugins', () => Promise.all([
-        probes.cavemanIndexText,
-        probes.rtkIndexText,
-        probes.updaterIndexText,
-        probes.comboIndexText,
-        probes.tersioIndexText,
-        probes.modeReinforcementText,
-        probes.ponytailPkgText,
-        probes.ponytailExtText,
-        probes.pluginsPkgRaw,
-        probes.selfPkgText,
-    ]));
-    const [cavemanRuleText, ruleMtime, rtkBinText, rtkMtime, rtkVersion, rtkOmpText, ponytailMtime] = await runInteractivePhase('Checking add-ons', () => Promise.all([
-        probes.cavemanRuleText,
-        probes.ruleMtime,
-        probes.rtkBinText,
-        probes.rtkMtime,
-        rtkVersionProbe,
-        probes.rtkOmpText,
-        probes.ponytailMtime,
-    ]));
-    // Categorized output with a tally; section headers group related probes.
+    // Categorized output with a tally; success rows stay quiet (no path echoes)
+    // while failures print the expected path or fix so they stay actionable.
     const tally = { ok: 0, missing: 0, warn: 0 };
     function check(label, ok, detail = '') {
         if (ok) {
             tally.ok++;
-            console.log(`  ${label}: ok${detail ? ` ${detail}` : ''}`);
+            console.log(`  ✅ ${label}: ok${detail ? ` ${detail}` : ''}`);
         }
         else {
             tally.missing++;
-            console.log(`  ${label}: MISSING${detail ? ` ${detail}` : ''}`);
+            console.log(`  ❌ ${label}: MISSING${detail ? ` ${detail}` : ''}`);
         }
     }
     function warnLine(label, detail) {
         tally.warn++;
-        console.log(`  ${label}: warn ${detail}`);
+        console.log(`  ⚠️ ${label}: warn ${detail}`);
     }
     section('Environment');
     check('Node', true, process.version);
@@ -110,33 +113,27 @@ async function runDoctor() {
         warnLine('Tersio CLI', `${PACKAGE_VERSION} (version check unreachable)`);
     else
         check('Tersio CLI', true, PACKAGE_VERSION);
-    console.log(`  Home: ${HOME}`);
     section('Installation');
-    check('OMP agent dir', agentEntries !== null, agentDir);
-    check('OMP extensions dir', extEntries !== null, extDir);
-    check('OMP config.yml', configText !== null, configPath);
+    check('OMP agent dir', agentEntries !== null, agentEntries === null ? agentDir : '');
+    check('OMP extensions dir', extEntries !== null, extEntries === null ? extDir : '');
+    check('OMP config.yml', configText !== null, configText === null ? configPath : '');
     check('Shared session bridge', sharedStateText !== null);
-    section('Extensions');
+    section('Extensions & plugins');
     check('Caveman extension', cavemanIndexText !== null);
     check('RTK extension', rtkIndexText !== null);
     check('Updater extension', updaterIndexText !== null);
     check('Combo extension', comboIndexText !== null);
     check('Tersio commands extension', tersioIndexText !== null);
     check('Mode reinforcement extension', modeReinforcementText !== null);
-    section('Plugins');
-    check('Ponytail package', ponytailPkgText !== null);
     check('Ponytail extension', ponytailExtText !== null);
-    if (configText) {
-        check('Ponytail in config.yml', configText.includes('ponytail') && configText.includes('pi-extension'));
-        check('Combo in config.yml', configText.includes('combo-toggle'));
-    }
+    check('Ponytail in config.yml', (configText ?? '').includes('ponytail') && (configText ?? '').includes('pi-extension'));
+    check('Combo in config.yml', (configText ?? '').includes('combo-toggle'));
     check('Self plugin package', selfPkgText !== null, parseJsonObject(selfPkgText)?.version ?? '');
     const selfDep = PACKAGE_NAME in (parseJsonObject(pluginsPkgRaw)?.dependencies || {});
     check('Self plugin in plugins/package.json', selfDep);
-    section('Usage');
+    section('Usage & records');
     const usageRows = readUsage();
-    check('Usage ledger', usageRows.length > 0, usageRows.length ? `${usageRows.length} rows · ${ledgerPath()}` : ledgerPath());
-    section('Records');
+    check('Usage ledger', true, usageRows.length ? `${usageRows.length} rows` : 'empty — no records yet');
     console.log(`  Usage ledger (tersio-owned, tersio reset clears): ${ledgerPath()} · ${usageRows.length} rows`);
     console.log(`  Session transcripts (host-owned, never touched): ${sessionsDir()}`);
     const rtkDb = rtkDbPath();
@@ -146,22 +143,14 @@ async function runDoctor() {
     const ruleAge = ruleMtime ? `updated ${relTime(Date.now() - ruleMtime.mtimeMs)}` : '';
     check('Caveman rule', cavemanRuleText !== null, ruleAge);
     const rtkAge = rtkMtime ? `updated ${relTime(Date.now() - rtkMtime.mtimeMs)}` : '';
-    if (rtkBinText === null)
-        check('RTK binary', false, rtkBin);
-    else {
-        const bits = [rtkVersion, rtkAge].filter(Boolean).join(', ');
-        check('RTK binary', true, bits);
-        if (!rtkVersion)
-            warnLine('RTK version', 'unavailable — binary may not be executable');
-        if (rtkOmpText === null)
-            check('RTK OMP wiring (rtk.ts)', false, `run: rtk init -g --agent omp`);
-        else
-            check('RTK OMP wiring (rtk.ts)', true, path.join(extDir, 'rtk.ts'));
-    }
+    check('RTK binary', rtkBinText !== null, rtkBinText === null ? rtkBin : [rtkVersion, rtkAge].filter(Boolean).join(', '));
+    if (rtkBinText !== null && !rtkVersion)
+        warnLine('RTK version', 'unavailable — binary may not be executable');
+    check('RTK OMP wiring (rtk.ts)', rtkOmpText !== null, rtkOmpText === null ? 'run: rtk init -g --agent omp' : '');
     const ponytailAge = ponytailMtime ? `updated ${relTime(Date.now() - ponytailMtime.mtimeMs)}` : '';
     check('Ponytail', ponytailPkgText !== null, [parseJsonObject(ponytailPkgText)?.version ?? '', ponytailAge].filter(Boolean).join(', '));
     const total = tally.ok + tally.missing + tally.warn;
-    console.log(`\n  Summary: ${total} checks — ${tally.ok} ok, ${tally.warn} warn, ${tally.missing} missing`);
+    console.log(`\n  Summary: ${total} checks — ✅ ${tally.ok} ok, ⚠️ ${tally.warn} warn, ❌ ${tally.missing} missing`);
 }
 function section(name) {
     console.log(`\n${name}`);

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, applyUpdate, cavemanDefaultFlag, comboDefaultFlag, command, dryRun, install, ponytailDefaultFlag, profileFlagsGiven, reinstall, rtkDefaultFlag, verbose, yes, dashboardExport, dashboardPort, debug, ensureExtensionAfterConfigEntry, ensureExtensionInConfig, ensurePonytailConfigValue, execP, parseJsonObject, readPluginsPackage, writeIfChanged, } from './common.js';
+import { BUN_BIN_DIR, CAVEMAN_DEFAULTS, COMBO_PRESET_MODES, EXTENSIONS_KEY_RE, HOME, IS_WINDOWS, OMP_AGENT_DIR, OMP_PLUGINS_DIR, OMP_BIN, PACKAGE_NAME, PACKAGE_VERSION, PONYTAIL_DEFAULTS, RTK_BINARY_NAME, applyUpdate, cavemanDefaultFlag, comboDefaultFlag, command, dryRun, install, ponytailDefaultFlag, profileFlagsGiven, reinstall, rtkDefaultFlag, verbose, yes, dashboardExport, dashboardPort, debug, ensureExtensionAfterConfigEntry, ensureExtensionInConfig, ensurePonytailConfigValue, execP, parseJsonObject, readPluginsPackage, writeIfChanged, } from './common.js';
 import { askInteractiveChoice, askInteractiveConfirm, closeRL, execNetwork, tty, withInteractiveSpinner, } from './interactive.js';
 import { printWelcome } from './banner.js';
 import { checkForUpdate, runLatestUpdate } from './update.js';
@@ -442,21 +442,52 @@ function defaultProfile() {
         ponytailDefault: 'off',
     };
 }
-// Install is always user-level (all OMP sessions). Project scope was removed:
-// session extensions must live in ~/.omp/agent/extensions to load.
-async function resolveProfile() {
-    const profile = defaultProfile();
+async function storedProfile() {
+    const base = defaultProfile();
+    const raw = await readTextIfExists(path.join(OMP_PLUGINS_DIR, 'omp-plugins.lock.json'));
+    if (!raw)
+        return base;
+    let stored;
+    try {
+        const parsed = JSON.parse(raw);
+        if (!parsed || typeof parsed !== 'object' || !('settings' in parsed))
+            return base;
+        const settings = parsed.settings;
+        if (!settings || typeof settings !== 'object' || !(PACKAGE_NAME in settings))
+            return base;
+        const entry = settings[PACKAGE_NAME];
+        if (!entry || typeof entry !== 'object')
+            return base;
+        stored = entry;
+    }
+    catch {
+        return base;
+    }
+    if (typeof stored.comboDefault === 'string' && stored.comboDefault in COMBO_PRESET_MODES)
+        base.comboDefault = stored.comboDefault;
+    if (typeof stored.cavemanDefault === 'string' && CAVEMAN_DEFAULTS.has(stored.cavemanDefault))
+        base.cavemanDefault = stored.cavemanDefault;
+    if (typeof stored.rtkDefault === 'boolean')
+        base.rtkDefault = stored.rtkDefault;
+    if (typeof stored.ponytailDefault === 'string' && PONYTAIL_DEFAULTS.has(stored.ponytailDefault))
+        base.ponytailDefault = stored.ponytailDefault;
+    return base;
+}
+async function resolveProfile(forceReinstall = false) {
+    // Seed from the lock file so flag-less update/reinstall runs keep the
+    // user's configured defaults instead of resetting them to off.
+    const profile = await storedProfile();
     // Single interactive prompt: the Combo preset implies all three modes.
     // Numbered menu — no typing preset names.
     // Only for a real user at a terminal, only when no default flags were
     // given, and never for --apply-update runs.
-    if (tty() && !profileFlagsGiven && !applyUpdate && (install || reinstall)) {
+    if (tty() && !profileFlagsGiven && !applyUpdate && (install || forceReinstall || reinstall)) {
         const choice = 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' },
-        ], 'off');
+        ], profile.comboDefault);
         if (choice.status === 'selected')
             profile.comboDefault = choice.value;
         else {
@@ -558,11 +589,12 @@ async function runCommandMenu() {
     updatePromptDone = true;
     const choice = await askInteractiveChoice('Tersio — what next?', [
         { value: 'install', label: 'Install add-ons', hint: 'user scope + combo defaults' },
-        { value: 'check', label: 'Check for updates', hint: 'check CLI version, then update ai-addons' },
+        { value: 'update', label: 'Update', hint: 'CLI version check, then refresh add-ons (RTK, Caveman rule, Ponytail)' },
+        { value: 'reinstall', label: 'Reinstall', hint: 'clean and reinstall the add-ons, Ponytail package kept' },
         { 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: 'reset', label: 'Reset statistics', hint: 'clear the tersio usage ledger' },
+        { value: 'reset', label: 'Reset statistics', hint: 'clear statistics; transcripts and RTK history stay' },
         { value: 'uninstall', label: 'Uninstall', hint: 'remove tersio' },
     ], 'install');
     if (choice.status !== 'selected') {
@@ -573,8 +605,8 @@ async function runCommandMenu() {
         case 'install':
             await runInstall();
             break;
-        case 'check': {
-            // One bound flow: report the CLI version, then offer the ai-addons
+        case 'update': {
+            // One bound flow: report the CLI version, then offer the add-on
             // refresh in the same pass — no redundant second "update" option.
             const latest = await checkForUpdate(true);
             if (typeof latest === 'string')
@@ -583,7 +615,7 @@ async function runCommandMenu() {
                 console.log(`  [warn] could not reach the npm registry — run \`tersio update\` to retry`);
             else
                 console.log(`  [ok] tersio ${PACKAGE_VERSION} is the latest`);
-            const go = await askInteractiveConfirm('Update ai-addons now (RTK, Caveman rule, Ponytail)?');
+            const go = await askInteractiveConfirm('Update add-ons now (RTK, Caveman rule, Ponytail)?');
             if (go.status === 'confirmed' && go.value) {
                 await runLatestUpdate();
             }
@@ -597,6 +629,10 @@ async function runCommandMenu() {
             closeRL();
             break;
         }
+        case 'reinstall':
+            await runInstall({ reinstall: true });
+            closeRL();
+            break;
         case 'doctor':
             await runDoctor();
             closeRL();
@@ -619,7 +655,8 @@ async function runCommandMenu() {
             break;
     }
 }
-async function runInstall() {
+async function runInstall(overrides = {}) {
+    const isReinstall = overrides.reinstall ?? reinstall;
     // Menu-driven installs must fall through: bare `tersio` re-enters here
     // with command === null after the picker, and without this guard the
     // choice loops straight back into runCommandMenu() forever.
@@ -628,8 +665,11 @@ async function runInstall() {
         return;
     }
     printWelcome();
-    if (reinstall) {
-        await runUninstall({ yes: true, removePonytail: false, removeRtk: true });
+    if (isReinstall) {
+        // removeRtk stays false: reinstall is about to replace the binary, and
+        // deleting it first would leave nothing to wire if the fresh download
+        // fails (rate limit, offline). rtk.ts is removed here and re-wired below.
+        await runUninstall({ yes: true, removePonytail: false, removeRtk: false });
     }
     if (dryRun)
         console.log('[dry-run] No changes will be written.\n');
@@ -665,13 +705,13 @@ async function runInstall() {
     }
     console.log('  Scope: user (all OMP sessions)');
     // Resolve session defaults: flags > interactive prompt > defaults.
-    const profile = await resolveProfile();
+    const profile = await resolveProfile(isReinstall);
     const userDir = OMP_AGENT_DIR;
     const userExtDir = path.join(userDir, 'extensions');
     // apply-update is `tersio update`'s payload run: treat it like reinstall so
     // the add-ons refresh too — Ponytail package via npm, self plugin, RTK
     // binary (always re-downloaded), and the Caveman rule (always re-fetched).
-    const options = { dryRun, verbose, yes, reinstall: reinstall || applyUpdate };
+    const options = { dryRun, verbose, yes, reinstall: isReinstall || applyUpdate };
     // Check prerequisites
     console.log('\nPrerequisites:');
     try {

package/cli/reset.js

@@ -1,29 +1,33 @@
-// cli/reset.ts — clear tersio-owned statistics (usage ledger).
-// Session transcripts (~/.omp/agent/sessions) and the RTK database are
-// host/tool-owned and are never touched; doctor shows where they live.
+// cli/reset.ts — clear tersio-owned statistics: the usage ledger plus a reset
+// watermark that filters session-derived and RTK-metered rows out of every
+// derived view. Session transcripts (~/.omp/agent/sessions) and the RTK
+// database are host/tool-owned and are never touched; the watermark only
+// changes what tersio shows.
 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, ledgerPath, readUsage } from '../extensions/shared/usage-ledger.js';
-import { sessionsDir } from '../extensions/shared/usage-ledger.js';
-import { rtkDbPath } from '../extensions/shared/rtk-gain.js';
+import { clearUsageLedger, importSessionTokens, ledgerPath, markReset, readUsage, sessionsDir } from '../extensions/shared/usage-ledger.js';
+import { readRtkGain, rtkDbPath } from '../extensions/shared/rtk-gain.js';
 async function runReset() {
     console.log('\n=== Tersio Reset ===\n');
     const rows = readUsage().length;
-    console.log(`Will remove: ${rows} usage rows · ${ledgerPath()}`);
-    console.log(`Left intact: sessions ${sessionsDir()}, rtk ${rtkDbPath()}`);
+    const sessions = importSessionTokens();
+    const rtk = readRtkGain(1);
+    console.log(`Will clear: ${rows} usage ledger rows · ${ledgerPath()}`);
+    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) {
-        console.log('[dry-run] ledger kept.');
+        console.log('[dry-run] nothing written.');
         return true;
     }
-    if (rows === 0) {
-        console.log('Nothing to reset — usage ledger is already empty.');
+    if (rows === 0 && sessions.messages === 0 && rtk.commands === 0) {
+        console.log('Nothing to reset — no statistics recorded.');
         return true;
     }
     if (!yes) {
         if (tty()) {
             closeRL();
-            const confirmedChoice = await clackConfirm({ message: 'Clear the usage ledger?', initialValue: false });
+            const confirmedChoice = await clackConfirm({ message: 'Clear tersio statistics?', initialValue: false });
             if (typeof confirmedChoice !== 'boolean') {
                 clackCancel('Aborted.');
                 closeRL();
@@ -45,7 +49,8 @@ async function runReset() {
         }
     }
     const cleared = clearUsageLedger();
-    console.log(`[ok] reset — removed ${cleared} usage rows`);
+    const ts = markReset();
+    console.log(`[ok] reset — removed ${cleared} usage rows; statistics view starts at ${new Date(ts).toISOString()}`);
     return true;
 }
 export { runReset };

package/cli/usage.js

@@ -1,9 +1,10 @@
 // cli/usage.ts — ledger + session-token usage report, tokscale-style.
-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 { co2GramsFor, energyWhFor, importSessionTokens, ledgerPath, priceFor, readResetWatermark, readUsage, refreshPricesIfStale, sessionsDir, usdCost, } from '../extensions/shared/usage-ledger.js';
+import { readRtkGain } from '../extensions/shared/rtk-gain.js';
 import { withInteractiveSpinner } from './interactive.js';
 import { PACKAGE_VERSION } from './common.js';
 export function summarizeUsage(rows) {
+    refreshPricesIfStale();
     const byKind = {};
     const detailCounts = {};
     for (const r of rows) {
@@ -12,6 +13,7 @@ export function summarizeUsage(rows) {
     }
     const byDetail = Object.entries(detailCounts).sort((a, b) => b[1] - a[1]).slice(0, 10);
     const session = importSessionTokens();
+    const watermark = readResetWatermark();
     let usd = 0;
     let priced = true;
     let savedUsd = 0;
@@ -44,7 +46,7 @@ export function summarizeUsage(rows) {
         byDayModel: session.byDayModel,
         byTool,
         recent: session.recent,
-        rtkGain: readRtkGain(),
+        rtkGain: readRtkGain(10, watermark || undefined),
         usd,
         priced,
         savedUsd,
@@ -52,7 +54,7 @@ export function summarizeUsage(rows) {
         co2g,
         energyWh,
         version: PACKAGE_VERSION,
-        paths: { ledger: ledgerPath(), sessions: sessionsDir(), rtk: rtkDbPath() },
+        paths: { ledger: ledgerPath(), sessions: sessionsDir() },
     };
 }
 function fmt(n) {

package/dashboard/app.js

@@ -778,7 +778,7 @@
     renderSpark(byDay, d.usd || 0, d.savedUsd || 0, total);
     document.getElementById('verChip').textContent = 'tersio v' + (d.version || '?');
     var dp = d.paths || {};
-    [['pathLedger', dp.ledger], ['pathSessions', dp.sessions], ['pathRtk', dp.rtk]].forEach(function(pair) {
+    [['pathLedger', dp.ledger], ['pathSessions', dp.sessions]].forEach(function(pair) {
       var pel = document.getElementById(pair[0]);
       if (pel && pair[1]) { pel.textContent = pair[1]; pel.title = pair[1]; }
     });
@@ -879,14 +879,50 @@
     els.forEach(function(el) { if (!seen.has(el)) io.observe(el); });
   }
 
+  var lastJson = '';
   function load() {
-    fetch('data.json').then(function(r) { return r.json(); }).then(render).catch(function() {
+    // Served mode only: file:// exports have no data.json endpoint, so
+    // polling there would just burn cycles on 404s.
+    if (window.location.protocol === 'file:') return;
+    // Skip background tabs: no render work while hidden, instant refresh on return.
+    if (document.hidden) return;
+    fetch('data.json').then(function(r) { return r.json(); }).then(function(d) {
+      var json = JSON.stringify(d);
+      if (json === lastJson) return;
+      lastJson = json;
+      render(d);
+    }).catch(function() {
       var cards = document.getElementById('modelCards');
       if (cards && !cards.children.length) cards.innerHTML = '<div class="empty md:col-span-3">' + emptyState('cloud-off', 'Could not load data', 'Serve with tersio gain instead of opening this file directly.') + '</div>';
       if (window.lucide) lucide.createIcons();
       observe();
     });
   }
+  // Live view: re-read data.json every 5s while served and visible; identical
+  // payloads skip render. The manual Reload button stays as an instant refresh.
+  setInterval(load, 5000);
+  document.addEventListener('visibilitychange', function() { if (!document.hidden) load(); });
+  function toast(title, desc, icon) {
+    var wrap = document.querySelector('.toaster');
+    if (!wrap) {
+      wrap = document.createElement('div');
+      wrap.className = 'toaster';
+      wrap.popover = 'manual';
+      document.body.appendChild(wrap);
+      if (wrap.showPopover) wrap.showPopover(); // top layer: paints above the native settings dialog
+    }
+    var el = document.createElement('div');
+    el.className = 'toast';
+    el.innerHTML = '<span class="toast-icon"><i data-lucide="' + (icon || 'check') + '" class="size-4"></i></span><div><p class="toast-title"></p><p class="toast-desc"></p></div>';
+    el.querySelector('.toast-title').textContent = title;
+    el.querySelector('.toast-desc').textContent = desc;
+    wrap.appendChild(el);
+    if (window.lucide) lucide.createIcons();
+    setTimeout(function() {
+      el.classList.add('out');
+      setTimeout(function() { el.remove(); }, 200);
+    }, 4000);
+  }
   document.getElementById('reload').addEventListener('click', load);
   (function() {
     var dlg = document.getElementById('settings');
@@ -909,7 +945,11 @@
         fetch('reset', { method: 'POST' }).then(function(r) { return r.json(); }).then(function() {
           label.textContent = 'Reset';
           load();
-        }).catch(function() { label.textContent = 'Reset'; });
+          toast('Statistics reset', 'The usage statistics view now starts fresh. Transcripts and RTK history were never touched.', 'rotate-ccw');
+        }).catch(function() {
+          label.textContent = 'Reset';
+          toast('Reset failed', 'Could not reach the server. Try again.', 'circle-alert');
+        });
       } else {
         resetBtn.dataset.armed = '1';
         label.textContent = 'Sure?';

package/dashboard/styles.css

@@ -201,3 +201,13 @@
   #reset { color: var(--danger); }
   #reset:hover { border-color: var(--danger); box-shadow: 0 0 14px var(--danger-border); }
   .dlg .seg button { display: grid; place-items: center; }
+
+  /* Toaster (shadcn/ui sonner-style, dependency-free) */
+  .toaster { position: fixed; inset: auto 16px 16px auto; z-index: 100; display: flex; flex-direction: column; gap: 8px; width: min(360px, calc(100vw - 32px)); border: 0; padding: 0; background: transparent; overflow: visible; }
+  .toast { display: flex; align-items: flex-start; gap: 10px; padding: 12px 14px; border: 1px solid var(--line); background: var(--panel); border-radius: 12px; box-shadow: var(--shadow-xs), 0 8px 24px rgba(0, 0, 0, .22); animation: toast-in .18s ease-out; }
+  .toast.out { animation: toast-out .18s ease-in forwards; }
+  .toast-icon { display: grid; place-items: center; width: 28px; height: 28px; border-radius: 8px; background: var(--accent-soft); color: var(--accent); flex: none; }
+  .toast-title { font-size: 13px; font-weight: 600; margin: 0; }
+  .toast-desc { font-size: 12px; color: var(--dim); margin: 1px 0 0; }
+  @keyframes toast-in { from { opacity: 0; transform: translateY(8px) scale(.98); } }
+  @keyframes toast-out { to { opacity: 0; transform: translateY(6px) scale(.98); } }

package/dashboard/template.html

@@ -83,17 +83,13 @@
         <p class="dlg-name">Session transcripts <span class="dlg-own">host-owned · never touched</span></p>
         <p class="mono dlg-file" id="pathSessions" title="">–</p>
       </div>
-      <div class="dlg-path">
-        <p class="dlg-name">RTK history <span class="dlg-own">rtk-owned · never touched</span></p>
-        <p class="mono dlg-file" id="pathRtk" title="">–</p>
-      </div>
     </div>
     <div class="dlg-danger">
       <p class="dlg-label">Danger zone</p>
       <div class="dlg-row">
         <div class="min-w-0">
           <p class="dlg-name">Reset statistics</p>
-          <p class="dlg-hint">Clears the usage ledger. Click twice to confirm.</p>
+          <p class="dlg-hint">Clears tersio statistics. Host-owned files stay intact. Click twice to confirm.</p>
         </div>
         <button id="reset" class="btn-push mono flex shrink-0 items-center gap-2 text-xs pl-2.5 pr-3 py-2 rounded-xl" style="border: 1px solid var(--danger-border)" aria-label="Reset tersio statistics">
           <i data-lucide="rotate-ccw" class="size-3.5"></i><span id="resetLabel">Reset</span>
@@ -292,7 +288,7 @@
       </span>
       <span class="ml-auto flex items-center gap-1" id="cmdPages" role="navigation" aria-label="Pages"></span>
     </div>
-    <p class="mono text-[11px] mt-3" style="color: var(--dim)">saved / avg / time are RTK-metered per command — session tools without metering show –. caveman + ponytail gains are instruction-following, bench-measured in BENCHMARK.md.</p>
+    <p class="mono text-[11px] mt-3" style="color: var(--dim)">bash commands run through the rtk-wired OMP hook meter automatically; rows without metering show –. caveman + ponytail gains are instruction-following, bench-measured in BENCHMARK.md.</p>
   </section>
 
   <footer class="mono text-xs mt-12 pt-4" style="color: var(--dim); border-top: 1px solid var(--line)">

package/extensions/combo-toggle/index.js

@@ -3,8 +3,8 @@
 import os from 'node:os';
 import path from 'node:path';
 import { createRequire } from 'node:module';
-import { activeModesSummary, asPromptArray, COMBO_LEVELS, getSharedComboState, isComboPresetActive, isOmpSubagentPrompt, normalizeComboLevel, reconcileSharedComboEntries, sessionEntries, setSharedComboLevel, setSharedComboListener, systemPromptIncludes, } from '../shared/session-state.js';
-import { readComboDefault } from '../shared/plugin-settings.js';
+import { activeModesSummary, asPromptArray, COMBO_LEVELS, getSharedComboState, isComboPresetActive, isOmpSubagentPrompt, normalizeComboLevel, reconcileSharedComboEntries, sessionEntries, setSharedComboLevel, setSharedComboListener, setSharedComboMode, systemPromptIncludes, } from '../shared/session-state.js';
+import { readComboDefault, readPonytailDefault } from '../shared/plugin-settings.js';
 const require = createRequire(import.meta.url);
 const PONYTAIL_FALLBACK_INTENSITY = {
     lite: 'Prefer the simplest correct solution.',
@@ -120,9 +120,13 @@ export default function comboToggleExtension(pi) {
         track(ctx);
         if (!ctx?.hasUI)
             syncStatus(ctx);
-        // Installer/user-configured default applies only to a fresh session with
-        // no persisted state — real session state always wins.
-        if (getSharedComboState().level === 'off' && !sessionEntries(ctx).length) {
+        // Installer/user-configured default applies only when no persisted *mode*
+        // state exists — unrelated session entries must not block it, or the
+        // combo bar never paints on sessions that already carry other entries.
+        const entries = sessionEntries(ctx);
+        const hasModeState = entries.some((e) => e?.type === 'custom' && (e.customType === 'combo-level' || e.customType === 'caveman-mode' ||
+            e.customType === 'rtk-mode' || e.customType === 'ponytail-mode'));
+        if (getSharedComboState().level === 'off' && !hasModeState) {
             const fallback = readComboDefault();
             if (fallback !== 'off') {
                 persistPreset(fallback);
@@ -130,6 +134,17 @@ export default function comboToggleExtension(pi) {
                 ctx?.ui?.notify?.(`Combo default applied: ${fallback} — ${activeModesSummary(getSharedComboState())} active for this session.`, 'info');
             }
         }
+        // Standalone ponytail default: no sibling extension restores it (upstream
+        // owns the command), so apply it here when nothing persisted a
+        // ponytail-mode entry. Skipped when it matches the active preset — the
+        // preset entry already covers that, no redundant write.
+        if (!entries.some((e) => e?.type === 'custom' && e.customType === 'ponytail-mode')) {
+            const ponytailFallback = readPonytailDefault();
+            if (ponytailFallback !== 'off' && ponytailFallback !== getSharedComboState().ponytail) {
+                pi.appendEntry?.('ponytail-mode', { mode: ponytailFallback });
+                useState(setSharedComboMode('ponytail', ponytailFallback), ctx);
+            }
+        }
     });
     for (const event of ['session_branch', 'session_tree', 'agent_start']) {
         pi.on(event, async (_event, ctx) => {

package/extensions/shared/plugin-settings.js

@@ -31,6 +31,7 @@ export function readPluginSettings() {
 }
 const COMBO_LEVELS = new Set(['off', 'medium', 'balanced', 'max']);
 const CAVEMAN_MODES = new Set(['off', 'lite', 'full', 'ultra', 'wenyan']);
+const PONYTAIL_MODES = new Set(['off', 'lite', 'full', 'ultra', 'review']);
 function readStringDefault(key, valid) {
     const raw = readPluginSettings()[key];
     return typeof raw === 'string' && valid.has(raw) ? raw : 'off';
@@ -45,3 +46,6 @@ export function readRtkDefault() {
     const raw = readPluginSettings().rtkDefault;
     return typeof raw === 'boolean' ? raw : false;
 }
+export function readPonytailDefault() {
+    return readStringDefault('ponytailDefault', PONYTAIL_MODES);
+}

package/extensions/shared/pricing.js

@@ -1,25 +1,19 @@
-// extensions/shared/pricing.ts — model pricing with live LiteLLM refresh.
-// Lookup order: exact id in the live cache → built-in substring table → default.
-// Network only in refreshPrices (called from `tersio update`); every reader is
-// sync and offline-safe. Best-effort throughout: pricing never breaks a caller.
+// extensions/shared/pricing.ts — dynamic model pricing from LiteLLM.
+// Lookup order: exact id in the live cache → provider-prefix strip → default.
+// The cache is the full LiteLLM feed (3k+ ids), refreshed lazily in background
+// and on `tersio update`; every reader is sync and offline-safe. No static
+// per-model table — list prices rot, the feed does not. Unknown models report
+// the default with known:false so the dashboard labels them honestly.
 import fs from 'node:fs';
 import os from 'node:os';
 import path from 'node:path';
-// Rough list rates (USD per 1M tokens) for the models OMP sessions cite.
-// Refresh against LiteLLM pricing data when adding families.
-const PRICE_TABLE = [
-    { match: ':free', price: { input: 0, output: 0, cacheRead: 0, cacheWrite: 0 } },
-    { match: 'opus', price: { input: 15, output: 75, cacheRead: 1.5, cacheWrite: 18.75 } },
-    { match: 'sonnet', price: { input: 3, output: 15, cacheRead: 0.3, cacheWrite: 3.75 } },
-    { match: 'haiku', price: { input: 0.8, output: 4, cacheRead: 0.08, cacheWrite: 1 } },
-    { match: 'gpt', price: { input: 2.5, output: 10, cacheRead: 1.25, cacheWrite: 2.5 } },
-    { match: 'gemini', price: { input: 1.25, output: 10, cacheRead: 0.125, cacheWrite: 1.25 } },
-    { match: 'glm', price: { input: 0.5, output: 1, cacheRead: 0.05, cacheWrite: 0.5 } },
-];
-export const DEFAULT_PRICE = { input: 3, output: 15, cacheRead: 0.3, cacheWrite: 3.75 };
+// Sonnet-class default for unpriced models; always paired with known:false.
+export const DEFAULT_PRICE = { input: 2, output: 10, cacheRead: 0.2, cacheWrite: 2.5 };
 const LITELLM_URL = 'https://raw.githubusercontent.com/BerriAI/litellm/main/model_prices_and_context_window.json';
+// Live cache refreshes lazily: readers use the file even when stale, and only
+// one refresh runs per process. `tersio update` still forces a fresh fetch.
 const CACHE_TTL_MS = 7 * 24 * 3600 * 1000;
-const KEEP_RE = /claude|sonnet|opus|haiku|gpt|gemini|glm|deepseek|qwen|kimi|mistral|grok|llama|muse|nemotron|ministral|codestral|qwen/i;
+let refreshInflight = null;
 export function pricesCachePath() {
     const override = process.env.TERSIO_PRICES_FILE;
     if (override)
@@ -29,6 +23,23 @@ export function pricesCachePath() {
 export function pricesUrl() {
     return process.env.TERSIO_PRICES_URL || LITELLM_URL;
 }
+function toPrice(t) {
+    return { input: t[0], output: t[1], cacheRead: t[2], cacheWrite: t[3] };
+}
+// Tolerate both cache shapes: compact tuples (new) and ModelPrice objects
+// (written by older refreshes) — a version bump never orphans the cache.
+function asPrice(v) {
+    if (Array.isArray(v) && v.length === 4 && v.every((n) => typeof n === 'number' && Number.isFinite(n) && n >= 0)) {
+        return toPrice(v);
+    }
+    if (v && typeof v === 'object') {
+        const o = v;
+        if (['input', 'output', 'cacheRead', 'cacheWrite'].every((k) => typeof o[k] === 'number' && Number.isFinite(o[k]) && o[k] >= 0)) {
+            return o;
+        }
+    }
+    return null;
+}
 export function loadLivePrices() {
     let raw;
     try {
@@ -41,9 +52,17 @@ export function loadLivePrices() {
         const parsed = JSON.parse(raw);
         if (typeof parsed.fetchedAt !== 'number' || !parsed.exact || typeof parsed.exact !== 'object')
             return null;
-        if (Date.now() - parsed.fetchedAt > CACHE_TTL_MS)
+        const exact = {};
+        for (const [k, v] of Object.entries(parsed.exact)) {
+            const p = asPrice(v);
+            if (p)
+                exact[k] = [p.input, p.output, p.cacheRead, p.cacheWrite];
+        }
+        if (!Object.keys(exact).length)
             return null;
-        return { fetchedAt: parsed.fetchedAt, exact: parsed.exact };
+        // Stale entries stay usable; refreshPricesIfStale refreshes in background.
+        const deprecated = Array.isArray(parsed.deprecated) ? parsed.deprecated.filter((d) => typeof d === 'string') : [];
+        return { fetchedAt: parsed.fetchedAt, exact, deprecated };
     }
     catch {
         return null;
@@ -55,67 +74,90 @@ function num(v) {
 export function priceFor(model, live) {
     const table = live === undefined ? loadLivePrices() : live;
     if (table) {
-        const hit = table.exact[model] ?? table.exact[model.toLowerCase()];
-        if (hit && [hit.input, hit.output, hit.cacheRead, hit.cacheWrite].every((v) => typeof v === 'number')) {
+        const hit = asPrice(table.exact[model] ?? table.exact[model.toLowerCase()]);
+        if (hit)
             return { price: hit, known: true, live: true };
-        }
-    }
-    const name = model.toLowerCase();
-    for (const row of PRICE_TABLE) {
-        if (name.includes(row.match))
-            return { price: row.price, known: true, live: false };
+        // Provider-prefixed ids ("azure/gpt-4o", "dashscope/qwen-max"): match the
+        // first cached id that ends with the bare model name.
+        const name = model.toLowerCase();
+        const key = Object.keys(table.exact).find((k) => k.toLowerCase() === name || k.toLowerCase().endsWith(`/${name}`));
+        const prefixed = key ? asPrice(table.exact[key]) : null;
+        if (prefixed)
+            return { price: prefixed, known: true, live: true };
     }
     return { price: DEFAULT_PRICE, known: false, live: false };
 }
-// Fetch LiteLLM pricing, keep relevant families, write the cache. False on
-// any failure (offline, timeout, shape change) — callers fall back silently.
+// Fetch LiteLLM pricing, keep every id with valid input/output rates, write
+// the cache. False on any failure (offline, timeout, shape change) — callers
+// fall back silently.
 export async function refreshPrices() {
-    let res;
-    try {
-        const ctl = new AbortController();
-        const timer = setTimeout(() => ctl.abort(), 15000);
+    if (refreshInflight)
+        return refreshInflight;
+    refreshInflight = (async () => {
+        let res;
         try {
-            res = await fetch(pricesUrl(), { signal: ctl.signal });
+            const ctl = new AbortController();
+            const timer = setTimeout(() => ctl.abort(), 15000);
+            try {
+                res = await fetch(pricesUrl(), { signal: ctl.signal });
+            }
+            finally {
+                clearTimeout(timer);
+            }
+            if (!res.ok)
+                return false;
+        }
+        catch {
+            return false;
         }
-        finally {
-            clearTimeout(timer);
+        let data;
+        try {
+            data = (await res.json());
         }
-        if (!res.ok)
+        catch {
             return false;
-    }
-    catch {
-        return false;
-    }
-    let data;
-    try {
-        data = (await res.json());
-    }
-    catch {
-        return false;
-    }
-    const exact = {};
-    for (const [id, row] of Object.entries(data)) {
-        if (!row || typeof row !== 'object' || !KEEP_RE.test(id))
-            continue;
-        const input = num(row.input_cost_per_token);
-        const output = num(row.output_cost_per_token);
-        if (input === null || output === null)
-            continue;
-        exact[id] = {
-            input: input * 1e6,
-            output: output * 1e6,
-            cacheRead: (num(row.cache_read_input_token_cost) ?? input) * 1e6,
-            cacheWrite: (num(row.cache_creation_input_token_cost) ?? input) * 1e6,
-        };
-    }
-    if (!Object.keys(exact).length)
-        return false;
+        }
+        const exact = {};
+        const deprecated = [];
+        for (const [id, row] of Object.entries(data)) {
+            if (!row || typeof row !== 'object')
+                continue;
+            const input = num(row.input_cost_per_token);
+            const output = num(row.output_cost_per_token);
+            if (input === null || output === null)
+                continue;
+            exact[id] = [
+                input * 1e6,
+                output * 1e6,
+                (num(row.cache_read_input_token_cost) ?? input) * 1e6,
+                (num(row.cache_creation_input_token_cost) ?? input) * 1e6,
+            ];
+            if (typeof row.deprecation_date === 'string' && row.deprecation_date)
+                deprecated.push(id);
+        }
+        if (!Object.keys(exact).length)
+            return false;
+        try {
+            fs.mkdirSync(path.dirname(pricesCachePath()), { recursive: true });
+            fs.writeFileSync(pricesCachePath(), JSON.stringify({ fetchedAt: Date.now(), exact, deprecated }), 'utf8');
+            return true;
+        }
+        catch {
+            return false;
+        }
+    })();
     try {
-        fs.mkdirSync(path.dirname(pricesCachePath()), { recursive: true });
-        fs.writeFileSync(pricesCachePath(), JSON.stringify({ fetchedAt: Date.now(), exact }), 'utf8');
-        return true;
+        return await refreshInflight;
     }
-    catch {
-        return false;
+    finally {
+        refreshInflight = null;
     }
 }
+// Fire-and-forget refresh when the cache is stale or missing. Readers keep
+// using the stale file (or the built-in table) — pricing never blocks.
+export function refreshPricesIfStale() {
+    const live = loadLivePrices();
+    if (live && Date.now() - live.fetchedAt <= CACHE_TTL_MS)
+        return;
+    void refreshPrices().catch(() => false);
+}

package/extensions/shared/rtk-gain.js

@@ -33,12 +33,18 @@ function query(db, sql) {
         .filter((line) => line.trim())
         .map((line) => line.split('\t'));
 }
-export function readRtkGain(limit = 10) {
+export function readRtkGain(limit = 10, cutoffMs) {
     try {
         if (!fs.existsSync(rtkDbPath()))
             return EMPTY;
-        const [[commands = '0', saved = '0', input = '0', avgPct = '0', totalMs = '0'] = []] = query(rtkDbPath(), 'SELECT COUNT(*), COALESCE(SUM(saved_tokens),0), COALESCE(SUM(input_tokens),0), COALESCE(AVG(savings_pct),0), COALESCE(SUM(exec_time_ms),0) FROM commands;');
-        const byCommand = query(rtkDbPath(), `SELECT rtk_cmd, COUNT(*), SUM(saved_tokens), AVG(savings_pct), AVG(exec_time_ms) FROM commands GROUP BY rtk_cmd ORDER BY SUM(saved_tokens) DESC LIMIT ${Math.max(1, Math.floor(limit))};`).map(([command, count, savedRow, pct, ms]) => ({
+        // View-level cutoff only: rows stay in rtk's own database untouched.
+        // strftime('%s') normalizes ISO-8601 timestamps to epoch seconds; rows
+        // with unparseable timestamps (0) drop out of a filtered view.
+        const where = cutoffMs && cutoffMs > 0
+            ? `WHERE CAST(strftime('%s', timestamp) AS INTEGER) >= ${Math.floor(cutoffMs / 1000)}`
+            : '';
+        const [[commands = '0', saved = '0', input = '0', avgPct = '0', totalMs = '0'] = []] = query(rtkDbPath(), `SELECT COUNT(*), COALESCE(SUM(saved_tokens),0), COALESCE(SUM(input_tokens),0), COALESCE(AVG(savings_pct),0), COALESCE(SUM(exec_time_ms),0) FROM commands ${where};`);
+        const byCommand = query(rtkDbPath(), `SELECT rtk_cmd, COUNT(*), SUM(saved_tokens), AVG(savings_pct), AVG(exec_time_ms) FROM commands ${where} GROUP BY rtk_cmd ORDER BY SUM(saved_tokens) DESC LIMIT ${Math.max(1, Math.floor(limit))};`).map(([command, count, savedRow, pct, ms]) => ({
             command,
             count: Number(count) || 0,
             saved: Number(savedRow) || 0,

package/extensions/shared/usage-ledger.js

@@ -11,6 +11,34 @@ export function ledgerPath() {
         return override;
     return path.join(os.homedir(), '.omp', 'plugins', 'tersio-usage.jsonl');
 }
+// Reset watermark: tersio-owned timestamp marking the last statistics reset.
+// Session transcripts and the RTK database are host/tool-owned and never
+// touched — instead, every derived view (token stats, command tools) filters
+// rows from before the watermark, so "reset" empties what tersio shows
+// without deleting anything it does not own.
+export function resetMarkerPath() {
+    const override = process.env.TERSIO_RESET_FILE;
+    if (override)
+        return override;
+    return path.join(os.homedir(), '.omp', 'plugins', 'tersio-reset.json');
+}
+export function readResetWatermark() {
+    try {
+        const raw = JSON.parse(fs.readFileSync(resetMarkerPath(), 'utf8'));
+        return typeof raw.ts === 'number' && Number.isFinite(raw.ts) && raw.ts > 0 ? raw.ts : 0;
+    }
+    catch {
+        return 0;
+    }
+}
+export function markReset(now = Date.now()) {
+    try {
+        fs.mkdirSync(path.dirname(resetMarkerPath()), { recursive: true });
+        fs.writeFileSync(resetMarkerPath(), JSON.stringify({ ts: now }) + '\n', 'utf8');
+    }
+    catch { /* best-effort; never break the caller */ }
+    return now;
+}
 export function appendUsage(kind, detail) {
     const row = JSON.stringify({ ts: Date.now(), kind, detail }) + '\n';
     try {
@@ -71,6 +99,7 @@ function walkJsonl(dir, out, cap) {
     }
 }
 export function importSessionTokens() {
+    const watermark = readResetWatermark();
     const byModel = {};
     const byDay = {};
     const byDayModel = {};
@@ -88,13 +117,17 @@ export function importSessionTokens() {
     }
     let codexProvider = null;
     const recent = [];
+    // Rows from before the reset watermark (and rows with no usable timestamp,
+    // which may predate it) stay out of every derived statistic.
     function ingest(model, usage, ts) {
+        const ms = ts === undefined ? NaN : typeof ts === 'number' ? ts : Date.parse(ts);
+        if (watermark > 0 && (!Number.isFinite(ms) || ms < watermark))
+            return false;
         addInto(totals, usage);
         byModel[model] ??= zeroBreakdown();
         addInto(byModel[model], usage);
         byModelMessages[model] = (byModelMessages[model] ?? 0) + 1;
         const num = (v) => (typeof v === 'number' && Number.isFinite(v) && v > 0 ? Math.floor(v) : 0);
-        const ms = ts === undefined ? NaN : typeof ts === 'number' ? ts : Date.parse(ts);
         if (Number.isFinite(ms))
             recent.push({ m: model, i: num(usage.input), o: num(usage.output), t: ms });
         const day = ts !== undefined ? dayKey(ts) : null;
@@ -108,6 +141,7 @@ export function importSessionTokens() {
             }
         }
         messages += 1;
+        return true;
     }
     for (const file of files) {
         let text;
@@ -145,9 +179,11 @@ export function importSessionTokens() {
                 if (!msg || msg.role !== 'assistant' || !msg.usage)
                     continue;
                 const model = typeof msg.model === 'string' && msg.model ? msg.model : 'unknown';
-                ingest(model, msg.usage, row.timestamp);
-                if (typeof msg.usage.cost === 'number' && Number.isFinite(msg.usage.cost))
+                const counted = ingest(model, msg.usage, row.timestamp);
+                if (counted && typeof msg.usage.cost === 'number' && Number.isFinite(msg.usage.cost))
                     costMeasured += msg.usage.cost;
+                if (!counted)
+                    continue;
                 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;
@@ -179,9 +215,9 @@ function leadBinary(command) {
     return 'bash';
 }
 // --- Pricing lives in ./pricing.ts (live LiteLLM cache + fallback table) ---
-import { DEFAULT_PRICE, priceFor } from './pricing.js';
+import { DEFAULT_PRICE, priceFor, refreshPricesIfStale } from './pricing.js';
 import { co2GramsFor, energyWhFor } from './carbon.js';
-export { DEFAULT_PRICE, priceFor };
+export { DEFAULT_PRICE, priceFor, refreshPricesIfStale };
 export { co2GramsFor, energyWhFor };
 export function usdCost(t, model) {
     const { price, known } = model ? priceFor(model) : { price: DEFAULT_PRICE, known: false };

package/extensions/tersio-commands/index.js

@@ -1,25 +1,21 @@
-// /tersio unified root command — routes every tersio capability through one
-// namespaced entrypoint. Aliases (/caveman, /rtk, /combo, /ai-addons) keep
-// working: this router drives the same shared bridge + session entries the
-// sibling extensions restore from. Shared-state publishes sync their local
-// mirrors live, so switches notify and take effect next turn — no reload.
-import { COMBO_LEVELS, activeModesSummary, getSharedComboState, normalizeComboLevel, normalizeMode, reconcileSharedComboEntries, sessionEntries, setSharedComboLevel, setSharedComboMode, } from '../shared/session-state.js';
+// /tersio root command — status, check, update, gain, usage, help.
+// Mode switches live on their own commands (/caveman, /rtk, /combo, and the
+// upstream /ponytail): the router keeps no redundant copies. Shared-state
+// publishes sync sibling mirrors live, so switches notify and take effect
+// next turn — no reload.
+import { getSharedComboState, reconcileSharedComboEntries, sessionEntries, } from '../shared/session-state.js';
 import os from 'node:os';
 import path from 'node:path';
 import { appendUsage, readUsage } from '../shared/usage-ledger.js';
 import { checkAddonsSummary, runAddonUpdate } from '../ai-addons-updater/index.js';
 const HELP = [
-    '/tersio caveman lite|full|ultra|wenyan|off — terse-reply mode',
-    '/tersio combo off|medium|balanced|max — preset for all three modes',
-    '/tersio rtk on|off — compact shell output',
-    '/tersio ponytail off|lite|full|ultra|review — minimal code',
     '/tersio status — active modes + combo level',
     '/tersio check — add-on version check',
     '/tersio update <ponytail|rtk|caveman|all> [--dry-run]',
     '/tersio gain — savings summary + dashboard hint',
     '/tersio usage — ledger report for this machine',
     '/tersio help — this table',
-    'aliases (still work): /caveman /rtk /combo /ai-addons',
+    'mode switches: /caveman /rtk /combo (tersio) + /ponytail (upstream)',
 ].join('\n');
 function statusLine() {
     const s = getSharedComboState();
@@ -56,14 +52,11 @@ async function openGainDashboard(pi, ctx) {
 }
 export default function tersioCommandsExtension(pi) {
     pi.setLabel?.('Tersio unified root command');
-    // Mode switches never reload the session: entries persist, the shared
-    // bridge publishes to every sibling mirror, and the change injects on the
-    // next turn like a normal input message. Only notify below.
     pi.registerCommand?.('tersio', {
-        description: 'Tersio root: caveman|combo|rtk|ponytail|status|check|update|gain|usage|help',
+        description: 'Tersio root: status|check|update|gain|usage|help (modes: /caveman /rtk /combo /ponytail)',
         handler: async (args, ctx) => {
             const parts = String(args || '').trim().toLowerCase().split(/\s+/).filter(Boolean);
-            const [sub, rest] = [parts[0], parts.slice(1).join(' ')];
+            const [sub] = [parts[0]];
             appendUsage('command', `/tersio ${parts.join(' ')}`.trim());
             if (!sub || sub === 'status') {
                 if (ctx?.hasUI)
@@ -75,69 +68,6 @@ export default function tersioCommandsExtension(pi) {
                 ctx?.ui?.notify?.(HELP, 'info');
                 return;
             }
-            if (sub === 'caveman') {
-                const mode = normalizeMode('caveman', rest);
-                if (!mode) {
-                    ctx?.ui?.notify?.('Usage: /tersio caveman [lite|full|ultra|wenyan|off|status]', 'warning');
-                    return;
-                }
-                pi.appendEntry?.('caveman-mode', { mode });
-                setSharedComboMode('caveman', mode);
-                appendUsage('toggle', `caveman=${mode}`);
-                ctx?.ui?.notify?.(`Caveman ${mode} on — Active: ${activeModesSummary(getSharedComboState())}.`, 'info');
-                return;
-            }
-            if (sub === 'rtk') {
-                if (!rest || rest === 'status') {
-                    const on = getSharedComboState().rtk === 'on';
-                    ctx?.ui?.notify?.(`RTK: ${on ? 'on' : 'off'}`, 'info');
-                    return;
-                }
-                if (!['on', 'off'].includes(rest)) {
-                    ctx?.ui?.notify?.('Usage: /tersio rtk [on|off|status]', 'warning');
-                    return;
-                }
-                const enabled = rest === 'on';
-                pi.appendEntry?.('rtk-mode', { enabled });
-                setSharedComboMode('rtk', enabled);
-                appendUsage('toggle', `rtk=${rest}`);
-                ctx?.ui?.notify?.(`RTK ${rest} — Active: ${activeModesSummary(getSharedComboState())}.`, 'info');
-                return;
-            }
-            if (sub === 'ponytail') {
-                const mode = normalizeMode('ponytail', rest);
-                if (!mode) {
-                    ctx?.ui?.notify?.('Usage: /tersio ponytail [off|lite|full|ultra|review|status]', 'warning');
-                    return;
-                }
-                pi.appendEntry?.('ponytail-mode', { mode });
-                setSharedComboMode('ponytail', mode);
-                appendUsage('toggle', `ponytail=${mode}`);
-                ctx?.ui?.notify?.(`Ponytail ${mode} — Active: ${activeModesSummary(getSharedComboState())}.`, 'info');
-                return;
-            }
-            if (sub === 'combo') {
-                if (!rest || rest === 'status') {
-                    if (ctx?.hasUI)
-                        reconcileSharedComboEntries(sessionEntries(ctx));
-                    ctx?.ui?.notify?.(statusLine(), 'info');
-                    return;
-                }
-                const level = normalizeComboLevel(rest);
-                if (!level) {
-                    ctx?.ui?.notify?.('Unknown combo level. Use: off | medium | balanced | max', 'warning');
-                    return;
-                }
-                const modes = COMBO_LEVELS[level];
-                pi.appendEntry?.('caveman-mode', { mode: modes.caveman });
-                pi.appendEntry?.('rtk-mode', { enabled: modes.rtk === 'on' });
-                pi.appendEntry?.('ponytail-mode', { mode: modes.ponytail });
-                pi.appendEntry?.('combo-level', { level });
-                setSharedComboLevel(level);
-                appendUsage('toggle', `combo=${level}`);
-                ctx?.ui?.notify?.(`Combo ${level} on — ${activeModesSummary(getSharedComboState())} active for this session.`, 'info');
-                return;
-            }
             if (sub === 'check') {
                 await checkAddonsSummary(ctx);
                 return;
@@ -160,6 +90,12 @@ export default function tersioCommandsExtension(pi) {
                 ctx?.ui?.notify?.(usageSummary(), 'info');
                 return;
             }
+            // Removed mode switches redirect to their own commands so only one
+            // spelling exists to learn: /caveman, /rtk, /combo, /ponytail.
+            if (sub === 'caveman' || sub === 'rtk' || sub === 'combo' || sub === 'ponytail') {
+                ctx?.ui?.notify?.(`Use /${sub} instead — /tersio no longer duplicates mode switches.\n${HELP}`, 'warning');
+                return;
+            }
             ctx?.ui?.notify?.(`Unknown subcommand: ${sub}.\n${HELP}`, 'warning');
         },
     });

package/package.json

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