@krtclcdy/tersio 2.12.0 → 2.14.0

package/README.md

@@ -1,4 +1,4 @@
-![Fontora](/TersioBanner.webp)
+![Banner](/TersioBanner.webp)
 
 # ✂️ Tersio — Token-saving OMP Add-ons
 
@@ -13,7 +13,7 @@ Terse replies, compact shell output, and minimal code decisions for [Oh My Pi (O
 ## ✨ Features
 
 - **Caveman** — Shortens replies, keeps technical substance. Modes: `lite`, `full`, `ultra`, `wenyan`.
-- **RTK** — Routes noisy shell commands through the RTK binary for compact output; exact bytes bypass it by policy.
+- **RTK** — Routes noisy shell commands through the RTK binary for compact output; exact bytes bypass it by policy. The installer wires rtk into OMP automatically (`rtk init -g --agent omp`), so bash tool calls rewrite to `rtk` before execution and meter into the gain dashboard.
 - **Ponytail** — Minimal, YAGNI-oriented code decisions, from nudge (`lite`) to requirement-challenger (`ultra`).
 - **Combo** — Toggles all three at once. Presets: `off`, `medium`, `balanced`, `max`.
 - **Updater** — `/tersio check` and `/tersio update` cover Ponytail, RTK, and Caveman in-session, with dry-run and backups.
@@ -84,14 +84,19 @@ Measured savings against the same workload without the modes. Token counts are r
 
 | Measured surface (n) | Baseline → Tersio | Δ |
 |---|---|---|
-| Terse reply, caveman lite — BPE tok (3 samples, p50) | 146 → 73 tok | **−52.6%** |
-| Terse reply, caveman full — BPE tok (3 samples, p50) | 154 → 58 tok | **−62.3%** |
-| Terse reply, caveman ultra — BPE tok (3 samples, p50) | 146 → 33 tok | **−78.6%** |
-| Code diff, ponytail minimal-ladder — BPE tok (2 tasks) | 261–481 → 108–143 tok | **−58.6…−70.3%** |
-| Shell output, rtk — `git status` — BPE tok | 32 → 21 tok | **−34.4%** |
-| Shell output, rtk — repo `grep` — BPE tok | 537 → 469 tok | **−12.7%** |
-
-Break-even math, balanced preset (caveman full + rtk + ponytail): `⌈overhead ÷ saving-per-turn⌉ = ⌈480 ÷ 306⌉ = 2 turns`, where a mixed turn (reply + `git status`-class command + code task) costs 944 tok baseline vs 638 tok with Tersio — a 0.68× ratio. Every turn after turn 2 nets ≈ −32%. RTK keeps diffs and failing-test output exact by design (−0.4% and −1.5% there), concentrating savings where noise lives.
+| Terse reply, caveman lite — BPE tok (3 samples, p50) | 173 → 69 tok | **−60.1%** |
+| Terse reply, caveman full — BPE tok (3 samples, p50) | 173 → 49 tok | **−71.7%** |
+| Terse reply, caveman ultra — BPE tok (3 samples, p50) | 173 → 25 tok | **−85.5%** |
+| Code diff, ponytail lite — BPE tok (2 tasks) | 326–462 → 57–121 tok | **−73.8…−82.5%** |
+| Code diff, ponytail full — BPE tok (2 tasks) | 326–462 → 55–88 tok | **−81.0…−83.1%** |
+| Code diff, ponytail ultra — BPE tok (2 tasks) | 326–462 → 40–88 tok | **−81.0…−87.7%** |
+| Shell output, rtk — `git status` — BPE tok | 182 → 72 tok | **−60.4%** |
+| Shell output, rtk — repo `grep` — BPE tok | 376 → 274 tok | **−27.1%** |
+| Shell output, rtk — `find` — BPE tok | 205 → 168 tok | **−18.0%** |
+| Shell output, rtk — `git diff` — BPE tok | 12,684 → 8,504 tok | **−33.0%** |
+| Shell output, rtk — `npm test` (passthrough) — BPE tok | 2,597 → 2,577 tok | **−0.8%** |
+
+Break-even math, balanced preset (caveman full + rtk + ponytail): a mixed turn costs 941 tok baseline vs 399 with Tersio (0.42×, **−57.6% per turn**). Overhead repays in turn 1 with the bundled floor (464 tok); turn 4 with the real installed Ponytail plugin (v4.9.0, 1,264 tok). RTK concentrates savings where noise lives — hook-wired sessions record **−97.5% on summarized test suites** (rtk `history.db`, 4 runs).
 
 ## 🖥️ CLI
 
@@ -103,8 +108,8 @@ Break-even math, balanced preset (caveman full + rtk + ponytail): `⌈overhead
 | `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 uninstall` | Remove extensions, registration, and the Ponytail plugin (`--keep-ponytail` keeps Ponytail; `--remove-rtk` also removes the RTK binary) |
+| `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 |
 
 Flags: `--dry-run`, `--yes`/`-y`, `--verbose`, `--combo-default`/`--caveman-default`/`--rtk-default`/`--ponytail-default`. Legacy `--doctor` / `--uninstall` forms still work.
@@ -132,6 +137,7 @@ Everything runs under one root. Bare `/tersio` prints status.
 | What | Path |
 |---|---|
 | Caveman / RTK / Updater / Combo extensions | `~/.omp/agent/extensions/{caveman-session,rtk-session,ai-addons-updater,combo-toggle}/` |
+| RTK OMP wiring (rtk-owned) | `~/.omp/agent/extensions/rtk.ts` — written by the installer via `rtk init -g --agent omp`; auto-loads, no config entry |
 | Ponytail package | `~/.omp/plugins/node_modules/@dietrichgebert/ponytail/` |
 | RTK binary | `~/.bun/bin/rtk` (`rtk.exe` on Windows) |
 | Extension registrations | `~/.omp/agent/config.yml` |
@@ -146,6 +152,8 @@ User-level installs also register the package in `~/.omp/plugins` (visible in OM
 
 **RTK missing or not executable:** run `tersio reinstall`, then `tersio doctor`. On Linux/macOS: `chmod +x ~/.bun/bin/rtk`.
 
+**RTK commands not metered in the gain dashboard:** check `tersio doctor` — the `RTK OMP wiring (rtk.ts)` row must be ok. Missing: run `rtk init -g --agent omp` (needs rtk ≥ 0.49) and restart OMP. Native tool calls (`read`/`edit`/`eval`) stay unmetered — only bash tool calls pass through rtk.
+
 **Checksum warning or failure:** the installer aborts on RTK checksum mismatch but warns and continues when checksum metadata is unavailable; `/tersio update rtk` aborts when metadata is missing.
 
 ## 🤝🏻 Contributing

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

@@ -39,6 +39,7 @@ async function runDoctor() {
         pluginsPkgRaw: readTextIfExists(path.join(pluginsDir, 'package.json')),
         selfPkgText: readTextIfExists(selfPkg),
         rtkBinText: readTextIfExists(rtkBin),
+        rtkOmpText: readTextIfExists(path.join(extDir, 'rtk.ts')),
         cavemanIndexText: readTextIfExists(cavemanIndex),
         cavemanRuleText: readTextIfExists(cavemanRule),
         rtkIndexText: readTextIfExists(rtkIndex),
@@ -75,12 +76,13 @@ async function runDoctor() {
         probes.pluginsPkgRaw,
         probes.selfPkgText,
     ]));
-    const [cavemanRuleText, ruleMtime, rtkBinText, rtkMtime, rtkVersion, ponytailMtime] = await runInteractivePhase('Checking add-ons', () => Promise.all([
+    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.
@@ -151,6 +153,10 @@ async function runDoctor() {
         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'));
     }
     const ponytailAge = ponytailMtime ? `updated ${relTime(Date.now() - ponytailMtime.mtimeMs)}` : '';
     check('Ponytail', ponytailPkgText !== null, [parseJsonObject(ponytailPkgText)?.version ?? '', ponytailAge].filter(Boolean).join(', '));

package/cli/install.js

@@ -12,6 +12,7 @@ import { runDoctor } from './doctor.js';
 import { runReset } from './reset.js';
 import { runUsage } from './usage.js';
 import { runDashboard } from './dashboard.js';
+import { wireRtkOmp } from './rtk-wiring.js';
 import { CAVEMAN_REMOTE_RULE, RTK_RELEASE_API, fetchJson, findFile, httpsGet, httpsDownload, parseChecksum, readTextIfExists, rtkPlatformSpec, sha256File, } from '../extensions/lib/utils.js';
 // Paths to extension source files (relative to this script)
 const EXT_DIR = path.join(path.dirname(fileURLToPath(import.meta.url)), '..', 'extensions');
@@ -234,6 +235,15 @@ async function verifyRtkArchive(archivePath, assetName, checksumsText) {
 function shortError(e) {
     return ((e.stderr) || e.message || '').trim().slice(0, 200);
 }
+async function fileExists(p) {
+    try {
+        await fs.access(p);
+        return true;
+    }
+    catch {
+        return false;
+    }
+}
 async function extractRtkArchive(archivePath, extractDir) {
     await fs.mkdir(extractDir, { recursive: true });
     if (archivePath.endsWith('.zip')) {
@@ -263,6 +273,9 @@ async function extractRtkArchive(archivePath, extractDir) {
 }
 async function stepRtk(binDir, options) {
     console.log('\n[3/8] Installing RTK binary...');
+    const binDest = path.join(binDir, RTK_BINARY_NAME);
+    // Download failure must not skip wiring: a pre-existing rtk binary is
+    // exactly as good for the OMP hook, so wire whatever ends up at binDest.
     try {
         const release = await withInteractiveSpinner('Finding latest RTK release', () => fetchJson(RTK_RELEASE_API));
         const triple = resolveRtkTriple();
@@ -271,7 +284,6 @@ async function stepRtk(binDir, options) {
         const asset = findRtkAsset(release, triple);
         if (!asset)
             return;
-        const binDest = path.join(binDir, RTK_BINARY_NAME);
         if (options.dryRun) {
             console.log(`  [dry-run] would download ${asset.name} from release ${release.tag_name}`);
             console.log('  [dry-run] would verify checksum against checksums.txt');
@@ -308,7 +320,7 @@ async function stepRtk(binDir, options) {
                 debug(`chmod 755 ${binDest}`);
             }
             try {
-                const v = (await execP(binDest, ['--version'], { timeout: 10000, shell: false })).stdout.trim();
+                const v = (await execP(binDest, ['--version'], { timeout: 30000, shell: false })).stdout.trim();
                 console.log(`  [ok] ${binDest} → ${v}`);
             }
             catch {
@@ -323,6 +335,17 @@ async function stepRtk(binDir, options) {
         console.log(`  [fail] RTK: ${e.message}`);
         console.log('  [hint] Manual: https://github.com/rtk-ai/rtk/releases');
     }
+    if (options.dryRun) {
+        await wireRtkOmp(binDest, options);
+        return;
+    }
+    if (!(await fileExists(binDest))) {
+        console.log('  [skip] no rtk binary to wire — install rtk, then run: rtk init -g --agent omp');
+        return;
+    }
+    // Binary alone never meters OMP sessions — wire rtk's tool_call
+    // extension so bash commands rewrite to rtk and land in history.db.
+    await wireRtkOmp(binDest, options);
 }
 // Copy repo source files into the target extension dir. First entry is
 // required (skip label on missing); rest are optional companions.
@@ -421,13 +444,13 @@ function defaultProfile() {
 }
 // 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() {
+async function resolveProfile(forceReinstall = false) {
     const profile = defaultProfile();
     // 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' },
@@ -535,11 +558,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') {
@@ -550,8 +574,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')
@@ -560,7 +584,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();
             }
@@ -574,6 +598,10 @@ async function runCommandMenu() {
             closeRL();
             break;
         }
+        case 'reinstall':
+            await runInstall({ reinstall: true });
+            closeRL();
+            break;
         case 'doctor':
             await runDoctor();
             closeRL();
@@ -596,7 +624,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.
@@ -605,8 +634,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');
@@ -642,13 +674,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/rtk-wiring.js

@@ -0,0 +1,58 @@
+// cli/rtk-wiring.ts — wire the installed rtk binary into OMP.
+// `rtk init -g --agent omp` writes rtk's tool_call extension to
+// ~/.omp/agent/extensions/rtk.ts; OMP auto-loads it and rewrites bash
+// commands to rtk before execution, so every rewritten call lands in
+// rtk's history.db and shows metered savings in the gain dashboard.
+// Fail-open: a failed wire only downgrades to manual `rtk` prefixing.
+// Deliberately free of cli/common.ts imports (argv side effects) so tests
+// can load it directly.
+import { execFile } from 'node:child_process';
+function shortWiringError(e) {
+    const err = e;
+    const why = [err.code !== undefined ? `code ${err.code}` : '', err.signal ?? '', err.stderr?.trim(), err.message]
+        .filter(Boolean).join(' · ');
+    return why.slice(0, 200);
+}
+function execFileP(cmd, args, timeout) {
+    return new Promise((resolve, reject) => {
+        execFile(cmd, args, { timeout, encoding: 'utf8' }, (err, stdout, stderr) => {
+            if (err) {
+                err.stderr = String(stderr || '');
+                reject(err);
+            }
+            else {
+                resolve({ stdout: String(stdout), stderr: String(stderr) });
+            }
+        });
+    });
+}
+// Idempotent: rtk rewrites its extension file on every init run, so
+// reinstalling tersio refreshes the wiring for free.
+export async function wireRtkOmp(rtkBin, options = {}) {
+    console.log('  Wiring rtk → OMP (bash tool_call rewrite)...');
+    if (options.dryRun) {
+        console.log('  [dry-run] would run: rtk init -g --agent omp');
+        return true;
+    }
+    try {
+        await execFileP(rtkBin, ['init', '-g', '--agent', 'omp'], 30000);
+        console.log('  [ok] rtk OMP extension wired (~/.omp/agent/extensions/rtk.ts)');
+        return true;
+    }
+    catch (first) {
+        // A freshly written binary can lose its first exec to macOS Gatekeeper
+        // verification; give it one settle-and-retry before reporting failure.
+        await new Promise((resolve) => setTimeout(resolve, 2000));
+        try {
+            await execFileP(rtkBin, ['init', '-g', '--agent', 'omp'], 30000);
+            console.log('  [ok] rtk OMP extension wired (~/.omp/agent/extensions/rtk.ts)');
+            return true;
+        }
+        catch (e) {
+            void first;
+            console.log(`  [warn] could not wire rtk → OMP: ${shortWiringError(e)}`);
+            console.log('  [hint] Manual: rtk init -g --agent omp (needs rtk >= 0.49)');
+            return false;
+        }
+    }
+}

package/cli/uninstall.js

@@ -88,6 +88,7 @@ async function runUninstall(options = {}) {
     }
     if (shouldRemoveRtk) {
         console.log(`  ${rtkBin}`);
+        console.log(`  ${path.join(extDir, 'rtk.ts')} (rtk OMP wiring)`);
     }
     if (!confirmed) {
         if (tty()) {
@@ -162,9 +163,13 @@ async function runUninstall(options = {}) {
     if ((await readTextIfExists(path.join(selfPluginDir, 'package.json'))) !== null) {
         await removeUninstallTarget(selfPluginDir, shouldDryRun);
     }
-    // Remove RTK binary if requested
-    if (shouldRemoveRtk)
+    // Remove RTK binary if requested. rtk.ts is rtk-owned but installed by our
+    // wiring step; with the binary gone it would pass through harmlessly, so
+    // only drop it on a full rtk removal.
+    if (shouldRemoveRtk) {
         await removeUninstallTarget(rtkBin, shouldDryRun, false);
+        await removeUninstallTarget(path.join(extDir, 'rtk.ts'), shouldDryRun);
+    }
     console.log('\nDone. Restart OMP for changes to take effect.');
     return true;
 }

package/cli/usage.js

@@ -1,6 +1,6 @@
 // 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, 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) {
@@ -12,6 +12,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 +45,7 @@ export function summarizeUsage(rows) {
         byDayModel: session.byDayModel,
         byTool,
         recent: session.recent,
-        rtkGain: readRtkGain(),
+        rtkGain: readRtkGain(10, watermark || undefined),
         usd,
         priced,
         savedUsd,
@@ -52,7 +53,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]; }
     });
@@ -887,6 +887,27 @@
       observe();
     });
   }
+  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 +930,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

@@ -5,6 +5,7 @@
     --cell-0: rgba(24, 24, 27, .07);
     --cell-1: rgba(4, 120, 87, .3); --cell-2: rgba(4, 120, 87, .55);
     --cell-3: rgba(4, 120, 87, .8); --cell-4: #047857;
+    --danger: #dc2626; --danger-border: rgba(220, 38, 38, .35); --danger-soft: rgba(220, 38, 38, .05);
     --shadow-xs: 0 1px 2px 0 rgb(0 0 0 / 0.07);
   }
   html[data-theme="light"] { color-scheme: light; }
@@ -17,6 +18,7 @@
       --cell-0: rgba(255, 255, 255, .07);
       --cell-1: rgba(52, 211, 153, .3); --cell-2: rgba(52, 211, 153, .55);
       --cell-3: rgba(52, 211, 153, .8); --cell-4: #34d399;
+      --danger: #f87171; --danger-border: rgba(248, 113, 113, .3); --danger-soft: rgba(248, 113, 113, .07);
     --shadow-xs: 0 1px 2px 0 rgb(0 0 0 / 0.55);
     }
   }
@@ -36,6 +38,7 @@
     --cell-0: rgba(255, 255, 255, .07);
     --cell-1: rgba(52, 211, 153, .3); --cell-2: rgba(52, 211, 153, .55);
     --cell-3: rgba(52, 211, 153, .8); --cell-4: #34d399;
+    --danger: #f87171; --danger-border: rgba(248, 113, 113, .3); --danger-soft: rgba(248, 113, 113, .07);
     --shadow-xs: 0 1px 2px 0 rgb(0 0 0 / 0.55);
   }
   .ticker { animation: tick 36s linear infinite; will-change: transform; }
@@ -185,6 +188,7 @@
   .dlg-desc { font-size: 12px; color: var(--dim); margin: 2px 0 0; }
   .dlg-label { font-size: 11px; text-transform: uppercase; letter-spacing: .14em; color: var(--dim); margin: 18px 0 8px; }
   .dlg-row { display: flex; align-items: center; justify-content: space-between; gap: 12px; }
+  .dlg-row + .dlg-row { margin-top: 14px; }
   .dlg-name { font-size: 13px; font-weight: 600; margin: 0; }
   .dlg-hint { font-size: 12px; color: var(--dim); margin: 2px 0 0; }
   .dlg-own { font-weight: 400; font-size: 11px; color: var(--dim); }
@@ -192,4 +196,18 @@
   .dlg-path { border: 1px solid var(--line); border-radius: 10px; padding: 8px 12px; min-width: 0; overflow: hidden; }
   .dlg-file { font-size: 11px; color: var(--dim); margin: 4px 0 0; white-space: nowrap; overflow: hidden; text-overflow: ellipsis; }
   #settingsBtn:hover { box-shadow: 0 0 14px var(--accent-soft); border-color: var(--accent); }
+  .dlg-danger { margin-top: 16px; border: 1px solid var(--danger-border); background: var(--danger-soft); border-radius: 12px; padding: 12px; }
+  .dlg-danger .dlg-label { color: var(--danger); margin: 0 0 10px; }
+  #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

@@ -36,9 +36,6 @@
       <span id="clock">--:--</span>
     </span>
     <span class="hidden sm:block w-px h-5 shrink-0" style="background: var(--line)" aria-hidden="true"></span>
-    <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(--line); color: var(--ink)" aria-label="Reset tersio statistics">
-      <i data-lucide="rotate-ccw" class="size-3.5"></i><span class="hidden md:inline" id="resetLabel">Reset</span>
-    </button>
     <button id="settingsBtn" class="btn-push flex shrink-0 items-center p-2 rounded-xl" style="border: 1px solid var(--line); color: var(--ink)" aria-label="Open settings">
       <i data-lucide="settings" class="size-4"></i>
     </button>
@@ -49,7 +46,7 @@
     <div class="dlg-head">
       <div class="min-w-0">
         <p class="dlg-title" id="settingsTitle">Settings</p>
-        <p class="dlg-desc">Appearance, data refresh, and where statistics live.</p>
+        <p class="dlg-desc">Appearance, data, and where statistics live.</p>
       </div>
       <button id="settingsClose" class="btn-push flex shrink-0 items-center p-2 rounded-xl" style="border: 1px solid var(--line); color: var(--ink)" aria-label="Close settings">
         <i data-lucide="x" class="size-4"></i>
@@ -86,9 +83,17 @@
         <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 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 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>
+        </button>
       </div>
     </div>
   </dialog>
@@ -283,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/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;

package/package.json

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