@krtclcdy/tersio 2.0.0 → 2.1.0

package/README.md

@@ -61,26 +61,28 @@ User-level installs also register the package in `~/.omp/plugins` (visible in OM
 
 ## Benchmarks
 
-Measured before/after — real `o200k_base` token counts, samples and run protocol in [BENCHMARK.md](./BENCHMARK.md). Overhead is paid once per session; savings accumulate per reply, command, or task.
+Measured savings against the same workload without the modes. Token counts are real `o200k_base` BPE tokens (js-tiktoken), not chars÷4 estimates. Sample protocol, per-sample data, and caveats in [BENCHMARK.md](./BENCHMARK.md).
 
-| Mode | Overhead (once) | Before | After | Saving | Pays off after |
-|---|---:|---:|---:|---:|---|
-| `/caveman lite` | 46 tok | 146 tok/reply | 67 | −55% | 1 reply |
-| `/caveman full` | 172 tok | 146 tok/reply | 61 | −58% | ~2 replies |
-| `/caveman ultra` | 68 tok | 146 tok/reply | 34 | −77% | 1 reply |
-| `/rtk on` | 165 tok | 537 tok (grep) | 469 | −13% (−34% on `git status`) | varies |
-| `/ponytail full` | 76 tok | 261–481 tok/task | 108–143 | −59 to −70% | first task |
-| `/combo balanced` | 480 tok | 944 tok mixed turn | 638 | −32%/turn | first turn |
+| 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.
 
 ## CLI
 
 | Command | Purpose |
 |---|---|
 | `tersio install` | Install (user scope by default; `--scope project\|both` for more) |
-| `tersio update` | Refresh from the latest release |
+| `tersio update` | Refresh the CLI, extensions, and add-ons (RTK binary, Caveman rule, Ponytail) |
 | `tersio reinstall` | Fresh install, preserving the Ponytail package |
 | `tersio doctor` | Check OMP, extension, Ponytail, and RTK health |
-| `tersio uninstall` | Remove extensions and registration (`--remove-rtk`, `--remove-ponytail` for more) |
+| `tersio uninstall` | Remove extensions, registration, and the Ponytail plugin (`--keep-ponytail` keeps Ponytail; `--remove-rtk` also removes the RTK binary) |
 | `tersio version` | Print version |
 
 Flags: `--dry-run`, `--yes`/`-y`, `--verbose`, `--scope`, `--combo-default`/`--caveman-default`/`--rtk-default`/`--ponytail-default`. Legacy `--doctor` / `--uninstall` forms still work.

package/extensions/caveman-session/index.js

@@ -1,7 +1,7 @@
 import { readFileSync } from 'node:fs';
 import { fileURLToPath } from 'node:url';
 import { dirname, join } from 'node:path';
-import { asPromptArray, getSharedComboState, isComboPresetActive, isOmpSubagentPrompt, lastCustomValue, normalizeInputCommand, normalizeMode, paintStatusBar, sessionEntries, setSharedComboMode } from '../shared/session-state.js';
+import { asPromptArray, getSharedComboState, isComboPresetActive, isOmpSubagentPrompt, lastCustomValue, normalizeInputCommand, normalizeMode, paintStatusBar, reconcileSharedComboEntries, sessionEntries, setSharedComboMode } from '../shared/session-state.js';
 import { readCavemanDefault } from '../shared/plugin-settings.js';
 const CAVERN_DIR = dirname(fileURLToPath(import.meta.url));
 const RULE_PATH = join(CAVERN_DIR, 'rule.md');
@@ -96,6 +96,11 @@ export default function cavemanSessionExtension(pi) {
     });
     function restoreMode(ctx) {
         const entries = sessionEntries(ctx);
+        // Publish the persisted combo state (incl. combo-level) before painting:
+        // bar suppression reads the in-process bridge, which is empty in a fresh
+        // host until the combo extension reconciles — and its reconcile is
+        // UI-gated. Deriving it here makes suppression independent of load order.
+        reconcileSharedComboEntries(entries);
         // Persisted session state wins; a fresh session falls back to the
         // installer/user-configured default (off unless configured).
         const persisted = resolveMode(entries, '');

package/extensions/combo-toggle/index.js

@@ -29,7 +29,6 @@ function loadPonytailInstructions(mode) {
 }
 export default function comboToggleExtension(pi) {
     pi.setLabel?.('Combo session toggle (all 3 add-ons)');
-    let currentState = getSharedComboState();
     let lastCtx = undefined;
     function syncStatus(ctx) {
         if (ctx)
@@ -43,11 +42,14 @@ export default function comboToggleExtension(pi) {
             c.ui.setStatus('combo', undefined);
             return;
         }
+        // Read the live bridge, not cached extension state: sibling extensions
+        // reconcile it from persisted entries before this one runs.
+        const state = getSharedComboState();
         const theme = c.ui.theme;
-        const c0 = currentState.caveman.toUpperCase();
-        const r = currentState.rtk.toUpperCase();
-        const p = currentState.ponytail.toUpperCase();
-        const lvl = currentState.level.toUpperCase();
+        const c0 = state.caveman.toUpperCase();
+        const r = state.rtk.toUpperCase();
+        const p = state.ponytail.toUpperCase();
+        const lvl = state.level.toUpperCase();
         const label = `combo ${lvl}: 🪨caveman=${c0} ⚡rtk=${r} 🦥ponytail=${p}`;
         c.ui.setStatus('combo', theme?.fg ? `${theme.fg('accent', '🧩')} ${theme.fg('muted', label)}` : `🧩 ${label}`);
         // Clobber any sibling bars another extension may have painted in a race
@@ -67,13 +69,12 @@ export default function comboToggleExtension(pi) {
         pi.appendEntry?.('combo-level', { level });
     }
     function useState(state, ctx) {
-        currentState = state;
         syncStatus(ctx);
         return state;
     }
     function reconcile(ctx) {
         if (!ctx?.hasUI)
-            return currentState;
+            return getSharedComboState();
         return useState(reconcileSharedComboEntries(sessionEntries(ctx)), ctx);
     }
     function listen(ctx) {
@@ -109,7 +110,7 @@ export default function comboToggleExtension(pi) {
             }
             persistPreset(level);
             useState(setSharedComboLevel(level), ctx);
-            ctx?.ui?.notify?.(`Combo ${level} applied: ${levelSummary(currentState)}`, 'info');
+            ctx?.ui?.notify?.(`Combo ${level} applied: ${levelSummary(getSharedComboState())}`, 'info');
             if (ctx?.reload)
                 await ctx.reload();
         },

package/extensions/rtk-session/index.js

@@ -1,6 +1,6 @@
 import os from 'node:os';
 import path from 'node:path';
-import { asPromptArray, getSharedComboState, isComboPresetActive, isOmpSubagentPrompt, lastCustomValue, normalizeInputCommand, paintStatusBar, sessionEntries, setSharedComboMode } from '../shared/session-state.js';
+import { asPromptArray, getSharedComboState, isComboPresetActive, isOmpSubagentPrompt, lastCustomValue, normalizeInputCommand, paintStatusBar, reconcileSharedComboEntries, sessionEntries, setSharedComboMode } from '../shared/session-state.js';
 import { readRtkDefault } from '../shared/plugin-settings.js';
 const DEFAULT_ENABLED = false;
 function asBoolean(value) {
@@ -102,6 +102,11 @@ export default function rtkSessionExtension(pi) {
     });
     function restoreEnabled(ctx) {
         const entries = sessionEntries(ctx);
+        // Publish the persisted combo state (incl. combo-level) before painting:
+        // bar suppression reads the in-process bridge, which is empty in a fresh
+        // host until the combo extension reconciles — and its reconcile is
+        // UI-gated. Deriving it here makes suppression independent of load order.
+        reconcileSharedComboEntries(entries);
         // Persisted session state wins; a fresh session falls back to the
         // installer/user-configured default (off unless configured).
         const persisted = resolveEnabled(entries);

package/package.json

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

package/tersio.js

@@ -69,6 +69,7 @@ const verbose = args.includes('--verbose');
 const doctor = command === 'doctor' || args.includes('--doctor');
 const uninstall = command === 'uninstall' || args.includes('--uninstall');
 const removePonytail = args.includes('--remove-ponytail');
+const keepPonytail = args.includes('--keep-ponytail');
 const removeRtk = args.includes('--remove-rtk');
 const scopeFlag = flagValue('--scope')?.toLowerCase() ?? null;
 // --- Profile selection (session-start mode defaults) ---
@@ -83,7 +84,7 @@ function printHelp() {
 
 Commands:
   install      Install the add-ons (user scope by default)
-  update       Run the latest published installer
+  update       Refresh the CLI and add-ons (RTK binary, Caveman rule, Ponytail)
   reinstall    Clean and reinstall the user-scope add-ons
   doctor       Check the current installation
   uninstall    Remove the managed extensions
@@ -92,7 +93,7 @@ Commands:
 
 Options:
   --scope user|project|both
-  --remove-ponytail (uninstall: also remove the Ponytail plugin)
+  --keep-ponytail (uninstall: keep the Ponytail plugin — removed by default)
   --remove-rtk (uninstall: also remove the RTK binary)
   --combo-default off|medium|balanced|max (implies caveman, rtk, ponytail)
   --caveman-default off|lite|full|ultra|wenyan (override; default follows combo)
@@ -660,17 +661,8 @@ async function stepCombo(extDir, options) {
     await ensureExtensionInConfig(configPath, dest, 'combo', options);
 }
 // --- Doctor ---
-function presence(label, text) {
-    console.log(`  ${label}: ${text !== null ? 'installed' : 'MISSING'}`);
-}
-function locationLine(label, ok, loc) {
-    console.log(`  ${label}: ${ok ? 'ok' : 'MISSING'} ${loc}`);
-}
 async function runDoctor() {
-    console.log('\n=== Tersio Doctor ===\n');
-    // Node
-    console.log(`  Node: ok ${process.version}`);
-    // OMP CLI version joins FS probes below; logs keep fixed order.
+    console.log('\n=== Tersio Doctor ===');
     // Directories
     const agentDir = OMP_AGENT_DIR;
     const extDir = path.join(agentDir, 'extensions');
@@ -706,48 +698,66 @@ async function runDoctor() {
         readTextIfExists(comboIndex),
         readTextIfExists(modeReinforcement),
     ]);
-    console.log(ompVersion !== null ? `  OMP CLI: ok ${ompVersion}` : '  OMP CLI: MISSING');
-    console.log(`  Home: ${HOME}`);
-    locationLine('OMP agent dir', agentEntries !== null, agentDir);
-    locationLine('OMP extensions dir', extEntries !== null, extDir);
-    console.log(`  Shared session bridge: ${sharedStateText !== null ? 'installed' : 'MISSING'}`);
-    locationLine('OMP config.yml', configText !== null, configPath);
-    presence('Ponytail package', ponytailPkgText);
-    presence('Ponytail extension', ponytailExtText);
-    if (configText) {
-        const hasPonytailPath = configText.includes('ponytail') && configText.includes('pi-extension');
-        console.log(`  Ponytail in config.yml: ${hasPonytailPath ? 'registered' : 'MISSING'}`);
-    }
-    // Self plugin registration (Settings → Plugins listing)
-    const selfDep = PACKAGE_NAME in (parseJsonObject(pluginsPkgRaw)?.dependencies || {});
-    console.log(`  Self plugin in plugins/package.json: ${selfDep ? 'registered' : 'MISSING'}`);
-    console.log(`  Self plugin package: ${selfPkgText !== null ? 'installed' : 'MISSING'}`);
-    // RTK
-    const rtkExists = rtkBinText !== null;
-    console.log(`  RTK binary: ${rtkExists ? 'installed' : 'MISSING'} ${rtkBin}`);
-    if (rtkExists) {
-        try {
-            const v = (await execP(rtkBin, ['--version'], { timeout: 5000 })).stdout.trim();
-            console.log(`  RTK version: ${v}`);
+    // Categorized output with a tally; section headers group related probes.
+    const tally = { ok: 0, missing: 0, warn: 0 };
+    function check(label, ok, detail = '') {
+        if (ok) {
+            tally.ok++;
+            console.log(`  ${label}: ok${detail ? ` ${detail}` : ''}`);
         }
-        catch {
-            console.log('  RTK version: unavailable (may not be executable)');
+        else {
+            tally.missing++;
+            console.log(`  ${label}: MISSING${detail ? ` ${detail}` : ''}`);
         }
     }
-    // Caveman
-    presence('Caveman extension', cavemanIndexText);
-    presence('Caveman rule.md', cavemanRuleText);
-    // RTK extension
-    presence('RTK extension', rtkIndexText);
-    // Updater
-    presence('Updater extension', updaterIndexText);
-    // Combo
-    presence('Combo extension', comboIndexText);
-    presence('Mode reinforcement extension', modeReinforcementText);
+    function warnLine(label, detail) {
+        tally.warn++;
+        console.log(`  ${label}: warn ${detail}`);
+    }
+    section('Environment');
+    check('Node', true, process.version);
+    check('OMP CLI', ompVersion !== null, ompVersion ?? '');
+    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('Shared session bridge', sharedStateText !== null);
+    section('Extensions');
+    check('Caveman extension', cavemanIndexText !== null);
+    check('Caveman rule.md', cavemanRuleText !== null);
+    check('RTK extension', rtkIndexText !== null);
+    check('Updater extension', updaterIndexText !== null);
+    check('Combo extension', comboIndexText !== null);
+    check('Mode reinforcement extension', modeReinforcementText !== null);
+    section('Plugins');
+    check('Ponytail package', ponytailPkgText !== null);
+    check('Ponytail extension', ponytailExtText !== null);
     if (configText) {
-        const hasComboPath = configText.includes('combo-toggle');
-        console.log(`  Combo in config.yml: ${hasComboPath ? 'registered' : 'MISSING'}`);
+        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);
+    const selfDep = PACKAGE_NAME in (parseJsonObject(pluginsPkgRaw)?.dependencies || {});
+    check('Self plugin in plugins/package.json', selfDep);
+    section('RTK');
+    check('RTK binary', rtkBinText !== null, rtkBin);
+    if (rtkBinText !== null) {
+        // rtk may exit non-zero while still printing its version — accept either stream.
+        const version = await execP(rtkBin, ['--version'], { timeout: 5000 }).then((r) => r.stdout.trim() || r.stderr.trim() || null, (e) => {
+            const err = e;
+            return err.stdout?.trim() || err.stderr?.trim() || null;
+        });
+        if (version)
+            check('RTK version', true, version);
+        else
+            warnLine('RTK version', 'unavailable — binary may not be executable');
+    }
+    const total = tally.ok + tally.missing + tally.warn;
+    console.log(`\n  Summary: ${total} checks — ${tally.ok} ok, ${tally.warn} warn, ${tally.missing} missing`);
+}
+function section(name) {
+    console.log(`\n${name}`);
 }
 // Read-modify-write a JSON file. mutate returns true when it changed
 // something; no change (or unreadable file) means no output at all.
@@ -800,7 +810,9 @@ async function removeUninstallTarget(target, shouldDryRun, recursive = true) {
 async function runUninstall(options = {}) {
     const shouldDryRun = options.dryRun ?? dryRun;
     const confirmed = (options.yes ?? yes) || shouldDryRun;
-    const shouldRemovePonytail = options.removePonytail ?? removePonytail;
+    // Ponytail ships with Tersio's presets, so a full uninstall removes it too;
+    // --keep-ponytail opts out and reinstall always preserves it.
+    const shouldRemovePonytail = options.removePonytail ?? (removePonytail || !keepPonytail);
     const shouldRemoveRtk = options.removeRtk ?? removeRtk;
     console.log('\n=== Tersio Uninstall ===\n');
     const extDir = path.join(OMP_AGENT_DIR, 'extensions');
@@ -894,6 +906,7 @@ async function runUninstall(options = {}) {
     return true;
 }
 const SCOPE_MAP = { user: '1', project: '2', both: '3' };
+const COMBO_MENU = { '1': 'off', '2': 'medium', '3': 'balanced', '4': 'max' };
 async function runLatestUpdate() {
     const updateScope = scopeFlag || 'user';
     if (!Object.hasOwn(SCOPE_MAP, updateScope)) {
@@ -920,6 +933,31 @@ async function runLatestUpdate() {
     const npmCommandArgs = IS_WINDOWS ? ['/d', '/s', '/c', 'npm', ...npmArgs] : npmArgs;
     console.log('=== Updating Tersio ===');
     console.log(`  Running the latest ${PACKAGE_NAME} installer...\n`);
+    // The npx delegation below only refreshes the OMP-side files; the globally
+    // installed CLI keeps its old version until npm -g runs. Refresh both.
+    if (dryRun) {
+        console.log(`  [dry-run] would run: npm install -g ${PACKAGE_NAME}@latest --no-audit --no-fund`);
+    }
+    else {
+        try {
+            const globalArgs = IS_WINDOWS ? ['/d', '/s', '/c', 'npm', 'install', '-g', `${PACKAGE_NAME}@latest`, '--no-audit', '--no-fund'] : ['install', '-g', `${PACKAGE_NAME}@latest`, '--no-audit', '--no-fund'];
+            const globalResult = await execP(npmCommand, globalArgs, {
+                timeout: 300000,
+                maxBuffer: 10 * 1024 * 1024,
+                windowsHide: true,
+                shell: false,
+            });
+            if (globalResult.stdout)
+                process.stdout.write(globalResult.stdout);
+            if (globalResult.stderr)
+                process.stderr.write(globalResult.stderr);
+            console.log(`  [ok] CLI updated to ${PACKAGE_NAME}@latest`);
+        }
+        catch (e) {
+            console.log(`  [warn] Global CLI update skipped: ${e.message}`);
+            console.log(`  [hint] Manual: npm install -g ${PACKAGE_NAME}@latest`);
+        }
+    }
     try {
         const result = await execP(npmCommand, npmCommandArgs, {
             timeout: 300000,
@@ -989,12 +1027,27 @@ async function resolveScope() {
 async function resolveProfile() {
     const profile = defaultProfile();
     // Single interactive prompt: the Combo preset implies all three modes.
+    // Numbered menu, same pattern as the scope prompt — 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)) {
-        const comboAnswer = (await ask('  Default Combo preset on session start? [off/medium/balanced/max] (off): ')).trim().toLowerCase();
-        if (comboAnswer && COMBO_DEFAULTS.has(comboAnswer))
-            profile.comboDefault = comboAnswer;
+        console.log('  Session-start defaults — Combo preset:');
+        console.log('    1) off');
+        console.log('    2) medium   (caveman=lite, rtk=on, ponytail=lite)');
+        console.log('    3) balanced (caveman=full, rtk=on, ponytail=full)');
+        console.log('    4) max      (caveman=ultra, rtk=on, ponytail=ultra)');
+        for (;;) {
+            const answer = (await ask('  Choose [1-4] (default 1): ')).trim();
+            if (!answer) {
+                profile.comboDefault = 'off';
+                break;
+            }
+            if (COMBO_MENU[answer]) {
+                profile.comboDefault = COMBO_MENU[answer];
+                break;
+            }
+            console.log(`  [fail] Invalid choice: ${answer}. Choose 1, 2, 3, or 4.`);
+        }
     }
     // Explicit flags always win over the Combo preset.
     if (comboDefaultFlag !== undefined)
@@ -1116,7 +1169,10 @@ async function main() {
     const userDir = OMP_AGENT_DIR;
     const userExtDir = path.join(userDir, 'extensions');
     const projectExtDir = path.join(process.cwd(), '.omp', 'extensions');
-    const options = { dryRun, verbose, yes, scope, reinstall };
+    // 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, scope, reinstall: reinstall || applyUpdate };
     // Check prerequisites
     console.log('\nPrerequisites:');
     try {