@krtclcdy/tersio 2.22.1 → 2.24.0

package/cli/doctor-fix.js

@@ -1,49 +1,67 @@
-import { promises as fs } from 'node:fs';
+import { existsSync, promises as fs } from 'node:fs';
 import os from 'node:os';
 import path from 'node:path';
 import { fileURLToPath } from 'node:url';
-import { BUN_BIN_DIR, OMP_AGENT_DIR, OMP_PLUGINS_DIR, PACKAGE_NAME, PACKAGE_VERSION, RTK_BINARY_NAME, dryRun, verbose, debug, ensureExtensionAfterConfigEntry, ensureExtensionInConfig, execP, readPluginsPackage, writeIfChanged, } from './common.js';
+import { BUN_BIN_DIR, OMP_AGENT_DIR, OMP_PLUGINS_DIR, PACKAGE_NAME, PACKAGE_VERSION, RTK_BINARY_NAME, removeExtensionFromConfig, dryRun, verbose, debug, execP, readPluginsPackage, writeIfChanged, } from './common.js';
 import { execNetwork } from './interactive.js';
 import { wireRtkOmp, ensureRtkInConfig } 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 { runLatestUpdate } from './update.js';
+import { TREE_FILES, sourcePath } from './manifest.js';
+import { detectHosts, hostExtensionsDir } from './hosts.js';
 const EXT_DIR = path.join(path.dirname(fileURLToPath(import.meta.url)), '..', 'extensions');
-const SOURCES = [
-    [path.join(EXT_DIR, 'shared', 'session-state.ts'), path.join('shared', 'session-state.ts')],
-    [path.join(EXT_DIR, 'shared', 'types.ts'), path.join('shared', 'types.ts')],
-    [path.join(EXT_DIR, 'lib', 'utils.ts'), path.join('lib', 'utils.ts')],
-    [path.join(EXT_DIR, 'shared', 'plugin-settings.ts'), path.join('shared', 'plugin-settings.ts')],
-    [path.join(EXT_DIR, 'shared', 'usage-ledger.ts'), path.join('shared', 'usage-ledger.ts')],
-    [path.join(EXT_DIR, 'shared', 'pricing.ts'), path.join('shared', 'pricing.ts')],
-    [path.join(EXT_DIR, 'shared', 'carbon.ts'), path.join('shared', 'carbon.ts')],
-    [path.join(EXT_DIR, 'caveman-session', 'index.ts'), path.join('caveman-session', 'index.ts')],
-    [path.join(EXT_DIR, 'rtk-session', 'index.ts'), path.join('rtk-session', 'index.ts')],
-    [path.join(EXT_DIR, 'ai-addons-updater', 'index.ts'), path.join('ai-addons-updater', 'index.ts')],
-    [path.join(EXT_DIR, 'combo-toggle', 'index.ts'), path.join('combo-toggle', 'index.ts')],
-    [path.join(EXT_DIR, 'tersio-commands', 'index.ts'), path.join('tersio-commands', 'index.ts')],
-    [path.join(EXT_DIR, 'shared', 'mode-reinforcement.ts'), path.join('shared', 'mode-reinforcement.ts')],
-];
-async function fixExtensions(extDir) {
-    console.log('  Doctor --fix: restoring extension files');
-    await fs.mkdir(extDir, { recursive: true });
-    const texts = await Promise.all(SOURCES.map(([from]) => readTextIfExists(from)));
-    const writes = [];
-    for (let i = 0; i < SOURCES.length; i++) {
-        if (texts[i] !== null)
-            writes.push(writeIfChanged(path.join(extDir, SOURCES[i][1]), texts[i], { dryRun, verbose }));
-        else
-            console.log(`  [warn] bundled source missing: ${SOURCES[i][0]}`);
+// A written tree is the install for both hosts now, so --fix restores it for
+// whichever hosts have it, alongside the OMP package when that is present.
+async function fixExtensionTrees() {
+    for (const host of detectHosts()) {
+        const dest = hostExtensionsDir(host.id);
+        // Repair a host whose tree is partly there: a half-written tree is exactly
+        // the case this runs for, and it reads as "not installed" to the detector.
+        const present = TREE_FILES.filter((file) => existsSync(path.join(dest, file))).length;
+        if (present === 0)
+            continue;
+        await fs.mkdir(dest, { recursive: true });
+        for (const file of TREE_FILES) {
+            const from = path.join(EXT_DIR, ...file.split('/'));
+            const text = await readTextIfExists(from);
+            if (text === null)
+                console.log(`  [warn] bundled source missing: ${from}`);
+            else
+                await writeIfChanged(path.join(dest, file), text, { dryRun, verbose });
+        }
+        if (!dryRun)
+            console.log(`  [ok] ${host.label} extension tree: ${dest}`);
     }
-    await Promise.all(writes);
-    if ((await readTextIfExists(path.join(extDir, 'caveman-session', 'rule.md'))) === null) {
-        const rule = await Promise.race([
-            httpsGet(CAVEMAN_REMOTE_RULE).catch(() => null),
-            new Promise((resolve) => setTimeout(() => resolve(null), 8000)),
-        ]);
-        if (rule !== null)
-            await writeIfChanged(path.join(extDir, 'caveman-session', 'rule.md'), rule, { dryRun, verbose });
+}
+async function fixExtensions(pluginsDir) {
+    await fixExtensionTrees();
+    console.log('  Doctor --fix: restoring plugin extension files');
+    const tersioPluginDir = path.join(pluginsDir, 'node_modules', '@krtclcdy', 'tersio');
+    const pluginExtDir = path.join(tersioPluginDir, 'extensions');
+    await fs.mkdir(pluginExtDir, { recursive: true });
+    for (const [from, to] of TREE_FILES.map((file) => [sourcePath(file), file])) {
+        const text = await readTextIfExists(from);
+        if (text === null)
+            console.log(`  [warn] bundled source missing: ${from}`);
         else
-            console.log('  [warn] Caveman rule unreachable — kept existing rule.md');
+            await writeIfChanged(path.join(pluginExtDir, to), text, { dryRun, verbose });
+    }
+    const ruleDest = path.join(pluginExtDir, 'caveman-session', 'rule.md');
+    if ((await readTextIfExists(ruleDest)) === null) {
+        const bundled = await readTextIfExists(path.join(EXT_DIR, 'caveman-session', 'rule.md'));
+        if (bundled !== null) {
+            await writeIfChanged(ruleDest, bundled, { dryRun, verbose });
+        }
+        else {
+            const rule = await Promise.race([
+                httpsGet(CAVEMAN_REMOTE_RULE).catch(() => null),
+                new Promise((resolve) => setTimeout(() => resolve(null), 8000)),
+            ]);
+            if (rule !== null)
+                await writeIfChanged(ruleDest, rule, { dryRun, verbose });
+            else
+                console.log('  [warn] Caveman rule unreachable and no bundled rule exists');
+        }
     }
 }
 async function fixRegistrations(agentDir, pluginsDir) {
@@ -58,13 +76,13 @@ async function fixRegistrations(agentDir, pluginsDir) {
         }
     }
     const extDir = path.join(agentDir, 'extensions');
-    const ponytailExtPath = path.join(pluginsDir, 'node_modules', '@dietrichgebert', 'ponytail', 'pi-extension', 'index.js');
-    await ensureExtensionInConfig(configPath, ponytailExtPath, 'ponytail', { dryRun, verbose });
-    await ensureExtensionInConfig(configPath, path.join(extDir, 'combo-toggle', 'index.ts'), 'combo', { dryRun, verbose });
     const rtkTs = path.join(extDir, 'rtk.ts');
     if ((await readTextIfExists(rtkTs)) !== null)
         await ensureRtkInConfig({ dryRun, verbose });
-    await ensureExtensionAfterConfigEntry(configPath, path.join(extDir, 'shared', 'mode-reinforcement.ts'), ponytailExtPath, 'mode reinforcement', { dryRun, verbose });
+    const ponytailExtPath = path.join(pluginsDir, 'node_modules', '@dietrichgebert', 'ponytail', 'pi-extension', 'index.js');
+    await removeExtensionFromConfig(configPath, path.join(extDir, 'combo-toggle', 'index.ts'), 'manifest-loaded combo', { dryRun, verbose });
+    await removeExtensionFromConfig(configPath, ponytailExtPath, 'manifest-loaded ponytail', { dryRun, verbose });
+    await removeExtensionFromConfig(configPath, path.join(extDir, 'shared', 'mode-reinforcement.ts'), 'retired mode reinforcement', { dryRun, verbose });
     const pkgPath = path.join(pluginsDir, 'package.json');
     const pkg = await readPluginsPackage(pkgPath);
     if (!(PACKAGE_NAME in pkg.dependencies)) {
@@ -127,7 +145,7 @@ async function fixRtk(binDir) {
     if (!(await wireRtkOmp(binDest, { dryRun, verbose })))
         throw new Error('rtk wiring failed');
 }
-async function fixPonytail(pluginsDir, agentDir) {
+async function fixPonytail(pluginsDir) {
     console.log('  Doctor --fix: restoring bundled Ponytail');
     await fs.mkdir(pluginsDir, { recursive: true });
     const pkgPath = path.join(pluginsDir, 'package.json');
@@ -147,7 +165,6 @@ async function fixPonytail(pluginsDir, agentDir) {
     await execNetwork('Restoring bundled Ponytail', 'npm', ['install', '--no-audit', '--no-fund'], { cwd: pluginsDir, timeout: 180000 }).catch((e) => {
         throw new Error(`bundled ponytail restore failed: ${e.message}`);
     });
-    await ensureExtensionInConfig(path.join(agentDir, 'config.yml'), path.join(pluginsDir, 'node_modules', '@dietrichgebert', 'ponytail', 'pi-extension', 'index.js'), 'ponytail', { dryRun, verbose });
 }
 async function fixCli() {
     console.log('  Doctor --fix: updating CLI + add-ons');
@@ -171,13 +188,13 @@ async function runDoctorRepairs(targets) {
         }
     };
     if (want('extensions'))
-        await attempt('extensions', () => fixExtensions(path.join(OMP_AGENT_DIR, 'extensions')));
+        await attempt('extensions', () => fixExtensions(OMP_PLUGINS_DIR));
     if (want('registrations'))
         await attempt('registrations', () => fixRegistrations(OMP_AGENT_DIR, OMP_PLUGINS_DIR));
     if (want('rtk'))
         await attempt('rtk', () => fixRtk(BUN_BIN_DIR));
     if (want('ponytail'))
-        await attempt('ponytail', () => fixPonytail(OMP_PLUGINS_DIR, OMP_AGENT_DIR));
+        await attempt('ponytail', () => fixPonytail(OMP_PLUGINS_DIR));
     if (want('cli'))
         await attempt('cli', fixCli);
     return failed;

package/cli/doctor.js

@@ -1,55 +1,51 @@
 // cli/doctor.ts — installation health checks.
-import { promises as fs } from 'node:fs';
+import { existsSync, promises as fs } from 'node:fs';
 import path from 'node:path';
-import { BUN_BIN_DIR, OMP_AGENT_DIR, OMP_PLUGINS_DIR, RTK_BINARY_NAME, args, dryRun, fix, yes, execP, parseJsonObject, relTime, } from './common.js';
+import { OMP_AGENT_DIR, OMP_PLUGINS_DIR, PACKAGE_NAME, args, dryRun, fix, yes, execP, parseJsonObject, relTime, } from './common.js';
+import { detectHosts, missingTreeFiles, ompPackageDir } from './hosts.js';
 import { askInteractiveChoice, askInteractiveConfirm, runInteractivePhase } from './interactive.js';
 import { usageDbPath } from '../extensions/shared/usage-store.js';
 import { pricesCachePath } from '../extensions/shared/pricing.js';
-import { readTextIfExists } from '../extensions/lib/utils.js';
+import { readTextIfExists, resolveRtkBinary } from '../extensions/lib/utils.js';
 async function runDoctor(recheck = false) {
     console.log('\n=== Tersio Doctor ===');
-    // Directories
-    const agentDir = OMP_AGENT_DIR;
-    const extDir = path.join(agentDir, 'extensions');
-    const configPath = path.join(agentDir, 'config.yml');
+    // OMP loads the plugin from its plugins dir; pi loads the same package as a
+    // pi package, which its own settings.json declares and its npm dir holds.
     const pluginsDir = OMP_PLUGINS_DIR;
-    const rtkBin = path.join(BUN_BIN_DIR, RTK_BINARY_NAME);
+    const rtkBin = resolveRtkBinary();
     // 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 cavemanIndex = path.join(extDir, 'caveman-session', 'index.ts');
-    const cavemanRule = path.join(extDir, 'caveman-session', 'rule.md');
-    const rtkIndex = path.join(extDir, 'rtk-session', 'index.ts');
-    const updaterIndex = path.join(extDir, 'ai-addons-updater', 'index.ts');
+    const tersioPluginDir = path.join(pluginsDir, 'node_modules', '@krtclcdy', 'tersio');
+    const cavemanIndex = path.join(tersioPluginDir, 'extensions', 'caveman-session', 'index.ts');
+    const cavemanRule = path.join(tersioPluginDir, 'extensions', 'caveman-session', 'rule.md');
+    const rtkIndex = path.join(tersioPluginDir, 'extensions', 'rtk-session', 'index.ts');
+    const updaterIndex = path.join(tersioPluginDir, 'extensions', 'ai-addons-updater', 'index.ts');
     // Independent probes start concurrently; sections report in fixed order as
     // their data settles. Every probe resolves instead of rejecting.
+    const hosts = detectHosts();
     const probes = {
-        agentEntries: fs.readdir(agentDir).catch(() => null),
-        extEntries: fs.readdir(extDir).catch(() => null),
-        sharedStateText: readTextIfExists(path.join(extDir, 'shared', 'session-state.ts')),
-        configText: readTextIfExists(configPath),
+        ompPkgText: readTextIfExists(path.join(ompPackageDir(), 'package.json')),
+        configText: readTextIfExists(path.join(OMP_AGENT_DIR, 'config.yml')),
         ponytailPkgText: readTextIfExists(ponytailPkg),
         ponytailExtText: readTextIfExists(ponytailExt),
-        rtkBinText: readTextIfExists(rtkBin),
-        rtkOmpText: readTextIfExists(path.join(extDir, 'rtk.ts')),
+        rtkBinText: rtkBin ? readTextIfExists(rtkBin) : Promise.resolve(null),
         cavemanIndexText: readTextIfExists(cavemanIndex),
         cavemanRuleText: readTextIfExists(cavemanRule),
         rtkIndexText: readTextIfExists(rtkIndex),
         updaterIndexText: readTextIfExists(updaterIndex),
+        rtkMtime: rtkBin ? fs.stat(rtkBin).catch(() => null) : Promise.resolve(null),
         ruleMtime: fs.stat(cavemanRule).catch(() => null),
-        rtkMtime: fs.stat(rtkBin).catch(() => null),
         ponytailMtime: fs.stat(ponytailPkg).catch(() => null),
         pricesMtime: fs.stat(pricesCachePath()).catch(() => null),
     };
-    const rtkVersionProbe = probes.rtkBinText.then((text) => text === null ? null : execP(rtkBin, ['--version'], { timeout: 5000 }).then((r) => r.stdout.trim() || r.stderr.trim() || null, (e) => {
+    const rtkVersionProbe = rtkBin ? execP(rtkBin, ['--version'], { timeout: 5000 }).then((r) => r.stdout.trim() || r.stderr.trim() || null, (e) => {
         const err = e;
         return err.stdout?.trim() || err.stderr?.trim() || null;
-    }));
-    const [[agentEntries, extEntries, sharedStateText, configText], [cavemanIndexText, rtkIndexText, updaterIndexText, ponytailPkgText, ponytailExtText], [cavemanRuleText, ruleMtime, rtkBinText, rtkMtime, rtkVersion, rtkOmpText, ponytailMtime, pricesMtime]] = await runInteractivePhase('Checking installation', () => Promise.all([
+    }) : Promise.resolve(null);
+    const [[ompPkgText, configText], [cavemanIndexText, rtkIndexText, updaterIndexText, ponytailPkgText, ponytailExtText], [cavemanRuleText, ruleMtime, rtkBinText, rtkMtime, rtkVersion, ponytailMtime, pricesMtime]] = await runInteractivePhase('Checking installation', () => Promise.all([
         Promise.all([
-            probes.agentEntries,
-            probes.extEntries,
-            probes.sharedStateText,
+            probes.ompPkgText,
             probes.configText,
         ]),
         Promise.all([
@@ -65,7 +61,6 @@ async function runDoctor(recheck = false) {
             probes.rtkBinText,
             probes.rtkMtime,
             rtkVersionProbe,
-            probes.rtkOmpText,
             probes.ponytailMtime,
             probes.pricesMtime,
         ]),
@@ -93,18 +88,49 @@ async function runDoctor(recheck = false) {
         tally.warn++;
         console.log(`  ⚠️ ${label}: warn ${detail}`);
     }
-    section('Environment');
-    check('Node', true, process.version);
-    section('Installation');
-    check('OMP agent dir', agentEntries !== null, agentEntries === null ? agentDir : '');
-    check('OMP extensions dir', extEntries !== null, extEntries === null ? extDir : '');
-    check('OMP config.yml', configText !== null, configText === null ? configPath : '');
-    check('Shared session bridge', sharedStateText !== null);
+    // A host you do not use is not a fault, so it stays out of the tally and only
+    // carries the one line that installs it.
+    function unused(label, detail) {
+        console.log(`  —  ${label}: not installed ${detail}`);
+    }
+    section('Hosts');
+    for (const host of hosts) {
+        if (!host.installed) {
+            // A pi declaration without the tree or the package is a broken install,
+            // so it stays a counted row rather than reading as "not installed".
+            if (host.declared)
+                check(host.label, false, `declared (${host.declared}) but not installed`);
+            else
+                unused(host.label, `· ${host.installCmd}`);
+            continue;
+        }
+        const where = host.via === 'tree' ? `extensions in ${host.dir}` : `package ${PACKAGE_NAME}`;
+        check(host.label, true, `${where}${host.version ? ` ${host.version}` : ''}`);
+    }
     section('Extensions & plugins');
-    check('Caveman extension', cavemanIndexText !== null);
-    check('RTK extension', rtkIndexText !== null);
-    check('Updater extension', updaterIndexText !== null);
-    check('Ponytail extension', ponytailExtText !== null);
+    const ompEntry = hosts.find((host) => host.id === 'omp');
+    if (ompEntry?.via === 'package') {
+        const explicitEntries = (configText ?? '').split('\n')
+            .map((line) => line.trim().replace(/^-\s*/, '').replace(/^['"]|['"]$/g, ''))
+            .filter((line) => line.startsWith('/') || line.startsWith('.'));
+        const duplicateExtensions = [...new Set(explicitEntries.filter((entry, index) => explicitEntries.indexOf(entry) !== index))];
+        check('Unique config registrations', duplicateExtensions.length === 0, duplicateExtensions.length ? duplicateExtensions.join(', ') : '');
+        const retiredReinforcement = explicitEntries.filter((entry) => entry.endsWith('/shared/mode-reinforcement.ts')).length;
+        if (retiredReinforcement === 0)
+            check('No retired reinforcement', true);
+        else
+            warnLine('Retired reinforcement registration', `${retiredReinforcement} found; run doctor --fix registrations`);
+        check('Caveman extension', existsSync(path.join(tersioPluginDir, 'extensions', 'caveman-session', 'index.ts')), existsSync(path.join(tersioPluginDir, 'extensions', 'caveman-session', 'index.ts')) ? '' : path.join(tersioPluginDir, 'extensions', 'caveman-session', 'index.ts'));
+        check('RTK extension', existsSync(path.join(tersioPluginDir, 'extensions', 'rtk-session', 'index.ts')), existsSync(path.join(tersioPluginDir, 'extensions', 'rtk-session', 'index.ts')) ? '' : path.join(tersioPluginDir, 'extensions', 'rtk-session', 'index.ts'));
+        check('Updater extension', existsSync(path.join(tersioPluginDir, 'extensions', 'ai-addons-updater', 'index.ts')), existsSync(path.join(tersioPluginDir, 'extensions', 'ai-addons-updater', 'index.ts')) ? '' : path.join(tersioPluginDir, 'extensions', 'ai-addons-updater', 'index.ts'));
+        check('Ponytail extension', existsSync(path.join(OMP_PLUGINS_DIR, 'node_modules', '@dietrichgebert', 'ponytail', 'pi-extension', 'index.js')), existsSync(path.join(OMP_PLUGINS_DIR, 'node_modules', '@dietrichgebert', 'ponytail', 'pi-extension', 'index.js')) ? '' : path.join(OMP_PLUGINS_DIR, 'node_modules', '@dietrichgebert', 'ponytail', 'pi-extension', 'index.js'));
+    }
+    for (const host of hosts) {
+        if (!host.installed || host.via !== 'tree')
+            continue;
+        const missing = missingTreeFiles(host.id);
+        check(`${host.label} extension tree`, missing.length === 0, missing.length ? `${missing.length} missing in ${host.dir}` : '');
+    }
     section('Usage & records');
     console.log(`  Usage DB (tersio-owned · local hosted): ${usageDbPath()}`);
     const pricesAge = pricesMtime ? `(pulled ${relTime(Date.now() - pricesMtime.mtimeMs)} · ${absDate(pricesMtime.mtimeMs)})` : '';
@@ -113,13 +139,9 @@ async function runDoctor(recheck = false) {
     const ruleAge = ruleMtime ? `(updated ${relTime(Date.now() - ruleMtime.mtimeMs)} · ${absDate(ruleMtime.mtimeMs)})` : '';
     check('Caveman rule', cavemanRuleText !== null, ruleAge);
     const rtkAge = rtkMtime ? `(updated ${relTime(Date.now() - rtkMtime.mtimeMs)} · ${absDate(rtkMtime.mtimeMs)})` : '';
-    check('RTK binary', rtkBinText !== null, rtkBinText === null ? rtkBin : [rtkVersion, rtkAge].filter(Boolean).join(' '));
+    check('RTK binary', rtkBin !== null, rtkBinText === null ? 'not found in PATH' : [rtkVersion, rtkAge].filter(Boolean).join(' '));
     if (rtkBinText !== null && !rtkVersion)
         warnLine('RTK version', 'unavailable — binary may not be executable');
-    const rtkRegistered = rtkOmpText !== null && (configText ?? '').includes('extensions/rtk.ts');
-    check('RTK OMP wiring (rtk.ts)', rtkOmpText !== null, rtkOmpText === null ? 'run: rtk init -g --agent omp' : '');
-    if (rtkOmpText !== null && !rtkRegistered)
-        warnLine('RTK in config.yml', 'rtk.ts not listed — OMP will not load it; rerun install');
     const ponytailAge = ponytailMtime ? `(updated ${relTime(Date.now() - ponytailMtime.mtimeMs)} · ${absDate(ponytailMtime.mtimeMs)})` : '';
     const ponytailVer = parseJsonObject(ponytailPkgText)?.version ?? '';
     check('Ponytail', ponytailPkgText !== null, [ponytailVer, ponytailAge].filter(Boolean).join(' '));
@@ -164,7 +186,7 @@ async function runDoctorFix(tally) {
     if (tally.warn > 0)
         problems.push(`${tally.warn} warn`);
     if (dryRun) {
-        console.log(`\n  [dry-run] would repair ${problems.join(' + ')} (extensions, config.yml registrations, rtk wiring, ponytail refresh, CLI update)`);
+        console.log(`\n  [dry-run] would repair ${problems.join(' + ')} (extensions, stale config.yml entries, rtk wiring, ponytail refresh, CLI update)`);
         return;
     }
     const scoped = fixScope();
@@ -186,7 +208,7 @@ async function runDoctorFix(tally) {
         const picked = await askInteractiveChoice('Doctor — what should I repair?', [
             { value: 'all', label: 'Fix everything', hint: `${tally.missing + tally.warn} rows` },
             { value: 'extensions', label: 'Missing extension files', hint: 'copy sources from this CLI' },
-            { value: 'registrations', label: 'config.yml registrations', hint: 'combo, ponytail, rtk.ts entries' },
+            { value: 'registrations', label: 'config.yml registrations', hint: 'remove stale entries; keep manifest-owned extensions out' },
             { value: 'rtk', label: 'RTK binary + wiring', hint: 'download checksum-verified binary, rtk init' },
             { value: 'ponytail', label: 'Ponytail package', hint: 'bundled reinstall via tersio dep' },
             { value: 'cli', label: 'CLI update', hint: 'latest tersio + delegated refresh' },

package/cli/hosts.js

@@ -0,0 +1,118 @@
+// cli/hosts.ts — the agent hosts Tersio installs into, and what is on disk.
+// One detector, shared by the doctor rows, the install menu, and the uninstall
+// menu, so the three can never disagree about what is installed.
+import { existsSync, readFileSync } from 'node:fs';
+import path from 'node:path';
+import { HOME, OMP_PLUGINS_DIR, PACKAGE_NAME, PACKAGE_VERSION } from './common.js';
+import { TREE_FILES } from './manifest.js';
+import { piAgentDir } from '../extensions/lib/utils.js';
+export function hostExtensionsDir(id, agentDir = piAgentDir()) {
+    return id === 'omp'
+        ? path.join(HOME, '.omp', 'agent', 'extensions')
+        : path.join(agentDir, 'extensions');
+}
+export function missingTreeFiles(id, agentDir = piAgentDir()) {
+    const dir = hostExtensionsDir(id, agentDir);
+    return TREE_FILES.filter((file) => !existsSync(path.join(dir, file)));
+}
+export function ompPackageDir() {
+    return path.join(OMP_PLUGINS_DIR, 'node_modules', ...PACKAGE_NAME.split('/'));
+}
+function piPackageDir(agentDir = piAgentDir()) {
+    return path.join(agentDir, 'npm', 'node_modules', ...PACKAGE_NAME.split('/'));
+}
+function piSettingsFile(agentDir = piAgentDir()) {
+    return path.join(agentDir, 'settings.json');
+}
+function packageVersion(dir) {
+    try {
+        const parsed = JSON.parse(readFileSync(path.join(dir, 'package.json'), 'utf8'));
+        return typeof parsed.version === 'string' ? parsed.version : null;
+    }
+    catch {
+        return null;
+    }
+}
+// The tersio package pi has declared in its own settings.json, or null. pi
+// writes the declaration on install and identifies a source by name, so an npm
+// spec, a git URL, and a local path all count when they name this package.
+export function piTersioSource(agentDir = piAgentDir()) {
+    let settings;
+    try {
+        const parsed = JSON.parse(readFileSync(piSettingsFile(agentDir), 'utf8'));
+        if (!parsed || typeof parsed !== 'object' || Array.isArray(parsed))
+            return null;
+        settings = parsed;
+    }
+    catch {
+        return null;
+    }
+    if (!Array.isArray(settings.packages))
+        return null;
+    for (const entry of settings.packages) {
+        const source = typeof entry === 'string' ? entry : entry?.source;
+        if (typeof source !== 'string')
+            continue;
+        const trimmed = source.trim().replace(/[/\\]+$/, '');
+        if (trimmed.includes(PACKAGE_NAME) || /(^|[/\\])tersio(\.git)?$/i.test(trimmed))
+            return source.trim();
+    }
+    return null;
+}
+// The hosts we install into, and the commands that add and remove each.
+const HOSTS = [
+    { id: 'omp', label: 'Oh My Pi', bin: 'omp', installCmd: `omp plugin install ${PACKAGE_NAME}`, removeCmd: `omp plugin remove ${PACKAGE_NAME}` },
+    { id: 'pi', label: 'Pi', bin: 'pi', installCmd: `pi install npm:${PACKAGE_NAME}`, removeCmd: `pi remove npm:${PACKAGE_NAME}` },
+];
+function detect(agentDir = piAgentDir()) {
+    return HOSTS.map((host) => {
+        const pkgDir = host.id === 'omp' ? ompPackageDir() : piPackageDir(agentDir);
+        const tree = hostExtensionsDir(host.id, agentDir);
+        // A tree wins: it is what the installer writes, and it carries no
+        // package.json, so its version is ours.
+        const via = missingTreeFiles(host.id, agentDir).length === 0
+            ? 'tree'
+            : existsSync(pkgDir) ? 'package' : null;
+        return {
+            ...host,
+            installed: via !== null,
+            via,
+            declared: host.id === 'omp'
+                ? (existsSync(pkgDir) ? `plugin ${PACKAGE_NAME}` : null)
+                : piTersioSource(agentDir),
+            version: via === 'tree' ? PACKAGE_VERSION : via === 'package' ? packageVersion(pkgDir) : null,
+            dir: via === 'tree' ? tree : via === 'package' ? pkgDir : null,
+        };
+    });
+}
+/**
+ * The menu label, with the current state in brackets: the version when the
+ * package is already there, so a rerun shows what it would replace.
+ */
+export function hostLabel(host) {
+    if (host.installed && host.version)
+        return `${host.label} (installed ${host.version})`;
+    if (host.installed)
+        return `${host.label} (installed)`;
+    if (host.declared)
+        return `${host.label} (package declared, not on disk)`;
+    return `${host.label} (not installed)`;
+}
+export function hostHint(host) {
+    if (host.installed && host.dir)
+        return host.dir;
+    return host.installCmd;
+}
+// `--host omp|pi` from raw argv; undefined when absent. Throws on an unknown
+// value so the caller can exit(1) with the message.
+export function parseHostArg(argv) {
+    const i = argv.indexOf('--host');
+    const raw = (i === -1 ? undefined : argv[i + 1]) ?? argv.find((a) => a.startsWith('--host='))?.slice('--host='.length);
+    if (raw === undefined)
+        return undefined;
+    const value = raw.trim().toLowerCase();
+    if (value !== 'omp' && value !== 'pi')
+        throw new Error(`Invalid --host: ${raw}. Valid: omp, pi`);
+    return value;
+}
+export { HOME, detect as detectHosts };