@krtclcdy/tersio 2.23.0 → 2.24.1

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, 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,38 @@ 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(', ') : '');
+        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'));
+    }
     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 +131,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,114 @@
+// cli/hosts.ts — the agent hosts Tersio installs into, and what is on disk.
+// One detector, shared by the doctor and both menus, so they cannot disagree.
+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 declared in its own settings.json, or null. pi
+// identifies a source by name, so an npm spec, git URL, or path all count.
+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,
+        };
+    });
+}
+/** Menu label with current state in brackets, so a rerun shows what it replaces. */
+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)`;
+}
+// Hints render inline, so menus name the install and doctor keeps the path.
+export function hostHint(host) {
+    if (host.installed && host.via)
+        return host.via === 'tree' ? 'extension tree' : 'plugin package';
+    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 };