@krtclcdy/tersio 2.23.0 → 2.24.0

package/cli/dashboard.js

@@ -1,7 +1,5 @@
-// cli/dashboard.ts — serves the built shadcn Dashboard with local usage APIs.
-// Binds 127.0.0.1 only; --export writes a file://-ready file instead.
-// Note: no Promise.withResolvers here — engines still allow Node 20.12,
-// which lacks it; the listening server itself keeps the process alive.
+// Serves the built Dashboard with local usage APIs. Binds 127.0.0.1 only;
+// --export writes a file instead. No Promise.withResolvers: Node 20.12 lacks it.
 import { spawn } from 'node:child_process';
 import { execFileSync } from 'node:child_process';
 import { existsSync, mkdirSync, readFileSync, statSync, writeFileSync } from 'node:fs';
@@ -52,10 +50,9 @@ async function brandDataUri() {
 function dataJson() {
     return JSON.stringify(summarizeUsage(readUsage()));
 }
-// Local-only health + diagnosis for the settings modal. No network: version
-// probes run with short timeouts, file checks are existsSync.
-function ompPath() {
-    const names = process.platform === 'win32' ? ['omp.cmd', 'omp.exe', 'omp.bat', 'omp'] : ['omp'];
+// Local-only health: find each agent on PATH, run `--version`, report both.
+function binOnPath(bin) {
+    const names = process.platform === 'win32' ? [`${bin}.cmd`, `${bin}.exe`, `${bin}.bat`, bin] : [bin];
     for (const dir of (process.env.PATH || '').split(path.delimiter).filter(Boolean)) {
         for (const name of names) {
             const candidate = path.join(dir, name);
@@ -68,15 +65,28 @@ function ompPath() {
     }
     return null;
 }
-function ompVersion(bin = ompPath()) {
+function ompPath() {
+    return binOnPath('omp');
+}
+function piPath() {
+    return binOnPath('pi');
+}
+// omp prints `omp/18.4.1`, pi prints a bare `0.87.1`; both read as name/version.
+function versionLabel(bin, raw) {
+    const out = raw.trim();
+    return out.includes('/') ? out : `${bin}/${out}`;
+}
+function agentVersion(bin) {
     if (!bin)
         return null;
     try {
         if (process.platform === 'win32') {
             const exe = process.env.ComSpec || 'cmd.exe';
-            return execFileSync(exe, ['/d', '/s', '/c', bin, '--version'], { encoding: 'utf8', timeout: 5000, windowsHide: true }).trim() || null;
+            const out = execFileSync(exe, ['/d', '/s', '/c', bin, '--version'], { encoding: 'utf8', timeout: 5000, windowsHide: true });
+            return out.trim() ? versionLabel(path.basename(bin), out) : null;
         }
-        return execFileSync(bin, ['--version'], { encoding: 'utf8', timeout: 5000, windowsHide: true }).trim() || null;
+        const out = execFileSync(bin, ['--version'], { encoding: 'utf8', timeout: 5000, windowsHide: true });
+        return out.trim() ? versionLabel(path.basename(bin), out) : null;
     }
     catch {
         return null;
@@ -104,12 +114,15 @@ function healthJson() {
     const rtkBin = resolveRtkBinary();
     const rtkPresent = rtkBin !== null;
     const detectedOmpPath = ompPath();
+    const detectedPiPath = piPath();
     return JSON.stringify({
         tersio: PACKAGE_VERSION,
         node: process.version,
         platform: `${process.platform}/${process.arch}`,
-        omp: ompVersion(detectedOmpPath),
+        omp: agentVersion(detectedOmpPath),
         ompPath: detectedOmpPath,
+        pi: agentVersion(detectedPiPath),
+        piPath: detectedPiPath,
         provider: ompDefaultModel(),
         rtk: { present: rtkPresent, version: rtkPresent ? rtkVersion(rtkBin) : null, path: rtkBin || 'not found in PATH' },
         home: tersioHomePath(),
@@ -125,8 +138,7 @@ const DIAG_TTL_MS = {
     monthly: 30 * 24 * 3600 * 1000,
 };
 function diagPaths() {
-    // Hermetic env (tests) overrides the DB path: keep the report next to it
-    // so test runs never touch the real ~/.tersio/diag.json.
+    // Keep the report beside the overridden DB so tests never touch the real one.
     const dbOverride = process.env.TERSIO_USAGE_DB;
     if (dbOverride)
         return { report: path.join(path.dirname(dbOverride), 'diag.json') };
@@ -185,7 +197,6 @@ function relAge(ms) {
 }
 function computeDoctorRows() {
     const rows = [];
-    const extDir = path.join(OMP_AGENT_DIR, 'extensions');
     const rtkBin = resolveRtkBinary();
     const ponytailPkg = path.join(OMP_PLUGINS_DIR, 'node_modules', '@dietrichgebert', 'ponytail', 'package.json');
     const tersioPluginDir = path.join(OMP_PLUGINS_DIR, 'node_modules', ...PACKAGE_NAME.split('/'));
@@ -219,8 +230,6 @@ function computeDoctorRows() {
     const rtkAge = rtkBin ? ageStr(rtkBin) : null;
     const rtkAt = rtkBin ? absTime(rtkBin) : null;
     addon('RTK binary', rtkVer !== null, rtkVer && rtkAge && rtkAt ? `${rtkVer} (updated ${rtkAge} · ${rtkAt})` : rtkBin || 'not found in PATH');
-    const wiring = path.join(extDir, 'rtk.ts');
-    addon('RTK OMP wiring (rtk.ts)', ok(wiring), ok(wiring) ? 'loaded' : wiring);
     let ponytailVer = null;
     try {
         ponytailVer = JSON.parse(readFileSync(ponytailPkg, 'utf8')).version ?? null;
@@ -237,10 +246,8 @@ function computeDoctorRows() {
     addon('Prices feed', pricesAge !== null, pricesAge && pricesAt ? `(pulled ${pricesAge} · ${pricesAt})` : prices, 'Usage');
     return rows;
 }
-// Retained diagnosis: recompute when forced, missing, or older than the
-// schedule. Otherwise return the saved report so users never re-run.
-// Labels retired from the report. A saved report containing any of them
-// is stale by definition and always recomputes.
+// Recompute when forced, missing, or past the schedule; a report holding a
+// retired label is stale by definition.
 const RETIRED_DIAG_LABELS = new Set([
     'OMP CLI',
     'Tersio CLI',
@@ -255,13 +262,11 @@ const RETIRED_DIAG_LABELS = new Set([
 function isRetiredReport(report) {
     return report.rows.some((r) => RETIRED_DIAG_LABELS.has(r.label));
 }
-// Retained diagnosis: recompute when forced, missing, retired, or older
-// than the schedule. Otherwise return the saved report.
+// Recompute when forced, missing, retired, or past the schedule.
 function getDoctorReport(force) {
     const saved = readDiagReport();
     const ttl = saved ? DIAG_TTL_MS[saved.schedule] : 0;
-    // Manual always recomputes on open; dated schedules reuse the saved
-    // report until stale. Otherwise a retained snapshot hides new rows.
+    // Manual recomputes on open; a dated schedule reuses the saved report.
     if (!force && saved && !isRetiredReport(saved) && ttl > 0 && Date.now() - saved.checkedAt < ttl)
         return saved;
     const report = { rows: computeDoctorRows(), checkedAt: Date.now(), schedule: saved?.schedule ?? 'manual' };
@@ -277,10 +282,8 @@ function setDiagSchedule(schedule) {
 function readDiagSchedule() {
     return readDiagReport()?.schedule ?? 'manual';
 }
-// Persist the dashboard's picker choice so close → reopen keeps it: each
-// `tersio dashboard` run serves a fresh ephemeral port (a new origin), so the
-// browser's localStorage alone cannot survive a restart. The stored default
-// feeds data.json and `tersio usage` on the next run.
+// Persist the picker choice: every run serves a fresh port, so localStorage
+// alone cannot survive a restart.
 async function saveDashboardCurrency(raw) {
     if (typeof raw !== 'string')
         return null;
@@ -304,21 +307,30 @@ function openBrowser(url) {
     const cmd = process.platform === 'darwin' ? 'open' : process.platform === 'win32' ? 'start' : 'xdg-open';
     spawn(cmd, [url], { detached: true, stdio: 'ignore' }).unref();
 }
-// Replacer functions throughout: session data routinely contains `$'`
-// sequences (shell quoting in tool details), which String.replace would
-// expand as match-suffix patterns and corrupt the file.
-// RTK-metered command lines routinely contain literal `</script>` (Vue
-// SFC probes), which would close the inlined <script> early and dump the
-// rest of the JSON as page text. Escape it; JSON.parse never sees the
-// backslash form inside a string literal, the browser decodes it first.
+// Replacers throughout: session data holds `$'` (shell quoting) and literal
+// `</script>`, which String.replace would mangle.
 function escapeInline(json) {
     return json.replace(/<\/(script)/gi, '<\\/$1');
 }
+// Our own JSON.stringify output, so a parse failure means a bad value: name it.
+function parseOwnJson(json, field) {
+    let parsed;
+    try {
+        parsed = JSON.parse(json);
+    }
+    catch {
+        throw new Error(`dashboard snapshot ${field} is not valid JSON`);
+    }
+    if (!parsed || typeof parsed !== 'object' || Array.isArray(parsed)) {
+        throw new Error(`dashboard snapshot ${field} is not an object`);
+    }
+    return parsed;
+}
 async function exportDashboard(exportFile) {
     requireDashboardBundle();
     const [bundle, icon] = await Promise.all([readSegment(DASHBOARD_INDEX), brandDataUri()]);
     const inline = bundle
-        .replace('window.__TERSIO_SNAP = null;', () => `window.__TERSIO_SNAP = ${escapeInline(JSON.stringify({ data: JSON.parse(dataJson()), health: JSON.parse(healthJson()), doctor: getDoctorReport(false) }))};`)
+        .replace('window.__TERSIO_SNAP = null;', () => `window.__TERSIO_SNAP = ${escapeInline(JSON.stringify({ data: parseOwnJson(dataJson(), 'usage data'), health: parseOwnJson(healthJson(), 'health'), doctor: getDoctorReport(false) }))};`)
         .replace(/href="brand\.webp"/g, () => `href="${icon}"`)
         .replace(/src="brand\.webp"/g, () => `src="${icon}"`)
         .replace('fetch("brand.webp")', () => `Promise.resolve({ ok: true, blob: async () => new Blob([atob("${icon.split(',')[1]}")], { type: "image/webp" }) })`);

package/cli/doctor-fix.js

@@ -1,4 +1,4 @@
-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';
@@ -7,28 +7,39 @@ 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, 'caveman-session', 'rule.md'), path.join('caveman-session', 'rule.md')],
-    [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')],
-];
+// 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}`);
+    }
+}
 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 SOURCES) {
+    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}`);

package/cli/doctor.js

@@ -1,17 +1,16 @@
 // 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 { OMP_AGENT_DIR, OMP_PLUGINS_DIR, 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, 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 = resolveRtkBinary();
     // Ponytail
@@ -24,15 +23,13 @@ async function runDoctor(recheck = false) {
     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(tersioPluginDir, 'extensions', '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: rtkBin ? readTextIfExists(rtkBin) : Promise.resolve(null),
-        rtkOmpText: readTextIfExists(path.join(extDir, 'rtk.ts')),
         cavemanIndexText: readTextIfExists(cavemanIndex),
         cavemanRuleText: readTextIfExists(cavemanRule),
         rtkIndexText: readTextIfExists(rtkIndex),
@@ -46,11 +43,9 @@ async function runDoctor(recheck = false) {
         const err = e;
         return err.stdout?.trim() || err.stderr?.trim() || null;
     }) : Promise.resolve(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([
+    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([
@@ -66,7 +61,6 @@ async function runDoctor(recheck = false) {
             probes.rtkBinText,
             probes.rtkMtime,
             rtkVersionProbe,
-            probes.rtkOmpText,
             probes.ponytailMtime,
             probes.pricesMtime,
         ]),
@@ -94,28 +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');
-    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))];
-    const retiredReinforcement = explicitEntries.filter((entry) => entry.endsWith('/shared/mode-reinforcement.ts')).length;
-    check('Unique config registrations', duplicateExtensions.length === 0, duplicateExtensions.join(', '));
-    if (retiredReinforcement === 0)
-        check('No retired reinforcement', true);
-    else
-        warnLine('Retired reinforcement registration', `${retiredReinforcement} found; run doctor --fix registrations`);
-    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)})` : '';
@@ -127,10 +142,6 @@ async function runDoctor(recheck = false) {
     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(' '));

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 };