@krtclcdy/tersio 2.23.0 → 2.24.0

package/cli/install.js

@@ -1,9 +1,9 @@
-// cli/install.ts — install/reinstall flow and all setup steps.
+// cli/install.ts — install flow and all setup steps.
 import { promises as fs } from 'node:fs';
 import os from 'node:os';
 import path from 'node:path';
 import { fileURLToPath } from 'node:url';
-import { BUN_BIN_DIR, COMBO_PRESET_MODES, IS_WINDOWS, OMP_AGENT_DIR, OMP_PLUGINS_DIR, OMP_BIN, PACKAGE_NAME, PACKAGE_VERSION, RTK_BINARY_NAME, applyUpdate, cavemanDefaultFlag, comboDefaultFlag, command, dryRun, install, ponytailDefaultFlag, profileFlagsGiven, reinstall, rtkDefaultFlag, verbose, yes, dashboardExport, dashboardPort, debug, ensurePonytailConfigValue, execP, parseJsonObject, readPluginsPackage, writeIfChanged, } from './common.js';
+import { BUN_BIN_DIR, COMBO_PRESET_MODES, IS_WINDOWS, OMP_AGENT_DIR, OMP_PLUGINS_DIR, OMP_BIN, PACKAGE_NAME, PACKAGE_VERSION, RTK_BINARY_NAME, args, applyUpdate, cavemanDefaultFlag, comboDefaultFlag, command, dryRun, ponytailDefaultFlag, profileFlagsGiven, rtkDefaultFlag, verbose, yes, dashboardExport, dashboardPort, debug, ensurePonytailConfigValue, execP, parseJsonObject, readPluginsPackage, writeIfChanged, } from './common.js';
 import { askInteractiveChoice, askInteractiveConfirm, closeRL, execNetwork, tty, withInteractiveSpinner, } from './interactive.js';
 import { printWelcome } from './banner.js';
 import { checkForUpdate, runLatestUpdate } from './update.js';
@@ -13,31 +13,17 @@ import { runReset } from './reset.js';
 import { runUsage } from './usage.js';
 import { runDashboard } from './dashboard.js';
 import { wireRtkOmp } from './rtk-wiring.js';
-import { CAVEMAN_REMOTE_RULE, RTK_RELEASE_API, fetchJson, findFile, httpsGet, httpsDownload, parseChecksum, readTextIfExists, rtkPlatformSpec, sha256File, } from '../extensions/lib/utils.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 { storedProfile, writePluginSettings } from './profile.js';
-// Paths to extension source files (relative to this script)
-const EXT_DIR = path.join(path.dirname(fileURLToPath(import.meta.url)), '..', 'extensions');
-const SHARED_SESSION_STATE = path.join(EXT_DIR, 'shared', 'session-state.ts');
-const CAVEMAN_INDEX = path.join(EXT_DIR, 'caveman-session', 'index.ts');
-const CAVEMAN_RULE = path.join(EXT_DIR, 'caveman-session', 'rule.md');
-const RTK_SESSION_INDEX = path.join(EXT_DIR, 'rtk-session', 'index.ts');
-const UPDATER_INDEX = path.join(EXT_DIR, 'ai-addons-updater', 'index.ts');
-const COMBO_TOGGLE_INDEX = path.join(EXT_DIR, 'combo-toggle', 'index.ts');
-const TERSIO_COMMANDS_INDEX = path.join(EXT_DIR, 'tersio-commands', 'index.ts');
-const SHARED_TYPES = path.join(EXT_DIR, 'shared', 'types.ts');
-const LIB_UTILS = path.join(EXT_DIR, 'lib', 'utils.ts');
-const SHARED_PLUGIN_SETTINGS = path.join(EXT_DIR, 'shared', 'plugin-settings.ts');
-const SHARED_USAGE_LEDGER = path.join(EXT_DIR, 'shared', 'usage-ledger.ts');
-const SHARED_PRICING = path.join(EXT_DIR, 'shared', 'pricing.ts');
-const SHARED_CARBON = path.join(EXT_DIR, 'shared', 'carbon.ts');
+import { filesUnder, sourcePath } from './manifest.js';
+import { detectHosts, hostHint, hostLabel, parseHostArg, piTersioSource } from './hosts.js';
 async function stepPonytail(pluginsDir, options) {
     if (!options.quiet)
         console.log('  Ponytail — ensure bundled plugin');
     await fs.mkdir(pluginsDir, { recursive: true });
     const pkgPath = path.join(pluginsDir, 'package.json');
     const pkg = await readPluginsPackage(pkgPath);
-    // Migration: ponytail was a separate plugin row. It is now a tersio
-    // dependency, so drop the legacy row. Runs after stepSelfPlugin.
+    // Drop the legacy Ponytail plugin row; it is a tersio dependency now.
     let migrated = false;
     if ('@dietrichgebert/ponytail' in pkg.dependencies) {
         delete pkg.dependencies['@dietrichgebert/ponytail'];
@@ -56,9 +42,7 @@ async function stepPonytail(pluginsDir, options) {
     }
     const ponytailExtPath = path.join(pluginsDir, 'node_modules', '@dietrichgebert', 'ponytail', 'pi-extension', 'index.js');
     const probeExt = async () => (await readTextIfExists(ponytailExtPath)) !== null;
-    // Fast path: bundled copy already present and no refresh asked — skip
-    // network. Migration always reinstalls: the probe may hit the stale legacy
-    // copy, and only npm install prunes it into the tersio-owned one.
+    // Skip the network unless a refresh was asked; migration always reinstalls.
     let ponytailExtExists = !options.reinstall && !options.dryRun && !migrated ? await probeExt() : false;
     if (ponytailExtExists) {
         debug('Bundled Ponytail pi-extension already installed; skipping network refresh');
@@ -70,8 +54,7 @@ async function stepPonytail(pluginsDir, options) {
         ponytailExtExists = true;
     }
     else {
-        // Self-plugin npm install already materialized the bundled copy.
-        // Reinstall here only when the probe still misses.
+        // Reinstall only when the self-plugin step did not materialize it.
         try {
             await execNetwork('Installing bundled Ponytail', 'npm', ['install', '--no-audit', '--no-fund'], { cwd: pluginsDir, timeout: 180000 });
         }
@@ -97,9 +80,7 @@ async function stepPonytail(pluginsDir, options) {
     // hideStatus=true keeps the upstream ponytail bar hidden; combo owns the bar.
     await ensurePonytailConfigValue('hideStatus', true, options);
 }
-// Registers this package in ~/.omp/plugins so OMP lists it on the
-// Settings → Plugins page (OMP enumerates plugins/package.json dependencies).
-// Returns true when the package is verified in plugins/node_modules.
+// Registers the package so OMP lists it under Settings → Plugins.
 async function stepSelfPlugin(pluginsDir, options) {
     if (!options.quiet)
         console.log('  Tersio — register plugin');
@@ -242,17 +223,38 @@ async function extractRtkArchive(archivePath, extractDir) {
     console.log(`  [fail] Unknown archive format: ${archivePath}`);
     return false;
 }
-async function stepRtk(binDir, options) {
-    if (!options.quiet)
-        console.log('  RTK — download binary and wire into OMP');
+// The binary is machine-wide and only OMP needs the wiring, so an install that
+// finds one present only rebinds. `tersio update` still refreshes it.
+async function stepRtk(binDir, options, target = 'omp') {
     const binDest = path.join(binDir, RTK_BINARY_NAME);
-    // Download failure must not skip wiring: a pre-existing rtk binary is
-    // exactly as good for the OMP hook, so wire whatever ends up at binDest.
-    // Dry runs stay offline: no registry probe, just the plan line above.
+    const found = resolveRtkBinary();
+    const bind = async (binary) => {
+        if (target !== 'omp')
+            return;
+        if (!(await fileExists(binary))) {
+            console.log('  [skip] no rtk binary to wire — install rtk, then run: rtk init -g --agent omp');
+            return;
+        }
+        await wireRtkOmp(binary, options);
+    };
+    if (found && !applyUpdate) {
+        // The path only under --verbose: a plain run, and a dry run, stay free of
+        // real user paths.
+        if (!options.quiet) {
+            const where = verbose ? ` (${found})` : '';
+            console.log(`  RTK — already installed${where}${target === 'omp' ? ', binding into OMP' : ', nothing to bind on pi'}`);
+        }
+        await bind(found);
+        return;
+    }
+    if (!options.quiet)
+        console.log(`  RTK — download binary and ${target === 'omp' ? 'wire into OMP' : 'put it on PATH'}`);
+    // A failed download must not skip wiring: a pre-existing binary serves the
+    // OMP hook just as well. Dry runs stay offline.
     if (options.dryRun) {
         if (verbose && !options.quiet)
             console.log(`  [dry-run] would download rtk binary and install to ${binDest}`);
-        await wireRtkOmp(binDest, options);
+        await bind(found ?? binDest);
         return;
     }
     try {
@@ -306,20 +308,11 @@ async function stepRtk(binDir, options) {
         console.log(`  [fail] RTK: ${e.message}`);
         console.log('  [hint] Manual: https://github.com/rtk-ai/rtk/releases');
     }
-    if (options.dryRun) {
-        await wireRtkOmp(binDest, options);
-        return;
-    }
-    if (!(await fileExists(binDest))) {
-        console.log('  [skip] no rtk binary to wire — install rtk, then run: rtk init -g --agent omp');
-        return;
-    }
-    // Binary alone never meters OMP sessions — wire rtk's tool_call
-    // extension so bash commands rewrite to rtk and land in history.db.
-    await wireRtkOmp(binDest, options);
+    // Wire rtk's tool_call extension: the binary alone never meters a session.
+    await bind(binDest);
 }
-// Copy repo source files into the target extension dir. First entry is
-// required (skip label on missing); rest are optional companions.
+// Copy sources into the target extension dir. 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) {
@@ -340,25 +333,18 @@ async function copySources(extDir, files, skipLabel, options) {
 async function stepSharedSessionState(extDir, options) {
     if (!options.quiet)
         console.log('  Shared files — sync session bridge');
-    await copySources(extDir, [
-        [SHARED_SESSION_STATE, path.join('shared', 'session-state.ts')],
-        [SHARED_TYPES, path.join('shared', 'types.ts')],
-        [LIB_UTILS, path.join('lib', 'utils.ts')],
-        [SHARED_PLUGIN_SETTINGS, path.join('shared', 'plugin-settings.ts')],
-        [SHARED_USAGE_LEDGER, path.join('shared', 'usage-ledger.ts')],
-        [SHARED_PRICING, path.join('shared', 'pricing.ts')],
-        [SHARED_CARBON, path.join('shared', 'carbon.ts')],
-    ], 'shared/session-state.js', options);
+    const shared = [...filesUnder('shared'), ...filesUnder('lib')];
+    await copySources(extDir, shared, 'shared/session-state.js', options);
 }
 async function stepRtkSession(extDir, options) {
     if (!options.quiet)
         console.log('  RTK session — install session mode');
-    await copySources(extDir, [[RTK_SESSION_INDEX, path.join('rtk-session', 'index.ts')]], 'rtk-session/index.ts', options);
+    await copySources(extDir, filesUnder('rtk-session'), 'rtk-session/index.ts', options);
 }
-// One rule fetch serves the install; dry runs stay offline
-// and fall back to the bundled rule to preview its destination.
+// One fetch serves the install; dry runs stay offline and preview the bundled
+// rule's destination.
 async function fetchCavemanRule(options) {
-    const bundled = await readTextIfExists(CAVEMAN_RULE);
+    const bundled = await readTextIfExists(sourcePath('caveman-session/rule.md'));
     if (options.dryRun)
         return bundled;
     try {
@@ -390,30 +376,27 @@ async function stepCaveman(extDir, rule, options) {
     else {
         await writeIfChanged(ruleDest, rule, options);
     }
-    await copySources(extDir, [[CAVEMAN_INDEX, path.join('caveman-session', 'index.ts')]], 'caveman-session/index.ts', options);
+    await copySources(extDir, filesUnder('caveman-session').filter(([, to]) => to.endsWith('index.ts')), 'caveman-session/index.ts', options);
 }
 async function stepTersioCommands(extDir, options) {
     if (!options.quiet)
         console.log('  Tersio commands — install /tersio root command');
-    await copySources(extDir, [[TERSIO_COMMANDS_INDEX, path.join('tersio-commands', 'index.ts')]], 'tersio-commands/index.ts', options);
+    await copySources(extDir, filesUnder('tersio-commands'), 'tersio-commands/index.ts', options);
 }
 async function stepUpdater(extDir, options) {
-    await copySources(extDir, [[UPDATER_INDEX, path.join('ai-addons-updater', 'index.ts')]], 'ai-addons-updater/index.ts', options);
+    await copySources(extDir, filesUnder('ai-addons-updater'), 'ai-addons-updater/index.ts', options);
 }
 async function stepCombo(extDir, options) {
     if (!options.quiet)
         console.log('  Combo — install preset switch');
-    await copySources(extDir, [[COMBO_TOGGLE_INDEX, path.join('combo-toggle', 'index.ts')]], 'combo-toggle/index.ts', options);
+    await copySources(extDir, filesUnder('combo-toggle'), 'combo-toggle/index.ts', options);
 }
-async function resolveProfile(forceReinstall = false, opts = {}) {
-    // Seed from the lock file so flag-less update/reinstall runs keep the
-    // user's configured defaults instead of resetting them to off.
+async function resolveProfile(opts = {}) {
+    // Seed from the stored defaults so flag-less runs keep them.
     const profile = await storedProfile();
-    // Single interactive prompt: the Combo preset implies all three modes.
-    // Numbered menu — no typing preset names.
-    // Only for a real user at a terminal, only when no default flags were
-    // given, and never for --apply-update runs.
-    if (tty() && !profileFlagsGiven && !applyUpdate && (install || forceReinstall || reinstall)) {
+    // 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.
+    if (tty() && !profileFlagsGiven && !applyUpdate) {
         const choice = await askInteractiveChoice('Session-start defaults — Combo preset', [
             { value: 'off', label: 'off' },
             { value: 'medium', label: 'medium', hint: 'caveman=lite, rtk=on, ponytail=lite' },
@@ -445,9 +428,7 @@ async function resolveProfile(forceReinstall = false, opts = {}) {
     return profile;
 }
 let updatePromptDone = false;
-// Bare `tersio` at a terminal is a command picker, not an install run:
-// update offer first (when pending), then a Clack menu over every command.
-// Scripts, pipes, --yes, and --dry-run keep the old straight-to-install path.
+// Bare `tersio` at a terminal picks a command; scripts and flags install.
 async function runCommandMenu() {
     printWelcome();
     const newer = await checkForUpdate();
@@ -468,7 +449,6 @@ async function runCommandMenu() {
     const choice = await askInteractiveChoice('Tersio — what next?', [
         { value: 'install', label: 'Install add-ons', hint: 'user scope + combo defaults' },
         { value: 'update', label: 'Update', hint: 'CLI version check, then refresh add-ons (RTK, Caveman rule, Ponytail)' },
-        { value: 'reinstall', label: 'Reinstall', hint: 'clean and reinstall the add-ons, Ponytail package kept' },
         { value: 'doctor', label: 'Doctor', hint: 'verify the installation' },
         { value: 'usage', label: 'Usage', hint: 'token usage and savings report' },
         { value: 'dashboard', label: 'Dashboard', hint: 'open the report in your browser' },
@@ -504,10 +484,6 @@ async function runCommandMenu() {
             closeRL();
             break;
         }
-        case 'reinstall':
-            await runInstall({ reinstall: true });
-            closeRL();
-            break;
         case 'doctor': {
             const summary = await runDoctor();
             if (!dryRun && summary.missing + summary.warn > 0) {
@@ -545,40 +521,117 @@ async function runCommandMenu() {
             break;
     }
 }
-async function runInstall(overrides = {}) {
-    const isReinstall = overrides.reinstall ?? reinstall;
-    // Menu-driven installs must fall through: bare `tersio` re-enters here
-    // with command === null after the picker, and without this guard the
-    // choice loops straight back into runCommandMenu() forever.
+// 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.
+let targetHost = 'omp';
+async function chooseHost(title, only) {
+    const hosts = detectHosts().filter((host) => !only || only.includes(host.id));
+    const choice = await askInteractiveChoice(title, hosts.map((host) => ({
+        value: host.id,
+        label: hostLabel(host),
+        hint: hostHint(host),
+    })), targetHost);
+    if (choice.status !== 'selected') {
+        closeRL();
+        process.exit(130);
+    }
+    return choice.value;
+}
+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.
+async function stepPiLayer(profile, options) {
+    const agentDir = piAgentDir();
+    const extDir = path.join(agentDir, 'extensions');
+    const declared = piTersioSource(agentDir);
+    if (declared)
+        console.log(`  [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 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.
+async function stepPonytailForPi(agentDir, options) {
+    if (!options.quiet)
+        console.log('  Ponytail — ensure the pi package');
+    if (!options.dryRun) {
+        try {
+            await execNetwork('Installing Ponytail for pi', 'pi', ['install', 'npm:@dietrichgebert/ponytail'], { timeout: 300000 });
+            return;
+        }
+        catch (e) {
+            console.log(`  [fail] pi install ponytail: ${shortError(e)}`);
+        }
+    }
+    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');
+        return;
+    }
+    const dest = path.join(agentDir, 'skills');
+    if (options.dryRun) {
+        if (verbose && !options.quiet)
+            console.log(`  [dry-run] would copy Ponytail skills to ${dest}`);
+        return;
+    }
+    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)
+            console.log(`  [write] skill ${entry.name} → ${to}`);
+    }
+}
+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) {
         await runCommandMenu();
         return;
     }
-    // apply-update is the delegated payload of `tersio update`: stay silent —
-    // the parent already printed the plan and owns the closing summary. Banner
-    // repeats here otherwise (the reported double-print), burying real output.
+    // Ask the host first: it decides the tree, the cleanup, and the defaults file.
+    let pinned;
+    try {
+        pinned = parseHostArg(args);
+    }
+    catch (e) {
+        console.error(`[fail] ${e.message}`);
+        process.exit(1);
+    }
+    if (pinned)
+        targetHost = pinned;
+    else if (tty() && !yes && !dryRun && !applyUpdate && command !== 'uninstall') {
+        targetHost = await chooseHost('Install Tersio into which agent?');
+    }
+    const host = hostEntry(targetHost);
+    // apply-update stays silent: the parent printed the plan.
     const quiet = applyUpdate;
     if (!quiet)
         printWelcome();
-    if (isReinstall) {
-        // removeRtk stays false: reinstall is about to replace the binary, and
-        // deleting it first would leave nothing to wire if the fresh download
-        // fails (rate limit, offline). rtk.ts is removed here and re-wired below.
-        await runUninstall({ yes: true, removePonytail: false, removeRtk: false });
-    }
     if (dryRun && !quiet)
         console.log('Preview — no changes will be written.\n');
     if (!quiet) {
         console.log(`Installing Tersio v${PACKAGE_VERSION}`);
     }
-    // Remind humans a newer release exists; silent for scripts (no TTY) and for
-    // the apply-update payload, which is itself an update run.
+    // Nudge about a newer release; silent without a TTY.
     if (tty() && !applyUpdate && command !== 'uninstall') {
         const newer = await checkForUpdate();
         if (typeof newer === 'string') {
-            // Bare `tersio` with an update pending: offer it now (Y/n) instead of
-            // burying the banner above the install prompts. Yes runs the full
-            // update and stops here — the fresh binary owns what follows.
+            // Update pending: offer it here instead of burying it above the install
+            // prompts. 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) {
@@ -598,22 +651,20 @@ async function runInstall(overrides = {}) {
         }
     }
     // Resolve session defaults: flags > interactive prompt > defaults.
-    const profile = await resolveProfile(isReinstall, { quiet });
+    const profile = await resolveProfile({ quiet });
     const userDir = OMP_AGENT_DIR;
     const userExtDir = path.join(userDir, 'extensions');
-    // apply-update is `tersio update`'s payload run: treat it like reinstall so
-    // the add-ons refresh too — Ponytail package via npm, self plugin, RTK
-    // binary (always re-downloaded), and the Caveman rule (always re-fetched).
-    const options = { dryRun, verbose, yes, reinstall: isReinstall || applyUpdate, quiet };
+    // apply-update refreshes every add-on like a reinstall.
+    const installOptions = { dryRun, verbose, yes, reinstall: applyUpdate, quiet };
     try {
         const v = (await execP(OMP_BIN, ['--version'])).stdout.trim();
         if (verbose && !quiet)
             console.log(`  omp ${v}`);
     }
     catch {
-        console.log('  [fail] omp not found — ensure it\'s installed');
+        if (targetHost === 'omp')
+            console.log('  [fail] omp not found — ensure it\'s installed');
     }
-    const cavemanRule = await fetchCavemanRule(options);
     const failures = [];
     const capture = async (label, work) => {
         try {
@@ -624,18 +675,30 @@ async function runInstall(overrides = {}) {
             console.log(`  [fail] ${label}: ${shortError(e)}`);
         }
     };
-    await capture('shared', () => stepSharedSessionState(userExtDir, options));
+    if (targetHost === 'pi') {
+        await capture('pi tree', () => stepPiLayer(profile, installOptions));
+        await capture('rtk', () => stepRtk(BUN_BIN_DIR, installOptions, 'pi'));
+        await capture('settings', () => writePluginSettings(profile, installOptions));
+        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.');
+        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, options); });
-    await capture('ponytail', () => stepPonytail(OMP_PLUGINS_DIR, options));
-    await capture('rtk', () => stepRtk(BUN_BIN_DIR, options));
-    await capture('rtk session', () => stepRtkSession(userExtDir, options));
-    await capture('caveman', () => stepCaveman(path.join(OMP_PLUGINS_DIR, 'node_modules', '@krtclcdy', 'tersio', 'extensions'), cavemanRule, options));
-    await capture('combo', () => stepCombo(userExtDir, options));
-    await capture('commands', () => stepTersioCommands(userExtDir, options));
-    await capture('updater', () => stepUpdater(userExtDir, options));
+    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('combo', () => stepCombo(userExtDir, installOptions));
+    await capture('commands', () => stepTersioCommands(userExtDir, installOptions));
+    await capture('updater', () => stepUpdater(userExtDir, installOptions));
     if (selfPlugin)
-        await capture('settings', () => writePluginSettings(profile, options));
+        await capture('settings', () => writePluginSettings(profile, installOptions));
     if (quiet) {
         if (failures.length > 0)
             console.log(`  add-ons: ${failures.length} failed (${failures.join(', ')}) — see [fail] lines above`);

package/cli/interactive.js

@@ -67,6 +67,32 @@ async function askInteractiveConfirm(message, initialValue = true) {
     }
     return { status: 'confirmed', value: answer };
 }
+// 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.
+async function confirmDestructive(message) {
+    if (tty()) {
+        closeRL();
+        const answer = await clackConfirm({ message, initialValue: false });
+        if (typeof answer !== 'boolean') {
+            clackCancel('Aborted.');
+            closeRL();
+            return false;
+        }
+        if (!answer) {
+            console.log('Aborted.');
+            closeRL();
+            return false;
+        }
+        return true;
+    }
+    const typed = await ask('\nProceed? [y/N]: ');
+    if (!typed.toLowerCase().startsWith('y')) {
+        console.log('Aborted.');
+        closeRL();
+        return false;
+    }
+    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.
 async function runInteractivePhase(title, collect) {
@@ -80,4 +106,4 @@ async function runInteractivePhase(title, collect) {
 async function execNetwork(label, cmd, args, opts = {}) {
     return withInteractiveSpinner(label, () => execP(cmd, args, opts));
 }
-export { ask, closeRL, tty, withInteractiveSpinner, execNetwork, askInteractiveChoice, askInteractiveConfirm, runInteractivePhase, };
+export { ask, closeRL, tty, withInteractiveSpinner, execNetwork, askInteractiveChoice, askInteractiveConfirm, confirmDestructive, runInteractivePhase, };

package/cli/layer.js

@@ -0,0 +1,24 @@
+// cli/layer.ts — the shared shape of an extension tree.
+import path from 'node:path';
+// Turns a `[dir, label]` table into resolved paths under `extDir`.
+export function layerEntries(extDir, table) {
+    return table.map(([dir, label]) => ({ label, path: path.join(extDir, dir) }));
+}
+// Directory names only, for callers that key off the names alone.
+export function layerDirs(table) {
+    return table.map(([dir]) => dir);
+}
+// A port source sits two levels below extensions/; installed, it sits one level
+// below <agent-dir>/extensions/. Rewriting on the way in keeps one spelling in
+// the repo and the same other spelling in every installed tree.
+export function rewritePortImports(content) {
+    return content.replace(/from '\.\.\/\.\.\/(shared|lib)\//g, "from '../$1/");
+}
+// What of the layer is on disk.
+export function reportLayer(extDir, tables, exists) {
+    const all = tables.flatMap((table) => layerEntries(extDir, table));
+    return {
+        present: all.filter((entry) => exists(entry.path)),
+        missing: all.filter((entry) => !exists(entry.path)),
+    };
+}

package/cli/manifest.js

@@ -0,0 +1,36 @@
+// cli/manifest.ts — the one list of what an install writes into a host's
+// extension tree. The installer, `doctor --fix extensions`, the doctor's
+// per-host tree row, and the loadability test all read it, so none of them
+// can drift from what actually ships.
+import path from 'node:path';
+import { fileURLToPath } from 'node:url';
+export const EXT_DIR = path.join(path.dirname(fileURLToPath(import.meta.url)), '..', 'extensions');
+/** Every file in the tree, as paths relative to the extensions directory. */
+export const TREE_FILES = [
+    'shared/host.ts',
+    'shared/session-state.ts',
+    'shared/types.ts',
+    'shared/plugin-settings.ts',
+    'shared/usage-ledger.ts',
+    'shared/pricing.ts',
+    'shared/carbon.ts',
+    'lib/utils.ts',
+    'caveman-session/index.ts',
+    'caveman-session/rule.md',
+    'rtk-session/index.ts',
+    'combo-toggle/index.ts',
+    'tersio-commands/index.ts',
+    'ai-addons-updater/index.ts',
+];
+export function sourcePath(relative) {
+    return path.join(EXT_DIR, ...relative.split('/'));
+}
+/** The entries under one directory, as source paths and tree-relative targets. */
+export function filesUnder(dir) {
+    const found = [];
+    for (const file of TREE_FILES) {
+        if (file.startsWith(`${dir}/`))
+            found.push([sourcePath(file), file]);
+    }
+    return found;
+}

package/cli/omp-layer.js

@@ -0,0 +1,51 @@
+// The Oh My Pi layer as data: the extension directories, the RTK wiring and the Ponytail package, named in one place...
+import path from 'node:path';
+import { layerEntries, reportLayer } from './layer.js';
+const INSTALLED_EXTENSIONS = [
+    ['caveman-session', 'caveman session mode'],
+    ['rtk-session', 'rtk session mode'],
+    ['ai-addons-updater', 'add-on updater'],
+    ['combo-toggle', 'combo preset switch'],
+    ['tersio-commands', '/tersio command'],
+    ['shared', 'session bridge, usage and pricing store'],
+    // Read by the add-on updater; the updater itself is removed above.
+    ['lib', 'shared installer and updater helpers'],
+];
+const RETIRED_EXTENSIONS = [
+    // Legacy always-on combo helper; imports shared/session-state.js, so it breaks with a module-not-found warning once the...
+    ['aaa-combo-boot', 'retired combo boot helper'],
+];
+// `rtkBinaryName` is passed in because it is platform-dependent and already resolved by the caller.
+export function ompLayer(home, rtkBinaryName) {
+    const agentDir = path.join(home, '.omp', 'agent');
+    const extDir = path.join(agentDir, 'extensions');
+    const pluginsDir = path.join(home, '.omp', 'plugins');
+    return {
+        extDir,
+        configFile: path.join(agentDir, 'config.yml'),
+        pluginsDir,
+        ponytailPackage: path.join(pluginsDir, 'node_modules', '@dietrichgebert', 'ponytail'),
+        rtkBinary: path.join(home, '.bun', 'bin', rtkBinaryName),
+        rtkExtension: path.join(extDir, 'rtk.ts'),
+        installed: layerEntries(extDir, INSTALLED_EXTENSIONS),
+        retired: layerEntries(extDir, RETIRED_EXTENSIONS),
+    };
+}
+// Every extension directory the layer owns, installed and retired together.
+export function ompExtensionTargets(layer) {
+    return [...layer.installed, ...layer.retired].map((entry) => entry.path);
+}
+export function tersioPluginDir(home) {
+    return path.join(home, '.omp', 'plugins', 'node_modules', '@krtclcdy', 'tersio');
+}
+export function reportOmpLayer(home, exists) {
+    const extDir = path.join(home, '.omp', 'agent', 'extensions');
+    const pluginPath = tersioPluginDir(home);
+    const { present, missing } = reportLayer(extDir, [INSTALLED_EXTENSIONS], exists);
+    return {
+        pluginPath: exists(pluginPath) ? pluginPath : null,
+        extensions: present,
+        missing,
+        installed: exists(pluginPath),
+    };
+}