@krtclcdy/tersio 2.25.5 → 2.25.7

package/dist/cli/doctor.js

@@ -1,14 +1,18 @@
 // cli/doctor.ts — installation health checks.
-import { existsSync, statSync, promises as fs } from 'node:fs';
+import { execFileSync } from 'node:child_process';
+import { existsSync, readdirSync, readFileSync, statSync, promises as fs } from 'node:fs';
 import path from 'node:path';
-import { OMP_AGENT_DIR, OMP_PLUGINS_DIR, PACKAGE_NAME, PACKAGE_VERSION, args, dryRun, fix, yes, execP, parseJsonObject, relTime, } from './common.js';
-import { detectHosts, hostExtensionsDir, ompPackageDir } from './hosts.js';
+import { HOME, OMP_AGENT_DIR, OMP_PLUGINS_DIR, PACKAGE_NAME, PACKAGE_VERSION, args, dryRun, fix, yes, BUN_BIN_DIR, OMP_BIN, execP, parseJsonObject, relTime, } from './common.js';
+import { detectHosts, hostExtensionsDir, ompPackageDir, piPonytailPackageDir } from './hosts.js';
+import { GENERATED_TREE_FILES } from './manifest.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, ruleBodyProblem } from '../extensions/shared/utils.js';
+import { findHoistedPackage, fetchJson, piAgentDir, readTextIfExists, resolveHostBinary, resolveRtkBinary, ruleBodyProblem } from '../extensions/shared/utils.js';
 import { sqliteScript, statsDbPath } from '../extensions/shared/agent-stats.js';
-import { TREE_FILES } from './manifest.js';
+import { OMP_SUBAGENT_MARKER } from '../extensions/shared/session-state.js';
+import { PI_PONYTAIL_FILES, PONYTAIL_BUNDLE_FILES, TREE_FILES, TREE_PSTACK_FILES, isObsoleteTreeFile, treeFileText, treeFilesFor } from './manifest.js';
+import { serviceRunning, serviceState } from './doctor-fix.js';
 /** Bytes at the scale a transcript gap reads in: `5.6M`, not `5571992`. */
 function shortBytes(bytes) {
     if (bytes >= 1e9)
@@ -21,19 +25,98 @@ function shortBytes(bytes) {
 }
 async function runDoctor(recheck = false) {
     console.log('\n=== Tersio Doctor ===');
-    // 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.
+    // OMP loads the plugin from its plugins dir; pi from its npm dir, per its settings.json.
     const pluginsDir = OMP_PLUGINS_DIR;
     const rtkBin = resolveRtkBinary();
-    // Ponytail
-    const ponytailPkg = path.join(pluginsDir, 'node_modules', '@dietrichgebert', 'ponytail', 'package.json');
+    // OpenCode's own binary, when installed: `~/.opencode/bin` first, then PATH.
+    const opencodeBin = resolveHostBinary('opencode', path.join(HOME, '.opencode', 'bin'));
     // One source for the installed plugin path, so the doctor follows a package rename.
     const tersioPluginDir = ompPackageDir();
+    // Node resolves npm's nested copy before the top-level one, so the top-level copy is a decoy no host loads.
+    const ponytailPkg = findHoistedPackage('@dietrichgebert/ponytail', tersioPluginDir, 'package.json')
+        ?? path.join(pluginsDir, 'node_modules', '@dietrichgebert', 'ponytail', 'package.json');
     const cavemanIndex = path.join(tersioPluginDir, 'extensions', 'caveman', 'index.ts');
     const cavemanRule = (name) => path.join(tersioPluginDir, 'extensions', 'caveman', name);
+    // The pstack body is a Tersio fork with no remote, so the check proves it is usable, not current.
+    const pstackRule = path.join(tersioPluginDir, 'extensions', 'pstack', 'rule.md');
     const rtkIndex = path.join(tersioPluginDir, 'extensions', 'rtk', 'session.ts');
     const updaterIndex = path.join(tersioPluginDir, 'extensions', 'updater', 'index.ts');
-    // Independent probes start concurrently; sections report in fixed order as their data settles. Every probe resolves instead of rejecting.
+    // Probes start concurrently and report in fixed order as data settles; each resolves instead of rejecting.
     const hosts = detectHosts();
+    // Only hosts with their own copy are compared: omp's copy is the reference. Paths hang off the package root.
+    const ponytailLoads = {
+        pi: { dir: piPonytailPackageDir(piAgentDir()), files: PI_PONYTAIL_FILES },
+        opencode: { dir: path.join(hostExtensionsDir('opencode'), 'ponytail-bundle'), files: PONYTAIL_BUNDLE_FILES },
+    };
+    // One hook cannot stand for the set: 5.1 and 5.2 ship the same instructions file and differ inside a skill.
+    const ponytailStale = [];
+    const ponytailSource = path.dirname(ponytailPkg);
+    for (const host of hosts.filter((h) => h.installed)) {
+        const copy = ponytailLoads[host.id];
+        if (!copy)
+            continue;
+        for (const rel of copy.files) {
+            const ref = await readTextIfExists(path.join(ponytailSource, ...rel.split('/')));
+            if (ref === null)
+                continue;
+            const theirs = await readTextIfExists(path.join(copy.dir, ...rel.split('/')));
+            if (theirs !== ref)
+                ponytailStale.push(`${host.id}/${rel}`);
+        }
+    }
+    // One comparison per read file catches three directions: dropped, not received, debris left under a dropped name.
+    const treeStale = [];
+    const treeMissing = [];
+    const treeOrphan = [];
+    // The tree a host loads: omp reads the plugin package, every other host its own directory.
+    const treeBaseFor = (host) => host.id === 'omp' ? path.join(tersioPluginDir, 'extensions') : hostExtensionsDir(host.id);
+    // A tree holding any file of this build is compared even when the host reads as not installed: pi auto-discovers every index.ts it finds, so a half-written tree needs reporting.
+    const treeHoldsOwnFiles = (host) => treeFilesFor(host.id === 'omp' ? 'opencode' : host.id).some((rel) => existsSync(path.join(treeBaseFor(host), ...rel.split('/'))));
+    for (const host of hosts.filter((h) => h.installed || treeHoldsOwnFiles(h))) {
+        const treeId = host.id === 'omp' ? 'opencode' : host.id;
+        const base = treeBaseFor(host);
+        const onDisk = new Set(hostTreeFiles(base).filter((rel) => path.extname(rel) !== '.js'));
+        const expected = new Set(treeFilesFor(treeId));
+        const every = new Set([...onDisk, ...expected]);
+        for (const rel of every) {
+            // Reference is this CLI's own definition, not `tersioPluginDir`, which compares the tree to itself.
+            const reference = treeFileText(rel);
+            const at = path.join(base, ...rel.split('/'));
+            // One debris definition for detection and repair, so a row can only name what a repair removes.
+            if (isObsoleteTreeFile(rel, treeId))
+                treeOrphan.push(`${host.id}/${rel}`);
+            else if (!expected.has(rel))
+                continue;
+            else if (!onDisk.has(rel))
+                treeMissing.push(`${host.id}/${rel}`);
+            // No reference means this build dropped the entry: debris, not a mismatch.
+            else if (reference === null)
+                continue;
+            else {
+                const theirs = await readTextIfExists(at);
+                if (theirs === null)
+                    treeMissing.push(`${host.id}/${rel}`);
+                else if (theirs !== reference)
+                    treeStale.push(`${host.id}/${rel}`);
+            }
+        }
+    }
+    // A host reading as installed whose tree is short of this build's declared files: the pair loop above cannot see a file that is absent on both sides.
+    const unwrittenTreeFiles = async () => {
+        const out = [];
+        for (const host of hosts.filter((h) => h.installed)) {
+            const treeId = host.id === 'omp' ? 'opencode' : host.id;
+            const base = treeBaseFor(host);
+            for (const rel of treeFilesFor(treeId)) {
+                if (existsSync(path.join(base, ...rel.split('/'))))
+                    continue;
+                if (host.id === 'omp' && GENERATED_TREE_FILES[rel] !== undefined)
+                    continue;
+                out.push(`${host.id}/${rel}`);
+            }
+        }
+        return out;
+    };
     const probes = {
         ompPkgText: readTextIfExists(path.join(ompPackageDir(), 'package.json')),
         configText: readTextIfExists(path.join(OMP_AGENT_DIR, 'config.yml')),
@@ -41,8 +124,13 @@ async function runDoctor(recheck = false) {
         rtkBinText: rtkBin ? readTextIfExists(rtkBin) : Promise.resolve(null),
         cavemanIndexText: readTextIfExists(cavemanIndex),
         cavemanRuleText: readTextIfExists(cavemanRule('rule.md')),
+        cavemanLiteText: readTextIfExists(cavemanRule('rule-lite.md')),
+        cavemanMegacaveLiteText: readTextIfExists(cavemanRule('rule-megacave-lite.md')),
+        cavemanMegacaveUltraText: readTextIfExists(cavemanRule('rule-megacave-ultra.md')),
         cavemanUltraText: readTextIfExists(cavemanRule('rule-ultra.md')),
         cavemanMegacaveText: readTextIfExists(cavemanRule('rule-megacave.md')),
+        pstackRuleText: readTextIfExists(pstackRule),
+        pstackTreeFiles: Promise.all(TREE_PSTACK_FILES.map((rel) => readTextIfExists(path.join(tersioPluginDir, "extensions", ...rel.split("/"))))),
         rtkIndexText: readTextIfExists(rtkIndex),
         updaterIndexText: readTextIfExists(updaterIndex),
         rtkMtime: rtkBin ? fs.stat(rtkBin).catch(() => null) : Promise.resolve(null),
@@ -54,7 +142,11 @@ async function runDoctor(recheck = false) {
         const err = e;
         return err.stdout?.trim() || err.stderr?.trim() || null;
     }) : Promise.resolve(null);
-    const [[ompPkgText, configText], [cavemanIndexText, rtkIndexText, updaterIndexText, ponytailPkgText], [cavemanRuleText, cavemanUltraText, cavemanMegacaveText, ruleMtime, rtkBinText, rtkMtime, rtkVersion, ponytailMtime, pricesMtime]] = await runInteractivePhase('Checking installation', () => Promise.all([
+    // A manager that lost its daemonized process reads stopped, while the orphan still holds the port.
+    const opencodeServiceProbe = opencodeBin
+        ? Promise.resolve(serviceState())
+        : Promise.resolve(null);
+    const [[ompPkgText, configText], [cavemanIndexText, rtkIndexText, updaterIndexText, ponytailPkgText], [cavemanRuleText, cavemanLiteText, cavemanMegacaveLiteText, cavemanMegacaveUltraText, cavemanUltraText, cavemanMegacaveText, pstackRuleText, pstackTreeFiles, ruleMtime, rtkBinText, rtkMtime, rtkVersion, ponytailMtime, pricesMtime], [opencodeService]] = await runInteractivePhase('Checking installation', () => Promise.all([
         Promise.all([
             probes.ompPkgText,
             probes.configText,
@@ -67,8 +159,13 @@ async function runDoctor(recheck = false) {
         ]),
         Promise.all([
             probes.cavemanRuleText,
+            probes.cavemanLiteText,
+            probes.cavemanMegacaveLiteText,
+            probes.cavemanMegacaveUltraText,
             probes.cavemanUltraText,
             probes.cavemanMegacaveText,
+            probes.pstackRuleText,
+            probes.pstackTreeFiles,
             probes.ruleMtime,
             probes.rtkBinText,
             probes.rtkMtime,
@@ -76,8 +173,9 @@ async function runDoctor(recheck = false) {
             probes.ponytailMtime,
             probes.pricesMtime,
         ]),
+        Promise.all([opencodeServiceProbe]),
     ]));
-    // Categorized output with a tally; success rows stay quiet (no path echoes) while failures print the expected path or fix so they stay actionable.
+    // Success rows stay quiet (no path echoes); failures print the expected path or fix so they stay actionable.
     const tally = { ok: 0, missing: 0, warn: 0 };
     function absDate(ms) {
         const d = new Date(ms);
@@ -99,7 +197,7 @@ async function runDoctor(recheck = false) {
         tally.warn++;
         console.log(`  ⚠️ ${label}: warn ${detail}`);
     }
-    // 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.
+    // An unused host is not a fault: out of the tally, carrying only the one line that installs it.
     function unused(label, detail) {
         console.log(`  —  ${label}: not installed ${detail}`);
     }
@@ -114,7 +212,7 @@ async function runDoctor(recheck = false) {
             continue;
         }
         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".
+            // A pi declaration without tree or package is a broken install: a counted row, not "not installed".
             if (host.declared)
                 check(host.label, false, `declared (${host.declared}) but not installed`);
             else
@@ -125,6 +223,16 @@ async function runDoctor(recheck = false) {
         const kind = host.via === 'tree' ? 'extensions' : 'package';
         check(host.label, true, `${kind} ${PACKAGE_NAME}${host.version ? ` ${host.version}` : ''}`);
     }
+    // A healthy service adds no row: the host row already names the install, and this row only shows when the manager's report and the live process disagree.
+    if (opencodeService) {
+        const running = serviceRunning(opencodeService.status);
+        if (!running && opencodeService.live) {
+            warnLine('OpenCode service', `a serve process is alive but the service reads ${opencodeService.status} — run: tersio doctor --fix service`);
+        }
+        else if (running && !opencodeService.live) {
+            warnLine('OpenCode service', 'the service reports running but no serve process is alive — run: tersio doctor --fix service');
+        }
+    }
     section('Extensions & plugins');
     if (hosts.find((host) => host.id === 'omp')?.via === 'package') {
         const explicitEntries = (configText ?? '').split('\n')
@@ -143,14 +251,13 @@ async function runDoctor(recheck = false) {
     console.log(`  Usage DB (tersio-owned · local hosted): ${usageDbPath()}`);
     const pricesAge = pricesMtime ? `(pulled ${relTime(Date.now() - pricesMtime.mtimeMs)} · ${absDate(pricesMtime.mtimeMs)})` : '';
     check('Prices feed', pricesMtime !== null, pricesAge || pricesCachePath());
-    // The pages read omp's own index, which only advances while an omp process owns it. A stalled
-    // index reads as an empty dashboard, so name the gap instead of leaving a user to guess.
+    // Pages read omp's own index, which advances only while an omp process owns it, so a stall reads as empty.
     const indexLag = statsIndexLag();
     if (indexLag)
         warnLine('omp stats index', indexLag);
     section('Add-ons');
     const ruleAge = ruleMtime ? `(updated ${relTime(Date.now() - ruleMtime.mtimeMs)} · ${absDate(ruleMtime.mtimeMs)})` : '';
-    const cavemanRules = [['rule.md', cavemanRuleText], ['rule-ultra.md', cavemanUltraText], ['rule-megacave.md', cavemanMegacaveText]];
+    const cavemanRules = [['rule.md', cavemanRuleText], ['rule-lite.md', cavemanLiteText], ['rule-megacave-lite.md', cavemanMegacaveLiteText], ['rule-megacave-ultra.md', cavemanMegacaveUltraText], ['rule-ultra.md', cavemanUltraText], ['rule-megacave.md', cavemanMegacaveText]];
     const missingRules = cavemanRules.filter(([, text]) => text === null).map(([name]) => name);
     check('Caveman rule', missingRules.length === 0, missingRules.length ? `missing: ${missingRules.join(', ')}` : ruleAge);
     for (const [name, text] of cavemanRules) {
@@ -160,6 +267,45 @@ async function runDoctor(recheck = false) {
         if (problem)
             warnLine(`Caveman ${name}`, `unusable body (${problem}) — run: tersio install`);
     }
+    // Every preset above off turns pstack on, so a body that is missing or unusable costs a live mode.
+    check('pstack rule', pstackRuleText !== null, pstackRuleText === null ? 'missing — run: tersio install' : '');
+    if (pstackRuleText !== null) {
+        const problem = ruleBodyProblem(pstackRuleText);
+        if (problem)
+            warnLine('pstack rule.md', `unusable body (${problem}) — run: tersio install`);
+    }
+    // The index routes to files, so a tree with the rule but no leaves serves a mode that cannot apply.
+    const pstackOnDisk = {};
+    TREE_PSTACK_FILES.forEach((rel, i) => {
+        if (pstackTreeFiles[i] !== null)
+            pstackOnDisk[rel] = true;
+    });
+    const pstackMissing = TREE_PSTACK_FILES.filter((rel) => !pstackOnDisk[rel]).map((rel) => rel.replace(/^pstack\//, ''));
+    if (pstackMissing.length > 0) {
+        warnLine('pstack tree', `missing ${pstackMissing.length} file${pstackMissing.length === 1 ? '' : 's'}: ${pstackMissing.slice(0, 6).join(', ')}${pstackMissing.length > 6 ? ` +${pstackMissing.length - 6} more` : ''} — run: tersio install`);
+    }
+    // A verbatim sentence read out of omp's own prompt, so a re-worded release stops Caveman reaching subagents.
+    const subagentGap = subagentMarkerStatus(ompBinary());
+    if (subagentGap)
+        warnLine('Caveman subagent marker', subagentGap);
+    // A tree on an older body serves until its install step runs; debris needs the sweeper instead.
+    if (treeStale.length > 0) {
+        warnLine('Per-host add-on files', `stale in ${treeStale.length} file${treeStale.length === 1 ? '' : 's'}: ${treeStale.slice(0, 6).join(', ')}` +
+            `${treeStale.length > 6 ? ` +${treeStale.length - 6} more` : ''} — run: tersio install --host <host>`);
+    }
+    if (treeMissing.length > 0) {
+        warnLine('Per-host add-on files', `never installed in ${treeMissing.length} file${treeMissing.length === 1 ? '' : 's'}: ${treeMissing.join(', ')}` +
+            ` — run: tersio install --host <host>`);
+    }
+    if (treeOrphan.length > 0) {
+        warnLine('Per-host add-on files', `orphaned in ${treeOrphan.length} file${treeOrphan.length === 1 ? '' : 's'}: ${treeOrphan.join(', ')}` +
+            ` — run: tersio doctor --fix extensions`);
+    }
+    // A count of pairs compared cannot show a file that is absent from disk and absent from the declaration, so assert every declared file landed.
+    const unwritten = await unwrittenTreeFiles();
+    if (unwritten.length > 0) {
+        check('Add-on tree content', false, `${unwritten.length} declared file${unwritten.length === 1 ? '' : 's'} not written for a host reading as installed: ${unwritten.slice(0, 6).join(', ')}${unwritten.length > 6 ? ` +${unwritten.length - 6} more` : ''} — run: tersio doctor --fix extensions`);
+    }
     const rtkAge = rtkMtime ? `(updated ${relTime(Date.now() - rtkMtime.mtimeMs)} · ${absDate(rtkMtime.mtimeMs)})` : '';
     check('RTK binary', rtkBin !== null, rtkBinText === null ? 'not found in PATH' : [rtkVersion, rtkAge].filter(Boolean).join(' '));
     // rtk_run needs a host exec API, which doctor cannot assume.
@@ -172,6 +318,14 @@ async function runDoctor(recheck = false) {
     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(' '));
+    if (ponytailStale.length > 0) {
+        warnLine('Ponytail per-host bodies', `stale in ${ponytailStale.length} file${ponytailStale.length === 1 ? '' : 's'}: ${ponytailStale.slice(0, 6).join(', ')}` +
+            `${ponytailStale.length > 6 ? ` +${ponytailStale.length - 6} more` : ''} — run: tersio install --host <host>`);
+    }
+    // Offline-safe: the registry call is best-effort, and silence means no row rather than a stale one.
+    const ponytailVersionGap = await ponytailLatestGap(ponytailPkgText);
+    if (ponytailVersionGap)
+        warnLine('Ponytail version', `${ponytailVersionGap} — run: tersio update --apply-update --yes`);
     const total = tally.ok + tally.missing + tally.warn;
     console.log(`\n  Summary: ${total} checks — ✅ ${tally.ok} ok, ⚠️ ${tally.warn} warn, ❌ ${tally.missing} missing`);
     if (!recheck && tally.missing + tally.warn > 0 && (fix || dryRun)) {
@@ -199,39 +353,113 @@ function fixScope() {
     return checkFixScope(next.trim().toLowerCase());
 }
 function checkFixScope(raw) {
-    const valid = ['extensions', 'registrations', 'rtk', 'ponytail', 'cli'];
+    const valid = ['extensions', 'registrations', 'rtk', 'ponytail', 'cli', 'service'];
     if (!valid.includes(raw)) {
         console.error(`[fail] Invalid --fix scope: ${raw}. Valid: ${valid.join(', ')}`);
         process.exit(1);
     }
     return raw;
 }
+/** omp's binary on PATH, or null, resolved against omp's own name the way `resolveRtkBinary` walks for rtk. */
+function ompBinary() {
+    for (const dir of (process.env.PATH ?? '').split(path.delimiter)) {
+        if (!dir)
+            continue;
+        const candidate = path.join(dir, OMP_BIN);
+        if (existsSync(candidate))
+            return candidate;
+    }
+    const managed = path.join(BUN_BIN_DIR, OMP_BIN);
+    return existsSync(managed) ? managed : null;
+}
+// The rule bodies a per-host tree carries. rule.md and rule-lite.md are bundled forks; the others track upstream.
+const CAVEMAN_BODIES = ['rule.md', 'rule-lite.md', 'rule-megacave-lite.md', 'rule-megacave-ultra.md', 'rule-ultra.md', 'rule-megacave.md'];
+/** `"installed < latest"` when npm answers, else null: silence means "no row", not "stale". */
+async function ponytailLatestGap(installedPkgText) {
+    const local = parseJsonObject(installedPkgText)?.version;
+    if (!local)
+        return null;
+    try {
+        const meta = await fetchJson('https://registry.npmjs.org/@dietrichgebert/ponytail/latest');
+        const remote = meta?.version;
+        if (!remote || remote === local)
+            return null;
+        return `${local} installed, ${remote} is the latest`;
+    }
+    catch {
+        return null;
+    }
+}
+/** Add-on files under a host's tree, repo-relative, empty when absent: `node_modules` is skipped as a hoisted dep. */
+function hostTreeFiles(base) {
+    const out = [];
+    const walk = (dir, rel) => {
+        let entries;
+        try {
+            entries = readdirSync(dir, { withFileTypes: true });
+        }
+        catch {
+            return;
+        }
+        for (const entry of entries) {
+            if (entry.name === 'node_modules' || entry.name === '.DS_Store')
+                continue;
+            const child = rel ? `${rel}/${entry.name}` : entry.name;
+            if (entry.isDirectory())
+                walk(path.join(dir, entry.name), child);
+            else
+                out.push(child);
+        }
+    };
+    walk(base, '');
+    return out;
+}
+/** Whether omp's strings still carry Caveman's marker sentence: null = no gap, string = warning; pi unchecked. */
+function subagentMarkerStatus(ompBin) {
+    if (!ompBin)
+        return null;
+    let haystack;
+    try {
+        haystack = execFileSync(ompBin, ['--version'], { encoding: 'utf8', timeout: 5000, stdio: ['ignore', 'pipe', 'pipe'] })
+            + readFileSync(ompBin, 'utf8');
+    }
+    catch {
+        // A binary that will not run is the version row's problem, not this one's.
+        return null;
+    }
+    if (haystack.includes(OMP_SUBAGENT_MARKER))
+        return null;
+    return `not found in ${path.basename(ompBin)} — Caveman will not reach subagents until OMP_SUBAGENT_MARKER in extensions/shared/session-state.ts is updated`;
+}
 async function runDoctorFix(tally) {
     const problems = [];
     if (tally.missing > 0)
         problems.push(`${tally.missing} missing`);
     if (tally.warn > 0)
         problems.push(`${tally.warn} warn`);
-    if (dryRun) {
-        console.log(`\n  [dry-run] would repair ${problems.join(' + ')} (extensions, stale config.yml entries, rtk wiring, ponytail refresh, CLI update)`);
-        return;
-    }
     const scoped = fixScope();
     let targets;
     if (scoped) {
         targets = [scoped];
-        if (!yes) {
-            const go = await askInteractiveConfirm(`Repair "${scoped}" now?`);
-            if (go.status !== 'confirmed' || !go.value) {
-                process.exitCode = 130;
-                return;
-            }
-        }
     }
-    else if (yes) {
+    else {
         targets = ['all'];
     }
-    else {
+    // A dry run still reaches the repairs: each write is guarded, so the flag only skips prompts a preview cannot ask.
+    if (dryRun) {
+        console.log(`\n  [dry-run] would repair ${problems.join(' + ') || 'nothing'} (extensions, stale config.yml entries, rtk wiring, ponytail refresh, CLI update, opencode service)`);
+        const { runDoctorRepairs } = await import('./doctor-fix.js');
+        await runDoctorRepairs(targets);
+        return;
+    }
+    if (scoped && !yes) {
+        const go = await askInteractiveConfirm(`Repair "${scoped}" now?`);
+        if (go.status !== 'confirmed' || !go.value) {
+            process.exitCode = 130;
+            return;
+        }
+    }
+    else if (!scoped && !yes) {
         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' },
@@ -239,6 +467,7 @@ async function runDoctorFix(tally) {
             { 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' },
+            { value: 'service', label: 'OpenCode service', hint: 'stop an orphaned serve process, then start it' },
         ], 'all');
         if (picked.status !== 'selected') {
             process.exitCode = 130;
@@ -273,26 +502,20 @@ async function runDoctorFix(tally) {
     else
         console.log(`  Doctor --fix: still ${again.missing} missing + ${again.warn} warn — rerun or repair manually.`);
 }
-/**
- * How far omp's own transcript index falls behind the transcripts on disk, or null when nothing is
- * behind or the index cannot be read. omp advances the offsets only while one of its processes owns
- * the index, so a closed dashboard leaves the newest turns unread and the pages read as empty.
- */
+/** How far omp's transcript index lags the transcripts on disk, or null when behind or unreadable. */
 function statsIndexLag() {
     const statsDb = statsDbPath();
     if (!existsSync(statsDb))
         return null;
     try {
-        // The same WAL-safe reader the aggregate uses, so this probe never creates side files beside a
-        // database omp has open, and never trips over them either.
+        // Same WAL-safe reader as the aggregate, so this probe creates no side files beside a database omp has open.
         const rows = sqliteScript(statsDb, 'SELECT session_file, offset FROM file_offsets;\n')
             .split('\n')
             .filter((line) => line.includes('\t'))
             .map((line) => line.split('\t'));
         if (rows.length === 0)
             return null;
-        // The gap behind the freshest transcript is what a page shows as "no requests", so the newest
-        // file sets the number rather than the sum of every file's gap.
+        // A page shows the gap behind the freshest transcript, so the newest file sets the number, not the sum.
         let worstBytes = 0;
         let freshest = '';
         for (const [file, offsetText] of rows) {
@@ -315,7 +538,7 @@ function statsIndexLag() {
         return `${shortBytes(worstBytes)} of ${path.basename(freshest)} unread, last written ${when === 'just now' ? 'moments ago' : when} — run: omp stats`;
     }
     catch {
-        return null; // no sqlite3, or an unreadable index: nothing to report
+        return null; // no SQLite engine, or an unreadable index: nothing to report
     }
 }
 function section(name) {

package/dist/cli/hosts.js

@@ -1,4 +1,4 @@
-// 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.
+// cli/hosts.ts — agent hosts Tersio installs into, and what is on disk. One detector shared by doctor and menus.
 import { existsSync, readFileSync } from 'node:fs';
 import path from 'node:path';
 import { HOME, OMP_PLUGINS_DIR, PACKAGE_NAME, PACKAGE_VERSION } from './common.js';
@@ -24,6 +24,26 @@ function piPackageDir(agentDir = piAgentDir()) {
 function piSettingsFile(agentDir = piAgentDir()) {
     return path.join(agentDir, 'settings.json');
 }
+// pi installs Ponytail as a local path package, so settings.json names the loaded directory; the npm spec is older.
+export function piPonytailPackageDir(agentDir = piAgentDir()) {
+    let packages = [];
+    try {
+        const parsed = JSON.parse(readFileSync(piSettingsFile(agentDir), 'utf8'));
+        if (parsed && typeof parsed === 'object' && !Array.isArray(parsed) && Array.isArray(parsed.packages)) {
+            packages = parsed.packages;
+        }
+    }
+    catch { /* no settings file, or unreadable */ }
+    for (const entry of packages) {
+        const source = typeof entry === 'string' ? entry : entry?.source;
+        if (typeof source !== 'string')
+            continue;
+        const trimmed = source.trim().replace(/[/\\]+$/, '');
+        if (path.isAbsolute(trimmed) && path.basename(trimmed) === 'ponytail')
+            return trimmed;
+    }
+    return path.join(agentDir, 'npm', 'node_modules', '@dietrichgebert', 'ponytail');
+}
 function packageVersion(dir) {
     try {
         const parsed = JSON.parse(readFileSync(path.join(dir, 'package.json'), 'utf8'));
@@ -33,7 +53,7 @@ function packageVersion(dir) {
         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.
+// The tersio package pi declared in settings.json, or null; pi names sources, so npm spec, git URL or path count.
 export function piTersioSource(agentDir = piAgentDir()) {
     let settings;
     try {
@@ -57,7 +77,6 @@ export function piTersioSource(agentDir = piAgentDir()) {
     }
     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}` },
@@ -67,8 +86,8 @@ function detect(agentDir = piAgentDir()) {
     return HOSTS.map((host) => {
         const pkgDir = host.id === 'omp' ? ompPackageDir() : host.id === 'pi' ? piPackageDir(agentDir) : null;
         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
+        // A tree wins: the installer writes it and it carries no package.json, so its version is ours. OpenCode keeps no package to fall back to, so a present tree is the install and drift gets the per-host warning.
+        const via = missingTreeFiles(host.id, agentDir).length === 0 || (host.id === 'opencode' && existsSync(tree))
             ? 'tree'
             : pkgDir && existsSync(pkgDir) ? 'package' : null;
         return {
@@ -101,7 +120,7 @@ export function hostHint(host) {
         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.
+// `--host omp|pi` from raw argv, undefined when absent; throws on an unknown value so the caller exits(1).
 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);