@krtclcdy/tersio 2.25.4 → 2.25.6

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, bundledPonytailSpec, cavemanDefaultFlag, comboDefaultFlag, command, dryRun, ponytailDefaultFlag, pstackDefaultFlag, 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 { PI_RTK_MANIFEST, PI_PONYTAIL_FILES, PONYTAIL_BUNDLE_FILES, filesUnder, rootFiles, sourcePath, syncPluginManifest, syncTreeFiles } from './manifest.js';
 import { detectHosts, hostHint, hostLabel, parseHostArg, piTersioSource } from './hosts.js';
 async function stepPonytail(pluginsDir, options) {
     if (!options.quiet)
@@ -25,22 +25,44 @@ async function stepPonytail(pluginsDir, options) {
     await fs.mkdir(pluginsDir, { recursive: true });
     const pkgPath = path.join(pluginsDir, 'package.json');
     const pkg = await readPluginsPackage(pkgPath);
-    // Drop the legacy Ponytail plugin row; it is a tersio dependency now.
+    // npm resolves the *published* tersio, so a plain dependency entry lets npm nest the range's version.
     let migrated = false;
-    if ('@dietrichgebert/ponytail' in pkg.dependencies) {
+    const localSpec = await bundledPonytailSpec();
+    const declared = pkg.dependencies['@dietrichgebert/ponytail'];
+    // Node resolves the nested copy first, so a dependency entry alone cannot hold the local version.
+    const rawOverrides = typeof pkg.overrides === 'object' && pkg.overrides !== null ? { ...pkg.overrides } : {};
+    const overrideNeeded = localSpec !== null && rawOverrides['@dietrichgebert/ponytail'] !== localSpec;
+    if (localSpec !== null && declared !== localSpec) {
+        pkg.dependencies['@dietrichgebert/ponytail'] = localSpec;
+        migrated = true;
+    }
+    else if (localSpec === null && declared) {
         delete pkg.dependencies['@dietrichgebert/ponytail'];
         migrated = true;
     }
+    if (localSpec === null) {
+        // No bundled spec means no tersio-owned row, so an override would resurrect the dependency.
+        delete rawOverrides['@dietrichgebert/ponytail'];
+    }
+    else if (overrideNeeded) {
+        rawOverrides['@dietrichgebert/ponytail'] = localSpec;
+    }
+    if (Object.keys(rawOverrides).length === 0)
+        delete pkg.overrides;
+    else if (JSON.stringify(rawOverrides) !== JSON.stringify(typeof pkg.overrides === 'object' && pkg.overrides !== null ? pkg.overrides : {})) {
+        pkg.overrides = rawOverrides;
+        migrated = true;
+    }
     if (options.dryRun) {
         if (verbose && !options.quiet)
             sayTagged(`  [dry-run] would write ${pkgPath}`);
         if (migrated && verbose && !options.quiet)
-            sayTagged(`  [dry-run] would drop the separate @dietrichgebert/ponytail dependency (bundled with tersio)`);
+            sayTagged(`  [dry-run] would set @dietrichgebert/ponytail → ${localSpec ?? 'this tree\x27s range'} (bundled with tersio)`);
     }
     else if (migrated) {
         await fs.writeFile(pkgPath, JSON.stringify(pkg, null, 2) + '\n');
         if (!options.quiet)
-            console.log('  [migrate] dropped separate @dietrichgebert/ponytail dependency (now bundled with tersio)');
+            console.log(`  [migrate] set @dietrichgebert/ponytail → ${pkg.dependencies['@dietrichgebert/ponytail'] ?? 'this tree\x27s range'} (bundled with tersio)`);
     }
     const ponytailExtPath = path.join(pluginsDir, 'node_modules', '@dietrichgebert', 'ponytail', 'pi-extension', 'index.js');
     const probeExt = async () => (await readTextIfExists(ponytailExtPath)) !== null;
@@ -50,7 +72,7 @@ async function stepPonytail(pluginsDir, options) {
         debug('Bundled Ponytail pi-extension already installed; skipping network refresh');
     }
     else if (options.dryRun) {
-        // Dry runs preview the wiring below without touching the network.
+        // Pretend the extension is present so the wiring below still runs, without touching the network.
         if (verbose && !options.quiet)
             console.log('  [dry-run] would run: npm install --no-audit --no-fund (in plugins dir)');
         ponytailExtExists = true;
@@ -163,7 +185,7 @@ async function downloadRtkChecksums(release) {
         return null;
     }
 }
-// Fails closed: a missing checksum is worse than a failed install, since an unverifiable RTK binary runs with the user's privileges. `--allow-unverified` opts out.
+// Fails closed: an unverifiable RTK binary runs with the user's privileges. `--allow-unverified` opts out.
 async function verifyRtkArchive(archivePath, assetName, checksumsText) {
     const unverified = (reason) => {
         if (allowUnverified) {
@@ -229,6 +251,34 @@ async function extractRtkArchive(archivePath, extractDir) {
     sayTagged(`  [fail] Unknown archive format: ${archivePath}`);
     return false;
 }
+// A rule body found in a retired copy still resolves and loads twice, so drop the agent tree's extras.
+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);
@@ -257,7 +307,7 @@ async function stepRtk(binDir, options, target = 'omp') {
     }
     if (!options.quiet)
         console.log(`  RTK — download binary and wire into ${hostName}`);
-    // A failed download must not skip wiring: a pre-existing binary serves the host hook just as well. Dry runs stay offline.
+    // A failed download must not skip wiring: a pre-existing binary serves the host hook. Dry runs stay offline.
     if (options.dryRun) {
         if (verbose && !options.quiet)
             sayTagged(`  [dry-run] would download rtk binary and install to ${binDest}`);
@@ -268,7 +318,7 @@ async function stepRtk(binDir, options, target = 'omp') {
         const triple = resolveRtkTriple();
         if (!triple)
             return;
-        // One task with streamed sub-steps: release lookup, download, checksum, extract, install. Non-TTY keeps the plain lines each step already prints.
+        // One task with streamed sub-steps; non-TTY keeps the plain lines each step already prints.
         await withInteractiveTask('Installing RTK', async (update) => {
             const release = await fetchJson(RTK_RELEASE_API);
             const asset = findRtkAsset(release, triple);
@@ -327,7 +377,7 @@ async function stepRtk(binDir, options, target = 'omp') {
     // Wire rtk's tool_call extension: the binary alone never meters a session.
     await bind(binDest);
 }
-// Copy sources into the target extension dir. First entry is required; the rest are optional companions.
+// First entry is required; the rest are optional companions.
 async function copySources(extDir, files, skipLabel, options) {
     const src = await readTextIfExists(files[0][0]);
     if (!src) {
@@ -348,22 +398,20 @@ 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-filter'), 'rtk-filter/index.ts', options);
+    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.
+// rule.md is a deliberate fork of skills/caveman/SKILL.md: a blind sync would drop the mode switch line.
 const CAVEMAN_RULES = [
     ['rule.md', null],
     ['rule-ultra.md', CAVEMAN_REMOTE_ULTRA],
@@ -372,11 +420,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 {
@@ -405,7 +453,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 });
@@ -413,22 +461,31 @@ 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);
+}
+// omp loads no OpenCode entry, but its package ships one: the repair writes it, so the install does too.
+async function stepPluginEntry(extDir, options) {
+    await copySources(extDir, rootFiles(), 'server.ts', options);
+}
+// pi records no first-token latency, so this stamps one into the row the dashboard reads.
+async function stepTiming(extDir, options) {
+    await copySources(extDir, filesUnder('timing'), 'timing/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 = [
-    'hooks/ponytail-instructions.js',
-    'hooks/ponytail-config.js',
-    'skills/ponytail/SKILL.md',
-];
+// The body is a Tersio fork of an upstream skill, so the install copies it and never fetches it.
+async function stepPstack(extDir, options) {
+    if (!options.quiet)
+        console.log('  pstack — install the rigor mode');
+    await copySources(extDir, filesUnder('pstack'), 'pstack/index.ts', options);
+}
+// The tree ships no node_modules, so the ruleset rides along as files. Both hosts need the same six.
 async function stepPonytailBundle(treeDir, options) {
     const root = findHoistedPackage('@dietrichgebert/ponytail', findPackageRoot(path.dirname(fileURLToPath(import.meta.url))));
     if (!root) {
@@ -456,19 +513,20 @@ async function stepOpencode(options) {
     const dir = path.join(HOME, '.config', 'opencode', 'plugins', 'tersio');
     if (!options.quiet)
         console.log(`  OpenCode — write the plugin tree (${dir})`);
+    // Retire the `-session`/`-toggle` leftovers first: a rule body found in one still resolves.
+    await stepRetireAgentCopies(dir, options);
     await stepSharedSessionState(dir, options);
-    await copySources(dir, filesUnder('rtk-session'), 'rtk-session/index.ts', options);
+    await copySources(dir, filesUnder('rtk'), 'rtk/session.ts', options);
     await stepRtkFilter(dir, options);
-    await copySources(dir, filesUnder('caveman-session'), 'caveman-session/index.ts', options);
+    await stepTiming(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 stepPstack(dir, 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 {
@@ -519,6 +577,7 @@ async function resolveProfile(opts = {}) {
         profile.cavemanDefault = preset.caveman;
         profile.rtkDefault = preset.rtk;
         profile.ponytailDefault = preset.ponytail;
+        profile.pstackDefault = preset.pstack;
     }
     if (cavemanDefaultFlag !== undefined)
         profile.cavemanDefault = cavemanDefaultFlag;
@@ -526,8 +585,10 @@ async function resolveProfile(opts = {}) {
         profile.rtkDefault = rtkDefaultFlag === 'on';
     if (ponytailDefaultFlag !== undefined)
         profile.ponytailDefault = ponytailDefaultFlag;
+    if (pstackDefaultFlag !== undefined)
+        profile.pstackDefault = pstackDefaultFlag;
     if ((!opts.quiet && verbose) || dryRun)
-        console.log(`  Defaults: combo=${profile.comboDefault} (caveman=${profile.cavemanDefault} · rtk=${profile.rtkDefault ? 'on' : 'off'} · ponytail=${profile.ponytailDefault})`);
+        console.log(`  Defaults: combo=${profile.comboDefault} (caveman=${profile.cavemanDefault} · rtk=${profile.rtkDefault ? 'on' : 'off'} · ponytail=${profile.ponytailDefault} · pstack=${profile.pstackDefault})`);
     return profile;
 }
 let updatePromptDone = false;
@@ -552,6 +613,7 @@ async function runCommandMenu() {
     updatePromptDone = true;
     const choice = await askInteractiveChoice(`Tersio — what next?\n${formatCliStatus(storedProfileSync())}`, [
         { value: 'install', label: 'Install add-ons', hint: 'user scope + combo defaults' },
+        { value: 'reinstall', label: 'Reinstall', hint: 're-install Tersio for the ai agents, then verify' },
         { value: 'update', label: 'Update', hint: 'CLI version check, then refresh add-ons (RTK, Caveman rule, Ponytail)' },
         { value: 'doctor', label: 'Doctor', hint: 'verify the installation' },
         { value: 'settings', label: 'Settings', hint: 'default combo mode, currency, diagnosis schedule' },
@@ -568,8 +630,11 @@ async function runCommandMenu() {
         case 'install':
             await runInstall();
             break;
+        case 'reinstall':
+            await runReinstall();
+            break;
         case 'update': {
-            // One bound flow: the version check already ran above, so report it and offer the refresh in the same breath — no second "update" quiz.
+            // Version check already ran above, so report it and offer the refresh here — no second "update" quiz.
             if (typeof newer === 'string')
                 console.log(`  tersio ${newer} available (installed ${PACKAGE_VERSION})`);
             else
@@ -616,7 +681,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':
@@ -629,9 +694,57 @@ async function runCommandMenu() {
             break;
     }
 }
-// Which host this run targets. --host pins it; a TTY user picks; scripts, pipes, --yes, and --dry-run keep the pre-multi-host default of Oh My Pi.
+// Which host this run targets. --host pins it; scripts and --yes keep the default of Oh My Pi.
 let targetHost = 'omp';
-// Hosts the menu advertises but cannot install yet. Listed disabled so the roadmap is visible without offering a target that does nothing.
+// A reinstall re-runs the npm fast path and the Ponytail probe instead of reusing what is on disk.
+let forceReinstall = false;
+/** Reinstall one agent: pick it from what is installed now, then run the full install with a refresh. */
+async function runReinstall() {
+    let pinned;
+    try {
+        pinned = parseHostArg(args);
+    }
+    catch (e) {
+        console.error(`[fail] ${e.message}`);
+        process.exit(1);
+    }
+    const installed = detectHosts().filter((host) => host.installed);
+    let host;
+    if (pinned)
+        host = pinned;
+    else if (installed.length === 0) {
+        console.log('  Nothing to reinstall — no agent has Tersio installed.\n  Run `tersio install`, or pick it from the menu.');
+        closeRL();
+        return;
+    }
+    else if (installed.length === 1 || !tty() || yes || dryRun) {
+        host = installed[0].id;
+    }
+    else {
+        const options = installed.map((entry) => ({
+            value: entry.id,
+            label: hostLabel(entry),
+            hint: hostHint(entry),
+        }));
+        const picked = await askInteractiveChoice('Reinstall Tersio into which agent?', options, installed[0].id);
+        if (picked.status !== 'selected') {
+            closeRL();
+            process.exit(130);
+        }
+        host = picked.value;
+    }
+    forceReinstall = true;
+    printWelcome();
+    console.log(`Reinstall — Tersio v${PACKAGE_VERSION} into ${hostLabel(hostEntry(host))}`);
+    console.log(`  ${resolvedHostPath(host)}`);
+    await runInstall(host);
+    if (!dryRun) {
+        const summary = await runDoctor();
+        if (summary.missing + summary.warn === 0)
+            console.log(`\n  Reinstall verified — ${hostLabel(hostEntry(host))} is healthy.`);
+    }
+}
+// Hosts the menu advertises but cannot install yet; listed disabled so the roadmap stays visible.
 const SOON_HOSTS = [
     { value: 'claude', label: 'Claude Code', hint: 'Coming soon' },
     { value: 'codex', label: 'Codex', hint: 'Coming soon' },
@@ -656,7 +769,19 @@ async function chooseHost(title, only) {
 function hostEntry(id) {
     return detectHosts().find((host) => host.id === id);
 }
-// pi auto-discovers `<agent-dir>/extensions/**/index.ts`, so this route writes the same tree as OMP's and registers nothing.
+/** pi discovers a subdirectory only through an index file or a package.json with `pi.extensions`, so rtk/ needs one or both files stay dead. */
+async function stepPiRtkManifest(extDir, options) {
+    await syncTreeFiles(extDir, [PI_RTK_MANIFEST], options);
+}
+/** The directory a host's install writes, for the plan line a reinstall prints. */
+function resolvedHostPath(host) {
+    if (host === 'pi')
+        return path.join(piAgentDir(), 'extensions');
+    if (host === 'opencode')
+        return path.join(HOME, '.config', 'opencode', 'plugins', 'tersio');
+    return path.join(OMP_PLUGINS_DIR, 'node_modules', ...PACKAGE_NAME.split('/'), 'extensions');
+}
+// pi auto-discovers `<agent-dir>/extensions/**/index.ts`, so this route writes the same tree and registers nothing.
 async function stepPiLayer(options) {
     const agentDir = piAgentDir();
     const extDir = path.join(agentDir, 'extensions');
@@ -666,23 +791,19 @@ 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 stepPiRtkManifest(extDir, options);
+    await stepTiming(extDir, options);
     await stepCaveman(extDir, options);
     await stepCombo(extDir, options);
+    await stepPstack(extDir, options);
     await stepTersioCommands(extDir, options);
     await stepUpdater(extDir, options);
     await stepPonytailForPi(agentDir, options);
 }
 // 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)
@@ -708,8 +829,7 @@ 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.
+    // Only when pi still declares the npm spec: with nothing to remove, `pi remove` still warns and exits non-zero.
     const declared = await piDeclaredPackages(agentDir);
     if (declared.some(isNpmPonytailPackage)) {
         try {
@@ -755,8 +875,7 @@ async function registerPiLocalPonytail(agentDir, dest, options) {
 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.
+async function runInstall(forcedHost) {
     if (command === null && tty() && !yes && !updatePromptDone) {
         await runCommandMenu();
         return;
@@ -770,7 +889,9 @@ async function runInstall() {
         console.error(`[fail] ${e.message}`);
         process.exit(1);
     }
-    if (pinned)
+    if (forcedHost)
+        targetHost = forcedHost;
+    else if (pinned)
         targetHost = pinned;
     else if (tty() && !yes && !dryRun && !applyUpdate && command !== 'uninstall') {
         targetHost = await chooseHost('Install Tersio into which agent?');
@@ -788,7 +909,7 @@ async function runInstall() {
     if (tty() && !applyUpdate && command !== 'uninstall') {
         const newer = await checkForUpdate();
         if (typeof newer === 'string') {
-            // Update pending: offer it here instead of burying it above the install prompts. Yes runs the full update and stops.
+            // Update pending: offer it here; yes runs the full update and stops.
             if (command === null && !dryRun && !yes && !updatePromptDone) {
                 const answer = await askInteractiveConfirm(`tersio ${newer} is available (installed ${PACKAGE_VERSION}). Install it now?`);
                 if (answer.status === 'confirmed' && answer.value) {
@@ -812,7 +933,7 @@ async function runInstall() {
     const userDir = OMP_AGENT_DIR;
     const userExtDir = path.join(userDir, 'extensions');
     // apply-update refreshes every add-on like a reinstall.
-    const installOptions = { dryRun, verbose, yes, reinstall: applyUpdate, quiet };
+    const installOptions = { dryRun, verbose, yes, reinstall: applyUpdate || forceReinstall, quiet };
     // Point of no return: disk writes start here; pipes stay unattended.
     if (!yes && !dryRun && !applyUpdate && tty()) {
         const target = hostEntry(targetHost);
@@ -873,17 +994,31 @@ async function runInstall() {
         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('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));
-    await capture('updater', () => stepUpdater(userExtDir, installOptions));
+    // The plugin manifest owns every mode extension; only a failed registration falls back to the agent tree.
+    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('pstack', () => stepPstack(extDir, installOptions));
+    await capture('commands', () => stepTersioCommands(extDir, installOptions));
+    await capture('updater', () => stepUpdater(extDir, installOptions));
+    // One package, one file set: the repair writes every tree file here, so the install does too.
+    if (ownsTree)
+        await capture('plugin entry', () => stepPluginEntry(extDir, installOptions));
+    if (ownsTree)
+        await capture('plugin manifest', () => syncPluginManifest(path.dirname(pluginExtDir), installOptions));
+    if (ownsTree)
+        await capture('retired agent copies', () => stepRetireAgentCopies(userExtDir, installOptions));
     if (selfPlugin)
         await capture('settings', () => writePluginSettings(profile, installOptions));
     if (quiet) {
@@ -895,4 +1030,4 @@ async function runInstall() {
     }
     closeRL();
 }
-export { runInstall, verifyRtkArchive };
+export { runInstall, runReinstall, verifyRtkArchive };

package/dist/cli/interactive.js

@@ -30,7 +30,7 @@ let spinnerDepth = 0;
 async function withInteractiveSpinner(message, work) {
     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.
+    // Clack manages stdin itself. Close the legacy question interface first; non-interactive callers skip it.
     closeRL();
     const active = clackSpinner({ indicator: 'timer' });
     active.start(message);
@@ -73,7 +73,7 @@ async function askInteractiveConfirm(message, initialValue = true) {
     finally {
     }
 }
-// Confirm a destructive run: a Clack dialog at a terminal, a plain prompt in a pipe or script. False means the user declined or aborted.
+// Confirm a destructive run: a Clack dialog at a terminal, a plain prompt in a pipe. False means declined or aborted.
 async function confirmDestructive(message) {
     if (tty()) {
         closeRL();
@@ -98,7 +98,7 @@ async function confirmDestructive(message) {
     }
     return true;
 }
-// Run collecting work under one TTY-only Clack task. Callers print after the task completes, keeping normal output out of the spinner animation.
+// Run collecting work under one TTY-only Clack task; callers print after it, so output stays out of the spinner.
 async function runInteractivePhase(title, collect) {
     if (!tty())
         return collect();