@krtclcdy/tersio 2.20.1 → 2.22.0

package/cli/doctor-fix.js

@@ -0,0 +1,185 @@
+import { 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 { 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';
+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]}`);
+    }
+    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 });
+        else
+            console.log('  [warn] Caveman rule unreachable — kept existing rule.md');
+    }
+}
+async function fixRegistrations(agentDir, pluginsDir) {
+    console.log('  Doctor --fix: repairing config.yml registrations');
+    const configPath = path.join(agentDir, 'config.yml');
+    if ((await readTextIfExists(configPath)) === null) {
+        if (dryRun)
+            console.log(`  [dry-run] would create ${configPath}`);
+        else {
+            await fs.mkdir(agentDir, { recursive: true });
+            await fs.writeFile(configPath, 'extensions:\n', 'utf8');
+        }
+    }
+    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 pkgPath = path.join(pluginsDir, 'package.json');
+    const pkg = await readPluginsPackage(pkgPath);
+    if (!(PACKAGE_NAME in pkg.dependencies)) {
+        pkg.dependencies[PACKAGE_NAME] = `^${PACKAGE_VERSION}`;
+        if (dryRun)
+            console.log(`  [dry-run] would register ${PACKAGE_NAME} in ${pkgPath}`);
+        else {
+            await fs.mkdir(pluginsDir, { recursive: true });
+            await fs.writeFile(pkgPath, JSON.stringify(pkg, null, 2) + '\n', 'utf8');
+        }
+    }
+}
+async function fixRtk(binDir) {
+    console.log('  Doctor --fix: repairing RTK binary + wiring');
+    const binDest = path.join(binDir, RTK_BINARY_NAME);
+    if (dryRun) {
+        console.log(`  [dry-run] would download a checksum-verified rtk to ${binDest} and wire it into OMP`);
+        return;
+    }
+    const spec = rtkPlatformSpec();
+    if (!spec)
+        throw new Error(`unsupported platform ${process.platform}/${process.arch}`);
+    const release = await fetchJson(RTK_RELEASE_API);
+    const asset = (release.assets || []).find((a) => a.name === `rtk-${spec.triple}${spec.ext}`);
+    const checksAsset = (release.assets || []).find((a) => a.name === 'checksums.txt');
+    if (!asset || !checksAsset)
+        throw new Error(`required assets missing in release ${release.tag_name}`);
+    const tmpDir = await fs.mkdtemp(path.join(os.tmpdir(), 'tersio-doctor-rtk-'));
+    try {
+        const archivePath = path.join(tmpDir, asset.name);
+        const [checks] = await Promise.all([
+            httpsGet(checksAsset.browser_download_url).catch(() => null),
+            httpsDownload(asset.browser_download_url, archivePath),
+        ]);
+        if (checks) {
+            const expected = parseChecksum(checks, asset.name);
+            if (expected && await sha256File(archivePath) !== expected)
+                throw new Error(`checksum mismatch for ${asset.name}`);
+            debug('RTK checksum verified');
+        }
+        const extractDir = path.join(tmpDir, 'extracted');
+        await fs.mkdir(extractDir, { recursive: true });
+        if (asset.name.endsWith('.zip'))
+            await execP('powershell', ['Expand-Archive', '-Path', archivePath, '-DestinationPath', extractDir, '-Force'], { timeout: 60000 });
+        else
+            await execP('tar', ['xzf', archivePath, '-C', extractDir], { timeout: 60000 });
+        const found = await findFile(extractDir, RTK_BINARY_NAME);
+        if (!found)
+            throw new Error(`${RTK_BINARY_NAME} not found in ${asset.name}`);
+        await fs.mkdir(path.dirname(binDest), { recursive: true });
+        await fs.copyFile(binDest, `${binDest}.bak`).catch(() => { });
+        await fs.copyFile(found, binDest);
+        if (process.platform !== 'win32')
+            await fs.chmod(binDest, 0o755);
+        await execP(binDest, ['--version'], { timeout: 30000, shell: false });
+    }
+    finally {
+        await fs.rm(tmpDir, { recursive: true, force: true }).catch(() => { });
+    }
+    if (!(await wireRtkOmp(binDest, { dryRun, verbose })))
+        throw new Error('rtk wiring failed');
+}
+async function fixPonytail(pluginsDir, agentDir) {
+    console.log('  Doctor --fix: restoring bundled Ponytail');
+    await fs.mkdir(pluginsDir, { recursive: true });
+    const pkgPath = path.join(pluginsDir, 'package.json');
+    const pkg = await readPluginsPackage(pkgPath);
+    // Drop the legacy separate entry: ponytail is a tersio dependency now.
+    if ('@dietrichgebert/ponytail' in pkg.dependencies) {
+        delete pkg.dependencies['@dietrichgebert/ponytail'];
+        console.log('  [migrate] dropped separate @dietrichgebert/ponytail dependency (now bundled with tersio)');
+    }
+    if (!(PACKAGE_NAME in pkg.dependencies))
+        pkg.dependencies[PACKAGE_NAME] = `^${PACKAGE_VERSION}`;
+    if (dryRun) {
+        console.log('  [dry-run] would run: npm install --no-audit --no-fund (in plugins dir)');
+        return;
+    }
+    await fs.writeFile(pkgPath, JSON.stringify(pkg, null, 2) + '\n', 'utf8');
+    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');
+    await runLatestUpdate();
+}
+async function runDoctorRepairs(targets) {
+    const all = targets.includes('all');
+    const want = (t) => all || targets.includes(t);
+    if (dryRun)
+        console.log('Preview — no changes will be written.\n');
+    const failed = [];
+    const attempt = async (label, work) => {
+        try {
+            await work();
+            if (!dryRun)
+                console.log(`  [ok] ${label}`);
+        }
+        catch (e) {
+            failed.push(label);
+            console.log(`  [fail] ${label}: ${(e.message || '').slice(0, 200)}`);
+        }
+    };
+    if (want('extensions'))
+        await attempt('extensions', () => fixExtensions(path.join(OMP_AGENT_DIR, 'extensions')));
+    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));
+    if (want('cli'))
+        await attempt('cli', fixCli);
+    return failed;
+}
+export { runDoctorRepairs };

package/cli/doctor.js

@@ -1,14 +1,12 @@
 // cli/doctor.ts — installation health checks.
 import { promises as fs } from 'node:fs';
 import path from 'node:path';
-import { BUN_BIN_DIR, OMP_AGENT_DIR, OMP_PLUGINS_DIR, OMP_BIN, PACKAGE_NAME, PACKAGE_VERSION, RTK_BINARY_NAME, execP, parseJsonObject, relTime, } from './common.js';
-import { runInteractivePhase } from './interactive.js';
-import { ledgerPath, readUsage, sessionsDir } from '../extensions/shared/usage-ledger.js';
+import { BUN_BIN_DIR, OMP_AGENT_DIR, OMP_PLUGINS_DIR, RTK_BINARY_NAME, args, dryRun, fix, yes, execP, parseJsonObject, relTime, } from './common.js';
+import { askInteractiveChoice, askInteractiveConfirm, runInteractivePhase } from './interactive.js';
 import { usageDbPath } from '../extensions/shared/usage-store.js';
-import { readRtkGain, rtkDbPath } from '../extensions/shared/rtk-gain.js';
-import { checkForUpdate } from './update.js';
+import { pricesCachePath } from '../extensions/shared/pricing.js';
 import { readTextIfExists } from '../extensions/lib/utils.js';
-async function runDoctor() {
+async function runDoctor(recheck = false) {
     console.log('\n=== Tersio Doctor ===');
     // Directories
     const agentDir = OMP_AGENT_DIR;
@@ -23,60 +21,43 @@ async function runDoctor() {
     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 comboIndex = path.join(extDir, 'combo-toggle', 'index.ts');
-    const tersioIndex = path.join(extDir, 'tersio-commands', 'index.ts');
-    const modeReinforcement = path.join(extDir, 'shared', 'mode-reinforcement.ts');
-    const selfPkg = path.join(pluginsDir, 'node_modules', PACKAGE_NAME, 'package.json');
     // Independent probes start concurrently; sections report in fixed order as
     // their data settles. Every probe resolves instead of rejecting.
     const probes = {
-        ompVersion: execP(OMP_BIN, ['--version']).then((r) => r.stdout.trim(), () => null),
         agentEntries: fs.readdir(agentDir).catch(() => null),
         extEntries: fs.readdir(extDir).catch(() => null),
         sharedStateText: readTextIfExists(path.join(extDir, 'shared', 'session-state.ts')),
         configText: readTextIfExists(configPath),
         ponytailPkgText: readTextIfExists(ponytailPkg),
         ponytailExtText: readTextIfExists(ponytailExt),
-        pluginsPkgRaw: readTextIfExists(path.join(pluginsDir, 'package.json')),
-        selfPkgText: readTextIfExists(selfPkg),
         rtkBinText: readTextIfExists(rtkBin),
         rtkOmpText: readTextIfExists(path.join(extDir, 'rtk.ts')),
         cavemanIndexText: readTextIfExists(cavemanIndex),
         cavemanRuleText: readTextIfExists(cavemanRule),
         rtkIndexText: readTextIfExists(rtkIndex),
         updaterIndexText: readTextIfExists(updaterIndex),
-        comboIndexText: readTextIfExists(comboIndex),
-        tersioIndexText: readTextIfExists(tersioIndex),
-        modeReinforcementText: readTextIfExists(modeReinforcement),
         ruleMtime: fs.stat(cavemanRule).catch(() => null),
         rtkMtime: fs.stat(rtkBin).catch(() => null),
         ponytailMtime: fs.stat(ponytailPkg).catch(() => null),
-        updateVersion: checkForUpdate(),
+        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 err = e;
         return err.stdout?.trim() || err.stderr?.trim() || null;
     }));
-    const [[ompVersion, agentEntries, extEntries, sharedStateText, configText, updateVersion], [cavemanIndexText, rtkIndexText, updaterIndexText, comboIndexText, tersioIndexText, modeReinforcementText, ponytailPkgText, ponytailExtText, pluginsPkgRaw, selfPkgText], [cavemanRuleText, ruleMtime, rtkBinText, rtkMtime, rtkVersion, rtkOmpText, ponytailMtime]] = await runInteractivePhase('Checking installation', () => Promise.all([
+    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.all([
-            probes.ompVersion,
             probes.agentEntries,
             probes.extEntries,
             probes.sharedStateText,
             probes.configText,
-            probes.updateVersion,
         ]),
         Promise.all([
             probes.cavemanIndexText,
             probes.rtkIndexText,
             probes.updaterIndexText,
-            probes.comboIndexText,
-            probes.tersioIndexText,
-            probes.modeReinforcementText,
             probes.ponytailPkgText,
             probes.ponytailExtText,
-            probes.pluginsPkgRaw,
-            probes.selfPkgText,
         ]),
         Promise.all([
             probes.cavemanRuleText,
@@ -86,11 +67,18 @@ async function runDoctor() {
             rtkVersionProbe,
             probes.rtkOmpText,
             probes.ponytailMtime,
+            probes.pricesMtime,
         ]),
     ]));
     // Categorized output with a tally; success rows stay quiet (no path echoes)
     // while 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);
+        const q = (n) => String(n).padStart(2, '0');
+        const h24 = d.getHours();
+        return `${q(d.getMonth() + 1)}-${q(d.getDate())}-${d.getFullYear()}, ${q(h24 % 12 || 12)}:${q(d.getMinutes())} ${h24 >= 12 ? 'PM' : 'AM'}`;
+    }
     function check(label, ok, detail = '') {
         if (ok) {
             tally.ok++;
@@ -107,13 +95,6 @@ async function runDoctor() {
     }
     section('Environment');
     check('Node', true, process.version);
-    check('OMP CLI', ompVersion !== null, ompVersion ?? '');
-    if (typeof updateVersion === 'string')
-        warnLine('Tersio CLI', `${updateVersion} available — run tersio update`);
-    else if (updateVersion === 'unknown')
-        warnLine('Tersio CLI', `${PACKAGE_VERSION} (version check unreachable)`);
-    else
-        check('Tersio CLI', true, PACKAGE_VERSION);
     section('Installation');
     check('OMP agent dir', agentEntries !== null, agentEntries === null ? agentDir : '');
     check('OMP extensions dir', extEntries !== null, extEntries === null ? extDir : '');
@@ -123,39 +104,125 @@ async function runDoctor() {
     check('Caveman extension', cavemanIndexText !== null);
     check('RTK extension', rtkIndexText !== null);
     check('Updater extension', updaterIndexText !== null);
-    check('Combo extension', comboIndexText !== null);
-    check('Tersio commands extension', tersioIndexText !== null);
-    check('Mode reinforcement extension', modeReinforcementText !== null);
     check('Ponytail extension', ponytailExtText !== null);
-    check('Ponytail in config.yml', (configText ?? '').includes('ponytail') && (configText ?? '').includes('pi-extension'));
-    check('Combo in config.yml', (configText ?? '').includes('combo-toggle'));
-    check('Self plugin package', selfPkgText !== null, parseJsonObject(selfPkgText)?.version ?? '');
-    const selfDep = PACKAGE_NAME in (parseJsonObject(pluginsPkgRaw)?.dependencies || {});
-    check('Self plugin in plugins/package.json', selfDep);
     section('Usage & records');
-    const usageRows = readUsage();
-    check('Usage ledger', true, usageRows.length ? `${usageRows.length} rows` : 'empty — no records yet');
-    console.log(`  Usage ledger (tersio-owned, tersio reset clears): ${ledgerPath()} · ${usageRows.length} rows`);
-    console.log(`  Session transcripts (host-owned, never touched): ${sessionsDir()}`);
-    console.log(`  Usage DB (tersio-owned, tersio reset clears): ${usageDbPath()}`);
-    const rtkDb = rtkDbPath();
-    const rtk = readRtkGain();
-    console.log(`  RTK history (rtk-owned, never touched): ${rtkDb}${rtk.commands ? ` · ${rtk.commands} commands` : ''}`);
+    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());
     section('Add-ons');
-    const ruleAge = ruleMtime ? `updated ${relTime(Date.now() - ruleMtime.mtimeMs)}` : '';
+    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)}` : '';
-    check('RTK binary', rtkBinText !== null, rtkBinText === null ? rtkBin : [rtkVersion, rtkAge].filter(Boolean).join(', '));
+    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(' '));
     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)}` : '';
-    check('Ponytail', ponytailPkgText !== null, [parseJsonObject(ponytailPkgText)?.version ?? '', ponytailAge].filter(Boolean).join(', '));
+    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(' '));
     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)) {
+        await runDoctorFix(tally);
+    }
+    else if (!recheck && tally.missing + tally.warn > 0) {
+        console.log('\n  Run `tersio doctor --fix` to repair the rows above.');
+    }
+    return tally;
+}
+function fixScope() {
+    const eq = args.find((a) => a.startsWith('--fix='));
+    if (eq !== undefined) {
+        const raw = eq.slice('--fix='.length).trim().toLowerCase();
+        if (raw === '')
+            return null;
+        return checkFixScope(raw);
+    }
+    const i = args.indexOf('--fix');
+    if (i === -1)
+        return null;
+    const next = args[i + 1];
+    if (next === undefined || next.startsWith('-'))
+        return null;
+    return checkFixScope(next.trim().toLowerCase());
+}
+function checkFixScope(raw) {
+    const valid = ['extensions', 'registrations', 'rtk', 'ponytail', 'cli'];
+    if (!valid.includes(raw)) {
+        console.error(`[fail] Invalid --fix scope: ${raw}. Valid: ${valid.join(', ')}`);
+        process.exit(1);
+    }
+    return raw;
+}
+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, config.yml registrations, 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) {
+        targets = ['all'];
+    }
+    else {
+        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: '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' },
+        ], 'all');
+        if (picked.status !== 'selected') {
+            process.exitCode = 130;
+            return;
+        }
+        if (picked.value === 'all')
+            targets = ['all'];
+        else {
+            const go = await askInteractiveConfirm(`Repair "${picked.value}" now?`);
+            if (go.status !== 'confirmed' || !go.value) {
+                process.exitCode = 130;
+                return;
+            }
+            targets = [picked.value];
+        }
+    }
+    const { runDoctorRepairs } = await import('./doctor-fix.js');
+    const failed = await runDoctorRepairs(targets);
+    if (failed.length > 0) {
+        console.log(`\n  Doctor --fix: ${failed.length} repair(s) failed (${failed.join(', ')}) — rerun or see [fail] lines above.`);
+        process.exitCode = 1;
+        return;
+    }
+    if (targets.includes('cli')) {
+        console.log('\n  Doctor --fix: CLI refresh delegated — rerun `tersio doctor` after it lands.');
+        return;
+    }
+    console.log('\n  Doctor --fix: repairs done — rechecking.');
+    const again = await runDoctor(true);
+    if (again.missing + again.warn === 0)
+        console.log('  Doctor --fix: all checks pass. Restart OMP.');
+    else
+        console.log(`  Doctor --fix: still ${again.missing} missing + ${again.warn} warn — rerun or repair manually.`);
 }
 function section(name) {
     console.log(`\n${name}`);

package/cli/install.js

@@ -31,98 +31,69 @@ const SHARED_PLUGIN_SETTINGS = path.join(EXT_DIR, 'shared', 'plugin-settings.ts'
 const SHARED_USAGE_LEDGER = path.join(EXT_DIR, 'shared', 'usage-ledger.ts');
 const SHARED_PRICING = path.join(EXT_DIR, 'shared', 'pricing.ts');
 const SHARED_CARBON = path.join(EXT_DIR, 'shared', 'carbon.ts');
-const PONYTAIL_GITHUB_SPEC = 'github:DietrichGebert/ponytail';
-const PONYTAIL_NPM_SPEC = '@dietrichgebert/ponytail@latest';
 async function stepPonytail(pluginsDir, userDir, options) {
     if (!options.quiet)
-        console.log('  Ponytail — refresh plugin');
+        console.log('  Ponytail — ensure bundled plugin');
     await fs.mkdir(pluginsDir, { recursive: true });
     const pkgPath = path.join(pluginsDir, 'package.json');
     const pkg = await readPluginsPackage(pkgPath);
-    pkg.dependencies['@dietrichgebert/ponytail'] = PONYTAIL_GITHUB_SPEC;
+    // Migration: ponytail was a separate plugin row. It is now a tersio
+    // dependency, so drop the legacy row. Runs after stepSelfPlugin.
+    let migrated = false;
+    if ('@dietrichgebert/ponytail' in pkg.dependencies) {
+        delete pkg.dependencies['@dietrichgebert/ponytail'];
+        migrated = true;
+    }
     if (options.dryRun) {
         if (verbose && !options.quiet)
             console.log(`  [dry-run] would write ${pkgPath}`);
+        if (migrated && verbose && !options.quiet)
+            console.log(`  [dry-run] would drop the separate @dietrichgebert/ponytail dependency (bundled with tersio)`);
     }
-    else {
+    else if (migrated) {
         await fs.writeFile(pkgPath, JSON.stringify(pkg, null, 2) + '\n');
+        if (!options.quiet)
+            console.log('  [migrate] dropped separate @dietrichgebert/ponytail dependency (now bundled with tersio)');
     }
     const ponytailExtPath = path.join(pluginsDir, 'node_modules', '@dietrichgebert', 'ponytail', 'pi-extension', 'index.js');
     const probeExt = async () => (await readTextIfExists(ponytailExtPath)) !== null;
-    // Fast path: extension already present and no refresh asked — skip network.
-    let ponytailExtExists = !options.reinstall && !options.dryRun ? await probeExt() : false;
+    // Fast path: bundled copy already present and no refresh asked — skip
+    // network. Migration always reinstalls: the probe may hit the stale legacy
+    // copy, and only npm install prunes it into the tersio-owned one.
+    let ponytailExtExists = !options.reinstall && !options.dryRun && !migrated ? await probeExt() : false;
     if (ponytailExtExists) {
-        debug('Ponytail pi-extension already installed; skipping network refresh');
+        debug('Bundled Ponytail pi-extension already installed; skipping network refresh');
     }
     else if (options.dryRun) {
         // Dry runs preview the wiring below without touching the network.
         if (verbose && !options.quiet)
-            console.log(`  [dry-run] would run: omp plugin install ${PONYTAIL_GITHUB_SPEC}`);
-        if (options.reinstall && verbose && !options.quiet) {
-            console.log(`  [dry-run] would run: npm install ${PONYTAIL_NPM_SPEC} --save --no-audit --no-fund`);
-        }
+            console.log('  [dry-run] would run: npm install --no-audit --no-fund (in plugins dir)');
         ponytailExtExists = true;
     }
     else {
-        // Try omp plugin install first
+        // Self-plugin npm install already materialized the bundled copy.
+        // Reinstall here only when the probe still misses.
         try {
-            await execNetwork('Installing Ponytail plugin', OMP_BIN, ['plugin', 'install', PONYTAIL_GITHUB_SPEC], { cwd: pluginsDir });
-        }
-        catch (e) {
-            console.log(`  [warn] omp plugin install failed: ${e.message}`);
+            await execNetwork('Installing bundled Ponytail', 'npm', ['install', '--no-audit', '--no-fund'], { cwd: pluginsDir, timeout: 180000 });
         }
-        if (options.reinstall) {
+        catch {
             try {
-                await execNetwork('Refreshing Ponytail package', 'npm', ['install', PONYTAIL_NPM_SPEC, '--save', '--no-audit', '--no-fund'], { cwd: pluginsDir, timeout: 120000 });
+                await execNetwork('Installing bundled Ponytail', 'bun', ['install'], { cwd: pluginsDir, timeout: 180000 });
             }
             catch (e) {
-                console.log(`  [fail] Could not refresh ponytail: ${e.message}`);
-                console.log(`  [hint] Manual: cd ~/.omp/plugins && npm install ${PONYTAIL_NPM_SPEC} --save --no-audit --no-fund`);
+                console.log(`  [fail] Could not install bundled ponytail: ${e.message}`);
+                console.log('  [hint] Manual: cd ~/.omp/plugins && npm install --no-audit --no-fund');
             }
         }
-        // Verify the pi-extension/index.js actually exists
         ponytailExtExists = await probeExt();
-        // Fallback: try bun install or npm install
-        if (!ponytailExtExists) {
-            if (!options.quiet)
-                console.log('  [info] pi-extension/index.js not found after omp plugin install — trying npm/bun install...');
-            try {
-                await execNetwork('Installing Ponytail dependencies', 'npm', ['install'], { cwd: pluginsDir, timeout: 120000 });
-            }
-            catch {
-                try {
-                    await execNetwork('Installing Ponytail dependencies', 'bun', ['install'], { cwd: pluginsDir, timeout: 120000 });
-                }
-                catch (e2) {
-                    console.log(`  [fail] Could not install ponytail: ${e2.message}`);
-                    console.log('  [hint] Manual: cd ~/.omp/plugins && npm install');
-                }
-            }
-            ponytailExtExists = await probeExt();
-        }
-        // Last-resort fallback: git clone the repo into node_modules
-        if (!ponytailExtExists) {
-            if (!options.quiet)
-                console.log('  [info] npm/bun did not produce pi-extension — trying git clone...');
-            try {
-                const dest = path.join(pluginsDir, 'node_modules', '@dietrichgebert', 'ponytail');
-                await fs.mkdir(path.dirname(dest), { recursive: true });
-                await execNetwork('Cloning Ponytail repository', 'git', ['clone', '--depth', '1', 'https://github.com/DietrichGebert/ponytail.git', dest], { timeout: 180000 });
-                ponytailExtExists = await probeExt();
-            }
-            catch (e3) {
-                console.log(`  [fail] git clone failed: ${e3.message}`);
-                console.log('  [hint] Install git or check network: https://github.com/DietrichGebert/ponytail');
-            }
-        }
     }
     if (!ponytailExtExists) {
-        console.log('  [skip] Ponytail pi-extension/index.js still not found — skill-only mode');
+        console.log('  [skip] Bundled Ponytail pi-extension/index.js still not found — skill-only mode');
         console.log('  [hint] The /ponytail command won\'t work, but ponytail skills will still load');
     }
     else if (!options.dryRun && !options.quiet) {
         // Wire extension into config.yml so /ponytail command loads
-        debug('Ponytail pi-extension found');
+        debug('Bundled Ponytail pi-extension found');
     }
     // Still set Ponytail config defaults even without the extension command
     const configPath = path.join(userDir, 'config.yml');
@@ -551,10 +522,25 @@ async function runCommandMenu() {
             await runInstall({ reinstall: true });
             closeRL();
             break;
-        case 'doctor':
-            await runDoctor();
+        case 'doctor': {
+            const summary = await runDoctor();
+            if (!dryRun && summary.missing + summary.warn > 0) {
+                const fixIt = await askInteractiveConfirm('Doctor found problems — repair them now?');
+                if (fixIt.status === 'confirmed' && fixIt.value) {
+                    const { runDoctorRepairs } = await import('./doctor-fix.js');
+                    const failed = await runDoctorRepairs(['all']);
+                    if (failed.length === 0) {
+                        console.log('\n  Repairs done — rechecking.');
+                        await runDoctor();
+                    }
+                    else {
+                        console.log(`\n  ${failed.length} repair(s) failed (${failed.join(', ')}) — see [fail] lines above.`);
+                    }
+                }
+            }
             closeRL();
             break;
+        }
         case 'usage':
             await runUsage();
             closeRL();
@@ -656,9 +642,9 @@ async function runInstall(overrides = {}) {
         }
     };
     await capture('shared', () => stepSharedSessionState(userExtDir, options));
-    await capture('ponytail', () => stepPonytail(OMP_PLUGINS_DIR, userDir, options));
     let selfPlugin = false;
     await capture('self-plugin', async () => { selfPlugin = await stepSelfPlugin(OMP_PLUGINS_DIR, options); });
+    await capture('ponytail', () => stepPonytail(OMP_PLUGINS_DIR, userDir, options));
     const ponytailExtPath = path.join(OMP_PLUGINS_DIR, 'node_modules', '@dietrichgebert', 'ponytail', 'pi-extension', 'index.js');
     await capture('rtk', () => stepRtk(BUN_BIN_DIR, options));
     await capture('rtk session', () => stepRtkSession(userExtDir, options));

package/cli/rtk-wiring.js

@@ -55,7 +55,7 @@ function rtkExtensionPath() {
 }
 // OMP loads only listed extensions: append rtk.ts after the existing entries
 // (or create the key) so a fresh wire takes effect on next OMP start.
-async function ensureRtkInConfig(options) {
+export async function ensureRtkInConfig(options) {
     const home = process.env.HOME || process.env.USERPROFILE || os.homedir();
     const configPath = path.join(home, '.omp', 'agent', 'config.yml');
     const extPath = rtkExtensionPath().replace(/\\/g, '/');