@krtclcdy/tersio 2.22.0 → 2.23.0

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' },

package/cli/install.js

@@ -3,14 +3,13 @@ import { promises as fs } from 'node:fs';
 import os from 'node:os';
 import path from 'node:path';
 import { fileURLToPath } from 'node:url';
-import { BUN_BIN_DIR, COMBO_PRESET_MODES, IS_WINDOWS, OMP_AGENT_DIR, OMP_PLUGINS_DIR, OMP_BIN, PACKAGE_NAME, PACKAGE_VERSION, RTK_BINARY_NAME, applyUpdate, cavemanDefaultFlag, comboDefaultFlag, command, dryRun, install, ponytailDefaultFlag, profileFlagsGiven, reinstall, rtkDefaultFlag, verbose, yes, dashboardExport, dashboardPort, debug, ensureExtensionAfterConfigEntry, ensureExtensionInConfig, ensurePonytailConfigValue, execP, parseJsonObject, readPluginsPackage, writeIfChanged, } from './common.js';
+import { BUN_BIN_DIR, COMBO_PRESET_MODES, IS_WINDOWS, OMP_AGENT_DIR, OMP_PLUGINS_DIR, OMP_BIN, PACKAGE_NAME, PACKAGE_VERSION, RTK_BINARY_NAME, applyUpdate, cavemanDefaultFlag, comboDefaultFlag, command, dryRun, install, ponytailDefaultFlag, profileFlagsGiven, reinstall, rtkDefaultFlag, verbose, yes, dashboardExport, dashboardPort, debug, ensurePonytailConfigValue, execP, parseJsonObject, readPluginsPackage, writeIfChanged, } from './common.js';
 import { askInteractiveChoice, askInteractiveConfirm, closeRL, execNetwork, tty, withInteractiveSpinner, } from './interactive.js';
 import { printWelcome } from './banner.js';
 import { checkForUpdate, runLatestUpdate } from './update.js';
 import { runUninstall } from './uninstall.js';
 import { runDoctor } from './doctor.js';
 import { runReset } from './reset.js';
-import { runSettings } from './settings.js';
 import { runUsage } from './usage.js';
 import { runDashboard } from './dashboard.js';
 import { wireRtkOmp } from './rtk-wiring.js';
@@ -20,18 +19,18 @@ import { storedProfile, writePluginSettings } from './profile.js';
 const EXT_DIR = path.join(path.dirname(fileURLToPath(import.meta.url)), '..', 'extensions');
 const SHARED_SESSION_STATE = path.join(EXT_DIR, 'shared', 'session-state.ts');
 const CAVEMAN_INDEX = path.join(EXT_DIR, 'caveman-session', 'index.ts');
+const CAVEMAN_RULE = path.join(EXT_DIR, 'caveman-session', 'rule.md');
 const RTK_SESSION_INDEX = path.join(EXT_DIR, 'rtk-session', 'index.ts');
 const UPDATER_INDEX = path.join(EXT_DIR, 'ai-addons-updater', 'index.ts');
 const COMBO_TOGGLE_INDEX = path.join(EXT_DIR, 'combo-toggle', 'index.ts');
 const TERSIO_COMMANDS_INDEX = path.join(EXT_DIR, 'tersio-commands', 'index.ts');
-const MODE_REINFORCEMENT_INDEX = path.join(EXT_DIR, 'shared', 'mode-reinforcement.ts');
 const SHARED_TYPES = path.join(EXT_DIR, 'shared', 'types.ts');
 const LIB_UTILS = path.join(EXT_DIR, 'lib', 'utils.ts');
 const SHARED_PLUGIN_SETTINGS = path.join(EXT_DIR, 'shared', 'plugin-settings.ts');
 const SHARED_USAGE_LEDGER = path.join(EXT_DIR, 'shared', 'usage-ledger.ts');
 const SHARED_PRICING = path.join(EXT_DIR, 'shared', 'pricing.ts');
 const SHARED_CARBON = path.join(EXT_DIR, 'shared', 'carbon.ts');
-async function stepPonytail(pluginsDir, userDir, options) {
+async function stepPonytail(pluginsDir, options) {
     if (!options.quiet)
         console.log('  Ponytail — ensure bundled plugin');
     await fs.mkdir(pluginsDir, { recursive: true });
@@ -92,12 +91,8 @@ async function stepPonytail(pluginsDir, userDir, options) {
         console.log('  [hint] The /ponytail command won\'t work, but ponytail skills will still load');
     }
     else if (!options.dryRun && !options.quiet) {
-        // Wire extension into config.yml so /ponytail command loads
-        debug('Bundled Ponytail pi-extension found');
+        debug('Bundled Ponytail pi-extension found; OMP loads it from the plugin manifest');
     }
-    // Still set Ponytail config defaults even without the extension command
-    const configPath = path.join(userDir, 'config.yml');
-    await ensureExtensionInConfig(configPath, ponytailExtPath, 'ponytail', options);
     await ensurePonytailConfigValue('defaultMode', 'off', options);
     // hideStatus=true keeps the upstream ponytail bar hidden; combo owns the bar.
     await ensurePonytailConfigValue('hideStatus', true, options);
@@ -355,14 +350,6 @@ async function stepSharedSessionState(extDir, options) {
         [SHARED_CARBON, path.join('shared', 'carbon.ts')],
     ], 'shared/session-state.js', options);
 }
-async function stepModeReinforcement(extDir, ponytailExtPath, options) {
-    if (!options.quiet)
-        console.log('  Session helpers — sync shared files');
-    const dest = path.join(extDir, 'shared', 'mode-reinforcement.ts');
-    if (!await copySources(extDir, [[MODE_REINFORCEMENT_INDEX, path.join('shared', 'mode-reinforcement.ts')]], 'shared/mode-reinforcement.ts', options))
-        return;
-    await ensureExtensionAfterConfigEntry(path.join(path.dirname(extDir), 'config.yml'), dest, ponytailExtPath, 'mode reinforcement', options);
-}
 async function stepRtkSession(extDir, options) {
     if (!options.quiet)
         console.log('  RTK session — install session mode');
@@ -371,12 +358,17 @@ async function stepRtkSession(extDir, options) {
 // One rule fetch serves the install; dry runs stay offline
 // and fall back to the bundled rule to preview its destination.
 async function fetchCavemanRule(options) {
+    const bundled = await readTextIfExists(CAVEMAN_RULE);
     if (options.dryRun)
-        return (await readTextIfExists(path.join(path.dirname(CAVEMAN_INDEX), 'rule.md'))) || '';
+        return bundled;
     try {
         return await withInteractiveSpinner('Fetching Caveman rule', () => httpsGet(CAVEMAN_REMOTE_RULE));
     }
     catch (e) {
+        if (bundled !== null) {
+            debug(`Using bundled Caveman rule: ${e.message}`);
+            return bundled;
+        }
         console.log(`  [warn] Could not fetch caveman rule: ${e.message}`);
         return null;
     }
@@ -411,12 +403,7 @@ async function stepUpdater(extDir, options) {
 async function stepCombo(extDir, options) {
     if (!options.quiet)
         console.log('  Combo — install preset switch');
-    const dest = path.join(extDir, 'combo-toggle', 'index.ts');
-    if (!await copySources(extDir, [[COMBO_TOGGLE_INDEX, path.join('combo-toggle', 'index.ts')]], 'combo-toggle/index.ts', options))
-        return;
-    // Auto-register combo in config.yml
-    const configPath = path.join(path.dirname(extDir), 'config.yml');
-    await ensureExtensionInConfig(configPath, dest, 'combo', options);
+    await copySources(extDir, [[COMBO_TOGGLE_INDEX, path.join('combo-toggle', 'index.ts')]], 'combo-toggle/index.ts', options);
 }
 async function resolveProfile(forceReinstall = false, opts = {}) {
     // Seed from the lock file so flag-less update/reinstall runs keep the
@@ -484,9 +471,8 @@ async function runCommandMenu() {
         { 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: 'dashboard', label: 'Dashboard', hint: 'open the report in your browser' },
         { value: 'reset', label: 'Reset statistics', hint: 'clear statistics; transcripts and RTK history stay' },
-        { value: 'settings', label: 'Settings', hint: 'defaults: combo, caveman, rtk, ponytail, currency' },
         { value: 'uninstall', label: 'Uninstall', hint: 'remove tersio' },
     ], 'install');
     if (choice.status !== 'selected') {
@@ -545,7 +531,7 @@ async function runCommandMenu() {
             await runUsage();
             closeRL();
             break;
-        case 'gain':
+        case 'dashboard':
             await runDashboard({ port: dashboardPort, open: true, exportFile: dashboardExport });
             closeRL();
             break;
@@ -553,9 +539,6 @@ async function runCommandMenu() {
             await runReset();
             closeRL();
             break;
-        case 'settings':
-            await runSettings();
-            break;
         case 'uninstall':
             await runUninstall();
             closeRL();
@@ -644,14 +627,12 @@ async function runInstall(overrides = {}) {
     await capture('shared', () => stepSharedSessionState(userExtDir, options));
     let selfPlugin = false;
     await capture('self-plugin', async () => { selfPlugin = await stepSelfPlugin(OMP_PLUGINS_DIR, options); });
-    await capture('ponytail', () => stepPonytail(OMP_PLUGINS_DIR, userDir, options));
-    const ponytailExtPath = path.join(OMP_PLUGINS_DIR, 'node_modules', '@dietrichgebert', 'ponytail', 'pi-extension', 'index.js');
+    await capture('ponytail', () => stepPonytail(OMP_PLUGINS_DIR, options));
     await capture('rtk', () => stepRtk(BUN_BIN_DIR, options));
     await capture('rtk session', () => stepRtkSession(userExtDir, options));
-    await capture('caveman', () => stepCaveman(userExtDir, cavemanRule, options));
+    await capture('caveman', () => stepCaveman(path.join(OMP_PLUGINS_DIR, 'node_modules', '@krtclcdy', 'tersio', 'extensions'), cavemanRule, options));
     await capture('combo', () => stepCombo(userExtDir, options));
     await capture('commands', () => stepTersioCommands(userExtDir, options));
-    await capture('reinforcement', () => stepModeReinforcement(userExtDir, ponytailExtPath, options));
     await capture('updater', () => stepUpdater(userExtDir, options));
     if (selfPlugin)
         await capture('settings', () => writePluginSettings(profile, options));

package/cli/profile.js

@@ -1,5 +1,5 @@
 // cli/profile.ts — session-start defaults profile (combo/caveman/rtk/ponytail)
-// plus the display-currency default for usage/gain reports.
+// plus the display-currency default for usage/dashboard reports.
 // Single source for reading/writing the omp plugin settings lock entry.
 // Extracted from cli/install.ts so both install and settings share it.
 import { promises as fs } from 'node:fs';
@@ -72,6 +72,7 @@ async function writePluginSettings(profile, options) {
     config.settings[PACKAGE_NAME] = {
         ...(config.settings[PACKAGE_NAME] || {}),
         comboDefault: profile.comboDefault,
+        comboSetupComplete: true,
         cavemanDefault: profile.cavemanDefault,
         rtkDefault: profile.rtkDefault,
         ponytailDefault: profile.ponytailDefault,

package/cli/settings.js

@@ -1,5 +1,5 @@
 // cli/settings.ts — view/edit session-start defaults (combo/caveman/rtk/ponytail)
-// plus the display-currency default for usage/gain reports.
+// plus the display-currency default for usage/dashboard reports.
 // Non-interactive: `tersio settings --combo-default balanced` (plus per-mode
 // override flags and --currency). Interactive: clack selects seeded from the
 // stored profile.
@@ -64,7 +64,7 @@ async function askProfile(current) {
     if (ponytail.status !== 'selected')
         return null;
     next.ponytailDefault = ponytail.value;
-    const cur = await askInteractiveChoice('Display currency (usage/gain reports)', CURRENCY_CODES.map((v) => ({
+    const cur = await askInteractiveChoice('Display currency (usage/dashboard reports)', CURRENCY_CODES.map((v) => ({
         value: v, label: v,
     })), next.currency);
     if (cur.status !== 'selected')
@@ -85,7 +85,7 @@ async function askDiagSchedule(current) {
 }
 const SETTING_NAMES = ['combo', 'caveman', 'rtk', 'ponytail', 'currency', 'diagnosis'];
 function settingsUsage() {
-    console.log('  Usage: tersio settings [combo|caveman|rtk|ponytail|currency|diagnosis] [--combo-default off|medium|balanced|max] [--caveman-default off|lite|full|ultra|wenyan] [--rtk-default on|off] [--ponytail-default off|lite|full|ultra|review] [--currency USD|PHP|EUR|GBP|JPY|KRW|SGD|AUD|CAD|INR] [--diag-schedule manual|daily|weekly|monthly] [--dry-run]');
+    console.log('  Usage: tersio settings [combo|caveman|rtk|ponytail|currency|diagnosis] [--combo-default off|medium|balanced|max] [--caveman-default off|lite|full|ultra|wenyan-lite|wenyan-full|wenyan-ultra] [--rtk-default on|off] [--ponytail-default off|lite|full|ultra] [--currency USD|PHP|EUR|GBP|JPY|KRW|SGD|AUD|CAD|INR] [--diag-schedule manual|daily|weekly|monthly] [--dry-run]');
 }
 // Single-setting jump: `tersio settings diagnosis` prompts only that value
 // instead of walking the whole chain. Returns false when aborted.
@@ -138,7 +138,7 @@ async function runSingleSetting(name, current, nextDiag) {
             break;
         }
         case 'currency': {
-            const picked = await askInteractiveChoice('Display currency (usage/gain reports)', CURRENCY_CODES.map((v) => ({
+            const picked = await askInteractiveChoice('Display currency (usage/dashboard reports)', CURRENCY_CODES.map((v) => ({
                 value: v, label: v,
             })), next.currency);
             if (picked.status !== 'selected')
@@ -162,7 +162,7 @@ async function runSingleSetting(name, current, nextDiag) {
 }
 function printSettingsTable(current) {
     console.log('\n=== Tersio Settings ===');
-    // Currency lives here no longer: the gain dashboard owns displaying and
+    // Currency lives here no longer: the dashboard owns displaying and
     // persisting it (its picker POSTs to /currency); settings can still set
     // the stored default via --currency or the prompt below.
     const rows = [
@@ -239,7 +239,7 @@ async function runSettings() {
     setDiagSchedule(nextDiag);
     console.log(`  Defaults: ${formatProfile(next)} · diagnosis=${nextDiag}`);
     console.log('  Applies to fresh sessions only — anything persisted with /combo, /caveman, or /rtk wins.');
-    console.log('  Currency applies to usage/gain reports; --currency overrides it per run.');
+    console.log('  Currency applies to usage/dashboard reports; --currency overrides it per run.');
     closeRL();
 }
 export { runSettings };

package/cli/update.js

@@ -2,11 +2,11 @@
 import { promises as fs } from 'node:fs';
 import path from 'node:path';
 import { spawn } from 'node:child_process';
-import { BUN_BIN_DIR, IS_WINDOWS, OMP_AGENT_DIR, OMP_PLUGINS_DIR, PACKAGE_BIN, PACKAGE_NAME, PACKAGE_VERSION, RTK_BINARY_NAME, dryRun, execP, parseJsonObject, verbose, } from './common.js';
+import { IS_WINDOWS, OMP_PLUGINS_DIR, PACKAGE_BIN, PACKAGE_NAME, PACKAGE_VERSION, dryRun, execP, parseJsonObject, verbose, } from './common.js';
 import { execNetwork } from './interactive.js';
-import { readTextIfExists, tersioDataPath } from '../extensions/lib/utils.js';
+import { readTextIfExists, resolveRtkBinary, tersioDataPath } from '../extensions/lib/utils.js';
 import { refreshPrices } from '../extensions/shared/pricing.js';
-import { CAVEMAN_REMOTE_RULE, RTK_RELEASE_API, fetchJson, httpsGet, normalizeRtkVersion, sha256Hex, } from '../extensions/lib/utils.js';
+import { CAVEMAN_REMOTE_RULE, RTK_RELEASE_API, httpsGet, normalizeRtkVersion, sha256Hex, } from '../extensions/lib/utils.js';
 const UPDATE_CHECK_TTL_MS = 6 * 60 * 60 * 1000;
 function newerThan(a, b) {
     const pa = a.replace(/^v/, '').split('.').map((n) => parseInt(n, 10) || 0);
@@ -83,21 +83,22 @@ async function execInherit(cmd, args) {
 // Current → latest per add-on. Every probe is capped and nullable; the plan
 // prints `unknown` for anything unreachable and the update proceeds anyway.
 async function probeUpdatePlan(cliLatest) {
-    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 ruleDest = path.join(OMP_AGENT_DIR, 'extensions', 'caveman-session', 'rule.md');
+    const tersioRule = path.join(OMP_PLUGINS_DIR, 'node_modules', '@krtclcdy', 'tersio', 'extensions', 'caveman-session', 'rule.md');
+    const controller = new AbortController();
     const [rtkLocal, rtkRelease, ruleLocalText, ruleRemoteText, ponytailLocalText] = await Promise.all([
-        settle(execP(rtkBin, ['--version'], { timeout: 5000 }).then((r) => normalizeRtkVersion(r.stdout.trim() || r.stderr.trim()) || null), 6000),
-        settle(fetchJson(RTK_RELEASE_API).then((r) => normalizeRtkVersion(r.tag_name) || null), 4000),
-        readTextIfExists(ruleDest),
-        settle(httpsGet(CAVEMAN_REMOTE_RULE), 4000),
+        settle(rtkBin ? execP(rtkBin, ['--version'], { timeout: 5000 }).then((r) => normalizeRtkVersion(r.stdout.trim() || r.stderr.trim()) || null) : Promise.resolve(null), 6000),
+        settle(httpsGet(RTK_RELEASE_API, { signal: controller.signal }).then((text) => normalizeRtkVersion(JSON.parse(text).tag_name) || null), 1500),
+        readTextIfExists(tersioRule),
+        settle(httpsGet(CAVEMAN_REMOTE_RULE, { signal: controller.signal }).then((text) => sha256Hex(text).slice(0, 8)), 1500),
         readTextIfExists(ponytailPkg),
     ]);
-    const shortHash = (text) => text === null ? null : sha256Hex(text).slice(0, 8);
+    controller.abort();
     return {
         cli: cliLatest,
         rtk: [rtkLocal, rtkRelease],
-        rule: [shortHash(ruleLocalText), shortHash(ruleRemoteText)],
+        rule: [ruleLocalText ? sha256Hex(ruleLocalText).slice(0, 8) : null, ruleRemoteText],
         ponytail: ponytailLocalText ? parseJsonObject(ponytailLocalText)?.version ?? null : null,
     };
 }

package/cli/usage.js

@@ -1,4 +1,6 @@
-import { co2GramsFor, displayModelId, energyWhFor, importSessionTokens, ledgerPath, priceFor, readResetWatermark, readUsage, refreshPricesIfStale, sessionsDir, usdCost, } from '../extensions/shared/usage-ledger.js';
+// cli/usage.ts — ledger + session-token usage report, tokscale-style.
+import { co2GramsFor, displayModelId, energyWhFor, importSessionTokens, ledgerPath, priceFor, readResetWatermark, readRtkAdoption, readRtkRecallDiagnostics, readUsage, refreshPricesIfStale, sessionsDir, usdCost, } from '../extensions/shared/usage-ledger.js';
+import { resolveRtkBinary } from '../extensions/lib/utils.js';
 import { readRtkGain } from '../extensions/shared/rtk-gain.js';
 import { readUsageDb, syncUsageDb, usageDbPath } from '../extensions/shared/usage-store.js';
 import { withInteractiveSpinner } from './interactive.js';
@@ -74,6 +76,8 @@ export function summarizeUsage(rows) {
             est: usdCost({ input: r.i, output: r.o, cacheRead: r.cr ?? 0, cacheWrite: r.cw ?? 0 }, r.m).usd,
         })),
         rtkGain: readRtkGain(RTK_COMMAND_ROWS, watermark || undefined),
+        rtkAdoption: readRtkAdoption(),
+        rtkRecall: readRtkRecallDiagnostics(resolveRtkBinary()),
         usd,
         priced,
         savedUsd,
@@ -134,6 +138,7 @@ function printReport(report) {
     const t = report.tokens;
     console.log(`  TOKENS  ${fmt(t.input)} in · ${fmt(t.output)} out · ${fmt(t.cacheRead)} cache read · ${fmt(t.cacheWrite)} cache write`);
     console.log(`  COST    ${formatCurrency(report.usd, report.currency)}${report.priced ? '' : ' (includes default pricing)'} · ~${formatCurrency(report.savedUsd, report.currency)} cache-saved (est.) · ~${report.co2g.toFixed(1)}g CO2 (est.)`);
+    console.log(`  RTK      ${fmt(report.rtkAdoption.rtkCalls)}/${fmt(report.rtkAdoption.eligibleCalls)} eligible OMP Bash calls use RTK (${report.rtkAdoption.adoptionPct.toFixed(1)}%) · ${fmt(report.rtkAdoption.missedCalls)} missed · recall ${report.rtkRecall.available ? `${report.rtkRecall.mode} (${report.rtkRecall.entries})` : 'unavailable'}`);
     const models = Object.entries(report.byModel).filter(([, b]) => b.input + b.output + b.cacheRead + b.cacheWrite > 0).sort((a, b) => (b[1].input + b[1].output) - (a[1].input + a[1].output)).slice(0, 8);
     if (models.length) {
         console.log('  BY MODEL');