@krtclcdy/tersio 2.25.3 → 2.25.5

package/dist/cli/doctor.js

@@ -1,13 +1,24 @@
 // cli/doctor.ts — installation health checks.
-import { existsSync, promises as fs } from 'node:fs';
+import { existsSync, statSync, promises as fs } from 'node:fs';
 import path from 'node:path';
 import { OMP_AGENT_DIR, OMP_PLUGINS_DIR, PACKAGE_NAME, PACKAGE_VERSION, args, dryRun, fix, yes, execP, parseJsonObject, relTime, } from './common.js';
 import { detectHosts, hostExtensionsDir, ompPackageDir } from './hosts.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, resolveRtkBinary, ruleBodyProblem } from '../extensions/lib/utils.js';
+import { readTextIfExists, resolveRtkBinary, ruleBodyProblem } from '../extensions/shared/utils.js';
+import { sqliteScript, statsDbPath } from '../extensions/shared/agent-stats.js';
 import { TREE_FILES } from './manifest.js';
+/** Bytes at the scale a transcript gap reads in: `5.6M`, not `5571992`. */
+function shortBytes(bytes) {
+    if (bytes >= 1e9)
+        return `${(bytes / 1e9).toFixed(1)}G`;
+    if (bytes >= 1e6)
+        return `${(bytes / 1e6).toFixed(1)}M`;
+    if (bytes >= 1e3)
+        return `${Math.round(bytes / 1e3)}K`;
+    return `${bytes}B`;
+}
 async function runDoctor(recheck = false) {
     console.log('\n=== Tersio Doctor ===');
     // OMP loads the plugin from its plugins dir; pi loads the same package as a pi package, which its own settings.json declares and its npm dir holds.
@@ -15,11 +26,12 @@ async function runDoctor(recheck = false) {
     const rtkBin = resolveRtkBinary();
     // Ponytail
     const ponytailPkg = path.join(pluginsDir, 'node_modules', '@dietrichgebert', 'ponytail', 'package.json');
-    const tersioPluginDir = path.join(pluginsDir, 'node_modules', '@krtclcdy', 'tersio');
-    const cavemanIndex = path.join(tersioPluginDir, 'extensions', 'caveman-session', 'index.ts');
-    const cavemanRule = (name) => path.join(tersioPluginDir, 'extensions', 'caveman-session', name);
-    const rtkIndex = path.join(tersioPluginDir, 'extensions', 'rtk-session', 'index.ts');
-    const updaterIndex = path.join(tersioPluginDir, 'extensions', 'ai-addons-updater', 'index.ts');
+    // One source for the installed plugin path, so the doctor follows a package rename.
+    const tersioPluginDir = ompPackageDir();
+    const cavemanIndex = path.join(tersioPluginDir, 'extensions', 'caveman', 'index.ts');
+    const cavemanRule = (name) => path.join(tersioPluginDir, 'extensions', 'caveman', name);
+    const rtkIndex = path.join(tersioPluginDir, 'extensions', 'rtk', 'session.ts');
+    const updaterIndex = path.join(tersioPluginDir, 'extensions', 'updater', 'index.ts');
     // Independent probes start concurrently; sections report in fixed order as their data settles. Every probe resolves instead of rejecting.
     const hosts = detectHosts();
     const probes = {
@@ -131,6 +143,11 @@ async function runDoctor(recheck = false) {
     console.log(`  Usage DB (tersio-owned · local hosted): ${usageDbPath()}`);
     const pricesAge = pricesMtime ? `(pulled ${relTime(Date.now() - pricesMtime.mtimeMs)} · ${absDate(pricesMtime.mtimeMs)})` : '';
     check('Prices feed', pricesMtime !== null, pricesAge || pricesCachePath());
+    // The pages read omp's own index, which only advances while an omp process owns it. A stalled
+    // index reads as an empty dashboard, so name the gap instead of leaving a user to guess.
+    const indexLag = statsIndexLag();
+    if (indexLag)
+        warnLine('omp stats index', indexLag);
     section('Add-ons');
     const ruleAge = ruleMtime ? `(updated ${relTime(Date.now() - ruleMtime.mtimeMs)} · ${absDate(ruleMtime.mtimeMs)})` : '';
     const cavemanRules = [['rule.md', cavemanRuleText], ['rule-ultra.md', cavemanUltraText], ['rule-megacave.md', cavemanMegacaveText]];
@@ -252,10 +269,55 @@ async function runDoctorFix(tally) {
     console.log('\n  Doctor --fix: repairs done — rechecking.');
     const again = await runDoctor(true);
     if (again.missing + again.warn === 0)
-        console.log('  Doctor --fix: all checks pass. Restart OMP.');
+        console.log('  Doctor --fix: all checks pass. Restart your agent.');
     else
         console.log(`  Doctor --fix: still ${again.missing} missing + ${again.warn} warn — rerun or repair manually.`);
 }
+/**
+ * How far omp's own transcript index falls behind the transcripts on disk, or null when nothing is
+ * behind or the index cannot be read. omp advances the offsets only while one of its processes owns
+ * the index, so a closed dashboard leaves the newest turns unread and the pages read as empty.
+ */
+function statsIndexLag() {
+    const statsDb = statsDbPath();
+    if (!existsSync(statsDb))
+        return null;
+    try {
+        // The same WAL-safe reader the aggregate uses, so this probe never creates side files beside a
+        // database omp has open, and never trips over them either.
+        const rows = sqliteScript(statsDb, 'SELECT session_file, offset FROM file_offsets;\n')
+            .split('\n')
+            .filter((line) => line.includes('\t'))
+            .map((line) => line.split('\t'));
+        if (rows.length === 0)
+            return null;
+        // The gap behind the freshest transcript is what a page shows as "no requests", so the newest
+        // file sets the number rather than the sum of every file's gap.
+        let worstBytes = 0;
+        let freshest = '';
+        for (const [file, offsetText] of rows) {
+            let size;
+            try {
+                size = statSync(file).size;
+            }
+            catch {
+                continue; // a rotated or deleted transcript is not a lag
+            }
+            const behind = size - Number(offsetText);
+            if (behind > worstBytes) {
+                worstBytes = behind;
+                freshest = file;
+            }
+        }
+        if (worstBytes < 4096)
+            return null;
+        const when = relTime(Date.now() - statSync(statsDb).mtimeMs);
+        return `${shortBytes(worstBytes)} of ${path.basename(freshest)} unread, last written ${when === 'just now' ? 'moments ago' : when} — run: omp stats`;
+    }
+    catch {
+        return null; // no sqlite3, or an unreadable index: nothing to report
+    }
+}
 function section(name) {
     console.log(`\n${name}`);
 }

package/dist/cli/hosts.js

@@ -2,8 +2,8 @@
 import { existsSync, readFileSync } from 'node:fs';
 import path from 'node:path';
 import { HOME, OMP_PLUGINS_DIR, PACKAGE_NAME, PACKAGE_VERSION } from './common.js';
-import { TREE_FILES } from './manifest.js';
-import { piAgentDir } from '../extensions/lib/utils.js';
+import { treeFilesFor } from './manifest.js';
+import { piAgentDir } from '../extensions/shared/utils.js';
 export function hostExtensionsDir(id, agentDir = piAgentDir()) {
     if (id === 'omp')
         return path.join(HOME, '.omp', 'agent', 'extensions');
@@ -11,9 +11,9 @@ export function hostExtensionsDir(id, agentDir = piAgentDir()) {
         return path.join(HOME, '.config', 'opencode', 'plugins', 'tersio');
     return path.join(agentDir, 'extensions');
 }
-export function missingTreeFiles(id, agentDir = piAgentDir()) {
+function missingTreeFiles(id, agentDir = piAgentDir()) {
     const dir = hostExtensionsDir(id, agentDir);
-    return TREE_FILES.filter((file) => !existsSync(path.join(dir, file)));
+    return treeFilesFor(id).filter((file) => !existsSync(path.join(dir, file)));
 }
 export function ompPackageDir() {
     return path.join(OMP_PLUGINS_DIR, 'node_modules', ...PACKAGE_NAME.split('/'));

package/dist/cli/install.js

@@ -1,9 +1,9 @@
 // cli/install.ts — install flow and all setup steps.
-import { promises as fs } from 'node:fs';
+import { existsSync, 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, HOME, IS_WINDOWS, OMP_AGENT_DIR, OMP_PLUGINS_DIR, OMP_BIN, PACKAGE_NAME, PACKAGE_VERSION, RTK_BINARY_NAME, args, allowUnverified, applyUpdate, cavemanDefaultFlag, comboDefaultFlag, command, dryRun, ponytailDefaultFlag, profileFlagsGiven, rtkDefaultFlag, verbose, yes, dashboardExport, dashboardPort, debug, ensurePonytailConfigValue, execP, parseJsonObject, readPluginsPackage, writeIfChanged, } from './common.js';
+import { BUN_BIN_DIR, COMBO_PRESET_MODES, HOME, IS_WINDOWS, OMP_AGENT_DIR, OMP_PLUGINS_DIR, OMP_BIN, PACKAGE_NAME, PACKAGE_VERSION, RTK_BINARY_NAME, args, allowUnverified, applyUpdate, cavemanDefaultFlag, comboDefaultFlag, command, dryRun, ponytailDefaultFlag, profileFlagsGiven, rtkDefaultFlag, verbose, yes, dashboardExport, dashboardPort, currency, debug, ensurePonytailConfigValue, execP, parseJsonObject, readPluginsPackage, writeIfChanged, } from './common.js';
 import { askInteractiveChoice, askInteractiveConfirm, closeRL, execNetwork, tty, withInteractiveSpinner, withInteractiveTask, sayTagged } from './interactive.js';
 import { printWelcome } from './banner.js';
 import { checkForUpdate, runLatestUpdate } from './update.js';
@@ -13,11 +13,11 @@ import { runReset } from './reset.js';
 import { runUsage } from './usage.js';
 import { runDashboard } from './dashboard.js';
 import { wireRtkOmp, wireRtkOpencode, wireRtkPi } from './rtk-wiring.js';
-import { CAVEMAN_REMOTE_ULTRA, CAVEMAN_REMOTE_MEGACAVE, RTK_RELEASE_API, fetchJson, findFile, findHoistedPackage, httpsGet, findPackageRoot, httpsDownload, parseChecksum, piAgentDir, readTextIfExists, resolveRtkBinary, ruleBodyProblem, rtkPlatformSpec, sha256File, } from '../extensions/lib/utils.js';
+import { CAVEMAN_REMOTE_ULTRA, CAVEMAN_REMOTE_MEGACAVE, RTK_RELEASE_API, fetchJson, findFile, findHoistedPackage, httpsGet, findPackageRoot, httpsDownload, parseChecksum, piAgentDir, readTextIfExists, resolveRtkBinary, ruleBodyProblem, rtkPlatformSpec, sha256File, } from '../extensions/shared/utils.js';
 import { formatCliStatus, storedProfile, storedProfileSync, writePluginSettings } from './profile.js';
 import { runSettings } from './settings.js';
 import { tersioSettingsFile } from '../extensions/shared/plugin-settings.js';
-import { OPENCODE_SERVER_SHIM, filesUnder, sourcePath } from './manifest.js';
+import { filesUnder, rootFiles, sourcePath } from './manifest.js';
 import { detectHosts, hostHint, hostLabel, parseHostArg, piTersioSource } from './hosts.js';
 async function stepPonytail(pluginsDir, options) {
     if (!options.quiet)
@@ -229,6 +229,38 @@ async function extractRtkArchive(archivePath, extractDir) {
     sayTagged(`  [fail] Unknown archive format: ${archivePath}`);
     return false;
 }
+// The agent tree keeps only rtk's own wiring file. Every Tersio extension loads from the
+// OMP plugin manifest, which omp merges with the extension dir it discovers by default, so a
+// copy left in the agent tree loads a second time. `caveman-session` was never written here
+// after the plugin registration shipped, so an old install holds a set that cannot resolve
+// its own rule bodies.
+const RETIRED_OMP_AGENT_DIRS = [
+    'caveman-session',
+    'rtk-session',
+    'rtk-filter',
+    'combo-toggle',
+    'tersio-commands',
+    'ai-addons-updater',
+    'shared',
+    'lib',
+];
+/** Drop the copies an older OMP install left in the agent tree, keeping rtk's `rtk.ts`. */
+async function stepRetireAgentCopies(extDir, options) {
+    const stale = RETIRED_OMP_AGENT_DIRS.filter((dir) => existsSync(path.join(extDir, dir)));
+    if (stale.length === 0) {
+        if (!options.quiet)
+            console.log('  Retired agent copies — none');
+        return;
+    }
+    if (!options.quiet)
+        console.log(`  Retired agent copies — remove ${stale.join(', ')}`);
+    if (options.dryRun) {
+        if (verbose)
+            sayTagged(`  [dry-run] would remove ${stale.map((d) => path.join(extDir, d)).join(', ')}`);
+        return;
+    }
+    await Promise.all(stale.map((dir) => fs.rm(path.join(extDir, dir), { recursive: true, force: true })));
+}
 // The binary is machine-wide; hosts without a hook only rebind. `tersio update` still refreshes it.
 async function stepRtk(binDir, options, target = 'omp') {
     const binDest = path.join(binDir, RTK_BINARY_NAME);
@@ -348,13 +380,18 @@ async function copySources(extDir, files, skipLabel, options) {
 async function stepSharedSessionState(extDir, options) {
     if (!options.quiet)
         console.log('  Shared files — sync session bridge');
-    const shared = [...filesUnder('shared'), ...filesUnder('lib')];
-    await copySources(extDir, shared, 'shared/session-state.js', options);
+    await copySources(extDir, filesUnder('shared'), 'shared/session-state.js', options);
 }
 async function stepRtkSession(extDir, options) {
     if (!options.quiet)
         console.log('  RTK session — install session mode');
-    await copySources(extDir, filesUnder('rtk-session'), 'rtk-session/index.ts', options);
+    await copySources(extDir, filesUnder('rtk'), 'rtk/session.ts', options);
+}
+// pi's built-in grep and glob never reach the bash hook, so this one filters their output.
+async function stepRtkFilter(extDir, options) {
+    if (!options.quiet)
+        console.log('  RTK filter — install built-in tool output filtering');
+    await copySources(extDir, filesUnder('rtk'), 'rtk/filter.ts', options);
 }
 // rule.md ships with the package; the other bodies track upstream skills.
 // rule.md is a deliberate fork of upstream skills/caveman/SKILL.md; a blind sync would drop the mode switch line and the STE100 rules.
@@ -366,11 +403,11 @@ const CAVEMAN_RULES = [
 async function stepCaveman(extDir, options) {
     if (!options.quiet)
         console.log('  Caveman — install session mode and rule bodies');
-    const cavemanDir = path.join(extDir, 'caveman-session');
+    const cavemanDir = path.join(extDir, 'caveman');
     if (!options.dryRun)
         await fs.mkdir(cavemanDir, { recursive: true });
     for (const [name, remote] of CAVEMAN_RULES) {
-        const bundled = await readTextIfExists(sourcePath(`caveman-session/${name}`));
+        const bundled = await readTextIfExists(sourcePath(`caveman/${name}`));
         let rule = bundled;
         if (remote && !options.dryRun) {
             try {
@@ -399,7 +436,7 @@ async function stepCaveman(extDir, options) {
             await writeIfChanged(path.join(cavemanDir, name), rule, options);
         }
     }
-    await copySources(extDir, filesUnder('caveman-session').filter(([, to]) => to.endsWith('index.ts')), 'caveman-session/index.ts', options);
+    await copySources(extDir, filesUnder('caveman').filter(([, to]) => to.endsWith('index.ts')), 'caveman/index.ts', options);
     // Renamed body: drop the stale copy an older install left behind.
     if (!options.dryRun)
         await fs.rm(path.join(cavemanDir, 'rule-wenyan.md'), { force: true });
@@ -407,15 +444,15 @@ async function stepCaveman(extDir, options) {
 async function stepTersioCommands(extDir, options) {
     if (!options.quiet)
         console.log('  Tersio commands — install /tersio root command');
-    await copySources(extDir, filesUnder('tersio-commands'), 'tersio-commands/index.ts', options);
+    await copySources(extDir, filesUnder('commands'), 'commands/index.ts', options);
 }
 async function stepUpdater(extDir, options) {
-    await copySources(extDir, filesUnder('ai-addons-updater'), 'ai-addons-updater/index.ts', options);
+    await copySources(extDir, filesUnder('updater'), 'updater/index.ts', options);
 }
 async function stepCombo(extDir, options) {
     if (!options.quiet)
         console.log('  Combo — install preset switch');
-    await copySources(extDir, filesUnder('combo-toggle'), 'combo-toggle/index.ts', options);
+    await copySources(extDir, filesUnder('combo'), 'combo/index.ts', options);
 }
 // The tree ships no node_modules, so the full ruleset rides along as files.
 const PONYTAIL_BUNDLE_FILES = [
@@ -451,17 +488,15 @@ async function stepOpencode(options) {
     if (!options.quiet)
         console.log(`  OpenCode — write the plugin tree (${dir})`);
     await stepSharedSessionState(dir, options);
-    await copySources(dir, filesUnder('rtk-session'), 'rtk-session/index.ts', options);
-    await copySources(dir, filesUnder('caveman-session'), 'caveman-session/index.ts', options);
+    await copySources(dir, filesUnder('rtk'), 'rtk/session.ts', options);
+    await stepRtkFilter(dir, options);
+    await copySources(dir, filesUnder('caveman'), 'caveman/index.ts', options);
     await stepCombo(dir, options);
-    await copySources(dir, filesUnder('tersio-commands'), 'tersio-commands/index.ts', options);
+    await copySources(dir, filesUnder('commands'), 'commands/index.ts', options);
     await stepUpdater(dir, options);
-    await copySources(dir, filesUnder('opencode'), 'opencode/server.ts', options);
     await stepPonytailBundle(dir, options);
-    // The loader resolves <pluginDir>/server.ts, so mirror the entry at the tree root.
-    await writeIfChanged(path.join(dir, 'server.ts'), OPENCODE_SERVER_SHIM, options);
-    if (!options.dryRun)
-        await fs.rm(path.join(dir, 'opencode', 'index.ts'), { force: true }).catch(() => { });
+    // The loader resolves <pluginDir>/server.ts, and the entry is that file: copy it in place.
+    await copySources(dir, rootFiles(), 'server.ts', options);
     const configPath = path.join(HOME, '.config', 'opencode', 'opencode.json');
     let config = {};
     try {
@@ -609,7 +644,7 @@ async function runCommandMenu() {
             closeRL();
             break;
         case 'dashboard':
-            await runDashboard({ port: dashboardPort, open: true, exportFile: dashboardExport });
+            await runDashboard({ port: dashboardPort, open: true, exportFile: dashboardExport, currency });
             closeRL();
             break;
         case 'reset':
@@ -659,8 +694,9 @@ async function stepPiLayer(options) {
     if (!options.quiet)
         console.log(`  Pi — write the extension tree (${extDir})`);
     await stepSharedSessionState(extDir, options);
-    // OMP loads rtk-session from its plugin manifest, so only the pi tree copies it.
-    await copySources(extDir, filesUnder('rtk-session'), 'rtk-session/index.ts', options);
+    // OMP loads rtk/session.ts from its plugin manifest, so only the pi tree copies it.
+    await copySources(extDir, filesUnder('rtk'), 'rtk/session.ts', options);
+    await stepRtkFilter(extDir, options);
     await stepCaveman(extDir, options);
     await stepCombo(extDir, options);
     await stepTersioCommands(extDir, options);
@@ -700,14 +736,30 @@ async function stepPonytailForPi(agentDir, options) {
     }
     if (options.dryRun)
         return;
+    // Only when pi still declares the npm spec: with nothing to remove, `pi remove` still
+    // shells out to npm, which warns on stderr and exits non-zero.
+    const declared = await piDeclaredPackages(agentDir);
+    if (declared.some(isNpmPonytailPackage)) {
+        try {
+            await execNetwork('Removing the pi npm copy of Ponytail', 'pi', ['remove', 'npm:@dietrichgebert/ponytail'], { timeout: 120000 });
+        }
+        catch (e) {
+            sayTagged(`  [warn] pi remove ponytail: ${shortError(e)}`);
+        }
+    }
+    await registerPiLocalPonytail(agentDir, dest, options);
+}
+// pi declares its package sources in settings.json; [] when the file is absent or unreadable.
+async function piDeclaredPackages(agentDir) {
     try {
-        await execNetwork('Removing the pi npm copy of Ponytail', 'pi', ['remove', 'npm:@dietrichgebert/ponytail'], { timeout: 120000 });
+        const settings = JSON.parse(await fs.readFile(path.join(agentDir, 'settings.json'), 'utf8'));
+        return Array.isArray(settings.packages) ? settings.packages : [];
     }
-    catch (e) {
-        sayTagged(`  [warn] pi remove ponytail: ${shortError(e)}`);
+    catch {
+        return [];
     }
-    await registerPiLocalPonytail(agentDir, dest, options);
 }
+const isNpmPonytailPackage = (value) => typeof value === 'string' && value.startsWith('npm:@dietrichgebert/ponytail');
 // pi lists package sources in settings; swap the npm spec for the local dir.
 async function registerPiLocalPonytail(agentDir, dest, options) {
     const settingsPath = path.join(agentDir, 'settings.json');
@@ -719,7 +771,7 @@ async function registerPiLocalPonytail(agentDir, dest, options) {
         return;
     }
     const packages = (Array.isArray(settings.packages) ? settings.packages : []);
-    const kept = packages.filter((p) => typeof p !== 'string' || !p.startsWith('npm:@dietrichgebert/ponytail'));
+    const kept = packages.filter((p) => !isNpmPonytailPackage(p));
     if (!kept.includes(dest))
         kept.push(dest);
     settings.packages = kept;
@@ -727,6 +779,10 @@ async function registerPiLocalPonytail(agentDir, dest, options) {
     if (!options.quiet)
         sayTagged(`  [write] pi package source → ${dest}`);
 }
+// Name the preset this run actually chose, instead of a hardcoded level.
+function comboHint(host, comboDefault) {
+    return comboDefault === 'off' ? `\nDone — restart ${host}.` : `\nDone — restart ${host}, then /combo ${comboDefault}.`;
+}
 async function runInstall() {
     // Without this guard a picked command re-enters here with command === null and loops straight back into the picker.
     if (command === null && tty() && !yes && !updatePromptDone) {
@@ -830,7 +886,7 @@ async function runInstall() {
         if (failures.length > 0)
             console.log(`\nDone with ${failures.length} failure(s) — see [fail] lines above.`);
         else
-            console.log('\nDone — restart OpenCode, then /combo balanced.');
+            console.log(comboHint('OpenCode', profile.comboDefault));
         closeRL();
         return;
     }
@@ -841,20 +897,32 @@ async function runInstall() {
         if (failures.length > 0)
             console.log(`\nDone with ${failures.length} failure(s) — see [fail] lines above.`);
         else
-            console.log('\nDone — restart pi, then /combo medium.');
+            console.log(comboHint('pi', profile.comboDefault));
         closeRL();
         return;
     }
-    await capture('shared', () => stepSharedSessionState(userExtDir, installOptions));
     let selfPlugin = false;
     await capture('self-plugin', async () => { selfPlugin = await stepSelfPlugin(OMP_PLUGINS_DIR, installOptions); });
     await capture('ponytail', () => stepPonytail(OMP_PLUGINS_DIR, installOptions));
     await capture('rtk', () => stepRtk(BUN_BIN_DIR, installOptions));
-    await capture('rtk session', () => stepRtkSession(userExtDir, installOptions));
-    await capture('caveman', () => stepCaveman(path.join(OMP_PLUGINS_DIR, 'node_modules', '@krtclcdy', 'tersio', 'extensions'), installOptions));
-    await capture('combo', () => stepCombo(userExtDir, installOptions));
-    await capture('commands', () => stepTersioCommands(userExtDir, installOptions));
-    await capture('updater', () => stepUpdater(userExtDir, installOptions));
+    // A real install registers the plugin before it writes, so the OMP plugin manifest owns
+    // every mode extension. A dry run previews that same destination. A registration that
+    // failed is the one fallback: the agent tree then carries the tree so an offline install
+    // still loads its add-ons, and the retired copies stay untouched.
+    const pluginExtDir = path.join(OMP_PLUGINS_DIR, 'node_modules', '@krtclcdy', 'tersio', 'extensions');
+    const ownsTree = selfPlugin || dryRun;
+    const extDir = ownsTree ? pluginExtDir : userExtDir;
+    if (!quiet)
+        console.log(`  Add-ons load from: ${ownsTree ? 'the OMP plugin manifest' : 'the agent tree (plugin registration failed)'}`);
+    await capture('shared', () => stepSharedSessionState(extDir, installOptions));
+    await capture('rtk session', () => stepRtkSession(extDir, installOptions));
+    await capture('rtk filter', () => stepRtkFilter(extDir, installOptions));
+    await capture('caveman', () => stepCaveman(extDir, installOptions));
+    await capture('combo', () => stepCombo(extDir, installOptions));
+    await capture('commands', () => stepTersioCommands(extDir, installOptions));
+    await capture('updater', () => stepUpdater(extDir, installOptions));
+    if (ownsTree)
+        await capture('retired agent copies', () => stepRetireAgentCopies(userExtDir, installOptions));
     if (selfPlugin)
         await capture('settings', () => writePluginSettings(profile, installOptions));
     if (quiet) {
@@ -862,7 +930,7 @@ async function runInstall() {
             console.log(`  add-ons: ${failures.length} failed (${failures.join(', ')}) — see [fail] lines above`);
     }
     else {
-        console.log(failures.length === 0 ? '\nDone — restart OMP, then /combo medium.' : `\nDone with ${failures.length} failure(s) — see [fail] lines above.`);
+        console.log(failures.length === 0 ? comboHint('OMP', profile.comboDefault) : `\nDone with ${failures.length} failure(s) — see [fail] lines above.`);
     }
     closeRL();
 }

package/dist/cli/manifest.js

@@ -1,13 +1,9 @@
 // Single list of install writes, shared by installer, doctor, and tests.
 import path from 'node:path';
 import { fileURLToPath } from 'node:url';
-import { findPackageRoot } from '../extensions/lib/utils.js';
+import { findPackageRoot, readTextIfExists } from '../extensions/shared/utils.js';
+import { writeIfChanged } from './common.js';
 export const EXT_DIR = path.join(findPackageRoot(path.dirname(fileURLToPath(import.meta.url))), 'extensions');
-/** Root entrypoint OpenCode resolves for the installed tree; re-exports the versioned entry beside it. Built by join so the path never reads as a relative import (repo-integrity scans literals). */
-const SERVER_SPEC = `./${['opencode', 'server.ts'].join('/')}`;
-export const OPENCODE_SERVER_SHIM = `// Generated by \`tersio install --host opencode\`: OpenCode resolves <pluginDir>/server.ts.
-export { default } from "${SERVER_SPEC}";
-`;
 /** Every file in the tree, as paths relative to the extensions directory. */
 export const TREE_FILES = [
     'shared/host.ts',
@@ -18,16 +14,17 @@ export const TREE_FILES = [
     'shared/usage-ledger.ts',
     'shared/pricing.ts',
     'shared/carbon.ts',
-    'lib/utils.ts',
-    'caveman-session/index.ts',
-    'caveman-session/rule.md',
-    'caveman-session/rule-ultra.md',
-    'caveman-session/rule-megacave.md',
-    'rtk-session/index.ts',
-    'combo-toggle/index.ts',
-    'tersio-commands/index.ts',
-    'ai-addons-updater/index.ts',
-    'opencode/server.ts',
+    'shared/utils.ts',
+    'caveman/index.ts',
+    'caveman/rule.md',
+    'caveman/rule-ultra.md',
+    'caveman/rule-megacave.md',
+    'rtk/session.ts',
+    'rtk/filter.ts',
+    'combo/index.ts',
+    'commands/index.ts',
+    'updater/index.ts',
+    'server.ts',
 ];
 export function sourcePath(relative) {
     return path.join(EXT_DIR, ...relative.split('/'));
@@ -41,3 +38,35 @@ export function filesUnder(dir) {
     }
     return found;
 }
+/** The entries at the extensions root, which `filesUnder` cannot name because it takes a directory. */
+export function rootFiles() {
+    return TREE_FILES.filter((file) => !file.includes('/')).map((file) => [sourcePath(file), file]);
+}
+/** The OpenCode plugin entry. It imports `@opencode/plugin`, which the omp and pi loaders lack, so it ships in the OpenCode tree alone. */
+export const OPENCODE_ENTRY = 'server.ts';
+/** The files one host's extension tree holds. The package tree holds all of them. */
+export function treeFilesFor(id) {
+    return id === 'opencode' ? TREE_FILES : TREE_FILES.filter((file) => file !== OPENCODE_ENTRY);
+}
+/**
+ * Copy every bundled file into `dest`, creating the directories it needs. A file the bundle does not
+ * carry is reported and skipped rather than aborting, so one missing source cannot stop the rest.
+ *
+ * `skip` answers "leave this file alone", which is how the rule bodies survive a repair: an upstream
+ * fetch can be newer than the bundled copy, and a re-fetch never overwrites it.
+ */
+export async function syncTreeFiles(dest, files, options, skip) {
+    const missing = [];
+    for (const file of files) {
+        if (skip?.(file))
+            continue;
+        const from = sourcePath(file);
+        const text = await readTextIfExists(from);
+        if (text === null) {
+            missing.push(from);
+            continue;
+        }
+        await writeIfChanged(path.join(dest, ...file.split('/')), text, options);
+    }
+    return missing;
+}

package/dist/cli/profile.js

@@ -4,7 +4,7 @@ import path from 'node:path';
 import { CAVEMAN_DEFAULTS, COMBO_PRESET_MODES, PACKAGE_NAME, PONYTAIL_DEFAULTS, verbose, } from './common.js';
 import os from 'node:os';
 import { DEFAULT_CURRENCY, isCurrencyCode } from './currency.js';
-import { readTextIfExists } from '../extensions/lib/utils.js';
+import { readTextIfExists } from '../extensions/shared/utils.js';
 import { tersioSettingsFile } from '../extensions/shared/plugin-settings.js';
 function readTextIfExistsSync(file) {
     try {

package/dist/cli/uninstall.js

@@ -4,19 +4,29 @@ import path from 'node:path';
 import { BUN_BIN_DIR, HOME, OMP_AGENT_DIR, OMP_PLUGINS_DIR, PACKAGE_NAME, RTK_BINARY_NAME, args, dryRun, keepPonytail, removePonytail, removeRtk, yes, debug, writeConfigLines, } from './common.js';
 import { askInteractiveChoice, closeRL, confirmDestructive, tty, sayTagged } from './interactive.js';
 import { detectHosts, hostHint, hostLabel, parseHostArg } from './hosts.js';
-import { piAgentDir, readTextIfExists } from '../extensions/lib/utils.js';
+import { piAgentDir, readTextIfExists } from '../extensions/shared/utils.js';
 import { tersioSettingsFile } from '../extensions/shared/plugin-settings.js';
 // The pi tree mirrors the OMP one. Ponytail and rtk stay: a package and a shared binary are not ours to delete.
 const PONYTAIL_PKG = '@dietrichgebert/ponytail';
 const PI_TREE_DIRS = [
+    // What an install writes now.
+    'caveman',
+    'rtk',
+    'updater',
+    'combo',
+    'commands',
+    'shared',
+    'server.ts',
+    // Legacy: a tree an older build wrote, or a foreign name that was never shipped here.
     'caveman-session',
     'rtk-session',
+    'rtk-filter',
     'ai-addons-updater',
     'combo-toggle',
     'tersio-commands',
-    'shared',
     'lib',
     'opencode',
+    'aaa-combo-boot',
 ];
 // One `pi remove`, for both packages the installer adds there.
 async function piRemove(spec, shouldDryRun) {
@@ -237,15 +247,21 @@ async function runUninstall(options = {}) {
     const pluginsDir = OMP_PLUGINS_DIR;
     const ponytailPkgDir = path.join(pluginsDir, 'node_modules', '@dietrichgebert', 'ponytail');
     const targets = [
+        // What an install writes now.
+        'caveman',
+        'rtk',
+        'updater',
+        'combo',
+        'commands',
+        'shared',
+        // Legacy: a tree an older build wrote into the agent tree, or a foreign name never shipped here.
         'caveman-session',
         'rtk-session',
+        'rtk-filter',
         'ai-addons-updater',
         'combo-toggle',
         'tersio-commands',
-        'shared',
-        // Only the updater reads it, and it runs before this.
         'lib',
-        // Legacy: imports session-state.js, so it warns once that module is gone.
         'aaa-combo-boot',
         // Foreign to the OMP loader; never shipped here on purpose.
         'opencode',

package/dist/cli/update.js

@@ -4,9 +4,9 @@ import path from 'node:path';
 import { spawn } from 'node:child_process';
 import { IS_WINDOWS, OMP_PLUGINS_DIR, PACKAGE_BIN, PACKAGE_NAME, PACKAGE_VERSION, args, dryRun, execP, parseJsonObject, verbose, } from './common.js';
 import { execNetwork, sayTagged } from './interactive.js';
-import { readTextIfExists, resolveRtkBinary, tersioDataPath } from '../extensions/lib/utils.js';
+import { readTextIfExists, resolveRtkBinary, tersioDataPath } from '../extensions/shared/utils.js';
 import { refreshPrices } from '../extensions/shared/pricing.js';
-import { CAVEMAN_REMOTE_ULTRA, CAVEMAN_REMOTE_MEGACAVE, RTK_RELEASE_API, httpsGet, normalizeRtkVersion, sha256Hex, } from '../extensions/lib/utils.js';
+import { CAVEMAN_REMOTE_ULTRA, CAVEMAN_REMOTE_MEGACAVE, RTK_RELEASE_API, httpsGet, normalizeRtkVersion, sha256Hex, } from '../extensions/shared/utils.js';
 import { parseHostArg } from './hosts.js';
 const UPDATE_CHECK_TTL_MS = 6 * 60 * 60 * 1000;
 function newerThan(a, b) {
@@ -79,7 +79,7 @@ async function probeUpdatePlan(cliLatest) {
     const rtkBin = resolveRtkBinary();
     const ponytailPkg = path.join(OMP_PLUGINS_DIR, 'node_modules', '@dietrichgebert', 'ponytail', 'package.json');
     // rule.md ships with the release; only the tracked bodies can go stale.
-    const tersioRule = (name) => path.join(OMP_PLUGINS_DIR, 'node_modules', '@krtclcdy', 'tersio', 'extensions', 'caveman-session', name);
+    const tersioRule = (name) => path.join(OMP_PLUGINS_DIR, 'node_modules', '@krtclcdy', 'tersio', 'extensions', 'caveman', name);
     const controller = new AbortController();
     const [rtkLocal, rtkRelease, ruleLocal, ruleRemote, ponytailLocalText] = await Promise.all([
         settle(rtkBin ? execP(rtkBin, ['--version'], { timeout: 5000 }).then((r) => normalizeRtkVersion(r.stdout.trim() || r.stderr.trim()) || null) : Promise.resolve(null), 6000),