@krtclcdy/tersio 2.12.0 → 2.13.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
 
@@ -104,7 +109,7 @@ Break-even math, balanced preset (caveman full + rtk + ponytail): `⌈overhead
 | `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 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/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.

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/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,8 @@
   .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; }

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>
@@ -91,6 +88,18 @@
         <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>
+        </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>
 
   <!-- Hero: centered total -->

package/package.json

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