@krtclcdy/tersio 1.0.3 → 2.0.0

package/tersio.js

@@ -2,82 +2,82 @@
 // tersio.ts — Install Tersio (caveman/rtk/ponytail) add-ons on any OMP device.
 // Usage: node tersio.js [install|update|reinstall|doctor|uninstall|version|help] [options]
 // Requires: node/npm and omp CLI
-import { execFile } from "node:child_process";
-import { promises as fs } from "node:fs";
-import os from "node:os";
-import path from "node:path";
-import readline from "node:readline";
-import { fileURLToPath } from "node:url";
-import { promisify } from "node:util";
-import { createRequire } from "node:module";
-import { httpsGet, httpsDownload, sha256File, parseChecksum, readTextIfExists, } from "./extensions/lib/utils.js";
-const IS_WINDOWS = process.platform === "win32";
-const HOME = process.env.HOME || process.env.USERPROFILE || "";
-const PACKAGE_NAME = "@krtclcdy/tersio";
-const PACKAGE_BIN = "tersio";
-const { version: PACKAGE_VERSION } = createRequire(import.meta.url)("./package.json");
+import { execFile } from 'node:child_process';
+import { promises as fs } from 'node:fs';
+import os from 'node:os';
+import path from 'node:path';
+import readline from 'node:readline';
+import { fileURLToPath } from 'node:url';
+import { promisify } from 'node:util';
+import { createRequire } from 'node:module';
+import { CAVEMAN_REMOTE_RULE, RTK_RELEASE_API, fetchJson, findFile, httpsGet, httpsDownload, sha256File, parseChecksum, readTextIfExists, rtkPlatformSpec, } from './extensions/lib/utils.js';
+const IS_WINDOWS = process.platform === 'win32';
+const RTK_BINARY_NAME = IS_WINDOWS ? 'rtk.exe' : 'rtk';
+const HOME = process.env.HOME || process.env.USERPROFILE || '';
+const OMP_AGENT_DIR = path.join(HOME, '.omp', 'agent');
+const OMP_PLUGINS_DIR = path.join(HOME, '.omp', 'plugins');
+const BUN_BIN_DIR = path.join(HOME, '.bun', 'bin');
+const OMP_BIN = IS_WINDOWS ? 'omp.cmd' : 'omp';
+const PACKAGE_NAME = '@krtclcdy/tersio';
+const PACKAGE_BIN = 'tersio';
+const { version: PACKAGE_VERSION } = createRequire(import.meta.url)('./package.json');
 // Session-start mode defaults for fresh installs.
-const COMBO_DEFAULTS = { off: true, medium: true, balanced: true, max: true };
-const CAVEMAN_DEFAULTS = { off: true, lite: true, full: true, ultra: true, wenyan: true };
+const CAVEMAN_DEFAULTS = new Set(['off', 'lite', 'full', 'ultra', 'wenyan']);
+const PONYTAIL_DEFAULTS = new Set(['off', 'lite', 'full', 'ultra', 'review']);
+const RTK_DEFAULTS = new Set(['on', 'off']);
 // ponytail: Combo preset implies all three modes. Mirrors COMBO_LEVELS in
 // extensions/shared/session-state.ts (rtk as boolean here). Single source.
 const COMBO_PRESET_MODES = {
-    off: { caveman: "off", rtk: false, ponytail: "off" },
-    medium: { caveman: "lite", rtk: true, ponytail: "lite" },
-    balanced: { caveman: "full", rtk: true, ponytail: "full" },
-    max: { caveman: "ultra", rtk: true, ponytail: "ultra" },
+    off: { caveman: 'off', rtk: false, ponytail: 'off' },
+    medium: { caveman: 'lite', rtk: true, ponytail: 'lite' },
+    balanced: { caveman: 'full', rtk: true, ponytail: 'full' },
+    max: { caveman: 'ultra', rtk: true, ponytail: 'ultra' },
 };
+const COMBO_DEFAULTS = new Set(Object.keys(COMBO_PRESET_MODES));
 function parseEnum(value, valid, flag) {
     if (value === undefined)
         return undefined;
     const v = value.trim().toLowerCase();
-    if (!(v in valid)) {
-        console.error(`[fail] Invalid ${flag}: ${value}. Valid: ${Object.keys(valid).join(", ")}`);
+    if (!valid.has(v)) {
+        console.error(`[fail] Invalid ${flag}: ${value}. Valid: ${[...valid].join(', ')}`);
         process.exit(1);
     }
     return v;
 }
 function flagValue(name) {
     const i = args.indexOf(name);
-    if (i === -1)
-        return undefined;
-    return args[i + 1];
+    if (i !== -1)
+        return args[i + 1];
+    const prefix = `${name}=`;
+    return args.find((arg) => arg.startsWith(prefix))?.slice(prefix.length);
 }
 // --- CLI flags ---
-const COMMANDS = { install: true, update: true, reinstall: true, doctor: true, uninstall: true, version: true, help: true };
+const COMMANDS = new Set(['install', 'update', 'reinstall', 'doctor', 'uninstall', 'version', 'help']);
 const args = process.argv.slice(2);
-const commandArg = args.find((arg, index) => !arg.startsWith("-") && args[index - 1] !== "--scope");
+const commandArg = args.find((arg, index) => !arg.startsWith('-') && args[index - 1] !== '--scope');
 const command = commandArg?.toLowerCase() || null;
-const unknownCommand = command !== null && !(command in COMMANDS);
-const install = command === "install";
-const update = command === "update";
-const reinstall = command === "reinstall";
-const showVersion = command === "version" || args.includes("--version") || args.includes("-v");
-const showHelp = command === "help" || args.includes("--help") || args.includes("-h");
-const applyUpdate = args.includes("--apply-update");
-const dryRun = args.includes("--dry-run");
-const yes = args.includes("--yes") || args.includes("-y") || install || update || reinstall || applyUpdate;
-const verbose = args.includes("--verbose");
-const doctor = command === "doctor" || args.includes("--doctor");
-const uninstall = command === "uninstall" || args.includes("--uninstall");
-const removePonytail = args.includes("--remove-ponytail");
-const removeRtk = args.includes("--remove-rtk");
-const scopeFlag = (() => {
-    const i = args.indexOf("--scope");
-    if (i === -1)
-        return null;
-    return args[i + 1]?.toLowerCase() || null;
-})();
+const unknownCommand = command !== null && !COMMANDS.has(command);
+const install = command === 'install';
+const update = command === 'update';
+const reinstall = command === 'reinstall';
+const showVersion = command === 'version' || args.includes('--version') || args.includes('-v');
+const showHelp = command === 'help' || args.includes('--help') || args.includes('-h');
+const applyUpdate = args.includes('--apply-update');
+const dryRun = args.includes('--dry-run');
+const yes = args.includes('--yes') || args.includes('-y') || install || update || reinstall || applyUpdate;
+const verbose = args.includes('--verbose');
+const doctor = command === 'doctor' || args.includes('--doctor');
+const uninstall = command === 'uninstall' || args.includes('--uninstall');
+const removePonytail = args.includes('--remove-ponytail');
+const removeRtk = args.includes('--remove-rtk');
+const scopeFlag = flagValue('--scope')?.toLowerCase() ?? null;
 // --- Profile selection (session-start mode defaults) ---
-const comboDefaultFlag = parseEnum(flagValue("--combo-default"), COMBO_DEFAULTS, "--combo-default");
-const cavemanDefaultFlag = parseEnum(flagValue("--caveman-default"), CAVEMAN_DEFAULTS, "--caveman-default");
-const rtkDefaultFlag = flagValue("--rtk-default")?.toLowerCase();
-if (rtkDefaultFlag !== undefined && rtkDefaultFlag !== "on" && rtkDefaultFlag !== "off") {
-    console.error(`[fail] Invalid --rtk-default: ${rtkDefaultFlag}. Use: on, off`);
-    process.exit(1);
-}
-const profileFlagsGiven = comboDefaultFlag !== undefined
-    || cavemanDefaultFlag !== undefined || rtkDefaultFlag !== undefined;
+const comboDefaultFlag = parseEnum(flagValue('--combo-default'), COMBO_DEFAULTS, '--combo-default');
+const cavemanDefaultFlag = parseEnum(flagValue('--caveman-default'), CAVEMAN_DEFAULTS, '--caveman-default');
+const ponytailDefaultFlag = parseEnum(flagValue('--ponytail-default'), PONYTAIL_DEFAULTS, '--ponytail-default');
+const rtkDefaultFlag = parseEnum(flagValue('--rtk-default'), RTK_DEFAULTS, '--rtk-default');
+const profileFlagsGiven = [comboDefaultFlag, cavemanDefaultFlag, rtkDefaultFlag, ponytailDefaultFlag]
+    .some((flag) => flag !== undefined);
 function printHelp() {
     console.log(`Usage: ${PACKAGE_BIN} [command] [options]
 
@@ -92,8 +92,11 @@ Commands:
 
 Options:
   --scope user|project|both
+  --remove-ponytail (uninstall: also remove the Ponytail plugin)
+  --remove-rtk (uninstall: also remove the RTK binary)
   --combo-default off|medium|balanced|max (implies caveman, rtk, ponytail)
   --caveman-default off|lite|full|ultra|wenyan (override; default follows combo)
+  --ponytail-default off|lite|full|ultra|review (override; default follows combo)
   --rtk-default on|off (override; default follows combo)
   --yes, -y
   --dry-run
@@ -103,14 +106,12 @@ Options:
 }
 function debug(...a) {
     if (verbose)
-        console.log("  [debug]", ...a);
+        console.log('  [debug]', ...a);
 }
 const RL = readline.createInterface({ input: process.stdin, output: process.stdout });
 let rlOpen = true;
 function ask(q) {
-    const { promise, resolve } = Promise.withResolvers();
-    RL.question(q, resolve);
-    return promise;
+    return new Promise((resolve) => RL.question(q, resolve));
 }
 function closeRL() { if (rlOpen) {
     RL.close();
@@ -118,25 +119,22 @@ function closeRL() { if (rlOpen) {
 } }
 // Paths to extension source files (relative to this script)
 const SCRIPT_DIR = path.dirname(fileURLToPath(import.meta.url));
-const EXT_DIR = path.join(SCRIPT_DIR, "extensions");
-const SHARED_SESSION_STATE = path.join(EXT_DIR, "shared", "session-state.js");
-const CAVEMAN_INDEX = path.join(EXT_DIR, "caveman-session", "index.js");
-const RTK_SESSION_INDEX = path.join(EXT_DIR, "rtk-session", "index.js");
-const UPDATER_INDEX = path.join(EXT_DIR, "ai-addons-updater", "index.js");
-const COMBO_TOGGLE_INDEX = path.join(EXT_DIR, "combo-toggle", "index.js");
-const AMANAI_REWARD_INDEX = path.join(EXT_DIR, "amanai-reward", "index.js");
-const MODE_REINFORCEMENT_INDEX = path.join(EXT_DIR, "shared", "mode-reinforcement.js");
-const SHARED_TYPES = path.join(EXT_DIR, "shared", "types.js");
-const LIB_UTILS = path.join(EXT_DIR, "lib", "utils.js");
-const SHARED_PLUGIN_SETTINGS = path.join(EXT_DIR, "shared", "plugin-settings.js");
-const CAVEMAN_REMOTE_RULE = "https://raw.githubusercontent.com/JuliusBrussee/caveman/main/src/rules/caveman-activate.md";
-const RTK_RELEASE_API = "https://api.github.com/repos/rtk-ai/rtk/releases/latest";
+const EXT_DIR = path.join(SCRIPT_DIR, 'extensions');
+const SHARED_SESSION_STATE = path.join(EXT_DIR, 'shared', 'session-state.js');
+const CAVEMAN_INDEX = path.join(EXT_DIR, 'caveman-session', 'index.js');
+const RTK_SESSION_INDEX = path.join(EXT_DIR, 'rtk-session', 'index.js');
+const UPDATER_INDEX = path.join(EXT_DIR, 'ai-addons-updater', 'index.js');
+const COMBO_TOGGLE_INDEX = path.join(EXT_DIR, 'combo-toggle', 'index.js');
+const MODE_REINFORCEMENT_INDEX = path.join(EXT_DIR, 'shared', 'mode-reinforcement.js');
+const SHARED_TYPES = path.join(EXT_DIR, 'shared', 'types.js');
+const LIB_UTILS = path.join(EXT_DIR, 'lib', 'utils.js');
+const SHARED_PLUGIN_SETTINGS = path.join(EXT_DIR, 'shared', 'plugin-settings.js');
 // --- Helpers ---
 const execFileP = promisify(execFile);
 async function execP(cmd, args, opts = {}) {
     return execFileP(cmd, args, {
         timeout: opts.timeout || 120000,
-        encoding: "utf8",
+        encoding: 'utf8',
         ...opts,
     });
 }
@@ -155,49 +153,61 @@ async function writeIfChanged(dest, content, options = {}) {
         await fs.copyFile(dest, `${dest}.bak`);
         debug(`${path.basename(dest)} → ${path.basename(dest)}.bak`);
     }
-    await fs.writeFile(dest, content, "utf8");
+    await fs.writeFile(dest, content, 'utf8');
     console.log(`  [write] ${dest}`);
     return true;
 }
+// omp ships 'extensions: null'; appending list items under a null scalar breaks
+// YAML parsing. Normalize null/~/[]/empty to a mapping key first.
+const EXTENSIONS_KEY_RE = /^\s*extensions\s*:/i;
+const EXTENSIONS_NULL_RE = /^\s*extensions\s*:\s*(?:\[\s*\]|null|~)?\s*$/i;
+function normalizeExtensionsKey(lines) {
+    const idx = lines.findIndex((l) => EXTENSIONS_NULL_RE.test(l));
+    if (idx === -1)
+        return false;
+    lines[idx] = 'extensions:';
+    return true;
+}
+async function writeConfigLines(configPath, lines, logMsg) {
+    await fs.mkdir(path.dirname(configPath), { recursive: true });
+    await fs.copyFile(configPath, `${configPath}.bak`).catch(() => { });
+    await fs.writeFile(configPath, lines.join('\n'), 'utf8');
+    console.log(logMsg);
+}
 async function ensureExtensionInConfig(configPath, extensionPath, label, options = {}) {
-    const normalizedPath = extensionPath.replace(/\\/g, "/");
+    const normalizedPath = extensionPath.replace(/\\/g, '/');
     const line = `  - ${normalizedPath}`;
     const raw = await readTextIfExists(configPath);
-    let lines = (raw || "").split("\n");
+    let lines = (raw || '').split('\n');
     if (lines.some((l) => l.includes(normalizedPath))) {
         debug(`${label} already in config.yml`);
         return false;
     }
-    const extLineIdx = lines.findIndex((l) => /^\s*extensions\s*:/i.test(l));
+    const extLineIdx = lines.findIndex((l) => EXTENSIONS_KEY_RE.test(l));
     if (options.dryRun) {
         console.log(`  [dry-run] would add ${label} to config.yml: ${normalizedPath}`);
         return true;
     }
-    // ponytail: omp ships "extensions: null"; appending list items under a null scalar breaks YAML parsing. Normalize null/~/[]/empty to a mapping key first.
-    const emptyArrayIdx = lines.findIndex((l) => /^\s*extensions\s*:\s*(?:\[\s*\]|null|~)?\s*$/i.test(l));
-    if (emptyArrayIdx !== -1) {
-        lines[emptyArrayIdx] = "extensions:";
-        lines.splice(emptyArrayIdx + 1, 0, line, "");
+    if (normalizeExtensionsKey(lines)) {
+        lines.splice(extLineIdx + 1, 0, line, '');
     }
     else if (extLineIdx === -1) {
-        lines.push("extensions:");
+        lines.push('extensions:');
         lines.push(line);
-        lines.push("");
+        lines.push('');
     }
     else {
         lines.splice(extLineIdx + 1, 0, line);
     }
-    await fs.mkdir(path.dirname(configPath), { recursive: true });
-    await fs.writeFile(configPath, lines.join("\n"), "utf8");
-    console.log(`  [write] Added ${label} to config.yml`);
+    await writeConfigLines(configPath, lines, `  [write] Added ${label} to config.yml`);
     return true;
 }
 async function ensureExtensionAfterConfigEntry(configPath, extensionPath, afterPath, label, options = {}) {
-    const normalizedPath = extensionPath.replace(/\\/g, "/");
-    const normalizedAfterPath = afterPath.replace(/\\/g, "/");
+    const normalizedPath = extensionPath.replace(/\\/g, '/');
+    const normalizedAfterPath = afterPath.replace(/\\/g, '/');
     const line = `  - ${normalizedPath}`;
     const raw = await readTextIfExists(configPath);
-    const lines = (raw || "").split("\n");
+    const lines = (raw || '').split('\n');
     const existingIndex = lines.findIndex((entry) => entry.includes(normalizedPath));
     const afterIndex = lines.findIndex((entry) => entry.includes(normalizedAfterPath));
     if (existingIndex !== -1 && afterIndex !== -1 && existingIndex === afterIndex + 1)
@@ -213,215 +223,180 @@ async function ensureExtensionAfterConfigEntry(configPath, extensionPath, afterP
         lines.splice(refreshedAfterIndex + 1, 0, line);
     }
     else {
-        const extensionsIndex = lines.findIndex((entry) => /^\s*extensions\s*:/i.test(entry));
+        const extensionsIndex = lines.findIndex((entry) => EXTENSIONS_KEY_RE.test(entry));
         if (extensionsIndex === -1) {
-            lines.push("extensions:", line, "");
+            lines.push('extensions:', line, '');
         }
         else {
-            if (/^\s*extensions\s*:\s*(?:\[\s*\]|null|~)?\s*$/i.test(lines[extensionsIndex]))
-                lines[extensionsIndex] = "extensions:";
+            normalizeExtensionsKey(lines);
             lines.splice(extensionsIndex + 1, 0, line);
         }
     }
-    await fs.mkdir(path.dirname(configPath), { recursive: true });
-    await fs.writeFile(configPath, lines.join("\n"), "utf8");
-    console.log(`  [write] Placed ${label} after Ponytail in config.yml`);
+    await writeConfigLines(configPath, lines, `  [write] Placed ${label} after Ponytail in config.yml`);
     return true;
 }
 function readPonytailConfig() {
     const dir = process.env.XDG_CONFIG_HOME
-        ? path.join(process.env.XDG_CONFIG_HOME, "ponytail")
-        : path.join(HOME, ".config", "ponytail");
-    return { dir, path: path.join(dir, "config.json") };
+        ? path.join(process.env.XDG_CONFIG_HOME, 'ponytail')
+        : path.join(HOME, '.config', 'ponytail');
+    return { dir, path: path.join(dir, 'config.json') };
 }
-async function ensurePonytailDefaultOff(options = {}) {
-    const config = readPonytailConfig();
-    if (options.dryRun) {
-        console.log(`  [dry-run] would set Ponytail defaultMode=off in ${config.path}`);
-        return;
-    }
-    let cfg = {};
-    const existing = await readTextIfExists(config.path);
-    if (existing) {
-        try {
-            cfg = JSON.parse(existing.replace(/^\uFEFF/, ""));
-            if (!cfg || typeof cfg !== "object" || Array.isArray(cfg)) {
-                cfg = {};
-            }
-        }
-        catch {
-            cfg = {};
-        }
+function parseJsonObject(text) {
+    if (!text)
+        return null;
+    try {
+        const parsed = JSON.parse(text.replace(/^\uFEFF/, ''));
+        if (!parsed || typeof parsed !== 'object' || Array.isArray(parsed))
+            return null;
+        return parsed;
     }
-    if (cfg.defaultMode === "off") {
-        debug("Ponytail defaultMode already off");
-        return;
+    catch {
+        return null;
     }
-    await fs.mkdir(config.dir, { recursive: true });
-    cfg.defaultMode = "off";
-    await fs.writeFile(config.path, JSON.stringify(cfg, null, 2) + "\n", "utf8");
-    console.log(`  [write] Set Ponytail defaultMode=off in ${config.path}`);
 }
-// Sets ~/.config/ponytail/config.json#hideStatus=true so the upstream ponytail
-// status bar doesn't render — the combo extension owns the bar instead.
-async function ensurePonytailHideStatus(options = {}) {
+function parsePonytailConfig(existing) {
+    return parseJsonObject(existing) ?? {};
+}
+async function patchPonytailConfig(apply, dryRunNote, writeNote, options = {}) {
     const config = readPonytailConfig();
     if (options.dryRun) {
-        console.log(`  [dry-run] would set Ponytail hideStatus=true in ${config.path}`);
+        console.log(`  [dry-run] ${dryRunNote} in ${config.path}`);
         return;
     }
-    let cfg = {};
-    const existing = await readTextIfExists(config.path);
-    if (existing) {
-        try {
-            cfg = JSON.parse(existing.replace(/^\uFEFF/, ""));
-            if (!cfg || typeof cfg !== "object" || Array.isArray(cfg))
-                cfg = {};
-        }
-        catch {
-            cfg = {};
-        }
-    }
-    if (cfg.hideStatus === true) {
-        debug("Ponytail hideStatus already true");
+    const cfg = parsePonytailConfig(await readTextIfExists(config.path));
+    if (!apply(cfg)) {
+        debug('Ponytail config already up to date');
         return;
     }
     await fs.mkdir(config.dir, { recursive: true });
-    cfg.hideStatus = true;
-    await fs.writeFile(config.path, JSON.stringify(cfg, null, 2) + "\n", "utf8");
-    console.log(`  [write] Set Ponytail hideStatus=true in ${config.path}`);
+    await fs.writeFile(config.path, JSON.stringify(cfg, null, 2) + '\n', 'utf8');
+    console.log(`  [write] ${writeNote} in ${config.path}`);
 }
+async function ensurePonytailConfigValue(key, value, options = {}) {
+    await patchPonytailConfig((cfg) => {
+        if (cfg[key] === value)
+            return false;
+        cfg[key] = value;
+        return true;
+    }, `would set Ponytail ${key}=${value}`, `Set Ponytail ${key}=${value}`, options);
+}
+// Read plugins/package.json tolerantly; corrupt or missing files start fresh
+// with installer-managed defaults.
+async function readPluginsPackage(pkgPath) {
+    const pkg = parseJsonObject(await readTextIfExists(pkgPath)) ?? {};
+    return { ...pkg, name: pkg.name || 'omp-plugins', private: true, dependencies: pkg.dependencies || {} };
+}
+const PONYTAIL_GITHUB_SPEC = 'github:DietrichGebert/ponytail';
+const PONYTAIL_NPM_SPEC = '@dietrichgebert/ponytail@latest';
 // --- Steps ---
 async function stepPonytail(pluginsDir, userDir, options) {
-    console.log("\n[1/8] Installing Ponytail plugin...");
+    console.log('\n[1/7] Installing Ponytail plugin...');
     await fs.mkdir(pluginsDir, { recursive: true });
-    const pkgPath = path.join(pluginsDir, "package.json");
-    let pkg = {};
-    const existing = await readTextIfExists(pkgPath);
-    if (existing)
-        pkg = JSON.parse(existing);
-    pkg.name = pkg.name || "omp-plugins";
-    pkg.private = true;
-    pkg.dependencies = pkg.dependencies || {};
-    pkg.dependencies["@dietrichgebert/ponytail"] = "github:DietrichGebert/ponytail";
+    const pkgPath = path.join(pluginsDir, 'package.json');
+    const pkg = await readPluginsPackage(pkgPath);
+    pkg.dependencies['@dietrichgebert/ponytail'] = PONYTAIL_GITHUB_SPEC;
     if (options.dryRun) {
         console.log(`  [dry-run] would write ${pkgPath}`);
     }
     else {
-        await fs.writeFile(pkgPath, JSON.stringify(pkg, null, 2) + "\n");
-        console.log(`  [write] package.json`);
-    }
-    if (options.dryRun) {
-        console.log("  [dry-run] would run: omp plugin install github:DietrichGebert/ponytail");
+        await fs.writeFile(pkgPath, JSON.stringify(pkg, null, 2) + '\n');
+        console.log('  [write] package.json');
+    }
+    const ponytailExtPath = path.join(pluginsDir, 'node_modules', '@dietrichgebert', 'ponytail', 'pi-extension', 'index.js');
+    const probeExt = async () => (await readTextIfExists(ponytailExtPath)) !== null;
+    // Fast path: extension already present and no refresh asked — skip network.
+    let ponytailExtExists = !options.reinstall && !options.dryRun ? await probeExt() : false;
+    if (ponytailExtExists) {
+        debug('Ponytail pi-extension already installed; skipping network refresh');
+    }
+    else if (options.dryRun) {
+        // Dry runs preview the wiring below without touching the network.
+        console.log(`  [dry-run] would run: omp plugin install ${PONYTAIL_GITHUB_SPEC}`);
         if (options.reinstall) {
-            console.log("  [dry-run] would run: npm install @dietrichgebert/ponytail@latest --save --no-audit --no-fund");
+            console.log(`  [dry-run] would run: npm install ${PONYTAIL_NPM_SPEC} --save --no-audit --no-fund`);
         }
-        const ponytailExtPath = path.join(pluginsDir, "node_modules", "@dietrichgebert", "ponytail", "pi-extension", "index.js");
-        const configPath = path.join(userDir, "config.yml");
-        await ensureExtensionInConfig(configPath, ponytailExtPath, "ponytail", options);
-        await ensurePonytailDefaultOff(options);
-        await ensurePonytailHideStatus(options);
-        return;
-    }
-    // Try omp plugin install first
-    try {
-        await execP(IS_WINDOWS ? "omp.cmd" : "omp", ["plugin", "install", "github:DietrichGebert/ponytail"], { cwd: pluginsDir });
-        console.log("  [ok] omp plugin install ran");
+        ponytailExtExists = true;
     }
-    catch (e) {
-        console.log(`  [warn] omp plugin install failed: ${e.message}`);
-    }
-    if (options.reinstall) {
+    else {
+        // Try omp plugin install first
         try {
-            await execP("npm", [
-                "install",
-                "@dietrichgebert/ponytail@latest",
-                "--save",
-                "--no-audit",
-                "--no-fund",
-            ], { cwd: pluginsDir, timeout: 120000 });
-            console.log("  [ok] Ponytail refreshed");
+            await execP(OMP_BIN, ['plugin', 'install', PONYTAIL_GITHUB_SPEC], { cwd: pluginsDir });
+            console.log('  [ok] omp plugin install ran');
         }
         catch (e) {
-            console.log(`  [fail] Could not refresh ponytail: ${e.message}`);
-            console.log(`  [hint] Manual: cd ~/.omp/plugins && npm install @dietrichgebert/ponytail@latest --save --no-audit --no-fund`);
-        }
-    }
-    // Verify the pi-extension/index.js actually exists
-    const ponytailExtPath = path.join(pluginsDir, "node_modules", "@dietrichgebert", "ponytail", "pi-extension", "index.js");
-    let ponytailExtExists = await readTextIfExists(ponytailExtPath);
-    // Fallback: try bun install or npm install
-    if (!ponytailExtExists) {
-        console.log("  [info] pi-extension/index.js not found after omp plugin install — trying npm/bun install...");
-        try {
-            await execP("npm", ["install"], { cwd: pluginsDir, timeout: 120000 });
-            console.log("  [ok] npm install completed");
+            console.log(`  [warn] omp plugin install failed: ${e.message}`);
         }
-        catch {
+        if (options.reinstall) {
             try {
-                await execP("bun", ["install"], { cwd: pluginsDir, timeout: 120000 });
-                console.log("  [ok] bun install completed");
+                await execP('npm', ['install', PONYTAIL_NPM_SPEC, '--save', '--no-audit', '--no-fund'], { cwd: pluginsDir, timeout: 120000 });
+                console.log('  [ok] Ponytail refreshed');
             }
-            catch (e2) {
-                console.log(`  [fail] Could not install ponytail: ${e2.message}`);
-                console.log(`  [hint] Manual: cd ~/.omp/plugins && npm install`);
+            catch (e) {
+                console.log(`  [fail] Could not refresh ponytail: ${e.message}`);
+                console.log(`  [hint] Manual: cd ~/.omp/plugins && npm install ${PONYTAIL_NPM_SPEC} --save --no-audit --no-fund`);
             }
         }
-        ponytailExtExists = await readTextIfExists(ponytailExtPath);
-    }
-    // Last-resort fallback: git clone the repo into node_modules
-    if (!ponytailExtExists) {
-        console.log("  [info] npm/bun did not produce pi-extension — trying git clone...");
-        try {
-            const dest = path.join(pluginsDir, "node_modules", "@dietrichgebert", "ponytail");
-            await fs.mkdir(path.dirname(dest), { recursive: true });
-            await execP("git", ["clone", "--depth", "1", "https://github.com/DietrichGebert/ponytail.git", dest], { timeout: 180000 });
-            console.log("  [ok] git clone completed");
-            ponytailExtExists = await readTextIfExists(ponytailExtPath);
+        // Verify the pi-extension/index.js actually exists
+        ponytailExtExists = await probeExt();
+        // Fallback: try bun install or npm install
+        if (!ponytailExtExists) {
+            console.log('  [info] pi-extension/index.js not found after omp plugin install — trying npm/bun install...');
+            try {
+                await execP('npm', ['install'], { cwd: pluginsDir, timeout: 120000 });
+                console.log('  [ok] npm install completed');
+            }
+            catch {
+                try {
+                    await execP('bun', ['install'], { cwd: pluginsDir, timeout: 120000 });
+                    console.log('  [ok] bun install completed');
+                }
+                catch (e2) {
+                    console.log(`  [fail] Could not install ponytail: ${e2.message}`);
+                    console.log('  [hint] Manual: cd ~/.omp/plugins && npm install');
+                }
+            }
+            ponytailExtExists = await probeExt();
         }
-        catch (e3) {
-            console.log(`  [fail] git clone failed: ${e3.message}`);
-            console.log(`  [hint] Install git or check network: https://github.com/DietrichGebert/ponytail`);
+        // Last-resort fallback: git clone the repo into node_modules
+        if (!ponytailExtExists) {
+            console.log('  [info] npm/bun did not produce pi-extension — trying git clone...');
+            try {
+                const dest = path.join(pluginsDir, 'node_modules', '@dietrichgebert', 'ponytail');
+                await fs.mkdir(path.dirname(dest), { recursive: true });
+                await execP('git', ['clone', '--depth', '1', 'https://github.com/DietrichGebert/ponytail.git', dest], { timeout: 180000 });
+                console.log('  [ok] git clone completed');
+                ponytailExtExists = await probeExt();
+            }
+            catch (e3) {
+                console.log(`  [fail] git clone failed: ${e3.message}`);
+                console.log('  [hint] Install git or check network: https://github.com/DietrichGebert/ponytail');
+            }
         }
     }
     if (!ponytailExtExists) {
-        console.log("  [skip] Ponytail pi-extension/index.js still not found — skill-only mode");
-        console.log("  [hint] The /ponytail command won't work, but ponytail skills will still load");
-        // Still set Ponytail config defaultMode=off even without the extension command
-        await ensurePonytailDefaultOff(options);
-        await ensurePonytailHideStatus(options);
-        return;
-    }
-    // Wire extension into config.yml so /ponytail command loads
-    console.log("  [ok] Ponytail pi-extension found");
-    const configPath = path.join(userDir, "config.yml");
-    await ensureExtensionInConfig(configPath, ponytailExtPath, "ponytail", options);
-    await ensurePonytailDefaultOff(options);
-    await ensurePonytailHideStatus(options);
+        console.log('  [skip] Ponytail pi-extension/index.js still not found — skill-only mode');
+        console.log('  [hint] The /ponytail command won\'t work, but ponytail skills will still load');
+    }
+    else if (!options.dryRun) {
+        // Wire extension into config.yml so /ponytail command loads
+        console.log('  [ok] Ponytail pi-extension found');
+    }
+    // Still set Ponytail config defaults even without the extension command
+    const configPath = path.join(userDir, 'config.yml');
+    await ensureExtensionInConfig(configPath, ponytailExtPath, 'ponytail', options);
+    await ensurePonytailConfigValue('defaultMode', 'off', 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 — the
-// Amanai detector then loads via the plugin's `omp.extensions` manifest, so
-// the caller must skip copying it into agent/extensions to avoid a double load.
+// Returns true when the package is verified in plugins/node_modules.
 async function stepSelfPlugin(pluginsDir, options) {
-    console.log("\n[2/8] Registering tersio as OMP plugin...");
-    const pkgPath = path.join(pluginsDir, "package.json");
-    let pkg = {};
-    const existing = await readTextIfExists(pkgPath);
-    if (existing) {
-        try {
-            pkg = JSON.parse(existing);
-        }
-        catch {
-            pkg = {};
-        }
-    }
-    pkg.name = pkg.name || "omp-plugins";
-    pkg.private = true;
-    pkg.dependencies = pkg.dependencies || {};
+    console.log('\n[2/7] Registering tersio as OMP plugin...');
+    const pkgPath = path.join(pluginsDir, 'package.json');
+    const pkg = await readPluginsPackage(pkgPath);
     pkg.dependencies[PACKAGE_NAME] = `^${PACKAGE_VERSION}`;
-    for (const legacy of ["oh-my-pi-token-saver", "tersio-omp"]) {
+    for (const legacy of ['oh-my-pi-token-saver', 'tersio-omp']) {
         if (legacy in pkg.dependencies) {
             delete pkg.dependencies[legacy];
             if (!options.dryRun)
@@ -433,14 +408,23 @@ async function stepSelfPlugin(pluginsDir, options) {
         console.log(`  [dry-run] would run: npm install --no-audit --no-fund (in ${pluginsDir})`);
         return false;
     }
+    // pkg.dependencies[PACKAGE_NAME] was assigned above, so only reinstall skips this fast path.
+    if (!options.reinstall) {
+        const installedPkgRaw = await readTextIfExists(path.join(pluginsDir, 'node_modules', PACKAGE_NAME, 'package.json'));
+        if (parseJsonObject(installedPkgRaw)?.version === PACKAGE_VERSION) {
+            debug(`${PACKAGE_NAME} already installed at v${PACKAGE_VERSION}; skipping npm install`);
+            console.log('  [ok] Listed in OMP Settings → Plugins as tersio');
+            return true;
+        }
+    }
     await fs.mkdir(pluginsDir, { recursive: true });
-    await fs.writeFile(pkgPath, JSON.stringify(pkg, null, 2) + "\n", "utf8");
+    await fs.writeFile(pkgPath, JSON.stringify(pkg, null, 2) + '\n', 'utf8');
     try {
-        await execP("npm", ["install", "--no-audit", "--no-fund"], { cwd: pluginsDir, timeout: 180000 });
+        await execP('npm', ['install', '--no-audit', '--no-fund'], { cwd: pluginsDir, timeout: 180000 });
     }
     catch {
         try {
-            await execP("bun", ["install"], { cwd: pluginsDir, timeout: 180000 });
+            await execP('bun', ['install'], { cwd: pluginsDir, timeout: 180000 });
         }
         catch (e) {
             console.log(`  [fail] Could not install ${PACKAGE_NAME} into plugins dir: ${e.message}`);
@@ -448,496 +432,493 @@ async function stepSelfPlugin(pluginsDir, options) {
             return false;
         }
     }
-    const installedPkg = path.join(pluginsDir, "node_modules", PACKAGE_NAME, "package.json");
+    const installedPkg = path.join(pluginsDir, 'node_modules', PACKAGE_NAME, 'package.json');
     if ((await readTextIfExists(installedPkg)) === null) {
         console.log(`  [warn] ${PACKAGE_NAME} not found in plugins/node_modules after install`);
         return false;
     }
-    console.log("  [ok] Listed in OMP Settings → Plugins as tersio");
+    console.log('  [ok] Listed in OMP Settings → Plugins as tersio');
     return true;
 }
-async function stepRtk(binDir, options) {
-    console.log("\n[3/8] Installing RTK binary...");
+function resolveRtkTriple() {
+    const triple = rtkPlatformSpec()?.triple;
+    if (triple)
+        return triple;
+    console.log(`  [fail] Unsupported platform: ${process.platform}/${process.arch}`);
+    console.log('  [hint] Manual: https://github.com/rtk-ai/rtk/releases');
+    return null;
+}
+function findRtkAsset(release, triple) {
+    const assets = release.assets || [];
+    const asset = assets.find((a) => a.name === `rtk-${triple}.zip` || a.name === `rtk-${triple}.tar.gz`);
+    if (asset)
+        return asset;
+    console.log(`  [fail] No rtk-${triple}.<zip|tar.gz> in release ${release.tag_name}`);
+    console.log(`  [hint] Available: ${assets.map((a) => a.name).filter((n) => n.startsWith('rtk-')).join(', ')}`);
+    return null;
+}
+async function downloadRtkChecksums(release) {
+    const checksumsAsset = (release.assets || []).find((a) => a.name === 'checksums.txt');
+    if (!checksumsAsset)
+        return null;
     try {
-        const raw = await httpsGet(RTK_RELEASE_API);
-        const release = JSON.parse(raw);
-        const tag = release.tag_name;
-        // Map (platform, arch) → Rust triple stem.
-        const PLATFORM = process.platform;
-        const ARCH = process.arch;
-        let assetTriple;
-        if (PLATFORM === "win32" && ARCH === "x64") {
-            assetTriple = "x86_64-pc-windows-msvc";
-        }
-        else if (PLATFORM === "linux" && ARCH === "x64") {
-            assetTriple = "x86_64-unknown-linux-musl";
+        return await httpsGet(checksumsAsset.browser_download_url);
+    }
+    catch (e) {
+        debug(`Could not download checksums.txt: ${e.message}`);
+        return null;
+    }
+}
+async function verifyRtkArchive(archivePath, assetName, checksumsText) {
+    if (!checksumsText) {
+        console.log('  [warn] No checksums.txt available — skipping verification');
+        return true;
+    }
+    const expected = parseChecksum(checksumsText, assetName);
+    const actual = await sha256File(archivePath);
+    if (!expected) {
+        console.log(`  [warn] checksums.txt missing entry for ${assetName} — skipping verification`);
+        return true;
+    }
+    if (actual === expected) {
+        console.log(`  [ok] Checksum verified for ${assetName}`);
+        return true;
+    }
+    console.log(`  [fail] Checksum mismatch for ${assetName}`);
+    console.log(`  [fail] Expected: ${expected}`);
+    console.log(`  [fail] Got:      ${actual}`);
+    // Caller finally removes the temp dir.
+    return false;
+}
+function shortError(e) {
+    return ((e.stderr) || e.message || '').trim().slice(0, 200);
+}
+async function extractRtkArchive(archivePath, extractDir) {
+    await fs.mkdir(extractDir, { recursive: true });
+    if (archivePath.endsWith('.zip')) {
+        if (IS_WINDOWS) {
+            await execP('powershell', ['Expand-Archive', '-Path', archivePath, '-DestinationPath', extractDir, '-Force'], { timeout: 60000 });
         }
-        else if (PLATFORM === "linux" && ARCH === "arm64") {
-            assetTriple = "aarch64-unknown-linux-gnu";
+        else {
+            await execP('unzip', [archivePath, '-d', extractDir], { timeout: 60000 });
         }
-        else if (PLATFORM === "darwin" && ARCH === "x64") {
-            assetTriple = "x86_64-apple-darwin";
+        return true;
+    }
+    if (archivePath.endsWith('.tar.gz') || archivePath.endsWith('.tgz')) {
+        try {
+            await execP('tar', ['xzf', archivePath, '-C', extractDir], { timeout: 60000 });
+            debug('tar xzf ok');
         }
-        else if (PLATFORM === "darwin" && ARCH === "arm64") {
-            assetTriple = "aarch64-apple-darwin";
+        catch (e) {
+            debug(`tar xzf failed: ${shortError(e)}`);
+            console.log(`  [fail] tar could not extract ${path.basename(archivePath)}`);
+            console.log('  [hint] Manual: https://github.com/rtk-ai/rtk/releases');
+            return false;
         }
-        else {
-            console.log(`  [fail] Unsupported platform: ${PLATFORM}/${ARCH}`);
-            console.log(`  [hint] Manual: https://github.com/rtk-ai/rtk/releases`);
+        return true;
+    }
+    console.log(`  [fail] Unknown archive format: ${archivePath}`);
+    return false;
+}
+async function stepRtk(binDir, options) {
+    console.log('\n[3/7] Installing RTK binary...');
+    try {
+        const release = await fetchJson(RTK_RELEASE_API);
+        const triple = resolveRtkTriple();
+        if (!triple)
             return;
-        }
-        const asset = (release.assets || []).find((a) => a.name === `rtk-${assetTriple}.zip` || a.name === `rtk-${assetTriple}.tar.gz`);
-        if (!asset) {
-            console.log(`  [fail] No rtk-${assetTriple}.<zip|tar.gz> in release ${tag}`);
-            console.log(`  [hint] Available: ${(release.assets || []).map((a) => a.name).filter((n) => n.startsWith("rtk-")).join(", ")}`);
+        const asset = findRtkAsset(release, triple);
+        if (!asset)
             return;
-        }
-        const binDest = path.join(binDir, IS_WINDOWS ? "rtk.exe" : "rtk");
+        const binDest = path.join(binDir, RTK_BINARY_NAME);
         if (options.dryRun) {
-            console.log(`  [dry-run] would download ${asset.name} from release ${tag}`);
-            console.log(`  [dry-run] would verify checksum against checksums.txt`);
+            console.log(`  [dry-run] would download ${asset.name} from release ${release.tag_name}`);
+            console.log('  [dry-run] would verify checksum against checksums.txt');
             console.log(`  [dry-run] would extract and install to ${binDest}`);
             return;
         }
-        // Also download checksums.txt for verification
-        const checksumsAsset = (release.assets || []).find((a) => a.name === "checksums.txt");
-        let checksumsText = null;
-        if (checksumsAsset) {
-            try {
-                checksumsText = await httpsGet(checksumsAsset.browser_download_url);
-            }
-            catch (e) {
-                debug(`Could not download checksums.txt: ${e.message}`);
-            }
-        }
-        const tmpDir = await fs.mkdtemp(path.join(os.tmpdir(), "omp-rtk-"));
-        const archivePath = path.join(tmpDir, asset.name);
-        await httpsDownload(asset.browser_download_url, archivePath);
-        // Verify checksum
-        if (checksumsText) {
-            const expected = parseChecksum(checksumsText, asset.name);
-            const actual = await sha256File(archivePath);
-            if (!expected) {
-                console.log(`  [warn] checksums.txt missing entry for ${asset.name} — skipping verification`);
-            }
-            else if (actual !== expected) {
-                console.log(`  [fail] Checksum mismatch for ${asset.name}`);
-                console.log(`  [fail] Expected: ${expected}`);
-                console.log(`  [fail] Got:      ${actual}`);
-                await fs.rm(tmpDir, { recursive: true, force: true });
+        const tmpDir = await fs.mkdtemp(path.join(os.tmpdir(), 'omp-rtk-'));
+        try {
+            const archivePath = path.join(tmpDir, asset.name);
+            const [checksumsText] = await Promise.all([
+                downloadRtkChecksums(release),
+                httpsDownload(asset.browser_download_url, archivePath),
+            ]);
+            if (!await verifyRtkArchive(archivePath, asset.name, checksumsText))
+                return;
+            const extractDir = path.join(tmpDir, 'extracted');
+            if (!await extractRtkArchive(archivePath, extractDir))
+                return;
+            const found = await findFile(extractDir, RTK_BINARY_NAME);
+            if (!found) {
+                console.log(`  [fail] Could not find ${RTK_BINARY_NAME} in extracted archive`);
                 return;
             }
-            else {
-                console.log(`  [ok] Checksum verified for ${asset.name}`);
-            }
-        }
-        else {
-            console.log(`  [warn] No checksums.txt available — skipping verification`);
-        }
-        // Extract by extension (not OS)
-        const extractDir = path.join(tmpDir, "extracted");
-        await fs.mkdir(extractDir, { recursive: true });
-        if (asset.name.endsWith(".zip")) {
-            if (IS_WINDOWS) {
-                await execP("powershell", ["Expand-Archive", "-Path", archivePath, "-DestinationPath", extractDir, "-Force"], { timeout: 60000 });
-            }
-            else {
-                await execP("unzip", [archivePath, "-d", extractDir], { timeout: 60000 });
+            await fs.mkdir(path.dirname(binDest), { recursive: true });
+            await fs.copyFile(binDest, `${binDest}.bak`).catch(() => { });
+            await fs.copyFile(found, binDest);
+            console.log(`  [write] ${binDest}`);
+            if (!IS_WINDOWS) {
+                await fs.chmod(binDest, 0o755);
+                debug(`chmod 755 ${binDest}`);
             }
-        }
-        else if (asset.name.endsWith(".tar.gz") || asset.name.endsWith(".tgz")) {
             try {
-                await execP("tar", ["xzf", archivePath, "-C", extractDir], { timeout: 60000 });
-                debug("tar xzf ok");
+                const v = (await execP(binDest, ['--version'], { timeout: 10000, shell: false })).stdout.trim();
+                console.log(`  [ok] ${binDest} → ${v}`);
             }
-            catch (e) {
-                debug(`tar xzf failed: ${((e.stderr) || e.message || "").trim().slice(0, 200)}`);
-                try {
-                    await execP("sh", ["-c", `gunzip < "${archivePath}" | tar xf - -C "${extractDir}"`], { timeout: 60000 });
-                    debug("gunzip|tar fallback ok");
-                }
-                catch (e2) {
-                    debug(`gunzip|tar fallback failed: ${((e2.stderr) || e2.message || "").trim().slice(0, 200)}`);
-                }
+            catch {
+                console.log(`  [hint] Verify manually: ${binDest} --version`);
             }
         }
-        else {
-            console.log(`  [fail] Unknown archive format: ${asset.name}`);
-            await fs.rm(tmpDir, { recursive: true, force: true });
-            return;
-        }
-        // Find binary
-        const binaryName = IS_WINDOWS ? "rtk.exe" : "rtk";
-        const entries = await fs.readdir(extractDir, { recursive: true });
-        debug(`extracted entries: ${entries.join(", ")}`);
-        const found = entries.find((e) => path.basename(e) === binaryName);
-        if (!found) {
-            console.log(`  [fail] Could not find ${binaryName} in extracted archive`);
-            await fs.rm(tmpDir, { recursive: true, force: true });
-            return;
-        }
-        await fs.mkdir(path.dirname(binDest), { recursive: true });
-        await fs.copyFile(path.join(extractDir, found), binDest);
-        console.log(`  [write] ${binDest}`);
-        // Set executable bit on Unix
-        if (!IS_WINDOWS) {
-            await fs.chmod(binDest, 0o755);
-            debug(`chmod 755 ${binDest}`);
-        }
-        // Verify
-        try {
-            const v = (await execP(binDest, ["--version"], { timeout: 10000, shell: false })).stdout.trim();
-            console.log(`  [ok] ${binDest} → ${v}`);
+        finally {
+            await fs.rm(tmpDir, { recursive: true, force: true }).catch(() => { });
         }
-        catch {
-            console.log(`  [hint] Verify manually: ${binDest} --version`);
-        }
-        // Cleanup
-        await fs.rm(tmpDir, { recursive: true, force: true });
     }
     catch (e) {
         console.log(`  [fail] RTK: ${e.message}`);
-        console.log(`  [hint] Manual: https://github.com/rtk-ai/rtk/releases`);
+        console.log('  [hint] Manual: https://github.com/rtk-ai/rtk/releases');
     }
 }
-async function stepSharedSessionState(extDir, options) {
-    const src = await readTextIfExists(SHARED_SESSION_STATE);
+// Copy repo source files into the target extension dir. First entry is
+// required (skip label on missing); rest are optional companions.
+async function copySources(extDir, files, skipLabel, options) {
+    const src = await readTextIfExists(files[0][0]);
     if (!src) {
-        console.log("  [skip] shared/session-state.js not found in repo");
-        return;
+        console.log(`  [skip] ${skipLabel} not found in repo`);
+        return false;
+    }
+    await writeIfChanged(path.join(extDir, files[0][1]), src, options);
+    const rest = files.slice(1);
+    const extras = await Promise.all(rest.map(([from]) => readTextIfExists(from)));
+    for (let i = 0; i < rest.length; i++) {
+        const extra = extras[i];
+        if (extra)
+            await writeIfChanged(path.join(extDir, rest[i][1]), extra, options);
     }
-    await writeIfChanged(path.join(extDir, "shared", "session-state.js"), src, options);
-    const typesSrc = await readTextIfExists(SHARED_TYPES);
-    if (typesSrc)
-        await writeIfChanged(path.join(extDir, "shared", "types.js"), typesSrc, options);
-    const utilsSrc = await readTextIfExists(LIB_UTILS);
-    if (utilsSrc)
-        await writeIfChanged(path.join(extDir, "lib", "utils.js"), utilsSrc, options);
-    const settingsSrc = await readTextIfExists(SHARED_PLUGIN_SETTINGS);
-    if (settingsSrc)
-        await writeIfChanged(path.join(extDir, "shared", "plugin-settings.js"), settingsSrc, options);
+    return true;
+}
+async function stepSharedSessionState(extDir, options) {
+    await copySources(extDir, [
+        [SHARED_SESSION_STATE, path.join('shared', 'session-state.js')],
+        [SHARED_TYPES, path.join('shared', 'types.js')],
+        [LIB_UTILS, path.join('lib', 'utils.js')],
+        [SHARED_PLUGIN_SETTINGS, path.join('shared', 'plugin-settings.js')],
+    ], 'shared/session-state.js', options);
 }
 async function stepModeReinforcement(extDir, ponytailExtPath, options) {
-    console.log("\n[7/8] Installing mode reinforcement extension...");
-    const src = await readTextIfExists(MODE_REINFORCEMENT_INDEX);
-    if (!src) {
-        console.log("  [skip] shared/mode-reinforcement.js not found in repo");
+    console.log('\n[7/7] Installing mode reinforcement extension...');
+    const dest = path.join(extDir, 'shared', 'mode-reinforcement.js');
+    if (!await copySources(extDir, [[MODE_REINFORCEMENT_INDEX, path.join('shared', 'mode-reinforcement.js')]], 'shared/mode-reinforcement.js', options))
         return;
-    }
-    const dest = path.join(extDir, "shared", "mode-reinforcement.js");
-    await writeIfChanged(dest, src, options);
-    await ensureExtensionAfterConfigEntry(path.join(path.dirname(extDir), "config.yml"), dest, ponytailExtPath, "mode reinforcement", options);
+    await ensureExtensionAfterConfigEntry(path.join(path.dirname(extDir), 'config.yml'), dest, ponytailExtPath, 'mode reinforcement', options);
 }
 async function stepRtkSession(extDir, options) {
-    console.log("\n[4/8] Installing RTK session extension...");
-    const src = await readTextIfExists(RTK_SESSION_INDEX);
-    if (!src) {
-        console.log("  [skip] rtk-session/index.js not found in repo");
-        return;
+    console.log('\n[4/7] Installing RTK session extension...');
+    await copySources(extDir, [[RTK_SESSION_INDEX, path.join('rtk-session', 'index.js')]], 'rtk-session/index.js', options);
+}
+// One rule fetch serves user- and project-level installs; dry runs stay offline
+// and fall back to the bundled rule to preview its destination.
+async function fetchCavemanRule(options) {
+    if (options.dryRun)
+        return (await readTextIfExists(path.join(path.dirname(CAVEMAN_INDEX), 'rule.md'))) || '';
+    try {
+        return await httpsGet(CAVEMAN_REMOTE_RULE);
+    }
+    catch (e) {
+        console.log(`  [warn] Could not fetch caveman rule: ${e.message}`);
+        return null;
     }
-    const dest = path.join(extDir, "rtk-session", "index.js");
-    await writeIfChanged(dest, src, options);
 }
-async function stepCaveman(extDir, options) {
-    console.log("\n[5/8] Installing Caveman session extension...");
-    const cavemanDir = path.join(extDir, "caveman-session");
+async function stepCaveman(extDir, rule, options) {
+    console.log('\n[5/7] Installing Caveman session extension...');
+    const cavemanDir = path.join(extDir, 'caveman-session');
     if (!options.dryRun)
         await fs.mkdir(cavemanDir, { recursive: true });
-    // Dry runs stay offline; the bundled rule is enough to preview its destination.
-    const rule = options.dryRun ? await readTextIfExists(path.join(path.dirname(CAVEMAN_INDEX), "rule.md")) || "" : await httpsGet(CAVEMAN_REMOTE_RULE);
-    await writeIfChanged(path.join(cavemanDir, "rule.md"), rule, options);
-    // Write index.js
-    const src = await readTextIfExists(CAVEMAN_INDEX);
-    if (!src) {
-        console.log("  [skip] caveman-session/index.js not found in repo");
-        return;
+    const ruleDest = path.join(cavemanDir, 'rule.md');
+    if (rule === null && (await readTextIfExists(ruleDest)) !== null) {
+        console.log('  [info] Keeping existing rule.md');
+    }
+    else if (rule === null) {
+        console.log('  [skip] Caveman rule.md unavailable');
+        console.log(`  [hint] Manual: ${CAVEMAN_REMOTE_RULE}`);
+    }
+    else {
+        await writeIfChanged(ruleDest, rule, options);
     }
-    await writeIfChanged(path.join(cavemanDir, "index.js"), src, options);
+    await copySources(extDir, [[CAVEMAN_INDEX, path.join('caveman-session', 'index.js')]], 'caveman-session/index.js', options);
 }
 async function stepUpdater(extDir, options) {
-    const updaterSrc = await readTextIfExists(UPDATER_INDEX);
-    if (!updaterSrc) {
-        console.log("  [skip] ai-addons-updater/index.js not found in repo");
-        return;
-    }
-    await writeIfChanged(path.join(extDir, "ai-addons-updater", "index.js"), updaterSrc, options);
+    await copySources(extDir, [[UPDATER_INDEX, path.join('ai-addons-updater', 'index.js')]], 'ai-addons-updater/index.js', options);
 }
 async function stepCombo(extDir, options) {
-    console.log("\n[6/8] Installing Combo toggle extension...");
-    const src = await readTextIfExists(COMBO_TOGGLE_INDEX);
-    if (!src) {
-        console.log("  [skip] combo-toggle/index.js not found in repo");
+    console.log('\n[6/7] Installing Combo toggle extension...');
+    const dest = path.join(extDir, 'combo-toggle', 'index.js');
+    if (!await copySources(extDir, [[COMBO_TOGGLE_INDEX, path.join('combo-toggle', 'index.js')]], 'combo-toggle/index.js', options))
         return;
-    }
-    const dest = path.join(extDir, "combo-toggle", "index.js");
-    await writeIfChanged(dest, src, options);
     // Auto-register combo in config.yml
-    const configPath = path.join(path.dirname(extDir), "config.yml");
-    await ensureExtensionInConfig(configPath, dest, "combo", options);
-}
-async function stepAmanaiReward(extDir, options, pluginProvided = false) {
-    console.log("\n[8/8] Installing Amanai reward detector...");
-    const destDir = path.join(extDir, "amanai-reward");
-    if (pluginProvided) {
-        // The plugin's omp.extensions manifest loads the detector from
-        // plugins/node_modules; a copied agent/extensions entry would double-load.
-        if ((await readTextIfExists(path.join(destDir, "index.js"))) !== null) {
-            if (options.dryRun)
-                console.log(`  [dry-run] would remove ${destDir} (now provided by the plugin)`);
-            else {
-                await fs.rm(destDir, { recursive: true, force: true });
-                console.log(`  [rm] ${destDir} (now provided by the plugin)`);
-            }
-        }
-        console.log("  [ok] detector loads via the tersio plugin manifest");
-        return;
-    }
-    const src = await readTextIfExists(AMANAI_REWARD_INDEX);
-    if (!src) {
-        console.log("  [skip] amanai-reward/index.js not found in repo");
-        return;
-    }
-    await writeIfChanged(path.join(destDir, "index.js"), src, options);
+    const configPath = path.join(path.dirname(extDir), 'config.yml');
+    await ensureExtensionInConfig(configPath, dest, 'combo', options);
 }
 // --- Doctor ---
+function presence(label, text) {
+    console.log(`  ${label}: ${text !== null ? 'installed' : 'MISSING'}`);
+}
+function locationLine(label, ok, loc) {
+    console.log(`  ${label}: ${ok ? 'ok' : 'MISSING'} ${loc}`);
+}
 async function runDoctor() {
-    console.log("\n=== Tersio Doctor ===\n");
+    console.log('\n=== Tersio Doctor ===\n');
     // Node
-    console.log(`  Node: ok v${process.version}`);
-    // OMP CLI
-    try {
-        const v = (await execP(IS_WINDOWS ? "omp.cmd" : "omp", ["--version"])).stdout.trim();
-        console.log(`  OMP CLI: ok ${v}`);
-    }
-    catch {
-        console.log("  OMP CLI: MISSING");
-    }
-    // Home
-    console.log(`  Home: ${HOME}`);
+    console.log(`  Node: ok ${process.version}`);
+    // OMP CLI version joins FS probes below; logs keep fixed order.
     // Directories
-    const agentDir = path.join(HOME, ".omp", "agent");
-    const extDir = path.join(agentDir, "extensions");
-    const configPath = path.join(agentDir, "config.yml");
-    const pluginsDir = path.join(HOME, ".omp", "plugins");
-    const rtkBin = path.join(HOME, ".bun", "bin", IS_WINDOWS ? "rtk.exe" : "rtk");
-    const agentOk = await readTextIfExists(agentDir) !== null || (await fs.readdir(agentDir).catch(() => null)) !== null;
-    console.log(`  OMP agent dir: ${agentOk ? "ok" : "MISSING"} ${agentDir}`);
-    const extOk = (await fs.readdir(extDir).catch(() => null)) !== null;
-    console.log(`  OMP extensions dir: ${extOk ? "ok" : "MISSING"} ${extDir}`);
-    const sharedState = path.join(extDir, "shared", "session-state.js");
-    console.log(`  Shared session bridge: ${(await readTextIfExists(sharedState)) !== null ? "installed" : "MISSING"}`);
-    const configOk = (await readTextIfExists(configPath)) !== null;
-    console.log(`  OMP config.yml: ${configOk ? "ok" : "MISSING"} ${configPath}`);
+    const agentDir = OMP_AGENT_DIR;
+    const extDir = path.join(agentDir, 'extensions');
+    const configPath = path.join(agentDir, 'config.yml');
+    const pluginsDir = OMP_PLUGINS_DIR;
+    const rtkBin = path.join(BUN_BIN_DIR, RTK_BINARY_NAME);
     // Ponytail
-    const ponytailPkg = path.join(pluginsDir, "node_modules", "@dietrichgebert", "ponytail", "package.json");
-    const ponytailExt = path.join(pluginsDir, "node_modules", "@dietrichgebert", "ponytail", "pi-extension", "index.js");
-    const ponytailInstalled = (await readTextIfExists(ponytailPkg)) !== null;
-    const ponytailExtInstalled = (await readTextIfExists(ponytailExt)) !== null;
-    console.log(`  Ponytail package: ${ponytailInstalled ? "installed" : "MISSING"}`);
-    console.log(`  Ponytail extension: ${ponytailExtInstalled ? "installed" : "MISSING"}`);
-    if (configOk) {
-        const configText = (await readTextIfExists(configPath));
-        const hasPonytailPath = configText.includes("ponytail") && configText.includes("pi-extension");
-        console.log(`  Ponytail in config.yml: ${hasPonytailPath ? "registered" : "MISSING"}`);
+    const ponytailPkg = path.join(pluginsDir, 'node_modules', '@dietrichgebert', 'ponytail', 'package.json');
+    const ponytailExt = path.join(pluginsDir, 'node_modules', '@dietrichgebert', 'ponytail', 'pi-extension', 'index.js');
+    const cavemanIndex = path.join(extDir, 'caveman-session', 'index.js');
+    const cavemanRule = path.join(extDir, 'caveman-session', 'rule.md');
+    const rtkIndex = path.join(extDir, 'rtk-session', 'index.js');
+    const updaterIndex = path.join(extDir, 'ai-addons-updater', 'index.js');
+    const comboIndex = path.join(extDir, 'combo-toggle', 'index.js');
+    const modeReinforcement = path.join(extDir, 'shared', 'mode-reinforcement.js');
+    const selfPkg = path.join(pluginsDir, 'node_modules', PACKAGE_NAME, 'package.json');
+    // Independent probes run concurrently; logs below keep fixed order.
+    const [ompVersion, agentEntries, extEntries, sharedStateText, configText, ponytailPkgText, ponytailExtText, pluginsPkgRaw, selfPkgText, rtkBinText, cavemanIndexText, cavemanRuleText, rtkIndexText, updaterIndexText, comboIndexText, modeReinforcementText,] = await Promise.all([
+        execP(OMP_BIN, ['--version']).then((r) => r.stdout.trim(), () => null),
+        fs.readdir(agentDir).catch(() => null),
+        fs.readdir(extDir).catch(() => null),
+        readTextIfExists(path.join(extDir, 'shared', 'session-state.js')),
+        readTextIfExists(configPath),
+        readTextIfExists(ponytailPkg),
+        readTextIfExists(ponytailExt),
+        readTextIfExists(path.join(pluginsDir, 'package.json')),
+        readTextIfExists(selfPkg),
+        readTextIfExists(rtkBin),
+        readTextIfExists(cavemanIndex),
+        readTextIfExists(cavemanRule),
+        readTextIfExists(rtkIndex),
+        readTextIfExists(updaterIndex),
+        readTextIfExists(comboIndex),
+        readTextIfExists(modeReinforcement),
+    ]);
+    console.log(ompVersion !== null ? `  OMP CLI: ok ${ompVersion}` : '  OMP CLI: MISSING');
+    console.log(`  Home: ${HOME}`);
+    locationLine('OMP agent dir', agentEntries !== null, agentDir);
+    locationLine('OMP extensions dir', extEntries !== null, extDir);
+    console.log(`  Shared session bridge: ${sharedStateText !== null ? 'installed' : 'MISSING'}`);
+    locationLine('OMP config.yml', configText !== null, configPath);
+    presence('Ponytail package', ponytailPkgText);
+    presence('Ponytail extension', ponytailExtText);
+    if (configText) {
+        const hasPonytailPath = configText.includes('ponytail') && configText.includes('pi-extension');
+        console.log(`  Ponytail in config.yml: ${hasPonytailPath ? 'registered' : 'MISSING'}`);
     }
     // Self plugin registration (Settings → Plugins listing)
-    const pluginsPkgRaw = await readTextIfExists(path.join(pluginsDir, "package.json"));
-    let selfDep = false;
-    if (pluginsPkgRaw) {
-        try {
-            selfDep = PACKAGE_NAME in (JSON.parse(pluginsPkgRaw).dependencies || {});
-        }
-        catch { /* ignore */ }
-    }
-    console.log(`  Self plugin in plugins/package.json: ${selfDep ? "registered" : "MISSING"}`);
-    const selfPkg = path.join(pluginsDir, "node_modules", PACKAGE_NAME, "package.json");
-    console.log(`  Self plugin package: ${(await readTextIfExists(selfPkg)) !== null ? "installed" : "MISSING"}`);
+    const selfDep = PACKAGE_NAME in (parseJsonObject(pluginsPkgRaw)?.dependencies || {});
+    console.log(`  Self plugin in plugins/package.json: ${selfDep ? 'registered' : 'MISSING'}`);
+    console.log(`  Self plugin package: ${selfPkgText !== null ? 'installed' : 'MISSING'}`);
     // RTK
-    const rtkExists = (await readTextIfExists(rtkBin)) !== null;
-    console.log(`  RTK binary: ${rtkExists ? "installed" : "MISSING"} ${rtkBin}`);
+    const rtkExists = rtkBinText !== null;
+    console.log(`  RTK binary: ${rtkExists ? 'installed' : 'MISSING'} ${rtkBin}`);
     if (rtkExists) {
         try {
-            const v = (await execP(rtkBin, ["--version"], { timeout: 5000 })).stdout.trim();
+            const v = (await execP(rtkBin, ['--version'], { timeout: 5000 })).stdout.trim();
             console.log(`  RTK version: ${v}`);
         }
         catch {
-            console.log("  RTK version: unavailable (may not be executable)");
+            console.log('  RTK version: unavailable (may not be executable)');
         }
     }
     // Caveman
-    const cavemanIndex = path.join(extDir, "caveman-session", "index.js");
-    const cavemanRule = path.join(extDir, "caveman-session", "rule.md");
-    console.log(`  Caveman extension: ${(await readTextIfExists(cavemanIndex)) !== null ? "installed" : "MISSING"}`);
-    console.log(`  Caveman rule.md: ${(await readTextIfExists(cavemanRule)) !== null ? "installed" : "MISSING"}`);
+    presence('Caveman extension', cavemanIndexText);
+    presence('Caveman rule.md', cavemanRuleText);
     // RTK extension
-    const rtkIndex = path.join(extDir, "rtk-session", "index.js");
-    console.log(`  RTK extension: ${(await readTextIfExists(rtkIndex)) !== null ? "installed" : "MISSING"}`);
+    presence('RTK extension', rtkIndexText);
     // Updater
-    const updaterIndex = path.join(extDir, "ai-addons-updater", "index.js");
-    console.log(`  Updater extension: ${(await readTextIfExists(updaterIndex)) !== null ? "installed" : "MISSING"}`);
+    presence('Updater extension', updaterIndexText);
     // Combo
-    const comboIndex = path.join(extDir, "combo-toggle", "index.js");
-    console.log(`  Combo extension: ${(await readTextIfExists(comboIndex)) !== null ? "installed" : "MISSING"}`);
-    const modeReinforcement = path.join(extDir, "shared", "mode-reinforcement.js");
-    console.log(`  Mode reinforcement extension: ${(await readTextIfExists(modeReinforcement)) !== null ? "installed" : "MISSING"}`);
-    // Amanai reward detector
-    const amanaiRewardIndex = path.join(extDir, "amanai-reward", "index.js");
-    const amanaiViaPlugin = selfDep && (await readTextIfExists(selfPkg)) !== null;
-    const amanaiState = (await readTextIfExists(amanaiRewardIndex)) !== null ? "installed" : amanaiViaPlugin ? "installed (via plugin manifest)" : "MISSING";
-    console.log(`  Amanai reward detector: ${amanaiState}`);
-    if (configOk) {
-        const configText = (await readTextIfExists(configPath));
-        const hasComboPath = configText.includes("combo-toggle");
-        console.log(`  Combo in config.yml: ${hasComboPath ? "registered" : "MISSING"}`);
+    presence('Combo extension', comboIndexText);
+    presence('Mode reinforcement extension', modeReinforcementText);
+    if (configText) {
+        const hasComboPath = configText.includes('combo-toggle');
+        console.log(`  Combo in config.yml: ${hasComboPath ? 'registered' : 'MISSING'}`);
+    }
+}
+// Read-modify-write a JSON file. mutate returns true when it changed
+// something; no change (or unreadable file) means no output at all.
+async function updateJsonFile(filePath, mutate, dryRunNote, writeNote, dryRun) {
+    const raw = await readTextIfExists(filePath);
+    if (!raw)
+        return;
+    let data;
+    try {
+        data = JSON.parse(raw);
+    }
+    catch {
+        debug(`Could not parse ${filePath}`);
+        return;
+    }
+    if (!mutate(data))
+        return;
+    if (dryRun) {
+        console.log(`  [dry-run] ${dryRunNote}`);
+        return;
+    }
+    await fs.writeFile(filePath, JSON.stringify(data, null, 2) + '\n', 'utf8');
+    console.log(`  [write] ${writeNote}`);
+}
+function dropKey(section, key) {
+    if (!section || typeof section !== 'object')
+        return false;
+    const record = section;
+    if (!(key in record))
+        return false;
+    delete record[key];
+    return true;
+}
+async function removeUninstallTarget(target, shouldDryRun, recursive = true) {
+    try {
+        if (shouldDryRun) {
+            console.log(`  [dry-run] would remove ${target}`);
+            return;
+        }
+        if (recursive)
+            await fs.rm(target, { recursive: true, force: true });
+        else
+            await fs.unlink(target);
+        console.log(`  [rm] ${target}`);
+    }
+    catch {
+        debug(`Could not remove ${target}`);
     }
 }
 async function runUninstall(options = {}) {
-    const confirmed = options.yes ?? yes;
+    const shouldDryRun = options.dryRun ?? dryRun;
+    const confirmed = (options.yes ?? yes) || shouldDryRun;
     const shouldRemovePonytail = options.removePonytail ?? removePonytail;
     const shouldRemoveRtk = options.removeRtk ?? removeRtk;
-    const shouldDryRun = options.dryRun ?? dryRun;
-    console.log("\n=== Tersio Uninstall ===\n");
-    const extDir = path.join(HOME, ".omp", "agent", "extensions");
-    const configPath = path.join(HOME, ".omp", "agent", "config.yml");
-    const rtkBin = path.join(HOME, ".bun", "bin", IS_WINDOWS ? "rtk.exe" : "rtk");
+    console.log('\n=== Tersio Uninstall ===\n');
+    const extDir = path.join(OMP_AGENT_DIR, 'extensions');
+    const configPath = path.join(OMP_AGENT_DIR, 'config.yml');
+    const rtkBin = path.join(BUN_BIN_DIR, RTK_BINARY_NAME);
+    const pluginsDir = OMP_PLUGINS_DIR;
+    const ponytailPkgDir = path.join(pluginsDir, 'node_modules', '@dietrichgebert', 'ponytail');
     const targets = [
-        path.join(extDir, "caveman-session"),
-        path.join(extDir, "rtk-session"),
-        path.join(extDir, "ai-addons-updater"),
-        path.join(extDir, "combo-toggle"),
-        path.join(extDir, "shared"),
-        path.join(extDir, "amanai-reward"),
+        'caveman-session',
+        'rtk-session',
+        'ai-addons-updater',
+        'combo-toggle',
+        'shared',
+        // Only consumed by ai-addons-updater (removed above); otherwise orphaned.
+        'lib',
         // Legacy always-on combo helper; imports shared/session-state.js, so it
         // breaks with a module-not-found warning once the shared dir is removed.
-        path.join(extDir, "aaa-combo-boot"),
-    ];
-    console.log("Will remove:");
+        'aaa-combo-boot',
+    ].map((dir) => path.join(extDir, dir));
+    console.log('Will remove:');
     for (const t of targets) {
         console.log(`  ${t}`);
     }
+    if (shouldRemovePonytail) {
+        console.log(`  ${ponytailPkgDir} (ponytail plugin package)`);
+    }
     if (shouldRemoveRtk) {
         console.log(`  ${rtkBin}`);
     }
     if (!confirmed) {
-        const answer = await ask("\nProceed? [y/N]: ");
-        if (!answer.toLowerCase().startsWith("y")) {
-            console.log("Aborted.");
+        const answer = await ask('\nProceed? [y/N]: ');
+        if (!answer.toLowerCase().startsWith('y')) {
+            console.log('Aborted.');
             closeRL();
             return false;
         }
     }
-    // Remove extension directories
-    for (const t of targets) {
-        try {
-            if (shouldDryRun)
-                console.log(`  [dry-run] would remove ${t}`);
-            else {
-                await fs.rm(t, { recursive: true, force: true });
-                console.log(`  [rm] ${t}`);
-            }
-        }
-        catch {
-            debug(`Could not remove ${t}`);
-        }
-    }
+    // Remove extension directories (independent paths, so concurrently).
+    await Promise.all(targets.map((t) => removeUninstallTarget(t, shouldDryRun)));
     // Remove Combo and mode-reinforcement registrations; Ponytail only when requested.
     const configRaw = await readTextIfExists(configPath);
     if (configRaw) {
-        let lines = configRaw.split("\n");
+        let lines = configRaw.split('\n');
         const before = lines.length;
         lines = lines.filter((l) => {
-            if (l.includes("combo-toggle") || l.includes("mode-reinforcement"))
+            if (l.includes('combo-toggle') || l.includes('mode-reinforcement'))
                 return false;
-            if (shouldRemovePonytail && l.includes("ponytail") && l.includes("pi-extension"))
+            if (shouldRemovePonytail && l.includes('ponytail') && l.includes('pi-extension'))
                 return false;
             return true;
         });
         if (lines.length !== before) {
             if (shouldDryRun)
                 console.log(`  [dry-run] would remove ${before - lines.length} config.yml entries`);
-            else {
-                await fs.writeFile(configPath, lines.join("\n"), "utf8");
-                console.log(`  [write] Updated config.yml (removed ${before - lines.length} entries)`);
-            }
-        }
-    }
-    // Remove our plugin registration from ~/.omp/plugins
-    const pluginsDir = path.join(HOME, ".omp", "plugins");
-    const pluginsPkgPath = path.join(pluginsDir, "package.json");
-    const pluginsPkgRaw = await readTextIfExists(pluginsPkgPath);
-    if (pluginsPkgRaw) {
-        try {
-            const pkg = JSON.parse(pluginsPkgRaw);
-            if (pkg.dependencies && PACKAGE_NAME in pkg.dependencies) {
-                if (shouldDryRun)
-                    console.log(`  [dry-run] would remove ${PACKAGE_NAME} from ${pluginsPkgPath}`);
-                else {
-                    delete pkg.dependencies[PACKAGE_NAME];
-                    await fs.writeFile(pluginsPkgPath, JSON.stringify(pkg, null, 2) + "\n", "utf8");
-                    console.log(`  [write] Removed ${PACKAGE_NAME} from plugins/package.json`);
-                }
-            }
-        }
-        catch {
-            debug("Could not update plugins/package.json");
+            else
+                await writeConfigLines(configPath, lines, `  [write] Updated config.yml (removed ${before - lines.length} entries)`);
         }
     }
-    const selfPluginDir = path.join(pluginsDir, "node_modules", PACKAGE_NAME);
-    if ((await readTextIfExists(path.join(selfPluginDir, "package.json"))) !== null) {
+    // Remove the Ponytail plugin package the installer added (dep, files,
+    // lock entry); the config.yml entry was filtered above.
+    if (shouldRemovePonytail) {
+        const pluginsPkgPath = path.join(pluginsDir, 'package.json');
+        await updateJsonFile(pluginsPkgPath, (data) => dropKey(data.dependencies, '@dietrichgebert/ponytail'), `would remove @dietrichgebert/ponytail from ${pluginsPkgPath}`, 'Removed @dietrichgebert/ponytail from plugins/package.json', shouldDryRun);
         try {
             if (shouldDryRun)
-                console.log(`  [dry-run] would remove ${selfPluginDir}`);
+                console.log(`  [dry-run] would remove ${ponytailPkgDir}`);
             else {
-                await fs.rm(selfPluginDir, { recursive: true, force: true });
-                console.log(`  [rm] ${selfPluginDir}`);
+                await fs.rm(ponytailPkgDir, { recursive: true, force: true });
+                console.log(`  [rm] ${ponytailPkgDir}`);
+                await fs.rm(path.dirname(ponytailPkgDir));
+                console.log(`  [rm] ${path.dirname(ponytailPkgDir)} (empty scope)`);
             }
         }
         catch {
-            debug(`Could not remove ${selfPluginDir}`);
+            debug('Could not remove ponytail package dir (scope may hold other packages)');
         }
+        const lockPath = path.join(pluginsDir, 'omp-plugins.lock.json');
+        await updateJsonFile(lockPath, (data) => dropKey(data.plugins, '@dietrichgebert/ponytail'), `would remove @dietrichgebert/ponytail from ${lockPath}`, `Removed @dietrichgebert/ponytail from ${lockPath}`, shouldDryRun);
     }
-    // Remove RTK binary if requested
-    if (shouldRemoveRtk) {
-        try {
-            if (shouldDryRun)
-                console.log(`  [dry-run] would remove ${rtkBin}`);
-            else {
-                await fs.unlink(rtkBin);
-                console.log(`  [rm] ${rtkBin}`);
-            }
-        }
-        catch {
-            debug(`Could not remove ${rtkBin}`);
-        }
+    // Remove our plugin registration from ~/.omp/plugins
+    const pluginsPkgPath = path.join(pluginsDir, 'package.json');
+    await updateJsonFile(pluginsPkgPath, (data) => dropKey(data.dependencies, PACKAGE_NAME), `would remove ${PACKAGE_NAME} from ${pluginsPkgPath}`, `Removed ${PACKAGE_NAME} from plugins/package.json`, shouldDryRun);
+    const selfPluginDir = path.join(pluginsDir, 'node_modules', PACKAGE_NAME);
+    if ((await readTextIfExists(path.join(selfPluginDir, 'package.json'))) !== null) {
+        await removeUninstallTarget(selfPluginDir, shouldDryRun);
     }
-    console.log("\nDone. Restart OMP for changes to take effect.");
+    // Remove RTK binary if requested
+    if (shouldRemoveRtk)
+        await removeUninstallTarget(rtkBin, shouldDryRun, false);
+    console.log('\nDone. Restart OMP for changes to take effect.');
     return true;
 }
+const SCOPE_MAP = { user: '1', project: '2', both: '3' };
 async function runLatestUpdate() {
-    const updateScope = scopeFlag || "user";
-    if (!["user", "project", "both"].includes(updateScope)) {
+    const updateScope = scopeFlag || 'user';
+    if (!Object.hasOwn(SCOPE_MAP, updateScope)) {
         console.error(`[fail] Invalid --scope: ${updateScope}. Use: user, project, both`);
         process.exitCode = 1;
         return;
     }
-    const forwardedArgs = ["--yes", "--scope", updateScope];
+    const forwardedArgs = ['--yes', '--scope', updateScope];
     if (dryRun)
-        forwardedArgs.push("--dry-run");
+        forwardedArgs.push('--dry-run');
     if (verbose)
-        forwardedArgs.push("--verbose");
+        forwardedArgs.push('--verbose');
     const npmArgs = [
-        "exec",
-        "--yes",
-        "--prefer-online",
+        'exec',
+        '--yes',
+        '--prefer-online',
         `--package=${PACKAGE_NAME}@latest`,
-        "--",
+        '--',
         PACKAGE_BIN,
-        "--apply-update",
+        '--apply-update',
         ...forwardedArgs,
     ];
-    const npmCommand = IS_WINDOWS ? process.env.ComSpec || "cmd.exe" : "npm";
-    const npmCommandArgs = IS_WINDOWS ? ["/d", "/s", "/c", "npm", ...npmArgs] : npmArgs;
-    console.log("=== Updating Tersio ===");
+    const npmCommand = IS_WINDOWS ? process.env.ComSpec || 'cmd.exe' : 'npm';
+    const npmCommandArgs = IS_WINDOWS ? ['/d', '/s', '/c', 'npm', ...npmArgs] : npmArgs;
+    console.log('=== Updating Tersio ===');
     console.log(`  Running the latest ${PACKAGE_NAME} installer...\n`);
     try {
         const result = await execP(npmCommand, npmCommandArgs, {
@@ -950,7 +931,7 @@ async function runLatestUpdate() {
             process.stdout.write(result.stdout);
         if (result.stderr)
             process.stderr.write(result.stderr);
-        console.log("\n=== Update complete ===");
+        console.log('\n=== Update complete ===');
     }
     catch (e) {
         const err = e;
@@ -965,26 +946,57 @@ async function runLatestUpdate() {
 // --- Install profile (session-start mode defaults) ---
 function defaultProfile() {
     return {
-        comboDefault: "off",
-        cavemanDefault: "off",
+        comboDefault: 'off',
+        cavemanDefault: 'off',
         rtkDefault: false,
-        ponytailDefault: "off",
+        ponytailDefault: 'off',
     };
 }
 function tty() {
     return Boolean(process.stdin.isTTY && process.stdout.isTTY);
 }
+// Determine install scope: reinstall > flag > non-interactive default > prompt.
+async function resolveScope() {
+    if (reinstall) {
+        console.log('  Scope: user (reinstall)');
+        return '1';
+    }
+    if (scopeFlag) {
+        const scope = SCOPE_MAP[scopeFlag];
+        if (!scope) {
+            console.log(`  [fail] Invalid --scope: ${scopeFlag}. Use: user, project, both`);
+            closeRL();
+            process.exit(1);
+        }
+        console.log(`  Scope: ${scopeFlag}`);
+        return scope;
+    }
+    if (install || yes) {
+        console.log(`  Scope: user (${install ? 'install default' : '--scope omitted, defaulting to user with --yes'})`);
+        return '1';
+    }
+    console.log('\nInstall scope:');
+    console.log('  1) User-level (all OMP sessions)');
+    console.log('  2) Project-level (this repo only)');
+    console.log('  3) Both');
+    while (true) {
+        const answer = (await ask('\nChoose [1-3] (default 1): ')).trim() || '1';
+        if (answer === '1' || answer === '2' || answer === '3')
+            return answer;
+        console.log(`  [fail] Invalid scope: ${answer}. Choose 1, 2, or 3.`);
+    }
+}
 async function resolveProfile() {
     const profile = defaultProfile();
     // Single interactive prompt: the Combo preset implies all three modes.
     // 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 || reinstall)) {
-        const comboAnswer = (await ask("  Default Combo preset on session start? [off/medium/balanced/max] (off): ")).trim().toLowerCase();
-        if (comboAnswer && comboAnswer in COMBO_DEFAULTS)
+        const comboAnswer = (await ask('  Default Combo preset on session start? [off/medium/balanced/max] (off): ')).trim().toLowerCase();
+        if (comboAnswer && COMBO_DEFAULTS.has(comboAnswer))
             profile.comboDefault = comboAnswer;
     }
-    // Explicit flags always win. Caveman/RTK flags override the Combo preset.
+    // 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;
@@ -994,8 +1006,10 @@ async function resolveProfile() {
     if (cavemanDefaultFlag !== undefined)
         profile.cavemanDefault = cavemanDefaultFlag;
     if (rtkDefaultFlag !== undefined)
-        profile.rtkDefault = rtkDefaultFlag === "on";
-    console.log(`  Profile: combo default=${profile.comboDefault} (caveman=${profile.cavemanDefault} · rtk=${profile.rtkDefault ? "on" : "off"} · ponytail=${profile.ponytailDefault})`);
+        profile.rtkDefault = rtkDefaultFlag === 'on';
+    if (ponytailDefaultFlag !== undefined)
+        profile.ponytailDefault = ponytailDefaultFlag;
+    console.log(`  Profile: combo default=${profile.comboDefault} (caveman=${profile.cavemanDefault} · rtk=${profile.rtkDefault ? 'on' : 'off'} · ponytail=${profile.ponytailDefault})`);
     return profile;
 }
 // ponytail: post-install guard. List entries under `extensions: null` break
@@ -1003,29 +1017,29 @@ async function resolveProfile() {
 async function validateConfigExtensions(agentDir, options) {
     if (options.dryRun)
         return;
-    const raw = await readTextIfExists(path.join(agentDir, "config.yml"));
+    const raw = await readTextIfExists(path.join(agentDir, 'config.yml'));
     if (!raw)
         return;
-    const lines = raw.split("\n");
-    const keyIdx = lines.findIndex((l) => /^\s*extensions\s*:/i.test(l));
+    const lines = raw.split('\n');
+    const keyIdx = lines.findIndex((l) => EXTENSIONS_KEY_RE.test(l));
     if (keyIdx === -1)
         return;
     const scalarNull = /^\s*extensions\s*:\s*(null|~|\[\s*\])\s*$/i.test(lines[keyIdx]);
     const hasEntries = lines.slice(keyIdx + 1).some((l) => /^\s*-\s+\S/.test(l));
     if (scalarNull && hasEntries) {
-        console.log("  [fail] config.yml lists extensions under `extensions: null` — OMP will fail to launch.");
-        console.log("  [hint] Replace the `extensions: null` line with `extensions:`, then reinstall.");
+        console.log('  [fail] config.yml lists extensions under `extensions: null` — OMP will fail to launch.');
+        console.log('  [hint] Replace the `extensions: null` line with `extensions:`, then reinstall.');
         process.exitCode = 1;
     }
     else {
-        console.log("  [ok] config.yml extensions key valid");
+        console.log('  [ok] config.yml extensions key valid');
     }
 }
 // Persist the profile as omp plugin settings so `omp plugin config get`
 // reflects the choice and the extensions pick it up on session start.
 async function writePluginSettings(profile, options) {
-    const pluginsDir = path.join(HOME, ".omp", "plugins");
-    const lockPath = path.join(pluginsDir, "omp-plugins.lock.json");
+    const pluginsDir = OMP_PLUGINS_DIR;
+    const lockPath = path.join(pluginsDir, 'omp-plugins.lock.json');
     let config = {};
     const existing = await readTextIfExists(lockPath);
     if (existing) {
@@ -1038,18 +1052,19 @@ async function writePluginSettings(profile, options) {
     }
     config.plugins = config.plugins || {};
     config.settings = config.settings || {};
-    const settings = { ...(config.settings[PACKAGE_NAME] || {}) };
-    settings.comboDefault = profile.comboDefault;
-    settings.cavemanDefault = profile.cavemanDefault;
-    settings.rtkDefault = profile.rtkDefault;
-    settings.ponytailDefault = profile.ponytailDefault;
-    config.settings[PACKAGE_NAME] = settings;
+    config.settings[PACKAGE_NAME] = {
+        ...(config.settings[PACKAGE_NAME] || {}),
+        comboDefault: profile.comboDefault,
+        cavemanDefault: profile.cavemanDefault,
+        rtkDefault: profile.rtkDefault,
+        ponytailDefault: profile.ponytailDefault,
+    };
     if (options.dryRun) {
         console.log(`  [dry-run] would write plugin settings (${PACKAGE_NAME}) to ${lockPath}`);
         return;
     }
     await fs.mkdir(pluginsDir, { recursive: true });
-    await fs.writeFile(lockPath, JSON.stringify(config, null, 2) + "\n", "utf8");
+    await fs.writeFile(lockPath, JSON.stringify(config, null, 2) + '\n', 'utf8');
     console.log(`  [write] Plugin settings in ${lockPath}`);
 }
 // --- Main ---
@@ -1090,89 +1105,60 @@ async function main() {
         await runUninstall({ yes: true, removePonytail: false, removeRtk: true });
     }
     if (dryRun)
-        console.log("[dry-run] No changes will be written.\n");
+        console.log('[dry-run] No changes will be written.\n');
     console.log(`=== Tersio v${PACKAGE_VERSION} ===`);
     console.log(`  Platform: ${process.platform}`);
     console.log(`  Arch: ${process.arch}`);
     console.log(`  Home: ${HOME}`);
-    // Determine install scope
-    let scope;
-    if (reinstall) {
-        scope = "1";
-        console.log("  Scope: user (reinstall)");
-    }
-    else if (scopeFlag) {
-        const map = { user: "1", project: "2", both: "3" };
-        scope = map[scopeFlag];
-        if (!scope) {
-            console.log(`  [fail] Invalid --scope: ${scopeFlag}. Use: user, project, both`);
-            closeRL();
-            process.exit(1);
-        }
-        console.log(`  Scope: ${scopeFlag}`);
-    }
-    else if (install || yes) {
-        scope = "1";
-        console.log(`  Scope: user (${install ? "install default" : "--scope omitted, defaulting to user with --yes"})`);
-    }
-    else {
-        console.log("\nInstall scope:");
-        console.log("  1) User-level (all OMP sessions)");
-        console.log("  2) Project-level (this repo only)");
-        console.log("  3) Both");
-        scope = (await ask("\nChoose [1-3] (default 1): ")).trim() || "1";
-    }
+    const scope = await resolveScope();
     // Resolve session defaults: flags > interactive prompt > defaults.
     const profile = await resolveProfile();
-    const userDir = path.join(HOME, ".omp", "agent");
-    const userExtDir = path.join(userDir, "extensions");
-    const userPluginsDir = path.join(userDir, "..", "plugins");
-    const bunBinDir = path.join(HOME, ".bun", "bin");
-    const projectExtDir = path.join(process.cwd(), ".omp", "extensions");
+    const userDir = OMP_AGENT_DIR;
+    const userExtDir = path.join(userDir, 'extensions');
+    const projectExtDir = path.join(process.cwd(), '.omp', 'extensions');
     const options = { dryRun, verbose, yes, scope, reinstall };
     // Check prerequisites
-    console.log("\nPrerequisites:");
+    console.log('\nPrerequisites:');
     try {
-        const v = (await execP(IS_WINDOWS ? "omp.cmd" : "omp", ["--version"])).stdout.trim();
+        const v = (await execP(OMP_BIN, ['--version'])).stdout.trim();
         console.log(`  [ok] omp ${v}`);
     }
     catch {
-        console.log("  [fail] omp not found — ensure it's installed");
+        console.log('  [fail] omp not found — ensure it\'s installed');
     }
-    if (scope === "1" || scope === "3") {
-        console.log("\n--- User-level install ---");
+    const cavemanRule = await fetchCavemanRule(options);
+    if (scope === '1' || scope === '3') {
+        console.log('\n--- User-level install ---');
         await stepSharedSessionState(userExtDir, options);
-        await stepPonytail(userPluginsDir, userDir, options);
-        const selfPlugin = await stepSelfPlugin(userPluginsDir, options);
-        const ponytailExtPath = path.join(userPluginsDir, "node_modules", "@dietrichgebert", "ponytail", "pi-extension", "index.js");
-        await stepRtk(bunBinDir, options);
+        await stepPonytail(OMP_PLUGINS_DIR, userDir, options);
+        const selfPlugin = await stepSelfPlugin(OMP_PLUGINS_DIR, options);
+        const ponytailExtPath = path.join(OMP_PLUGINS_DIR, 'node_modules', '@dietrichgebert', 'ponytail', 'pi-extension', 'index.js');
+        await stepRtk(BUN_BIN_DIR, options);
         await stepRtkSession(userExtDir, options);
-        await stepCaveman(userExtDir, options);
+        await stepCaveman(userExtDir, cavemanRule, options);
         await stepCombo(userExtDir, options);
         await stepModeReinforcement(userExtDir, ponytailExtPath, options);
         await stepUpdater(userExtDir, options);
-        await stepAmanaiReward(userExtDir, options, selfPlugin);
         if (selfPlugin)
             await writePluginSettings(profile, options);
         await validateConfigExtensions(userDir, options);
     }
-    if (scope === "2" || scope === "3") {
-        console.log("\n--- Project-level install ---");
+    if (scope === '2' || scope === '3') {
+        console.log('\n--- Project-level install ---');
         await stepSharedSessionState(projectExtDir, options);
         await stepRtkSession(projectExtDir, options);
-        await stepCaveman(projectExtDir, options);
+        await stepCaveman(projectExtDir, cavemanRule, options);
         await stepUpdater(projectExtDir, options);
-        await stepAmanaiReward(projectExtDir, options);
-        console.log("  [note] Ponytail, RTK binary, and Combo toggle require user-level (global) install");
-    }
-    console.log("\n=== Installation complete ===");
-    console.log("\nNext steps:");
-    console.log("  1. Restart OMP");
-    console.log("  2. /caveman full");
-    console.log("  3. /rtk on");
-    console.log("  4. /ponytail full");
-    console.log("  5. /ai-addons check");
-    console.log("  6. /combo medium   (toggle all 3 at once — off by default)");
+        console.log('  [note] Ponytail, RTK binary, and Combo toggle require user-level (global) install');
+    }
+    console.log('\n=== Installation complete ===');
+    console.log('\nNext steps:');
+    console.log('  1. Restart OMP');
+    console.log('  2. /caveman full');
+    console.log('  3. /rtk on');
+    console.log('  4. /ponytail full');
+    console.log('  5. /ai-addons check');
+    console.log('  6. /combo medium   (toggle all 3 at once — off by default)');
     closeRL();
 }
-main().catch((e) => { closeRL(); console.error(e); });
+main().catch((e) => { closeRL(); console.error(e); process.exitCode = 1; });