@krtclcdy/tersio 2.23.0 → 2.24.1

package/cli/currency.js

@@ -1,10 +1,7 @@
-// cli/currency.ts — display-currency helpers (USD-base, offline snapshot rates).
-// Same 10 currencies, symbols, and snapshot rates as the dashboard's
-// converter (dashboard/app); the dashboard replaces rates with live
-// frankfurter figures when reachable, the CLI always uses the snapshot.
+// cli/currency.ts — USD-base currency helpers on offline snapshot rates. Same
+// 10 currencies as the dashboard, which prefers live frankfurter figures.
 import { existsSync, readFileSync } from 'node:fs';
-import os from 'node:os';
-import path from 'node:path';
+import { tersioSettingsFile } from '../extensions/shared/plugin-settings.js';
 const CURRENCY_CODES = [
     'USD',
     'PHP',
@@ -32,22 +29,16 @@ function parseCurrencyFlag(raw) {
     }
     return v;
 }
-// Stored default from the omp plugin lock file (written by tersio settings);
-// USD when missing, corrupt, or holding an unknown code. Sync so flag
-// parsing in cli/common.ts can fall back to it at startup.
+// Stored default; USD when missing, corrupt, or an unknown code.
 function readStoredCurrency() {
-    const home = process.env.HOME || process.env.USERPROFILE || os.homedir();
-    const lock = path.join(home, '.omp', 'plugins', 'omp-plugins.lock.json');
-    if (!existsSync(lock))
+    const file = tersioSettingsFile();
+    if (!existsSync(file))
         return DEFAULT_CURRENCY;
     try {
-        const parsed = JSON.parse(readFileSync(lock, 'utf8'));
-        if (!parsed || typeof parsed !== 'object' || !('settings' in parsed))
+        const parsed = JSON.parse(readFileSync(file, 'utf8'));
+        if (!parsed || typeof parsed !== 'object')
             return DEFAULT_CURRENCY;
-        const entry = parsed.settings?.['@krtclcdy/tersio'];
-        if (!entry || typeof entry !== 'object')
-            return DEFAULT_CURRENCY;
-        const raw = entry.currency;
+        const raw = parsed.currency;
         return typeof raw === 'string' && isCurrencyCode(raw.trim().toUpperCase())
             ? raw.trim().toUpperCase()
             : DEFAULT_CURRENCY;
@@ -68,7 +59,8 @@ const CURRENCY_META = {
     CAD: { symbol: 'C$', decimals: 2 },
     INR: { symbol: '₹', decimals: 2 },
 };
-const FX_SNAPSHOT_RATES = {
+// Exported so a test can hold it against the Dashboard's copy of the same table.
+export const FX_SNAPSHOT_RATES = {
     USD: 1,
     PHP: 58.7,
     EUR: 0.92,

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';
@@ -12,9 +10,12 @@ import { fileURLToPath } from 'node:url';
 import { clearUsageLedger, markReset, readUsage } from '../extensions/shared/usage-ledger.js';
 import { pricesCachePath } from '../extensions/shared/pricing.js';
 import { summarizeUsage } from './usage.js';
+import { deleteUsageBackup, listUsageBackups, restoreUsageBackup } from '../extensions/shared/usage-store.js';
 import { isCurrencyCode } from './currency.js';
 import { OMP_AGENT_DIR, OMP_PLUGINS_DIR, PACKAGE_VERSION, } from './common.js';
-import { storedProfile, writePluginSettings } from './profile.js';
+import { BACKUP_SCHEDULES, storedProfile, writePluginSettings } from './profile.js';
+import { normalizeComboLevel } from '../extensions/shared/session-state.js';
+import { CAVEMAN_DEFAULTS, PONYTAIL_DEFAULTS } from './common.js';
 import { PACKAGE_NAME } from './common.js';
 import { resolveRtkBinary } from '../extensions/lib/utils.js';
 const DASHBOARD_DIST = path.join(path.dirname(fileURLToPath(import.meta.url)), '..', 'dashboard', 'dist');
@@ -52,10 +53,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 +68,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 +117,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 +141,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 +200,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('/'));
@@ -206,8 +220,12 @@ function computeDoctorRows() {
     catch { /* missing config is reported by extension rows */ }
     const duplicateExtensions = [...new Set(explicitEntries.filter((entry, index) => explicitEntries.indexOf(entry) !== index))];
     addon('Unique config registrations', duplicateExtensions.length === 0, duplicateExtensions.length ? duplicateExtensions.join(', ') : 'ok', 'Extensions');
-    const retiredReinforcement = explicitEntries.filter((entry) => entry.endsWith('/shared/mode-reinforcement.ts')).length;
-    addon('No retired reinforcement', retiredReinforcement === 0, retiredReinforcement ? `${retiredReinforcement} registration(s)` : 'ok', 'Extensions');
+    // A listed extension whose file is gone makes the host warn on every load, so
+    // surface it rather than leaving the user with only a startup message.
+    const dangling = explicitEntries
+        .filter((entry) => entry.includes(`extensions${path.sep}`) || entry.includes('extensions/'))
+        .filter((entry) => !ok(path.isAbsolute(entry) ? entry : path.resolve(OMP_AGENT_DIR, entry)));
+    addon('Extension files present', dangling.length === 0, dangling.length ? dangling.join(', ') : 'ok', 'Extensions');
     ext('Caveman extension', path.join(tersioPluginDir, 'extensions', 'caveman-session', 'index.ts'));
     ext('RTK extension', path.join(tersioPluginDir, 'extensions', 'rtk-session', 'index.ts'));
     ext('Ponytail extension', path.join(OMP_PLUGINS_DIR, 'node_modules', '@dietrichgebert', 'ponytail', 'pi-extension', 'index.js'));
@@ -219,8 +237,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 +253,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',
@@ -251,17 +265,16 @@ const RETIRED_DIAG_LABELS = new Set([
     'Self plugin',
     'Ponytail registered',
     'Usage store',
+    'RTK OMP wiring (rtk.ts)',
 ]);
 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' };
@@ -274,13 +287,55 @@ function setDiagSchedule(schedule) {
     writeDiagReport(base);
     return base;
 }
+// One field per call, validated against the same sets the CLI uses.
+async function saveDefaults(body) {
+    const profile = await storedProfile();
+    if (body.comboDefault !== undefined) {
+        const level = normalizeComboLevel(body.comboDefault);
+        if (!level)
+            return { ok: false, error: 'unknown combo level' };
+        profile.comboDefault = level;
+    }
+    if (body.cavemanDefault !== undefined) {
+        const v = String(body.cavemanDefault);
+        if (!CAVEMAN_DEFAULTS.has(v))
+            return { ok: false, error: 'unknown caveman level' };
+        profile.cavemanDefault = v;
+    }
+    if (body.ponytailDefault !== undefined) {
+        const v = String(body.ponytailDefault);
+        if (!PONYTAIL_DEFAULTS.has(v))
+            return { ok: false, error: 'unknown ponytail level' };
+        profile.ponytailDefault = v;
+    }
+    if (body.backupSchedule !== undefined) {
+        const v = String(body.backupSchedule);
+        if (!BACKUP_SCHEDULES.has(v))
+            return { ok: false, error: 'unknown backup schedule' };
+        profile.backupSchedule = v;
+    }
+    if (body.rtkDefault !== undefined) {
+        if (typeof body.rtkDefault !== 'boolean')
+            return { ok: false, error: 'rtk default must be true or false' };
+        profile.rtkDefault = body.rtkDefault;
+    }
+    await writePluginSettings(profile, {});
+    return {
+        ok: true,
+        profile: {
+            comboDefault: profile.comboDefault,
+            cavemanDefault: profile.cavemanDefault,
+            rtkDefault: profile.rtkDefault,
+            ponytailDefault: profile.ponytailDefault,
+            backupSchedule: profile.backupSchedule,
+        },
+    };
+}
 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;
@@ -292,6 +347,50 @@ async function saveDashboardCurrency(raw) {
     await writePluginSettings(profile, {});
     return code;
 }
+export const EXPORT_FORMATS = ['json', 'jsonl', 'csv'];
+export function exportRows(report) {
+    return report.recent.map((r) => ({
+        timestamp: new Date(r.t).toISOString(),
+        local: new Date(r.t).toLocaleString(),
+        agent: r.h ?? 'pi',
+        model: r.m,
+        input: r.i,
+        output: r.o,
+        cacheRead: r.cr ?? 0,
+        cacheWrite: r.cw ?? 0,
+        costUsd: r.usd,
+        elapsedMs: r.d,
+        status: r.st,
+    }));
+}
+export function csvCell(v) {
+    const s = v === undefined || v === null ? '' : String(v);
+    return /[",\n]/.test(s) ? `"${s.replace(/"/g, '""')}"` : s;
+}
+export function exportBody(format, report) {
+    const stamp = new Date().toISOString().slice(0, 10);
+    if (format === 'json') {
+        return { body: JSON.stringify({ exportedAt: new Date().toISOString(), version: report.version, source: report.source, report }, null, 2), type: 'application/json' };
+    }
+    const rows = exportRows(report);
+    if (format === 'jsonl') {
+        return { body: rows.map((r) => JSON.stringify(r)).join('\n') + '\n', type: 'application/x-ndjson' };
+    }
+    const cols = Object.keys(rows[0] ?? { timestamp: '', agent: '' });
+    const head = cols.join(',');
+    const body = [head, ...rows.map((r) => cols.map((c) => csvCell(r[c])).join(','))].join('\n') + '\n';
+    return { body, type: 'text/csv; charset=utf-8' };
+}
+function serveExport(req, res) {
+    const format = ((req.url || '').split('?')[1] || '').match(/format=([a-z]+)/)?.[1];
+    const fmt = format && EXPORT_FORMATS.includes(format) ? format : 'json';
+    const { body, type } = exportBody(fmt, summarizeUsage(readUsage()));
+    res.writeHead(200, {
+        'Content-Type': type,
+        'Content-Disposition': `attachment; filename="tersio-usage-${new Date().toISOString().slice(0, 10)}.${fmt === 'jsonl' ? 'ndjson' : fmt}"`,
+    });
+    res.end(body);
+}
 function readBody(req) {
     return new Promise((resolve) => {
         let body = '';
@@ -304,21 +403,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" }) })`);
@@ -339,6 +447,70 @@ async function runDashboard(options) {
             res.end(JSON.stringify({ ok: true, rows }));
             return;
         }
+        if (req.url === '/backups' && req.method === 'GET') {
+            const rows = listUsageBackups().map((b) => ({ file: path.basename(b.file), mtime: b.mtime, size: b.size }));
+            res.writeHead(200, { 'Content-Type': 'application/json' });
+            res.end(JSON.stringify({ backups: rows }));
+            return;
+        }
+        if (req.url === '/backups/delete' && req.method === 'POST') {
+            let file = '';
+            try {
+                file = String(JSON.parse(await readBody(req)).file ?? '');
+            }
+            catch {
+                file = '';
+            }
+            const ok = deleteUsageBackup(file);
+            res.writeHead(ok ? 200 : 400, { 'Content-Type': 'application/json' });
+            res.end(JSON.stringify(ok ? { ok: true, file } : { ok: false, error: 'unknown backup' }));
+            return;
+        }
+        if (req.url === '/backups/restore' && req.method === 'POST') {
+            let file = '';
+            try {
+                file = String(JSON.parse(await readBody(req)).file ?? '');
+            }
+            catch {
+                file = '';
+            }
+            const ok = restoreUsageBackup(file);
+            res.writeHead(ok ? 200 : 400, { 'Content-Type': 'application/json' });
+            res.end(JSON.stringify(ok ? { ok: true, file } : { ok: false, error: 'unknown backup' }));
+            return;
+        }
+        if (req.url === '/settings' && req.method === 'GET') {
+            storedProfile().then((profile) => {
+                res.writeHead(200, { 'Content-Type': 'application/json' });
+                res.end(JSON.stringify({
+                    comboDefault: profile.comboDefault,
+                    cavemanDefault: profile.cavemanDefault,
+                    rtkDefault: profile.rtkDefault,
+                    ponytailDefault: profile.ponytailDefault,
+                    backupSchedule: profile.backupSchedule,
+                }));
+            });
+            return;
+        }
+        if (req.url === '/settings' && req.method === 'POST') {
+            let body = {};
+            try {
+                body = JSON.parse(await readBody(req)) ?? {};
+            }
+            catch {
+                body = {};
+            }
+            const saved = await saveDefaults(body);
+            if (!saved.ok) {
+                res.writeHead(400, { 'Content-Type': 'application/json' });
+                res.end(JSON.stringify({ ok: false, error: saved.error }));
+            }
+            else {
+                res.writeHead(200, { 'Content-Type': 'application/json' });
+                res.end(JSON.stringify({ ok: true, ...saved.profile }));
+            }
+            return;
+        }
         if (req.url === '/currency' && req.method === 'POST') {
             let code = null;
             try {
@@ -363,6 +535,10 @@ async function runDashboard(options) {
             res.end(dataJson());
             return;
         }
+        if (req.url?.startsWith('/export')) {
+            serveExport(req, res);
+            return;
+        }
         if (req.url === '/health') {
             res.writeHead(200, { 'Content-Type': 'application/json' });
             res.end(healthJson());

package/cli/doctor-fix.js

@@ -1,40 +1,54 @@
-import { promises as fs } from 'node:fs';
+import { existsSync, promises as fs } from 'node:fs';
 import os from 'node:os';
 import path from 'node:path';
 import { fileURLToPath } from 'node:url';
 import { BUN_BIN_DIR, OMP_AGENT_DIR, OMP_PLUGINS_DIR, PACKAGE_NAME, PACKAGE_VERSION, RTK_BINARY_NAME, removeExtensionFromConfig, dryRun, verbose, debug, execP, readPluginsPackage, writeIfChanged, } from './common.js';
-import { execNetwork } from './interactive.js';
+import { execNetwork, sayTagged } 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)
+                sayTagged(`  [warn] bundled source missing: ${from}`);
+            else
+                await writeIfChanged(path.join(dest, file), text, { dryRun, verbose });
+        }
+        if (!dryRun)
+            sayTagged(`  [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) {
-        const text = await readTextIfExists(from);
+    // rule.md is skipped: its live content is the upstream fetch, not the bundle.
+    const bundledTree = TREE_FILES.filter((file) => file !== 'caveman-session/rule.md');
+    for (const file of bundledTree) {
+        const text = await readTextIfExists(sourcePath(file));
         if (text === null)
-            console.log(`  [warn] bundled source missing: ${from}`);
+            sayTagged(`  [warn] bundled source missing: ${sourcePath(file)}`);
         else
-            await writeIfChanged(path.join(pluginExtDir, to), text, { dryRun, verbose });
+            await writeIfChanged(path.join(pluginExtDir, file), text, { dryRun, verbose });
     }
+    // Restore only a missing rule; a stale one is /ai-addons' to report.
     const ruleDest = path.join(pluginExtDir, 'caveman-session', 'rule.md');
     if ((await readTextIfExists(ruleDest)) === null) {
         const bundled = await readTextIfExists(path.join(EXT_DIR, 'caveman-session', 'rule.md'));
@@ -58,7 +72,7 @@ async function fixRegistrations(agentDir, pluginsDir) {
     const configPath = path.join(agentDir, 'config.yml');
     if ((await readTextIfExists(configPath)) === null) {
         if (dryRun)
-            console.log(`  [dry-run] would create ${configPath}`);
+            sayTagged(`  [dry-run] would create ${configPath}`);
         else {
             await fs.mkdir(agentDir, { recursive: true });
             await fs.writeFile(configPath, 'extensions:\n', 'utf8');
@@ -77,7 +91,7 @@ async function fixRegistrations(agentDir, pluginsDir) {
     if (!(PACKAGE_NAME in pkg.dependencies)) {
         pkg.dependencies[PACKAGE_NAME] = `^${PACKAGE_VERSION}`;
         if (dryRun)
-            console.log(`  [dry-run] would register ${PACKAGE_NAME} in ${pkgPath}`);
+            sayTagged(`  [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');
@@ -88,7 +102,7 @@ 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`);
+        sayTagged(`  [dry-run] would download a checksum-verified rtk to ${binDest} and wire it into OMP`);
         return;
     }
     const spec = rtkPlatformSpec();
@@ -169,11 +183,11 @@ async function runDoctorRepairs(targets) {
         try {
             await work();
             if (!dryRun)
-                console.log(`  [ok] ${label}`);
+                sayTagged(`  [ok] ${label}`);
         }
         catch (e) {
             failed.push(label);
-            console.log(`  [fail] ${label}: ${(e.message || '').slice(0, 200)}`);
+            sayTagged(`  [fail] ${label}: ${(e.message || '').slice(0, 200)}`);
         }
     };
     if (want('extensions'))