@krtclcdy/tersio 2.22.1 → 2.23.0

package/README.md

@@ -38,6 +38,8 @@ Then restart OMP and enable a preset:
 
 Individual toggles: `/caveman full` · `/rtk on` · `/ponytail full`. Everything starts off until you enable it.
 
+When Tersio is installed through OMP, the first interactive launch asks for a session-start Combo preset once (`off`, `medium`, `balanced`, or `max`) and saves it as `comboDefault`. Running `tersio install` performs the same setup through the CLI.
+
 Session-start defaults (prompted during `install`, or flags):
 
 ```bash
@@ -61,23 +63,24 @@ Windows/WSL have separate OMP homes — install from the environment where OMP r
 
 ## 📊 Benchmarks
 
-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).
+Measured surfaces use different boundaries. Do not treat reply-text, code-diff, and shell-output reductions as total bill savings. Full protocol and caveats are in [BENCHMARK.md](./BENCHMARK.md).
 
 | Measured surface (n) | Baseline → Tersio | Δ |
 |---|---|---|
-| 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).
+| Terse reply, caveman lite — BPE tokens (3 samples, p50) | 173 → 69 | **−60.1% reply text** |
+| Terse reply, caveman full — BPE tokens (3 samples, p50) | 173 → 49 | **−71.7% reply text** |
+| Terse reply, caveman ultra — BPE tokens (3 samples, p50) | 173 → 25 | **−85.5% reply text** |
+| Code diff, ponytail lite — BPE tokens (2 tasks) | 326–462 → 57–121 | **−73.8…−82.5% diff** |
+| Code diff, ponytail full — BPE tokens (2 tasks) | 326–462 → 55–88 | **−81.0…−83.1% diff** |
+| Code diff, ponytail ultra — BPE tokens (2 tasks) | 326–462 → 40–88 | **−81.0…−87.7% diff** |
+| Shell output, rtk `git status` | 182 → 72 | **−60.4% command output** |
+| Shell output, rtk repo `grep` | 376 → 274 | **−27.1% command output** |
+| Shell output, rtk `find` | 205 → 168 | **−18.0% command output** |
+| Shell output, rtk `git diff` | 12,684 → 8,504 | **−33.0% command output** |
+
+The Command tools table reports weighted RTK command-output savings and OMP-specific adoption from executed Bash records. It does not estimate provider billing.
+Upstream Ponytail's fair agentic benchmark reports 54% less code, 22% fewer tokens, 20% lower cost, and 100% retained safety. RTK estimates command-output tokens, not bill savings. Caveman and Ponytail compliance varies by model. Measure your own sessions with `tersio usage` and the dashboard.
+
 
 ## 📈 Dashboard
 
@@ -123,9 +126,9 @@ Mode switches live on their own commands; bare `/tersio` prints status.
 | Command | Purpose |
 |---|---|
 | `/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). |
+| `/caveman lite\|full\|ultra\|wenyan-lite\|wenyan-full\|wenyan-ultra\|off\|status` | Terse replies with upstream-aligned Caveman levels. Legacy `wenyan` restores as `wenyan-full`. |
+| `/rtk on\|off\|status` | Controls RTK session guidance, `rtk_run`, and the automatic hook through shared `RTK_DISABLED` state. Exact bytes bypass RTK. |
+| `/ponytail off\|lite\|full\|ultra\|status` | Minimal code using upstream Ponytail modes. Review runs separately through `/ponytail-review`. |
 | `/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 |
@@ -138,11 +141,11 @@ Mode switches live on their own commands; bare `/tersio` prints status.
 
 | What | Path |
 |---|---|
-| Caveman / RTK / Updater / Combo extensions | `~/.omp/agent/extensions/{caveman-session,rtk-session,ai-addons-updater,combo-toggle}/` |
+| Caveman / RTK / Combo / Tersio commands | `~/.omp/plugins/node_modules/@krtclcdy/tersio/extensions/{caveman-session,rtk-session,combo-toggle,tersio-commands}/` — loaded from Tersio's OMP plugin manifest |
 | 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 (bundled tersio dependency — one Plugins row, updates with `tersio update`) | `~/.omp/plugins/node_modules/@dietrichgebert/ponytail/` |
-| RTK binary | `~/.bun/bin/rtk` (`rtk.exe` on Windows) |
-| Extension registrations | `~/.omp/agent/config.yml` |
+| Ponytail package (bundled Tersio dependency — one Plugins row, updates with `tersio update`) | `~/.omp/plugins/node_modules/@dietrichgebert/ponytail/` — loaded as a nested plugin dependency |
+| RTK binary | Installer writes `~/.bun/bin/rtk` (`rtk.exe` on Windows). Runtime resolves `PATH` first, then this managed path. |
+| Legacy config cleanup | `~/.omp/agent/config.yml` — doctor removes retired or duplicate extension entries |
 
 The installer writes `<file>.bak` before replacing an extension source; the updater keeps `rtk.bak` / `rule.md.bak` and restores them if the replacement fails validation.
 
@@ -150,7 +153,7 @@ User-level installs also register the package in `~/.omp/plugins` (visible in OM
 
 ## 🛠️ Troubleshooting
 
-**Ponytail or Combo command missing:** run `tersio reinstall` in OMP's environment, restart OMP, then `tersio doctor` (repairs `config.yml` registrations).
+**Ponytail or Combo command missing:** confirm `~/.omp/plugins/package.json` lists `@krtclcdy/tersio`, then run `tersio reinstall`, restart OMP, and check `tersio doctor`.
 
 **RTK missing or not executable:** run `tersio reinstall`, then `tersio doctor`. On Linux/macOS: `chmod +x ~/.bun/bin/rtk`.
 

package/cli/common.js

@@ -16,9 +16,8 @@ const OMP_BIN = IS_WINDOWS ? 'omp.cmd' : 'omp';
 const PACKAGE_NAME = '@krtclcdy/tersio';
 const PACKAGE_BIN = 'tersio';
 const { version: PACKAGE_VERSION } = createRequire(import.meta.url)('../package.json');
-// Session-start mode defaults for fresh installs.
-const CAVEMAN_DEFAULTS = new Set(['off', 'lite', 'full', 'ultra', 'wenyan']);
-const PONYTAIL_DEFAULTS = new Set(['off', 'lite', 'full', 'ultra', 'review']);
+const CAVEMAN_DEFAULTS = new Set(['off', 'lite', 'full', 'ultra', 'wenyan-lite', 'wenyan-full', 'wenyan-ultra']);
+const PONYTAIL_DEFAULTS = new Set(['off', 'lite', 'full', 'ultra']);
 const RTK_DEFAULTS = new Set(['on', 'off']);
 const DIAG_SCHEDULES = new Set(['manual', 'daily', 'weekly', 'monthly']);
 // ponytail: Combo preset implies all three modes. Mirrors COMBO_LEVELS in
@@ -167,7 +166,26 @@ async function ensureExtensionInConfig(configPath, extensionPath, label, options
         const legacyTail = `${normalizedPath.slice(0, -3)}.js`.split('/').slice(-2).join('/');
         lines = lines.filter((l) => !l.trim().replace(/^\.\//, '').endsWith(legacyTail));
     }
-    if (lines.some((l) => l.includes(normalizedPath))) {
+    const matchingEntries = lines.filter((entry) => entry.trim().replace(/^-\s*/, '').replace(/^['"]|['"]$/g, '') === normalizedPath);
+    if (matchingEntries.length > 1) {
+        if (options.dryRun) {
+            if (verbose && !options.quiet)
+                console.log(`  [dry-run] would remove ${matchingEntries.length - 1} duplicate ${label} registration${matchingEntries.length === 2 ? '' : 's'}`);
+            return true;
+        }
+        let kept = false;
+        lines = lines.filter((entry) => {
+            if (entry.trim().replace(/^-\s*/, '').replace(/^['"]|['"]$/g, '') !== normalizedPath)
+                return true;
+            if (kept)
+                return false;
+            kept = true;
+            return true;
+        });
+        await writeConfigLines(configPath, lines, `  [write] Removed duplicate ${label} registration`, options);
+        return true;
+    }
+    if (matchingEntries.length === 1) {
         debug(`${label} already in config.yml`);
         return false;
     }
@@ -191,43 +209,29 @@ async function ensureExtensionInConfig(configPath, extensionPath, label, options
     await writeConfigLines(configPath, lines, `  [write] Added ${label} to config.yml`, options);
     return true;
 }
-async function ensureExtensionAfterConfigEntry(configPath, extensionPath, afterPath, label, options = {}) {
-    const normalizedPath = extensionPath.replace(/\\/g, '/');
-    const normalizedAfterPath = afterPath.replace(/\\/g, '/');
-    const line = `  - ${normalizedPath}`;
+async function removeExtensionFromConfig(configPath, extensionPath, label, options = {}) {
+    const normalizedPath = extensionPath.replace(/\\/g, '/').replace(/^\.\//, '');
+    const extensionSuffix = normalizedPath.includes('/extensions/')
+        ? normalizedPath.slice(normalizedPath.indexOf('/extensions/') + 1)
+        : normalizedPath;
     const raw = await readTextIfExists(configPath);
-    let lines = (raw || '').split('\n');
-    // Same legacy-twin drop as ensureExtensionInConfig above.
-    if (normalizedPath.endsWith('.ts')) {
-        const legacyTail = `${normalizedPath.slice(0, -3)}.js`.split('/').slice(-2).join('/');
-        lines = lines.filter((l) => !l.trim().replace(/^\.\//, '').endsWith(legacyTail));
-    }
-    const existingIndex = lines.findIndex((entry) => entry.includes(normalizedPath));
-    const afterIndex = lines.findIndex((entry) => entry.includes(normalizedAfterPath));
-    if (existingIndex !== -1 && afterIndex !== -1 && existingIndex === afterIndex + 1)
+    if (raw === null)
+        return false;
+    const lines = raw.split('\n');
+    const matches = (entry) => {
+        const value = entry.trim().replace(/^-\s*/, '').replace(/^['"]|['"]$/g, '').replace(/\\/g, '/').replace(/^\.\//, '');
+        return value === extensionSuffix || value.endsWith(`/${extensionSuffix}`);
+    };
+    const kept = lines.filter((entry) => !matches(entry));
+    const removed = lines.length - kept.length;
+    if (removed === 0)
         return false;
     if (options.dryRun) {
         if (verbose && !options.quiet)
-            console.log(`  [dry-run] would place ${label} after Ponytail in config.yml`);
+            console.log(`  [dry-run] would remove ${label} registration${removed === 1 ? '' : 's'}`);
         return true;
     }
-    if (existingIndex !== -1)
-        lines.splice(existingIndex, 1);
-    const refreshedAfterIndex = lines.findIndex((entry) => entry.includes(normalizedAfterPath));
-    if (refreshedAfterIndex !== -1) {
-        lines.splice(refreshedAfterIndex + 1, 0, line);
-    }
-    else {
-        const extensionsIndex = lines.findIndex((entry) => EXTENSIONS_KEY_RE.test(entry));
-        if (extensionsIndex === -1) {
-            lines.push('extensions:', line, '');
-        }
-        else {
-            normalizeExtensionsKey(lines);
-            lines.splice(extensionsIndex + 1, 0, line);
-        }
-    }
-    await writeConfigLines(configPath, lines, `  [write] Placed ${label} after Ponytail in config.yml`, options);
+    await writeConfigLines(configPath, kept, `  [write] Removed duplicate ${label} registration`, options);
     return true;
 }
 function readPonytailConfig() {
@@ -298,4 +302,4 @@ function relTime(ageMs) {
     const weeks = Math.floor(days / 7);
     return `${weeks} week${weeks === 1 ? '' : 's'} ago`;
 }
-export { IS_WINDOWS, RTK_BINARY_NAME, HOME, OMP_AGENT_DIR, OMP_PLUGINS_DIR, BUN_BIN_DIR, OMP_BIN, PACKAGE_NAME, PACKAGE_BIN, PACKAGE_VERSION, CAVEMAN_DEFAULTS, PONYTAIL_DEFAULTS, RTK_DEFAULTS, DIAG_SCHEDULES, COMBO_PRESET_MODES, COMBO_DEFAULTS, parseEnum, flagValue, COMMANDS, commandArg, command, settingArg, unknownCommand, install, update, reinstall, showVersion, showHelp, applyUpdate, args, dryRun, yes, verbose, doctor, fix, uninstall, usage, dashboard, reset, settings, dashboardPort, dashboardOpen, dashboardExport, currency, currencyGiven, removePonytail, keepPonytail, removeRtk, comboDefaultFlag, cavemanDefaultFlag, ponytailDefaultFlag, rtkDefaultFlag, diagScheduleFlag, profileFlagsGiven, debug, execFileP, execP, writeIfChanged, normalizeExtensionsKey, EXTENSIONS_KEY_RE, writeConfigLines, ensureExtensionInConfig, ensureExtensionAfterConfigEntry, readPonytailConfig, parseJsonObject, parsePonytailConfig, patchPonytailConfig, ensurePonytailConfigValue, readPluginsPackage, relTime, };
+export { IS_WINDOWS, RTK_BINARY_NAME, HOME, OMP_AGENT_DIR, OMP_PLUGINS_DIR, BUN_BIN_DIR, OMP_BIN, PACKAGE_NAME, PACKAGE_BIN, PACKAGE_VERSION, CAVEMAN_DEFAULTS, PONYTAIL_DEFAULTS, RTK_DEFAULTS, DIAG_SCHEDULES, COMBO_PRESET_MODES, COMBO_DEFAULTS, parseEnum, flagValue, COMMANDS, commandArg, command, settingArg, unknownCommand, install, update, reinstall, showVersion, showHelp, applyUpdate, args, dryRun, yes, verbose, doctor, fix, uninstall, usage, dashboard, reset, settings, dashboardPort, dashboardOpen, dashboardExport, currency, currencyGiven, removePonytail, keepPonytail, removeRtk, comboDefaultFlag, cavemanDefaultFlag, ponytailDefaultFlag, rtkDefaultFlag, diagScheduleFlag, profileFlagsGiven, debug, execFileP, execP, writeIfChanged, normalizeExtensionsKey, EXTENSIONS_KEY_RE, writeConfigLines, ensureExtensionInConfig, removeExtensionFromConfig, readPonytailConfig, parseJsonObject, parsePonytailConfig, patchPonytailConfig, ensurePonytailConfigValue, readPluginsPackage, relTime, };

package/cli/dashboard.js

@@ -13,8 +13,10 @@ import { clearUsageLedger, markReset, readUsage } from '../extensions/shared/usa
 import { pricesCachePath } from '../extensions/shared/pricing.js';
 import { summarizeUsage } from './usage.js';
 import { isCurrencyCode } from './currency.js';
-import { BUN_BIN_DIR, OMP_AGENT_DIR, OMP_PLUGINS_DIR, PACKAGE_VERSION, RTK_BINARY_NAME, } from './common.js';
+import { OMP_AGENT_DIR, OMP_PLUGINS_DIR, PACKAGE_VERSION, } from './common.js';
 import { storedProfile, writePluginSettings } from './profile.js';
+import { PACKAGE_NAME } from './common.js';
+import { resolveRtkBinary } from '../extensions/lib/utils.js';
 const DASHBOARD_DIST = path.join(path.dirname(fileURLToPath(import.meta.url)), '..', 'dashboard', 'dist');
 const DASHBOARD_INDEX = path.join(DASHBOARD_DIST, 'index.html');
 const DASHBOARD_BRAND = path.join(DASHBOARD_DIST, 'brand.webp');
@@ -99,8 +101,8 @@ function ompDefaultModel() {
     }
 }
 function healthJson() {
-    const rtkBin = path.join(BUN_BIN_DIR, RTK_BINARY_NAME);
-    const rtkPresent = existsSync(rtkBin);
+    const rtkBin = resolveRtkBinary();
+    const rtkPresent = rtkBin !== null;
     const detectedOmpPath = ompPath();
     return JSON.stringify({
         tersio: PACKAGE_VERSION,
@@ -109,7 +111,7 @@ function healthJson() {
         omp: ompVersion(detectedOmpPath),
         ompPath: detectedOmpPath,
         provider: ompDefaultModel(),
-        rtk: { present: rtkPresent, version: rtkPresent ? rtkVersion(rtkBin) : null, path: rtkBin },
+        rtk: { present: rtkPresent, version: rtkPresent ? rtkVersion(rtkBin) : null, path: rtkBin || 'not found in PATH' },
         home: tersioHomePath(),
     });
 }
@@ -184,26 +186,39 @@ function relAge(ms) {
 function computeDoctorRows() {
     const rows = [];
     const extDir = path.join(OMP_AGENT_DIR, 'extensions');
-    const rtkBin = path.join(BUN_BIN_DIR, RTK_BINARY_NAME);
+    const rtkBin = resolveRtkBinary();
     const ponytailPkg = path.join(OMP_PLUGINS_DIR, 'node_modules', '@dietrichgebert', 'ponytail', 'package.json');
+    const tersioPluginDir = path.join(OMP_PLUGINS_DIR, 'node_modules', ...PACKAGE_NAME.split('/'));
     const ok = (p) => existsSync(p);
+    const configPath = path.join(OMP_AGENT_DIR, 'config.yml');
     const ext = (label, p) => {
         rows.push({ label, ok: ok(p), detail: ok(p) ? 'installed' : p, group: 'Extensions' });
     };
     const addon = (label, present, detail, group = 'Add-ons') => {
         rows.push({ label, ok: present, detail, group });
     };
-    ext('Caveman extension', path.join(extDir, 'caveman-session', 'index.ts'));
-    ext('RTK extension', path.join(extDir, 'rtk-session', 'index.ts'));
+    let explicitEntries = [];
+    try {
+        explicitEntries = readFileSync(configPath, 'utf8').split('\n')
+            .map((line) => line.trim().replace(/^-\s*/, '').replace(/^['"]|['"]$/g, ''))
+            .filter((line) => line.startsWith('/') || line.startsWith('.'));
+    }
+    catch { /* missing config is reported by extension rows */ }
+    const duplicateExtensions = [...new Set(explicitEntries.filter((entry, index) => explicitEntries.indexOf(entry) !== index))];
+    addon('Unique config registrations', duplicateExtensions.length === 0, duplicateExtensions.length ? duplicateExtensions.join(', ') : 'ok', 'Extensions');
+    const retiredReinforcement = explicitEntries.filter((entry) => entry.endsWith('/shared/mode-reinforcement.ts')).length;
+    addon('No retired reinforcement', retiredReinforcement === 0, retiredReinforcement ? `${retiredReinforcement} registration(s)` : 'ok', 'Extensions');
+    ext('Caveman extension', path.join(tersioPluginDir, 'extensions', 'caveman-session', 'index.ts'));
+    ext('RTK extension', path.join(tersioPluginDir, 'extensions', 'rtk-session', 'index.ts'));
     ext('Ponytail extension', path.join(OMP_PLUGINS_DIR, 'node_modules', '@dietrichgebert', 'ponytail', 'pi-extension', 'index.js'));
-    const rule = path.join(extDir, 'caveman-session', 'rule.md');
+    const rule = path.join(tersioPluginDir, 'extensions', 'caveman-session', 'rule.md');
     const ruleAge = ageStr(rule);
     const ruleAt = absTime(rule);
     addon('Caveman rule', ruleAge !== null, ruleAge && ruleAt ? `(updated ${ruleAge} · ${ruleAt})` : rule);
-    const rtkVer = ok(rtkBin) ? rtkVersion(rtkBin) : null;
-    const rtkAge = ageStr(rtkBin);
-    const rtkAt = absTime(rtkBin);
-    addon('RTK binary', rtkVer !== null, rtkVer && rtkAge && rtkAt ? `${rtkVer} (updated ${rtkAge} · ${rtkAt})` : rtkBin);
+    const rtkVer = rtkBin ? rtkVersion(rtkBin) : null;
+    const rtkAge = rtkBin ? ageStr(rtkBin) : null;
+    const rtkAt = rtkBin ? absTime(rtkBin) : null;
+    addon('RTK binary', rtkVer !== null, rtkVer && rtkAge && rtkAt ? `${rtkVer} (updated ${rtkAge} · ${rtkAt})` : rtkBin || 'not found in PATH');
     const wiring = path.join(extDir, 'rtk.ts');
     addon('RTK OMP wiring (rtk.ts)', ok(wiring), ok(wiring) ? 'loaded' : wiring);
     let ponytailVer = null;

package/cli/doctor-fix.js

@@ -2,7 +2,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, OMP_AGENT_DIR, OMP_PLUGINS_DIR, PACKAGE_NAME, PACKAGE_VERSION, RTK_BINARY_NAME, dryRun, verbose, debug, ensureExtensionAfterConfigEntry, ensureExtensionInConfig, execP, readPluginsPackage, writeIfChanged, } from './common.js';
+import { BUN_BIN_DIR, OMP_AGENT_DIR, OMP_PLUGINS_DIR, PACKAGE_NAME, PACKAGE_VERSION, RTK_BINARY_NAME, removeExtensionFromConfig, dryRun, verbose, debug, execP, readPluginsPackage, writeIfChanged, } from './common.js';
 import { execNetwork } from './interactive.js';
 import { wireRtkOmp, ensureRtkInConfig } from './rtk-wiring.js';
 import { CAVEMAN_REMOTE_RULE, RTK_RELEASE_API, fetchJson, findFile, httpsGet, httpsDownload, parseChecksum, readTextIfExists, rtkPlatformSpec, sha256File, } from '../extensions/lib/utils.js';
@@ -17,33 +17,40 @@ const SOURCES = [
     [path.join(EXT_DIR, 'shared', 'pricing.ts'), path.join('shared', 'pricing.ts')],
     [path.join(EXT_DIR, 'shared', 'carbon.ts'), path.join('shared', 'carbon.ts')],
     [path.join(EXT_DIR, 'caveman-session', 'index.ts'), path.join('caveman-session', 'index.ts')],
+    [path.join(EXT_DIR, 'caveman-session', 'rule.md'), path.join('caveman-session', 'rule.md')],
     [path.join(EXT_DIR, 'rtk-session', 'index.ts'), path.join('rtk-session', 'index.ts')],
     [path.join(EXT_DIR, 'ai-addons-updater', 'index.ts'), path.join('ai-addons-updater', 'index.ts')],
     [path.join(EXT_DIR, 'combo-toggle', 'index.ts'), path.join('combo-toggle', 'index.ts')],
     [path.join(EXT_DIR, 'tersio-commands', 'index.ts'), path.join('tersio-commands', 'index.ts')],
-    [path.join(EXT_DIR, 'shared', 'mode-reinforcement.ts'), path.join('shared', 'mode-reinforcement.ts')],
 ];
-async function fixExtensions(extDir) {
-    console.log('  Doctor --fix: restoring extension files');
-    await fs.mkdir(extDir, { recursive: true });
-    const texts = await Promise.all(SOURCES.map(([from]) => readTextIfExists(from)));
-    const writes = [];
-    for (let i = 0; i < SOURCES.length; i++) {
-        if (texts[i] !== null)
-            writes.push(writeIfChanged(path.join(extDir, SOURCES[i][1]), texts[i], { dryRun, verbose }));
+async function fixExtensions(pluginsDir) {
+    console.log('  Doctor --fix: restoring plugin extension files');
+    const tersioPluginDir = path.join(pluginsDir, 'node_modules', '@krtclcdy', 'tersio');
+    const pluginExtDir = path.join(tersioPluginDir, 'extensions');
+    await fs.mkdir(pluginExtDir, { recursive: true });
+    for (const [from, to] of SOURCES) {
+        const text = await readTextIfExists(from);
+        if (text === null)
+            console.log(`  [warn] bundled source missing: ${from}`);
         else
-            console.log(`  [warn] bundled source missing: ${SOURCES[i][0]}`);
+            await writeIfChanged(path.join(pluginExtDir, to), text, { dryRun, verbose });
     }
-    await Promise.all(writes);
-    if ((await readTextIfExists(path.join(extDir, 'caveman-session', 'rule.md'))) === null) {
-        const rule = await Promise.race([
-            httpsGet(CAVEMAN_REMOTE_RULE).catch(() => null),
-            new Promise((resolve) => setTimeout(() => resolve(null), 8000)),
-        ]);
-        if (rule !== null)
-            await writeIfChanged(path.join(extDir, 'caveman-session', 'rule.md'), rule, { dryRun, verbose });
-        else
-            console.log('  [warn] Caveman rule unreachable — kept existing rule.md');
+    const ruleDest = path.join(pluginExtDir, 'caveman-session', 'rule.md');
+    if ((await readTextIfExists(ruleDest)) === null) {
+        const bundled = await readTextIfExists(path.join(EXT_DIR, 'caveman-session', 'rule.md'));
+        if (bundled !== null) {
+            await writeIfChanged(ruleDest, bundled, { dryRun, verbose });
+        }
+        else {
+            const rule = await Promise.race([
+                httpsGet(CAVEMAN_REMOTE_RULE).catch(() => null),
+                new Promise((resolve) => setTimeout(() => resolve(null), 8000)),
+            ]);
+            if (rule !== null)
+                await writeIfChanged(ruleDest, rule, { dryRun, verbose });
+            else
+                console.log('  [warn] Caveman rule unreachable and no bundled rule exists');
+        }
     }
 }
 async function fixRegistrations(agentDir, pluginsDir) {
@@ -58,13 +65,13 @@ async function fixRegistrations(agentDir, pluginsDir) {
         }
     }
     const extDir = path.join(agentDir, 'extensions');
-    const ponytailExtPath = path.join(pluginsDir, 'node_modules', '@dietrichgebert', 'ponytail', 'pi-extension', 'index.js');
-    await ensureExtensionInConfig(configPath, ponytailExtPath, 'ponytail', { dryRun, verbose });
-    await ensureExtensionInConfig(configPath, path.join(extDir, 'combo-toggle', 'index.ts'), 'combo', { dryRun, verbose });
     const rtkTs = path.join(extDir, 'rtk.ts');
     if ((await readTextIfExists(rtkTs)) !== null)
         await ensureRtkInConfig({ dryRun, verbose });
-    await ensureExtensionAfterConfigEntry(configPath, path.join(extDir, 'shared', 'mode-reinforcement.ts'), ponytailExtPath, 'mode reinforcement', { dryRun, verbose });
+    const ponytailExtPath = path.join(pluginsDir, 'node_modules', '@dietrichgebert', 'ponytail', 'pi-extension', 'index.js');
+    await removeExtensionFromConfig(configPath, path.join(extDir, 'combo-toggle', 'index.ts'), 'manifest-loaded combo', { dryRun, verbose });
+    await removeExtensionFromConfig(configPath, ponytailExtPath, 'manifest-loaded ponytail', { dryRun, verbose });
+    await removeExtensionFromConfig(configPath, path.join(extDir, 'shared', 'mode-reinforcement.ts'), 'retired mode reinforcement', { dryRun, verbose });
     const pkgPath = path.join(pluginsDir, 'package.json');
     const pkg = await readPluginsPackage(pkgPath);
     if (!(PACKAGE_NAME in pkg.dependencies)) {
@@ -127,7 +134,7 @@ async function fixRtk(binDir) {
     if (!(await wireRtkOmp(binDest, { dryRun, verbose })))
         throw new Error('rtk wiring failed');
 }
-async function fixPonytail(pluginsDir, agentDir) {
+async function fixPonytail(pluginsDir) {
     console.log('  Doctor --fix: restoring bundled Ponytail');
     await fs.mkdir(pluginsDir, { recursive: true });
     const pkgPath = path.join(pluginsDir, 'package.json');
@@ -147,7 +154,6 @@ async function fixPonytail(pluginsDir, agentDir) {
     await execNetwork('Restoring bundled Ponytail', 'npm', ['install', '--no-audit', '--no-fund'], { cwd: pluginsDir, timeout: 180000 }).catch((e) => {
         throw new Error(`bundled ponytail restore failed: ${e.message}`);
     });
-    await ensureExtensionInConfig(path.join(agentDir, 'config.yml'), path.join(pluginsDir, 'node_modules', '@dietrichgebert', 'ponytail', 'pi-extension', 'index.js'), 'ponytail', { dryRun, verbose });
 }
 async function fixCli() {
     console.log('  Doctor --fix: updating CLI + add-ons');
@@ -171,13 +177,13 @@ async function runDoctorRepairs(targets) {
         }
     };
     if (want('extensions'))
-        await attempt('extensions', () => fixExtensions(path.join(OMP_AGENT_DIR, 'extensions')));
+        await attempt('extensions', () => fixExtensions(OMP_PLUGINS_DIR));
     if (want('registrations'))
         await attempt('registrations', () => fixRegistrations(OMP_AGENT_DIR, OMP_PLUGINS_DIR));
     if (want('rtk'))
         await attempt('rtk', () => fixRtk(BUN_BIN_DIR));
     if (want('ponytail'))
-        await attempt('ponytail', () => fixPonytail(OMP_PLUGINS_DIR, OMP_AGENT_DIR));
+        await attempt('ponytail', () => fixPonytail(OMP_PLUGINS_DIR));
     if (want('cli'))
         await attempt('cli', fixCli);
     return failed;

package/cli/doctor.js

@@ -1,11 +1,11 @@
 // cli/doctor.ts — installation health checks.
 import { promises as fs } from 'node:fs';
 import path from 'node:path';
-import { BUN_BIN_DIR, OMP_AGENT_DIR, OMP_PLUGINS_DIR, RTK_BINARY_NAME, args, dryRun, fix, yes, execP, parseJsonObject, relTime, } from './common.js';
+import { OMP_AGENT_DIR, OMP_PLUGINS_DIR, args, dryRun, fix, yes, execP, parseJsonObject, relTime, } from './common.js';
 import { askInteractiveChoice, askInteractiveConfirm, runInteractivePhase } from './interactive.js';
 import { usageDbPath } from '../extensions/shared/usage-store.js';
 import { pricesCachePath } from '../extensions/shared/pricing.js';
-import { readTextIfExists } from '../extensions/lib/utils.js';
+import { readTextIfExists, resolveRtkBinary } from '../extensions/lib/utils.js';
 async function runDoctor(recheck = false) {
     console.log('\n=== Tersio Doctor ===');
     // Directories
@@ -13,38 +13,39 @@ async function runDoctor(recheck = false) {
     const extDir = path.join(agentDir, 'extensions');
     const configPath = path.join(agentDir, 'config.yml');
     const pluginsDir = OMP_PLUGINS_DIR;
-    const rtkBin = path.join(BUN_BIN_DIR, RTK_BINARY_NAME);
+    const rtkBin = resolveRtkBinary();
     // Ponytail
     const ponytailPkg = path.join(pluginsDir, 'node_modules', '@dietrichgebert', 'ponytail', 'package.json');
     const ponytailExt = path.join(pluginsDir, 'node_modules', '@dietrichgebert', 'ponytail', 'pi-extension', 'index.js');
-    const cavemanIndex = path.join(extDir, 'caveman-session', 'index.ts');
-    const cavemanRule = path.join(extDir, 'caveman-session', 'rule.md');
-    const rtkIndex = path.join(extDir, 'rtk-session', 'index.ts');
-    const updaterIndex = path.join(extDir, 'ai-addons-updater', 'index.ts');
+    const tersioPluginDir = path.join(pluginsDir, 'node_modules', '@krtclcdy', 'tersio');
+    const cavemanIndex = path.join(tersioPluginDir, 'extensions', 'caveman-session', 'index.ts');
+    const cavemanRule = path.join(tersioPluginDir, 'extensions', 'caveman-session', 'rule.md');
+    const rtkIndex = path.join(tersioPluginDir, 'extensions', 'rtk-session', 'index.ts');
+    const updaterIndex = path.join(tersioPluginDir, 'extensions', 'ai-addons-updater', 'index.ts');
     // Independent probes start concurrently; sections report in fixed order as
     // their data settles. Every probe resolves instead of rejecting.
     const probes = {
         agentEntries: fs.readdir(agentDir).catch(() => null),
         extEntries: fs.readdir(extDir).catch(() => null),
-        sharedStateText: readTextIfExists(path.join(extDir, 'shared', 'session-state.ts')),
+        sharedStateText: readTextIfExists(path.join(tersioPluginDir, 'extensions', 'shared', 'session-state.ts')),
         configText: readTextIfExists(configPath),
         ponytailPkgText: readTextIfExists(ponytailPkg),
         ponytailExtText: readTextIfExists(ponytailExt),
-        rtkBinText: readTextIfExists(rtkBin),
+        rtkBinText: rtkBin ? readTextIfExists(rtkBin) : Promise.resolve(null),
         rtkOmpText: readTextIfExists(path.join(extDir, 'rtk.ts')),
         cavemanIndexText: readTextIfExists(cavemanIndex),
         cavemanRuleText: readTextIfExists(cavemanRule),
         rtkIndexText: readTextIfExists(rtkIndex),
         updaterIndexText: readTextIfExists(updaterIndex),
+        rtkMtime: rtkBin ? fs.stat(rtkBin).catch(() => null) : Promise.resolve(null),
         ruleMtime: fs.stat(cavemanRule).catch(() => null),
-        rtkMtime: fs.stat(rtkBin).catch(() => null),
         ponytailMtime: fs.stat(ponytailPkg).catch(() => null),
         pricesMtime: fs.stat(pricesCachePath()).catch(() => null),
     };
-    const rtkVersionProbe = probes.rtkBinText.then((text) => text === null ? null : execP(rtkBin, ['--version'], { timeout: 5000 }).then((r) => r.stdout.trim() || r.stderr.trim() || null, (e) => {
+    const rtkVersionProbe = rtkBin ? 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;
-    }));
+    }) : Promise.resolve(null);
     const [[agentEntries, extEntries, sharedStateText, configText], [cavemanIndexText, rtkIndexText, updaterIndexText, ponytailPkgText, ponytailExtText], [cavemanRuleText, ruleMtime, rtkBinText, rtkMtime, rtkVersion, rtkOmpText, ponytailMtime, pricesMtime]] = await runInteractivePhase('Checking installation', () => Promise.all([
         Promise.all([
             probes.agentEntries,
@@ -101,6 +102,16 @@ async function runDoctor(recheck = false) {
     check('OMP config.yml', configText !== null, configText === null ? configPath : '');
     check('Shared session bridge', sharedStateText !== null);
     section('Extensions & plugins');
+    const explicitEntries = (configText ?? '').split('\n')
+        .map((line) => line.trim().replace(/^-\s*/, '').replace(/^['"]|['"]$/g, ''))
+        .filter((line) => line.startsWith('/') || line.startsWith('.'));
+    const duplicateExtensions = [...new Set(explicitEntries.filter((entry, index) => explicitEntries.indexOf(entry) !== index))];
+    const retiredReinforcement = explicitEntries.filter((entry) => entry.endsWith('/shared/mode-reinforcement.ts')).length;
+    check('Unique config registrations', duplicateExtensions.length === 0, duplicateExtensions.join(', '));
+    if (retiredReinforcement === 0)
+        check('No retired reinforcement', true);
+    else
+        warnLine('Retired reinforcement registration', `${retiredReinforcement} found; run doctor --fix registrations`);
     check('Caveman extension', cavemanIndexText !== null);
     check('RTK extension', rtkIndexText !== null);
     check('Updater extension', updaterIndexText !== null);
@@ -113,7 +124,7 @@ async function runDoctor(recheck = false) {
     const ruleAge = ruleMtime ? `(updated ${relTime(Date.now() - ruleMtime.mtimeMs)} · ${absDate(ruleMtime.mtimeMs)})` : '';
     check('Caveman rule', cavemanRuleText !== null, ruleAge);
     const rtkAge = rtkMtime ? `(updated ${relTime(Date.now() - rtkMtime.mtimeMs)} · ${absDate(rtkMtime.mtimeMs)})` : '';
-    check('RTK binary', rtkBinText !== null, rtkBinText === null ? rtkBin : [rtkVersion, rtkAge].filter(Boolean).join(' '));
+    check('RTK binary', rtkBin !== null, rtkBinText === null ? 'not found in PATH' : [rtkVersion, rtkAge].filter(Boolean).join(' '));
     if (rtkBinText !== null && !rtkVersion)
         warnLine('RTK version', 'unavailable — binary may not be executable');
     const rtkRegistered = rtkOmpText !== null && (configText ?? '').includes('extensions/rtk.ts');
@@ -164,7 +175,7 @@ async function runDoctorFix(tally) {
     if (tally.warn > 0)
         problems.push(`${tally.warn} warn`);
     if (dryRun) {
-        console.log(`\n  [dry-run] would repair ${problems.join(' + ')} (extensions, config.yml registrations, rtk wiring, ponytail refresh, CLI update)`);
+        console.log(`\n  [dry-run] would repair ${problems.join(' + ')} (extensions, stale config.yml entries, rtk wiring, ponytail refresh, CLI update)`);
         return;
     }
     const scoped = fixScope();
@@ -186,7 +197,7 @@ async function runDoctorFix(tally) {
         const picked = await askInteractiveChoice('Doctor — what should I repair?', [
             { value: 'all', label: 'Fix everything', hint: `${tally.missing + tally.warn} rows` },
             { value: 'extensions', label: 'Missing extension files', hint: 'copy sources from this CLI' },
-            { value: 'registrations', label: 'config.yml registrations', hint: 'combo, ponytail, rtk.ts entries' },
+            { value: 'registrations', label: 'config.yml registrations', hint: 'remove stale entries; keep manifest-owned extensions out' },
             { value: 'rtk', label: 'RTK binary + wiring', hint: 'download checksum-verified binary, rtk init' },
             { value: 'ponytail', label: 'Ponytail package', hint: 'bundled reinstall via tersio dep' },
             { value: 'cli', label: 'CLI update', hint: 'latest tersio + delegated refresh' },