@krtclcdy/tersio 2.25.1 → 2.25.3

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_RULE, 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,41 +356,53 @@ async function stepRtkSession(extDir, options) {
         console.log('  RTK session — install session mode');
     await copySources(extDir, filesUnder('rtk-session'), 'rtk-session/index.ts', options);
 }
-// One fetch serves the install; dry runs stay offline and preview the bundled rule's destination.
-async function fetchCavemanRule(options) {
-    const bundled = await readTextIfExists(sourcePath('caveman-session/rule.md'));
-    if (options.dryRun)
-        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;
-        }
-        sayTagged(`  [warn] Could not fetch caveman rule: ${e.message}`);
-        return null;
-    }
-}
-async function stepCaveman(extDir, rule, 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-megacave.md', CAVEMAN_REMOTE_MEGACAVE],
+];
+async function stepCaveman(extDir, options) {
     if (!options.quiet)
-        console.log('  Caveman — fetch rule and install session mode');
+        console.log('  Caveman — install session mode and rule bodies');
     const cavemanDir = path.join(extDir, 'caveman-session');
     if (!options.dryRun)
         await fs.mkdir(cavemanDir, { recursive: true });
-    const ruleDest = path.join(cavemanDir, 'rule.md');
-    if (rule === null && (await readTextIfExists(ruleDest)) !== null) {
-        debug('Keeping existing rule.md');
-    }
-    else if (rule === null) {
-        console.log('  [skip] Caveman rule.md unavailable');
-        sayTagged(`  [hint] Manual: ${CAVEMAN_REMOTE_RULE}`);
-    }
-    else {
-        await writeIfChanged(ruleDest, rule, options);
+    for (const [name, remote] of CAVEMAN_RULES) {
+        const bundled = await readTextIfExists(sourcePath(`caveman-session/${name}`));
+        let rule = bundled;
+        if (remote && !options.dryRun) {
+            try {
+                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)
+                    sayTagged(`  [warn] Could not fetch caveman ${name}: ${e.message}`);
+                else
+                    debug(`Using bundled Caveman ${name}: ${e.message}`);
+            }
+        }
+        if (rule === null) {
+            if (remote)
+                sayTagged(`  [hint] Manual: ${remote}`);
+            console.log(`  [skip] Caveman ${name} unavailable`);
+        }
+        else {
+            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);
+    // 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)
@@ -412,7 +424,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');
@@ -459,18 +471,22 @@ async function stepOpencode(options) {
         return;
     }
     const plugins = Array.isArray(config.plugins) ? [...config.plugins] : [];
-    const withoutTersio = plugins.filter((p) => typeof p !== 'string' || !p.includes('/opencode/plugins/tersio'));
-    if (!withoutTersio.includes(dir))
-        withoutTersio.push(dir);
-    config.plugins = withoutTersio;
-    if (!options.dryRun)
+    // The tree ships the rtk rewrite, so its own plugin entry is redundant.
+    const kept = plugins.filter((p) => typeof p !== 'string' || !p.endsWith('/opencode/plugins/rtk.ts'));
+    if (!kept.includes(dir))
+        kept.push(dir);
+    config.plugins = kept;
+    if (!options.dryRun) {
         await fs.mkdir(path.dirname(configPath), { recursive: true });
+        await fs.rm(path.join(HOME, '.config', 'opencode', 'plugins', 'rtk.ts'), { force: true }).catch(() => { });
+    }
     await writeIfChanged(configPath, `${JSON.stringify(config, null, 2)}\n`, 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', [
             { value: 'off', label: 'off' },
@@ -478,8 +494,10 @@ async function resolveProfile(opts = {}) {
             { value: 'balanced', label: 'balanced', hint: 'caveman=full, rtk=on, ponytail=full' },
             { value: 'max', label: 'max', hint: 'caveman=ultra, rtk=on, ponytail=ultra' },
         ], profile.comboDefault);
-        if (choice.status === 'selected')
+        if (choice.status === 'selected') {
             profile.comboDefault = choice.value;
+            comboChosen = true;
+        }
         else {
             closeRL();
             process.exit(130);
@@ -488,10 +506,13 @@ async function resolveProfile(opts = {}) {
     // Explicit flags always win over the Combo preset.
     if (comboDefaultFlag !== undefined)
         profile.comboDefault = comboDefaultFlag;
-    const preset = COMBO_PRESET_MODES[profile.comboDefault] ?? COMBO_PRESET_MODES.off;
-    profile.cavemanDefault = preset.caveman;
-    profile.rtkDefault = preset.rtk;
-    profile.ponytailDefault = preset.ponytail;
+    // A stored per-mode choice survives installs and updates; only a chosen preset rewrites it.
+    if (comboChosen) {
+        const preset = COMBO_PRESET_MODES[profile.comboDefault] ?? COMBO_PRESET_MODES.off;
+        profile.cavemanDefault = preset.caveman;
+        profile.rtkDefault = preset.rtk;
+        profile.ponytailDefault = preset.ponytail;
+    }
     if (cavemanDefaultFlag !== undefined)
         profile.cavemanDefault = cavemanDefaultFlag;
     if (rtkDefaultFlag !== undefined)
@@ -506,7 +527,8 @@ let updatePromptDone = false;
 // Bare `tersio` at a terminal picks a command; scripts and flags install.
 async function runCommandMenu() {
     printWelcome();
-    const newer = await checkForUpdate();
+    // Interactive launches always check; scripts use the cached verdict.
+    const newer = await checkForUpdate(true);
     if (typeof newer === 'string' && !dryRun) {
         const answer = await askInteractiveConfirm(`tersio ${newer} is available (installed ${PACKAGE_VERSION}). Install it now?`);
         if (answer.status === 'confirmed' && answer.value) {
@@ -636,50 +658,74 @@ async function stepPiLayer(options) {
         sayTagged(`  [note] pi also has a tersio package (${declared}) — remove one, or both copies load: pi remove npm:${PACKAGE_NAME}`);
     if (!options.quiet)
         console.log(`  Pi — write the extension tree (${extDir})`);
-    const cavemanRule = await fetchCavemanRule(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 stepCaveman(extDir, cavemanRule, options);
+    await stepCaveman(extDir, options);
     await stepCombo(extDir, options);
     await stepTersioCommands(extDir, options);
     await stepUpdater(extDir, options);
     await stepPonytailForPi(agentDir, options);
 }
-// Ponytail for pi: install the package, or copy the bundled skills offline.
+// A local dir, not an npm spec: pi only version-checks npm entries, so this avoids the update nag.
+const PI_PONYTAIL_FILES = [
+    'pi-extension/index.js',
+    'hooks/ponytail-instructions.js',
+    'hooks/ponytail-config.js',
+    ...['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 — ensure the pi package');
-    if (!options.dryRun) {
+        console.log('  Ponytail — write the local pi package');
+    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');
+        console.log('  [hint] The /ponytail command will not work; run: tersio update --host pi');
+        return;
+    }
+    await writeIfChanged(path.join(dest, 'package.json'), PI_PONYTAIL_PACKAGE, options);
+    for (const rel of PI_PONYTAIL_FILES) {
+        let text;
         try {
-            await execNetwork('Installing Ponytail for pi', 'pi', ['install', 'npm:@dietrichgebert/ponytail'], { timeout: 300000 });
-            return;
+            text = await fs.readFile(path.join(root, ...rel.split('/')), 'utf8');
         }
-        catch (e) {
-            sayTagged(`  [fail] pi install ponytail: ${shortError(e)}`);
+        catch {
+            sayTagged(`  [fail] Ponytail file missing: ${rel}`);
+            return;
         }
+        await writeIfChanged(path.join(dest, ...rel.split('/')), text, options);
     }
-    const skills = findHoistedPackage('@dietrichgebert/ponytail', path.dirname(fileURLToPath(import.meta.url)), 'skills');
-    if (!skills) {
-        console.log('  [skip] Ponytail package not found next to the CLI — skills not copied');
-        console.log('  [hint] The /ponytail command will not work; run: pi install npm:@dietrichgebert/ponytail');
+    if (options.dryRun)
         return;
+    try {
+        await execNetwork('Removing the pi npm copy of Ponytail', 'pi', ['remove', 'npm:@dietrichgebert/ponytail'], { timeout: 120000 });
     }
-    const dest = path.join(agentDir, 'skills');
-    if (options.dryRun) {
-        if (verbose && !options.quiet)
-            sayTagged(`  [dry-run] would copy Ponytail skills to ${dest}`);
-        return;
+    catch (e) {
+        sayTagged(`  [warn] pi remove ponytail: ${shortError(e)}`);
     }
-    for (const entry of await fs.readdir(skills, { withFileTypes: true })) {
-        if (!entry.isDirectory())
-            continue;
-        const to = path.join(dest, entry.name);
-        await fs.rm(to, { recursive: true, force: true });
-        await fs.cp(path.join(skills, entry.name), to, { recursive: true });
-        if (!options.quiet)
-            sayTagged(`  [write] skill ${entry.name} → ${to}`);
+    await registerPiLocalPonytail(agentDir, dest, options);
+}
+// 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');
+    let settings;
+    try {
+        settings = JSON.parse(await fs.readFile(settingsPath, 'utf8'));
+    }
+    catch {
+        return;
     }
+    const packages = (Array.isArray(settings.packages) ? settings.packages : []);
+    const kept = packages.filter((p) => typeof p !== 'string' || !p.startsWith('npm:@dietrichgebert/ponytail'));
+    if (!kept.includes(dest))
+        kept.push(dest);
+    settings.packages = kept;
+    await fs.writeFile(settingsPath, `${JSON.stringify(settings, null, 2)}\n`, 'utf8');
+    if (!options.quiet)
+        sayTagged(`  [write] pi package source → ${dest}`);
 }
 async function runInstall() {
     // Without this guard a picked command re-enters here with command === null and loops straight back into the picker.
@@ -799,14 +845,13 @@ async function runInstall() {
         closeRL();
         return;
     }
-    const cavemanRule = await fetchCavemanRule(installOptions);
     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'), cavemanRule, 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));

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

@@ -26,9 +26,9 @@ function tty() {
     return Boolean(process.stdin.isTTY && process.stdout.isTTY);
 }
 let spinnerDepth = 0;
-// Run async work under a TTY-only timer spinner. The spinner is cleared before the caller prints its normal result line, preserving locked output shapes.
+// Clack's spinner stop writes an extra newline under CI, shifting later output by a row.
 async function withInteractiveSpinner(message, work) {
-    if (!tty() || spinnerDepth > 0)
+    if (!tty() || spinnerDepth > 0 || process.env.CI === 'true')
         return work(() => { });
     // Clack manages stdin itself. Close the legacy question interface before its first use; non-interactive callers never reach this branch.
     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.
@@ -20,6 +21,8 @@ export const TREE_FILES = [
     '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',

package/{cli → dist/cli}/rtk-wiring.js

@@ -1,5 +1,5 @@
 // OMP loads only listed extensions, so register rtk's path; fail-open.
-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 { execFile } from 'node:child_process';
@@ -47,8 +47,11 @@ export async function wireRtkOmp(rtkBin, options = {}) {
     await ensureRtkInConfig(options);
     return true;
 }
+// The Tersio plugin does the same rewrite, so OpenCode needs no rtk plugin of its own.
 export async function wireRtkOpencode(rtkBin, options = {}) {
-    return runWire(rtkBin, { host: 'OpenCode', mechanism: 'tool.execute.before', initArgs: ['init', '-g', '--opencode'], hint: 'rtk init -g --opencode' }, options);
+    if (!options.dryRun && !options.quiet)
+        console.log('  RTK rewrite runs inside the Tersio plugin — no separate entry');
+    return existsSync(rtkBin);
 }
 export async function wireRtkPi(rtkBin, options = {}) {
     return runWire(rtkBin, { host: 'pi', mechanism: 'bash tool_call', initArgs: ['init', '-g', '--agent', 'pi'], hint: 'rtk init -g --agent pi' }, options);

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

@@ -4,8 +4,7 @@ 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 { findHoistedPackage, piAgentDir, readTextIfExists } from '../extensions/lib/utils.js';
-import { fileURLToPath } from 'node:url';
+import { piAgentDir, readTextIfExists } from '../extensions/lib/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';
@@ -42,20 +41,30 @@ async function piRemove(spec, shouldDryRun) {
         sayTagged(`  [hint] Manual: pi remove ${spec}`);
     }
 }
-// Only the skill directories the installer copied, never pi's own skills dir.
+// The installer writes a local package dir; drop it and its settings entry.
 async function removeCopiedPonytailSkills(shouldDryRun) {
-    const source = findHoistedPackage(PONYTAIL_PKG, path.dirname(fileURLToPath(import.meta.url)), 'skills');
-    if (!source)
-        return;
-    for (const entry of await fs.readdir(source, { withFileTypes: true })) {
-        if (entry.isDirectory())
-            await removeUninstallTarget(path.join(piAgentDir(), 'skills', entry.name), shouldDryRun);
+    const agentDir = piAgentDir();
+    const settingsPath = path.join(agentDir, 'settings.json');
+    try {
+        const settings = JSON.parse(await fs.readFile(settingsPath, 'utf8'));
+        if (!Array.isArray(settings.packages))
+            return;
+        const kept = settings.packages.filter((p) => p !== path.join(agentDir, 'ponytail'));
+        if (kept.length === settings.packages.length)
+            return;
+        if (shouldDryRun)
+            sayTagged(`  [dry-run] would drop the local ponytail entry from ${settingsPath}`);
+        else
+            await fs.writeFile(settingsPath, `${JSON.stringify({ ...settings, packages: kept }, null, 2)}\n`, 'utf8');
     }
+    catch { /* no settings file, nothing to clean */ }
+    await removeUninstallTarget(path.join(agentDir, 'ponytail'), shouldDryRun);
 }
 // pi removal delegates to pi remove; always list and confirm first.
 async function removePiLayer(host, shouldDryRun, shouldRemovePonytail, shouldRemoveRtk, confirmed) {
     const targets = PI_TREE_DIRS.map((dir) => path.join(piAgentDir(), 'extensions', dir));
     const rtkWiring = path.join(piAgentDir(), 'extensions', 'rtk.ts');
+    const piPonytail = path.join(piAgentDir(), 'ponytail');
     if (!host.installed && !host.declared) {
         sayTagged(`  [skip] ${host.label} — nothing installed (${host.installCmd})`);
         return false;
@@ -63,8 +72,10 @@ async function removePiLayer(host, shouldDryRun, shouldRemovePonytail, shouldRem
     console.log('Will remove:');
     for (const t of targets)
         console.log(`  ${t}`);
-    if (shouldRemovePonytail)
+    if (shouldRemovePonytail) {
         console.log(`  npm:${PONYTAIL_PKG} (pi package)`);
+        console.log(`  ${piPonytail} (local Ponytail package)`);
+    }
     if (shouldRemoveRtk)
         console.log(`  ${rtkWiring} (rtk wiring)`);
     console.log(`  ${tersioSettingsFile()} (session defaults)`);
@@ -278,7 +289,8 @@ async function runUninstall(options = {}) {
         }
     }
     // Cleared last: writeConfigLines above would just make a fresh one.
-    for (const backup of [`${configPath}.bak`, path.join(pluginsDir, 'node_modules', PACKAGE_NAME, 'extensions', 'caveman-session', 'rule.md.bak')]) {
+    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-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_RULE, 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) {
@@ -78,20 +78,23 @@ async function execInherit(cmd, args) {
 async function probeUpdatePlan(cliLatest) {
     const rtkBin = resolveRtkBinary();
     const ponytailPkg = path.join(OMP_PLUGINS_DIR, 'node_modules', '@dietrichgebert', 'ponytail', 'package.json');
-    const tersioRule = path.join(OMP_PLUGINS_DIR, 'node_modules', '@krtclcdy', 'tersio', 'extensions', 'caveman-session', 'rule.md');
+    // 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 controller = new AbortController();
-    const [rtkLocal, rtkRelease, ruleLocalText, ruleRemoteText, ponytailLocalText] = await Promise.all([
+    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),
-        readTextIfExists(tersioRule),
-        settle(httpsGet(CAVEMAN_REMOTE_RULE, { signal: controller.signal }).then((text) => sha256Hex(text).slice(0, 8)), 1500),
+        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_MEGACAVE, { signal: controller.signal })])
+            .then((texts) => texts.map((t) => sha256Hex(t).slice(0, 8)).join('+')), 1500),
         readTextIfExists(ponytailPkg),
     ]);
     controller.abort();
     return {
         cli: cliLatest,
         rtk: [rtkLocal, rtkRelease],
-        rule: [ruleLocalText ? sha256Hex(ruleLocalText).slice(0, 8) : null, ruleRemoteText],
+        rule: [ruleLocal, ruleRemote],
         ponytail: ponytailLocalText ? parseJsonObject(ponytailLocalText)?.version ?? null : null,
     };
 }
@@ -211,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();