@krtclcdy/tersio 2.25.2 → 2.25.4

package/{cli → dist/cli}/common.js

@@ -4,7 +4,8 @@ import { promises as fs } from 'node:fs';
 import path from 'node:path';
 import { promisify } from 'node:util';
 import { createRequire } from 'node:module';
-import { readTextIfExists } from '../extensions/lib/utils.js';
+import { fileURLToPath } from 'node:url';
+import { findPackageRoot, readTextIfExists } from '../extensions/lib/utils.js';
 import { parseCurrencyFlag, readStoredCurrency } from './currency.js';
 const IS_WINDOWS = process.platform === 'win32';
 const RTK_BINARY_NAME = IS_WINDOWS ? 'rtk.exe' : 'rtk';
@@ -15,8 +16,8 @@ const BUN_BIN_DIR = path.join(HOME, '.bun', 'bin');
 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');
-const CAVEMAN_DEFAULTS = new Set(['off', 'lite', 'full', 'ultra', 'wenyan-lite', 'wenyan-full', 'wenyan-ultra']);
+const { version: PACKAGE_VERSION } = createRequire(import.meta.url)(path.join(findPackageRoot(path.dirname(fileURLToPath(import.meta.url))), 'package.json'));
+const CAVEMAN_DEFAULTS = new Set(['off', 'lite', 'full', 'ultra', 'megacave-lite', 'megacave-full', 'megacave-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']);

package/{cli → dist/cli}/dashboard.js

@@ -16,8 +16,8 @@ import { BACKUP_SCHEDULES, formatCliStatus, storedProfile, writePluginSettings }
 import { normalizeComboLevel } from '../extensions/shared/session-state.js';
 import { CAVEMAN_DEFAULTS, PONYTAIL_DEFAULTS } from './common.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');
+import { findPackageRoot, resolveRtkBinary } from '../extensions/lib/utils.js';
+const DASHBOARD_DIST = path.join(findPackageRoot(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');
 function requireDashboardBundle() {
@@ -634,17 +634,34 @@ async function runDashboard(options) {
         res.writeHead(200, { 'Content-Type': 'text/html; charset=utf-8' });
         res.end(await readSegment(DASHBOARD_INDEX));
     });
-    server.listen(options.port, '127.0.0.1', () => {
-        try {
-            process.title = 'tersio dashboard';
-        }
-        catch { /* non-POSIX shells keep node */ }
-        const address = server.address();
-        const port = typeof address === 'object' && address ? address.port : options.port;
-        const url = `http://127.0.0.1:${port}`;
-        console.log(`[ok] Dashboard live → ${url} (Ctrl-C to stop)`);
-        if (options.open)
-            openBrowser(url);
+    await new Promise((resolve, reject) => {
+        let stopping = false;
+        const rejectOnce = (err) => {
+            if (!stopping)
+                reject(err);
+        };
+        const stop = () => {
+            if (stopping)
+                return;
+            stopping = true;
+            server.close(() => resolve());
+            server.closeIdleConnections();
+        };
+        process.once('SIGINT', stop);
+        process.once('SIGTERM', stop);
+        server.once('error', rejectOnce);
+        server.listen(options.port, '127.0.0.1', () => {
+            try {
+                process.title = 'tersio dashboard';
+            }
+            catch { /* non-POSIX shells keep node */ }
+            const address = server.address();
+            const port = typeof address === 'object' && address ? address.port : options.port;
+            const url = `http://127.0.0.1:${port}`;
+            console.log(`[ok] Dashboard live → ${url} (Ctrl-C to stop)`);
+            if (options.open)
+                openBrowser(url);
+        });
     });
 }
 export { runDashboard, saveDashboardCurrency, readDiagSchedule, setDiagSchedule };

package/{cli → dist/cli}/doctor-fix.js

@@ -1,15 +1,13 @@
 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, 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, sayTagged } from './interactive.js';
 import { wireRtkOmp, wireRtkOpencode, wireRtkPi, ensureRtkInConfig } from './rtk-wiring.js';
 import { RTK_RELEASE_API, fetchJson, findFile, httpsGet, httpsDownload, parseChecksum, readTextIfExists, rtkPlatformSpec, sha256File, } from '../extensions/lib/utils.js';
 import { runLatestUpdate } from './update.js';
-import { OPENCODE_SERVER_SHIM, TREE_FILES, sourcePath } from './manifest.js';
+import { EXT_DIR, OPENCODE_SERVER_SHIM, TREE_FILES, sourcePath } from './manifest.js';
 import { detectHosts, hostExtensionsDir } from './hosts.js';
-const EXT_DIR = path.join(path.dirname(fileURLToPath(import.meta.url)), '..', 'extensions');
 // A written tree is the install for both hosts now, so --fix restores it for whichever hosts have it, alongside the OMP package when that is present.
 async function fixExtensionTrees() {
     // The opencode entrypoint is foreign to pi/omp loaders: never copy it there, and remove strays.
@@ -148,7 +146,7 @@ async function fixRtk(binDir) {
     console.log('  Doctor --fix: repairing RTK binary + wiring');
     const binDest = path.join(binDir, RTK_BINARY_NAME);
     if (dryRun) {
-        sayTagged(`  [dry-run] would download a checksum-verified rtk to ${binDest} and wire it into OMP`);
+        sayTagged(`  [dry-run] would download a checksum-verified rtk to ${binDest} and wire it into the installed hosts`);
         return;
     }
     const spec = rtkPlatformSpec();

package/{cli → dist/cli}/doctor.js

@@ -6,7 +6,7 @@ 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 } from '../extensions/lib/utils.js';
+import { readTextIfExists, resolveRtkBinary, ruleBodyProblem } from '../extensions/lib/utils.js';
 import { TREE_FILES } from './manifest.js';
 async function runDoctor(recheck = false) {
     console.log('\n=== Tersio Doctor ===');
@@ -30,7 +30,7 @@ async function runDoctor(recheck = false) {
         cavemanIndexText: readTextIfExists(cavemanIndex),
         cavemanRuleText: readTextIfExists(cavemanRule('rule.md')),
         cavemanUltraText: readTextIfExists(cavemanRule('rule-ultra.md')),
-        cavemanWenyanText: readTextIfExists(cavemanRule('rule-wenyan.md')),
+        cavemanMegacaveText: readTextIfExists(cavemanRule('rule-megacave.md')),
         rtkIndexText: readTextIfExists(rtkIndex),
         updaterIndexText: readTextIfExists(updaterIndex),
         rtkMtime: rtkBin ? fs.stat(rtkBin).catch(() => null) : Promise.resolve(null),
@@ -42,7 +42,7 @@ async function runDoctor(recheck = false) {
         const err = e;
         return err.stdout?.trim() || err.stderr?.trim() || null;
     }) : Promise.resolve(null);
-    const [[ompPkgText, configText], [cavemanIndexText, rtkIndexText, updaterIndexText, ponytailPkgText], [cavemanRuleText, cavemanUltraText, cavemanWenyanText, ruleMtime, rtkBinText, rtkMtime, rtkVersion, ponytailMtime, pricesMtime]] = await runInteractivePhase('Checking installation', () => Promise.all([
+    const [[ompPkgText, configText], [cavemanIndexText, rtkIndexText, updaterIndexText, ponytailPkgText], [cavemanRuleText, cavemanUltraText, cavemanMegacaveText, ruleMtime, rtkBinText, rtkMtime, rtkVersion, ponytailMtime, pricesMtime]] = await runInteractivePhase('Checking installation', () => Promise.all([
         Promise.all([
             probes.ompPkgText,
             probes.configText,
@@ -56,7 +56,7 @@ async function runDoctor(recheck = false) {
         Promise.all([
             probes.cavemanRuleText,
             probes.cavemanUltraText,
-            probes.cavemanWenyanText,
+            probes.cavemanMegacaveText,
             probes.ruleMtime,
             probes.rtkBinText,
             probes.rtkMtime,
@@ -133,9 +133,16 @@ async function runDoctor(recheck = false) {
     check('Prices feed', pricesMtime !== null, pricesAge || pricesCachePath());
     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-wenyan.md', cavemanWenyanText]];
+    const cavemanRules = [['rule.md', cavemanRuleText], ['rule-ultra.md', cavemanUltraText], ['rule-megacave.md', cavemanMegacaveText]];
     const missingRules = cavemanRules.filter(([, text]) => text === null).map(([name]) => name);
     check('Caveman rule', missingRules.length === 0, missingRules.length ? `missing: ${missingRules.join(', ')}` : ruleAge);
+    for (const [name, text] of cavemanRules) {
+        if (text === null)
+            continue;
+        const problem = ruleBodyProblem(text);
+        if (problem)
+            warnLine(`Caveman ${name}`, `unusable body (${problem}) — run: tersio install`);
+    }
     const rtkAge = rtkMtime ? `(updated ${relTime(Date.now() - rtkMtime.mtimeMs)} · ${absDate(rtkMtime.mtimeMs)})` : '';
     check('RTK binary', rtkBin !== null, rtkBinText === null ? 'not found in PATH' : [rtkVersion, rtkAge].filter(Boolean).join(' '));
     // rtk_run needs a host exec API, which doctor cannot assume.
@@ -245,7 +252,7 @@ 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.`);
 }

package/{cli → dist/cli}/install.js

@@ -13,7 +13,7 @@ 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_WENYAN, RTK_RELEASE_API, fetchJson, findFile, findHoistedPackage, httpsGet, httpsDownload, parseChecksum, piAgentDir, readTextIfExists, resolveRtkBinary, 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/lib/utils.js';
 import { formatCliStatus, storedProfile, storedProfileSync, writePluginSettings } from './profile.js';
 import { runSettings } from './settings.js';
 import { tersioSettingsFile } from '../extensions/shared/plugin-settings.js';
@@ -356,11 +356,18 @@ async function stepRtkSession(extDir, options) {
         console.log('  RTK session — install session mode');
     await copySources(extDir, filesUnder('rtk-session'), 'rtk-session/index.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-filter'), 'rtk-filter/index.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.
 const CAVEMAN_RULES = [
     ['rule.md', null],
     ['rule-ultra.md', CAVEMAN_REMOTE_ULTRA],
-    ['rule-wenyan.md', CAVEMAN_REMOTE_WENYAN],
+    ['rule-megacave.md', CAVEMAN_REMOTE_MEGACAVE],
 ];
 async function stepCaveman(extDir, options) {
     if (!options.quiet)
@@ -373,7 +380,14 @@ async function stepCaveman(extDir, options) {
         let rule = bundled;
         if (remote && !options.dryRun) {
             try {
-                rule = await withInteractiveSpinner(`Fetching Caveman ${name}`, () => httpsGet(remote));
+                const fetched = await withInteractiveSpinner(`Fetching Caveman ${name}`, () => httpsGet(remote));
+                const problem = ruleBodyProblem(fetched);
+                if (problem && bundled !== null) {
+                    sayTagged(`  [warn] ${name} fetch rejected (${problem}) — keeping the bundled body`);
+                    rule = bundled;
+                }
+                else
+                    rule = fetched;
             }
             catch (e) {
                 if (bundled === null)
@@ -392,6 +406,9 @@ async function stepCaveman(extDir, options) {
         }
     }
     await copySources(extDir, filesUnder('caveman-session').filter(([, to]) => to.endsWith('index.ts')), 'caveman-session/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 });
 }
 async function stepTersioCommands(extDir, options) {
     if (!options.quiet)
@@ -413,7 +430,7 @@ const PONYTAIL_BUNDLE_FILES = [
     'skills/ponytail/SKILL.md',
 ];
 async function stepPonytailBundle(treeDir, options) {
-    const root = findHoistedPackage('@dietrichgebert/ponytail', path.dirname(fileURLToPath(import.meta.url)));
+    const root = findHoistedPackage('@dietrichgebert/ponytail', findPackageRoot(path.dirname(fileURLToPath(import.meta.url))));
     if (!root) {
         if (!options.quiet)
             console.log('  [skip] Ponytail package not found next to the CLI — OpenCode keeps the built-in text');
@@ -441,6 +458,7 @@ async function stepOpencode(options) {
         console.log(`  OpenCode — write the plugin tree (${dir})`);
     await stepSharedSessionState(dir, options);
     await copySources(dir, filesUnder('rtk-session'), 'rtk-session/index.ts', options);
+    await stepRtkFilter(dir, options);
     await copySources(dir, filesUnder('caveman-session'), 'caveman-session/index.ts', options);
     await stepCombo(dir, options);
     await copySources(dir, filesUnder('tersio-commands'), 'tersio-commands/index.ts', options);
@@ -474,7 +492,7 @@ async function stepOpencode(options) {
 async function resolveProfile(opts = {}) {
     // Seed from the stored defaults so flag-less runs keep them.
     const profile = await storedProfile();
-    // One numbered prompt for all three modes, for a real terminal user with no default flags. Never for --apply-update, and never for a script.
+    // The chosen preset owns all three modes.
     let comboChosen = comboDefaultFlag !== undefined;
     if (tty() && !profileFlagsGiven && !applyUpdate) {
         const choice = await askInteractiveChoice('Session-start defaults — Combo preset', [
@@ -650,6 +668,7 @@ async function stepPiLayer(options) {
     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);
+    await stepRtkFilter(extDir, options);
     await stepCaveman(extDir, options);
     await stepCombo(extDir, options);
     await stepTersioCommands(extDir, options);
@@ -661,13 +680,14 @@ const PI_PONYTAIL_FILES = [
     'pi-extension/index.js',
     'hooks/ponytail-instructions.js',
     'hooks/ponytail-config.js',
-    'skills/ponytail/SKILL.md',
+    ...['ponytail', 'ponytail-audit', 'ponytail-debt', 'ponytail-gain', 'ponytail-help', 'ponytail-review']
+        .map((skill) => `skills/${skill}/SKILL.md`),
 ];
 const PI_PONYTAIL_PACKAGE = `${JSON.stringify({ name: 'ponytail', version: '0.0.0', private: true, pi: { extensions: ['./pi-extension/index.js'], skills: ['./skills'] } }, null, 2)}\n`;
 async function stepPonytailForPi(agentDir, options) {
     if (!options.quiet)
         console.log('  Ponytail — write the local pi package');
-    const root = findHoistedPackage('@dietrichgebert/ponytail', path.dirname(fileURLToPath(import.meta.url)));
+    const root = findHoistedPackage('@dietrichgebert/ponytail', findPackageRoot(path.dirname(fileURLToPath(import.meta.url))));
     const dest = path.join(agentDir, 'ponytail');
     if (!root) {
         console.log('  [skip] Ponytail package not found next to the CLI');
@@ -688,14 +708,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');
@@ -707,7 +743,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;
@@ -715,6 +751,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) {
@@ -818,7 +858,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;
     }
@@ -829,7 +869,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 pi, then /combo medium.');
+            console.log(comboHint('pi', profile.comboDefault));
         closeRL();
         return;
     }
@@ -839,6 +879,7 @@ async function runInstall() {
     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('rtk filter', () => stepRtkFilter(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));
@@ -850,7 +891,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/{cli → dist/cli}/manifest.js

@@ -1,7 +1,8 @@
 // Single list of install writes, shared by installer, doctor, and tests.
 import path from 'node:path';
 import { fileURLToPath } from 'node:url';
-export const EXT_DIR = path.join(path.dirname(fileURLToPath(import.meta.url)), '..', 'extensions');
+import { findPackageRoot } from '../extensions/lib/utils.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.
@@ -21,8 +22,9 @@ export const TREE_FILES = [
     'caveman-session/index.ts',
     'caveman-session/rule.md',
     'caveman-session/rule-ultra.md',
-    'caveman-session/rule-wenyan.md',
+    'caveman-session/rule-megacave.md',
     'rtk-session/index.ts',
+    'rtk-filter/index.ts',
     'combo-toggle/index.ts',
     'tersio-commands/index.ts',
     'ai-addons-updater/index.ts',

package/{cli → dist/cli}/settings.js

@@ -1,6 +1,6 @@
 // cli/settings.ts — view/edit session-start defaults and the display currency.
-import path from 'node:path';
-import { CAVEMAN_DEFAULTS, COMBO_DEFAULTS, COMBO_PRESET_MODES, OMP_PLUGINS_DIR, PACKAGE_NAME, PONYTAIL_DEFAULTS, cavemanDefaultFlag, comboDefaultFlag, currency, currencyGiven, diagScheduleFlag, dryRun, ponytailDefaultFlag, profileFlagsGiven, rtkDefaultFlag, settingArg, subagentMarkerFlags, subagentMarkersGiven, } from './common.js';
+import { CAVEMAN_DEFAULTS, COMBO_DEFAULTS, COMBO_PRESET_MODES, PONYTAIL_DEFAULTS, cavemanDefaultFlag, comboDefaultFlag, currency, currencyGiven, diagScheduleFlag, dryRun, ponytailDefaultFlag, profileFlagsGiven, rtkDefaultFlag, settingArg, subagentMarkerFlags, subagentMarkersGiven, } from './common.js';
+import { tersioSettingsFile } from '../extensions/shared/plugin-settings.js';
 import { CURRENCY_CODES } from './currency.js';
 import { textTable } from './usage.js';
 import { ask, askInteractiveChoice, closeRL, tty } from './interactive.js';
@@ -45,25 +45,6 @@ async function askProfile(current) {
         backupSchedule: current.backupSchedule,
         subagentMarkers: current.subagentMarkers,
     };
-    const caveman = await askInteractiveChoice('Caveman default', [...CAVEMAN_DEFAULTS].map((v) => ({
-        value: v, label: v,
-    })), next.cavemanDefault);
-    if (caveman.status !== 'selected')
-        return null;
-    next.cavemanDefault = caveman.value;
-    const rtk = await askInteractiveChoice('RTK default', [
-        { value: 'on', label: 'on' },
-        { value: 'off', label: 'off' },
-    ], next.rtkDefault ? 'on' : 'off');
-    if (rtk.status !== 'selected')
-        return null;
-    next.rtkDefault = rtk.value === 'on';
-    const ponytail = await askInteractiveChoice('Ponytail default', [...PONYTAIL_DEFAULTS].map((v) => ({
-        value: v, label: v,
-    })), next.ponytailDefault);
-    if (ponytail.status !== 'selected')
-        return null;
-    next.ponytailDefault = ponytail.value;
     const cur = await askInteractiveChoice('Display currency (usage/dashboard reports)', CURRENCY_CODES.map((v) => ({
         value: v, label: v,
     })), next.currency);
@@ -103,7 +84,7 @@ async function askDiagSchedule(current) {
 }
 const SETTING_NAMES = ['combo', 'caveman', 'rtk', 'ponytail', 'currency', 'diagnosis', 'markers'];
 function settingsUsage() {
-    console.log('  Usage: tersio settings [combo|caveman|rtk|ponytail|currency|diagnosis|markers] [--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] [--subagent-marker <text>]... [--dry-run]');
+    console.log('  Usage: tersio settings [combo|caveman|rtk|ponytail|currency|diagnosis|markers] [--combo-default off|medium|balanced|max] [--caveman-default off|lite|full|ultra|megacave-lite|megacave-full|megacave-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] [--subagent-marker <text>]... [--dry-run]');
 }
 // Single-setting jump: `tersio settings diagnosis` prompts only that value instead of walking the whole chain. Returns false when aborted.
 async function runSingleSetting(name, current, nextDiag) {
@@ -198,7 +179,8 @@ function printSettingsTable(current) {
     for (const l of textTable(['Setting', 'Current', 'Valid values'], rows, [false, false, false], 64)) {
         console.log(l);
     }
-    console.log(`  Stored: ${PACKAGE_NAME} in ${path.join(OMP_PLUGINS_DIR, 'omp-plugins.lock.json')}`);
+    console.log(`  Stored: ${tersioSettingsFile()}`);
+    console.log(`  Combo ${current.comboDefault} sets caveman/rtk/ponytail. Tune one: tersio settings <name>`);
 }
 async function runSettings() {
     const current = await storedProfile();

package/{cli → dist/cli}/uninstall.js

@@ -290,7 +290,7 @@ async function runUninstall(options = {}) {
     }
     // Cleared last: writeConfigLines above would just make a fresh one.
     const cavemanDir = path.join(pluginsDir, 'node_modules', PACKAGE_NAME, 'extensions', 'caveman-session');
-    for (const backup of [`${configPath}.bak`, path.join(cavemanDir, 'rule.md.bak'), path.join(cavemanDir, 'rule-ultra.md.bak'), path.join(cavemanDir, 'rule-wenyan.md.bak')]) {
+    for (const backup of [`${configPath}.bak`, path.join(cavemanDir, 'rule.md.bak'), path.join(cavemanDir, 'rule-ultra.md.bak'), path.join(cavemanDir, 'rule-megacave.md.bak')]) {
         await removeUninstallTarget(backup, shouldDryRun, false);
     }
     // Remove the bundled Ponytail copy; its config.yml entry is already filtered.

package/{cli → dist/cli}/update.js

@@ -6,7 +6,7 @@ import { IS_WINDOWS, OMP_PLUGINS_DIR, PACKAGE_BIN, PACKAGE_NAME, PACKAGE_VERSION
 import { execNetwork, sayTagged } from './interactive.js';
 import { readTextIfExists, resolveRtkBinary, tersioDataPath } from '../extensions/lib/utils.js';
 import { refreshPrices } from '../extensions/shared/pricing.js';
-import { CAVEMAN_REMOTE_ULTRA, CAVEMAN_REMOTE_WENYAN, 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/lib/utils.js';
 import { parseHostArg } from './hosts.js';
 const UPDATE_CHECK_TTL_MS = 6 * 60 * 60 * 1000;
 function newerThan(a, b) {
@@ -84,9 +84,9 @@ async function probeUpdatePlan(cliLatest) {
     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),
         settle(httpsGet(RTK_RELEASE_API, { signal: controller.signal }).then((text) => normalizeRtkVersion(JSON.parse(text).tag_name) || null), 1500),
-        Promise.all([readTextIfExists(tersioRule('rule-ultra.md')), readTextIfExists(tersioRule('rule-wenyan.md'))])
+        Promise.all([readTextIfExists(tersioRule('rule-ultra.md')), readTextIfExists(tersioRule('rule-megacave.md'))])
             .then((texts) => (texts.every(Boolean) ? texts.map((t) => sha256Hex(t).slice(0, 8)).join('+') : null)),
-        settle(Promise.all([httpsGet(CAVEMAN_REMOTE_ULTRA, { signal: controller.signal }), httpsGet(CAVEMAN_REMOTE_WENYAN, { signal: controller.signal })])
+        settle(Promise.all([httpsGet(CAVEMAN_REMOTE_ULTRA, { signal: controller.signal }), httpsGet(CAVEMAN_REMOTE_MEGACAVE, { signal: controller.signal })])
             .then((texts) => texts.map((t) => sha256Hex(t).slice(0, 8)).join('+')), 1500),
         readTextIfExists(ponytailPkg),
     ]);
@@ -214,8 +214,7 @@ async function runLatestUpdate() {
     // Inherited stdio, no outer spinner; the delegated installer runs quiet and this parent owns both the plan line and the closing summary.
     try {
         await execInherit(npmCommand, npmCommandArgs);
-        const hostName = pinned === 'pi' ? 'pi' : pinned === 'opencode' ? 'OpenCode' : 'OMP';
-        console.log(`Done — tersio ${plan.cli ?? PACKAGE_VERSION}. Restart ${hostName}.`);
+        console.log(`Done — tersio ${plan.cli ?? PACKAGE_VERSION} and add-ons updated.`);
         if (!dryRun) {
             try {
                 await refreshPrices();

package/{extensions → dist/extensions}/ai-addons-updater/index.js

@@ -6,7 +6,7 @@ import os from 'node:os';
 import path from 'node:path';
 import { fileURLToPath } from 'node:url';
 import { setExtensionLabel } from '../shared/host.js';
-import { CAVEMAN_REMOTE_ULTRA, CAVEMAN_REMOTE_WENYAN, RTK_RELEASE_API, fetchJson, findFile, findHoistedPackage, httpsGet, httpsDownload, isPiProcess, sha256Hex, parseChecksum, normalizeRtkVersion, readTextIfExists, rtkPlatformSpec, resolveRtkBinary, } from '../lib/utils.js';
+import { CAVEMAN_REMOTE_ULTRA, CAVEMAN_REMOTE_MEGACAVE, RTK_RELEASE_API, fetchJson, findFile, findHoistedPackage, httpsGet, httpsDownload, sha256Hex, parseChecksum, normalizeRtkVersion, readTextIfExists, rtkPlatformSpec, resolveRtkBinary, } from '../lib/utils.js';
 const IS_WINDOWS = process.platform === 'win32';
 const EXTENSION_DIR = path.dirname(fileURLToPath(import.meta.url));
 const PONYTAIL_REMOTE = 'https://raw.githubusercontent.com/DietrichGebert/ponytail/main/package.json';
@@ -16,10 +16,10 @@ const cavemanRule = (name) => path.join(EXTENSION_DIR, '..', 'caveman-session',
 const CAVEMAN_LOCAL = cavemanRule('rule.md');
 const CAVEMAN_TRACKED = [
     { file: cavemanRule('rule-ultra.md'), remote: CAVEMAN_REMOTE_ULTRA },
-    { file: cavemanRule('rule-wenyan.md'), remote: CAVEMAN_REMOTE_WENYAN },
+    { file: cavemanRule('rule-megacave.md'), remote: CAVEMAN_REMOTE_MEGACAVE },
 ];
-const HOST_NAME = isPiProcess() ? 'Pi' : 'OMP';
-const RELOAD_MSG = `Reminder: restart ${HOST_NAME} (or reload extensions) for updates to take effect.`;
+// Host-neutral: this updater runs inside pi, OMP, and OpenCode alike.
+const RELOAD_MSG = 'Reminder: restart your agent (or reload extensions) for updates to take effect.';
 // Ponytail is a hoisted dependency, so the installed copy is found by walking up rather than by naming a host directory.
 function ponytailLocal() {
     return findHoistedPackage('@dietrichgebert/ponytail', EXTENSION_DIR, 'package.json');

package/{extensions → dist/extensions}/caveman-session/index.js

@@ -7,9 +7,14 @@ import { announceStatus } from '../shared/status.js';
 import { readCavemanDefault } from '../shared/plugin-settings.js';
 const CAVERN_DIR = dirname(fileURLToPath(import.meta.url));
 // Upstream ships one skill per register: default, ultracave, megacave.
-const RULE_FILES = { lite: 'rule.md', full: 'rule.md', ultra: 'rule-ultra.md', 'wenyan-lite': 'rule-wenyan.md', 'wenyan-full': 'rule-wenyan.md', 'wenyan-ultra': 'rule-wenyan.md' };
+const RULE_FILES = { lite: 'rule.md', full: 'rule.md', ultra: 'rule-ultra.md', 'megacave-lite': 'rule-megacave.md', 'megacave-full': 'rule-megacave.md', 'megacave-ultra': 'rule-megacave.md' };
 const DEFAULT_MODE = 'off';
+// A rule file is immutable for the process, so read each level once; reinstalling needs a restart.
+const instructionCache = new Map();
 function buildInstruction(mode) {
+    const cached = instructionCache.get(mode);
+    if (cached)
+        return cached;
     const name = RULE_FILES[mode] ?? RULE_FILES.full;
     // Fail loud: a wrong rule reads to the model as the real one.
     let body;
@@ -17,9 +22,11 @@ function buildInstruction(mode) {
         body = readFileSync(join(CAVERN_DIR, name), 'utf8');
     }
     catch {
-        body = `Caveman ${mode} requested, but ${name} is missing. Run: tersio doctor --fix extensions`;
+        return `Caveman ${mode} requested, but ${name} is missing. Run: tersio doctor --fix extensions`;
     }
-    return `Caveman ${mode} active for this session.\n${body}`;
+    const instruction = `Caveman ${mode} active for this session.\n${body}`;
+    instructionCache.set(mode, instruction);
+    return instruction;
 }
 function resolveMode(entries, fallback = DEFAULT_MODE) {
     return lastCustomValue(entries, 'caveman-mode', (data) => normalizeMode('caveman', data?.mode)) ?? fallback;
@@ -62,7 +69,7 @@ export default function cavemanSessionExtension(pi) {
                 return;
             }
             if (!setMode(arg, ctx)) {
-                ctx?.ui?.notify?.('Usage: /caveman [lite|full|ultra|wenyan-lite|wenyan-full|wenyan-ultra|off|status]', 'warning');
+                ctx?.ui?.notify?.('Usage: /caveman [lite|full|ultra|megacave-lite|megacave-full|megacave-ultra|off|status]', 'warning');
             }
         },
     });
@@ -110,6 +117,6 @@ export default function cavemanSessionExtension(pi) {
         // The previous level's block is replaced, not stacked on.
         const stale = lastInjected;
         lastInjected = instruction;
-        return injectPromptText(pi, event, instruction, stale);
+        return injectPromptText(pi, event, { text: instruction, staleMarker: stale, sectionTag: 'caveman' });
     });
 }

package/dist/extensions/caveman-session/rule-ultra.md

@@ -0,0 +1,63 @@
+---
+name: ultracave
+description: >
+  Caveman at maximum compression: fragments, one word when one word is enough,
+  each fact once. Invoke only with /ultracave or /caveman ultra. Stays on until
+  "stop caveman" or "normal mode".
+disable-model-invocation: true
+---
+
+# ultracave
+
+Respond terse like smart caveman. All technical substance stay. Only fluff die. Then cut again.
+
+Ultracave is caveman with the grammar stripped. Payload only.
+
+## Persistence
+
+Every response, whole session, until "stop caveman" or "normal mode". Unsure? Still on. `/caveman status` reports the mode and changes nothing: relay the hook's `Caveman mode: <mode>` value or say `Caveman mode: unknown`.
+
+## Floor
+
+Never cut: code, commands, paths, API names, error strings (verbatim). not/never/no/only/except. Numbers and units. The user's language. One term per thing. No invented abbreviations, no arrows.
+
+## Rules
+
+### 1. Fragments
+
+Drop articles, copulas, connectives when order stays clear.
+
+Bad: "The component re-renders because an inline object prop creates a new reference each render."
+Good: "Inline object prop, new ref, re-render. `useMemo`."
+
+### 2. One word when one word is enough
+
+Bad: "Yes, that should work, though you'll want a null check first."
+Good: "Yes. Null check first."
+
+### 3. Each fact once
+
+No restating, no summary after a list.
+
+Good: "Pool reuses open DB connections. No per-request handshake."
+
+### 4. Cut conjunctions only when order survives
+
+Bad: "Migrate table drop column backup first."
+Good: "Back up first. Then migrate: drops column."
+
+### 5. Tool runs
+
+One line in, one line out. Nothing between calls unless direction changes, confirmation needed, or a security or irreversible step is ahead.
+
+### 6. Never perform
+
+No prefix, no announcement, no mangled verbs for flavor. Fragment not shorter than the sentence? Use the sentence.
+
+## When to break the rules
+
+Plain prose, then resume: security warning. Irreversible action, confirm first. Any fragment with two readings. User confused. Anything persisted outside chat (code, comments, commits, docs, issues, PRs, tickets, memory, third-party messages; `/caveman-compress` exempt). Harness asks for a status line.
+
+## Pre-send check
+
+Two readings? Full sentence. Negations present? Payload verbatim? Flavor word? Cut.