@krtclcdy/tersio 2.25.6 → 2.25.8

package/dist/cli/banner.js

@@ -81,8 +81,7 @@ function printWelcome() {
         'tersio update    refresh CLI + add-ons',
         'tersio doctor    verify the install',
     ];
-    // Below 26 rows the note scrolls off the top and slices the art, and the screen must also hold the
-    // update prompt and every option, so the tips take one line there.
+    // Below 26 rows the tips scroll off the top and slice the art, so they take one line there.
     if (process.stdout.rows < 26) {
         clackNote(`  ${tips.join(' · ')}`);
         return;

package/dist/cli/common.js

@@ -1,6 +1,6 @@
 // cli/common.ts — shared foundation: CLI flags, paths, exec, file/config helpers.
 import { execFile } from 'node:child_process';
-import { promises as fs } from 'node:fs';
+import { existsSync, promises as fs } from 'node:fs';
 import path from 'node:path';
 import { promisify } from 'node:util';
 import { createRequire } from 'node:module';
@@ -14,6 +14,10 @@ const OMP_AGENT_DIR = path.join(HOME, '.omp', 'agent');
 const OMP_PLUGINS_DIR = path.join(HOME, '.omp', 'plugins');
 const BUN_BIN_DIR = path.join(HOME, '.bun', 'bin');
 const OMP_BIN = IS_WINDOWS ? 'omp.cmd' : 'omp';
+// npm and bun are `.cmd` shims on Windows, and CreateProcess spawns neither a bare name nor a shim,
+// so the spawn name itself carries the extension the way `omp.cmd` does.
+const NPM_BIN = IS_WINDOWS ? 'npm.cmd' : 'npm';
+const BUN_BIN = IS_WINDOWS ? 'bun.cmd' : 'bun';
 const PACKAGE_NAME = '@krtclcdy/tersio';
 const PACKAGE_BIN = 'tersio';
 const { version: PACKAGE_VERSION } = createRequire(import.meta.url)(path.join(findPackageRoot(path.dirname(fileURLToPath(import.meta.url))), 'package.json'));
@@ -112,8 +116,26 @@ function debug(...a) {
         console.log('  [debug]', ...a);
 }
 const execFileP = promisify(execFile);
+/** Windows has no real `omp`, `npm`, or `pgrep`: `.cmd` shims throw EINVAL when spawned, so a bare name wraps through cmd.exe only when a `<name>.cmd` really sits on PATH. */
+export function shimCommand(cmd, args) {
+    if (!IS_WINDOWS)
+        return { cmd, args };
+    if (/\.(?:cmd|bat)$/i.test(cmd)) {
+        return { cmd: process.env.ComSpec || 'cmd.exe', args: ['/d', '/s', '/c', cmd, ...args] };
+    }
+    if (hasCmdShim(cmd)) {
+        return { cmd: process.env.ComSpec || 'cmd.exe', args: ['/d', '/s', '/c', cmd, ...args] };
+    }
+    return { cmd, args };
+}
+function hasCmdShim(cmd) {
+    if (cmd.includes('/') || cmd.includes('\\'))
+        return false;
+    return (process.env.PATH || '').split(path.delimiter).some((dir) => dir && existsSync(path.join(dir, `${cmd}.cmd`)));
+}
 async function execP(cmd, args, opts = {}) {
-    return execFileP(cmd, args, {
+    const shim = shimCommand(cmd, args);
+    return execFileP(shim.cmd, shim.args, {
         timeout: opts.timeout || 120000,
         encoding: 'utf8',
         ...opts,
@@ -131,7 +153,7 @@ async function writeIfChanged(dest, content, options = {}) {
         return true;
     }
     await fs.mkdir(path.dirname(dest), { recursive: true });
-    if (existing !== null) {
+    if (existing !== null && options.backup === true) {
         await fs.copyFile(dest, `${dest}.bak`);
         debug(`${path.basename(dest)} → ${path.basename(dest)}.bak`);
     }
@@ -316,4 +338,4 @@ function relTime(ageMs) {
     const weeks = Math.floor(days / 7);
     return `${weeks} week${weeks === 1 ? '' : 's'} ago`;
 }
-export { IS_WINDOWS, RTK_BINARY_NAME, HOME, OMP_AGENT_DIR, OMP_PLUGINS_DIR, BUN_BIN_DIR, OMP_BIN, PACKAGE_NAME, PACKAGE_BIN, PACKAGE_VERSION, CAVEMAN_DEFAULTS, PONYTAIL_DEFAULTS, PSTACK_DEFAULTS, RTK_DEFAULTS, DIAG_SCHEDULES, COMBO_PRESET_MODES, COMBO_DEFAULTS, parseEnum, flagValue, COMMANDS, commandArg, command, settingArg, unknownCommand, install, reinstall, update, showVersion, showHelp, applyUpdate, args, dryRun, yes, verbose, doctor, fix, uninstall, usage, dashboard, reset, settings, allowUnverified, dashboardPort, dashboardOpen, dashboardExport, currency, currencyGiven, removePonytail, keepPonytail, removeRtk, comboDefaultFlag, cavemanDefaultFlag, ponytailDefaultFlag, pstackDefaultFlag, rtkDefaultFlag, diagScheduleFlag, profileFlagsGiven, subagentMarkerFlags, subagentMarkersGiven, debug, execFileP, execP, writeIfChanged, normalizeExtensionsKey, writeConfigLines, ensureExtensionInConfig, removeExtensionFromConfig, readPonytailConfig, parseJsonObject, parsePonytailConfig, patchPonytailConfig, ensurePonytailConfigValue, readPluginsPackage, relTime, bundledPonytailSpec, ponytailOverride, };
+export { IS_WINDOWS, RTK_BINARY_NAME, HOME, OMP_AGENT_DIR, OMP_PLUGINS_DIR, BUN_BIN_DIR, OMP_BIN, NPM_BIN, BUN_BIN, PACKAGE_NAME, PACKAGE_BIN, PACKAGE_VERSION, CAVEMAN_DEFAULTS, PONYTAIL_DEFAULTS, PSTACK_DEFAULTS, RTK_DEFAULTS, DIAG_SCHEDULES, COMBO_PRESET_MODES, COMBO_DEFAULTS, parseEnum, flagValue, COMMANDS, commandArg, command, settingArg, unknownCommand, install, reinstall, update, showVersion, showHelp, applyUpdate, args, dryRun, yes, verbose, doctor, fix, uninstall, usage, dashboard, reset, settings, allowUnverified, dashboardPort, dashboardOpen, dashboardExport, currency, currencyGiven, removePonytail, keepPonytail, removeRtk, comboDefaultFlag, cavemanDefaultFlag, ponytailDefaultFlag, pstackDefaultFlag, rtkDefaultFlag, diagScheduleFlag, profileFlagsGiven, subagentMarkerFlags, subagentMarkersGiven, debug, execFileP, execP, writeIfChanged, normalizeExtensionsKey, writeConfigLines, ensureExtensionInConfig, removeExtensionFromConfig, readPonytailConfig, parseJsonObject, parsePonytailConfig, patchPonytailConfig, ensurePonytailConfigValue, readPluginsPackage, relTime, bundledPonytailSpec, ponytailOverride, };

package/dist/cli/dashboard.js

@@ -457,8 +457,13 @@ function readBody(req) {
     });
 }
 function openBrowser(url) {
-    const cmd = process.platform === 'darwin' ? 'open' : process.platform === 'win32' ? 'start' : 'xdg-open';
-    spawn(cmd, [url], { detached: true, stdio: 'ignore' }).unref();
+    // `start` is a cmd builtin, not an executable: spawning it by name fails with ENOENT.
+    const [cmd, args] = process.platform === 'darwin'
+        ? ['open', [url]]
+        : process.platform === 'win32'
+            ? [process.env.ComSpec || 'cmd.exe', ['/d', '/s', '/c', 'start', '', url]]
+            : ['xdg-open', [url]];
+    spawn(cmd, args, { detached: true, stdio: 'ignore' }).unref();
 }
 // Replacers throughout: session data holds `$'` (shell quoting) and `</script>`, which String.replace would mangle.
 function escapeInline(json) {

package/dist/cli/doctor-fix.js

@@ -2,7 +2,7 @@ import { existsSync, promises as fs } from 'node:fs';
 import { spawnSync } from 'node:child_process';
 import os from 'node:os';
 import path from 'node:path';
-import { BUN_BIN_DIR, HOME, OMP_AGENT_DIR, OMP_PLUGINS_DIR, PACKAGE_NAME, PACKAGE_VERSION, RTK_BINARY_NAME, removeExtensionFromConfig, dryRun, verbose, debug, bundledPonytailSpec, execP, ponytailOverride, readPluginsPackage, } from './common.js';
+import { BUN_BIN_DIR, HOME, NPM_BIN, OMP_AGENT_DIR, OMP_PLUGINS_DIR, PACKAGE_NAME, PACKAGE_VERSION, RTK_BINARY_NAME, removeExtensionFromConfig, dryRun, verbose, debug, bundledPonytailSpec, execP, ponytailOverride, readPluginsPackage, shimCommand, } from './common.js';
 import { execNetwork, sayTagged } from './interactive.js';
 import { wireRtkOmp, wireRtkOpencode, wireRtkPi, ensureRtkInConfig } from './rtk-wiring.js';
 import { RTK_RELEASE_API, fetchJson, findFile, httpsGet, httpsDownload, parseChecksum, readTextIfExists, resolveHostBinary, rtkPlatformSpec, sha256File, } from '../extensions/shared/utils.js';
@@ -14,18 +14,20 @@ export function serviceOrphanPids() {
     const bin = resolveHostBinary('opencode', path.join(HOME, '.opencode', 'bin'));
     if (!bin)
         return [];
+    const shim = shimCommand(bin, ['service', 'status']);
     let status = '';
     try {
-        status = spawnSync(bin, ['service', 'status'], { encoding: 'utf8' }).stdout.trim().toLowerCase();
+        status = spawnSync(shim.cmd, shim.args, { encoding: 'utf8' }).stdout.trim().toLowerCase();
     }
     catch {
         return [];
     }
     if (serviceRunning(status))
         return [];
+    const grepShim = shimCommand('pgrep', ['-f', 'opencode serve --service']);
     let out = '';
     try {
-        out = spawnSync('pgrep', ['-f', 'opencode serve --service'], { encoding: 'utf8' }).stdout ?? '';
+        out = spawnSync(grepShim.cmd, grepShim.args, { encoding: 'utf8' }).stdout ?? '';
     }
     catch {
         return [];
@@ -38,9 +40,10 @@ export function serviceState() {
     const bin = resolveHostBinary('opencode', path.join(HOME, '.opencode', 'bin'));
     if (!bin)
         return null;
+    const shim = shimCommand(bin, ['service', 'status']);
     let status = '';
     try {
-        status = spawnSync(bin, ['service', 'status'], { encoding: 'utf8' }).stdout.trim().toLowerCase();
+        status = spawnSync(shim.cmd, shim.args, { encoding: 'utf8' }).stdout.trim().toLowerCase();
     }
     catch {
         return null;
@@ -49,7 +52,8 @@ export function serviceState() {
         return null;
     let live = false;
     try {
-        const out = spawnSync('pgrep', ['-f', 'opencode serve --service'], { encoding: 'utf8' }).stdout ?? '';
+        const grepShim = shimCommand('pgrep', ['-f', 'opencode serve --service']);
+        const out = spawnSync(grepShim.cmd, grepShim.args, { encoding: 'utf8' }).stdout ?? '';
         live = out.split(/[\s,]+/).some((line) => /^\d+$/.test(line.trim()));
     }
     catch {
@@ -365,7 +369,7 @@ async function fixPonytail(pluginsDir) {
         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) => {
+    await execNetwork('Restoring bundled Ponytail', NPM_BIN, ['install', '--no-audit', '--no-fund'], { cwd: pluginsDir, timeout: 180000 }).catch((e) => {
         throw new Error(`bundled ponytail restore failed: ${e.message}`);
     });
 }
@@ -405,7 +409,8 @@ async function fixOpencodeService() {
         sayTagged('  [warn] opencode not found on PATH; start it with `opencode service start`');
         return;
     }
-    await execNetwork('Starting the OpenCode service', bin, ['service', 'start'], { timeout: 60000 }).catch((e) => {
+    const shim = shimCommand(bin, ['service', 'start']);
+    await execNetwork('Starting the OpenCode service', shim.cmd, shim.args, { timeout: 60000 }).catch((e) => {
         throw new Error(`service start failed: ${shortError(e)}`);
     });
 }

package/dist/cli/doctor.js

@@ -2,15 +2,16 @@
 import { execFileSync } from 'node:child_process';
 import { existsSync, readdirSync, readFileSync, statSync, promises as fs } from 'node:fs';
 import path from 'node:path';
-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 { HOME, OMP_AGENT_DIR, OMP_PLUGINS_DIR, PACKAGE_NAME, PACKAGE_VERSION, args, dryRun, fix, yes, BUN_BIN_DIR, OMP_BIN, execP, parseJsonObject, relTime, shimCommand, } 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 { findHoistedPackage, fetchJson, piAgentDir, readTextIfExists, resolveHostBinary, resolveRtkBinary, ruleBodyProblem } from '../extensions/shared/utils.js';
+import { findHoistedPackage, fetchJson, piAgentDir, readTextIfExists, resolveHostBinary, resolveRtkBinary, rtkPlatformSpec, ruleBodyProblem, tersioHome } from '../extensions/shared/utils.js';
 import { sqliteScript, statsDbPath } from '../extensions/shared/agent-stats.js';
 import { OMP_SUBAGENT_MARKER } from '../extensions/shared/session-state.js';
-import { PI_PONYTAIL_FILES, PONYTAIL_BUNDLE_FILES, TREE_FILES, isObsoleteTreeFile, treeFileText, treeFilesFor } from './manifest.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) {
@@ -42,8 +43,7 @@ async function runDoctor(recheck = false) {
     const updaterIndex = path.join(tersioPluginDir, 'extensions', 'updater', 'index.ts');
     // Probes start concurrently and report in fixed order as data settles; each resolves instead of rejecting.
     const hosts = detectHosts();
-    // Every host keeps a copy, and the copy omp loads is the reference itself, so only the hosts that get
-    // their own copy are compared below. The package root, not the hook's directory, is what the paths hang off.
+    // 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 },
@@ -70,9 +70,7 @@ async function runDoctor(recheck = false) {
     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 at least one 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,
-    // and `detectHosts` reads one as absent: it wants every file or a declared package.
+    // 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;
@@ -103,6 +101,22 @@ async function runDoctor(recheck = false) {
             }
         }
     }
+    // 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')),
@@ -110,9 +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),
@@ -128,7 +146,7 @@ async function runDoctor(recheck = false) {
     const opencodeServiceProbe = opencodeBin
         ? Promise.resolve(serviceState())
         : Promise.resolve(null);
-    const [[ompPkgText, configText], [cavemanIndexText, rtkIndexText, updaterIndexText, ponytailPkgText], [cavemanRuleText, cavemanUltraText, cavemanMegacaveText, pstackRuleText, ruleMtime, rtkBinText, rtkMtime, rtkVersion, ponytailMtime, pricesMtime], [opencodeService]] = await runInteractivePhase('Checking installation', () => Promise.all([
+    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,
@@ -141,9 +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,
@@ -179,6 +201,18 @@ async function runDoctor(recheck = false) {
     function unused(label, detail) {
         console.log(`  —  ${label}: not installed ${detail}`);
     }
+    // A Windows failure names its cause here: several rows below silently degrade when the
+    // platform has no rtk build, and a wrong home would move every one of them.
+    section('Platform');
+    const rtkSpec = rtkPlatformSpec();
+    check('Platform', rtkSpec !== null, `${process.platform}/${process.arch}${rtkSpec ? ` · node ${process.version} · rtk ${rtkSpec.triple}` : ''}`);
+    if (rtkSpec === null) {
+        // Windows on ARM today: rtk publishes no build, so the RTK rows read as not installed.
+        console.log(`      rtk publishes no build for ${process.platform}/${process.arch}; every RTK row below reads as missing`);
+    }
+    // Windows resolves data through the profile, so name the resolved home and data dir.
+    check('Home', HOME !== '', HOME);
+    check('Data', true, path.join(tersioHome(), 'usage.db'));
     section('Hosts');
     for (const host of hosts) {
         // pi can hold a working tree while reading as not installed; use the tree as ground truth.
@@ -201,8 +235,7 @@ 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 with its version, and
-    // this row earns its place only when the manager's report and the live process disagree.
+    // 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) {
@@ -236,7 +269,7 @@ async function runDoctor(recheck = false) {
         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) {
@@ -253,6 +286,16 @@ async function runDoctor(recheck = false) {
         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)
@@ -270,6 +313,11 @@ async function runDoctor(recheck = false) {
         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.
@@ -336,8 +384,8 @@ function ompBinary() {
     const managed = path.join(BUN_BIN_DIR, OMP_BIN);
     return existsSync(managed) ? managed : null;
 }
-// The rule bodies a per-host tree carries. rule.md is the bundled fork; the others track upstream.
-const CAVEMAN_BODIES = ['rule.md', 'rule-ultra.md', 'rule-megacave.md'];
+// 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;
@@ -384,7 +432,8 @@ function subagentMarkerStatus(ompBin) {
         return null;
     let haystack;
     try {
-        haystack = execFileSync(ompBin, ['--version'], { encoding: 'utf8', timeout: 5000, stdio: ['ignore', 'pipe', 'pipe'] })
+        const shim = shimCommand(ompBin, ['--version']);
+        haystack = execFileSync(shim.cmd, shim.args, { encoding: 'utf8', timeout: 5000, stdio: ['ignore', 'pipe', 'pipe'] })
             + readFileSync(ompBin, 'utf8');
     }
     catch {

package/dist/cli/hosts.js

@@ -86,8 +86,7 @@ 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.
-        // OpenCode keeps no package to fall back to, so a present tree is the install; its drifted files get the per-host warning instead.
+        // 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;

package/dist/cli/install.js

@@ -3,7 +3,7 @@ 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, COMBO_PRESET_MODES, HOME, IS_WINDOWS, OMP_AGENT_DIR, OMP_PLUGINS_DIR, OMP_BIN, PACKAGE_NAME, PACKAGE_VERSION, RTK_BINARY_NAME, args, allowUnverified, applyUpdate, bundledPonytailSpec, cavemanDefaultFlag, comboDefaultFlag, command, dryRun, ponytailDefaultFlag, pstackDefaultFlag, profileFlagsGiven, rtkDefaultFlag, verbose, yes, dashboardExport, dashboardPort, currency, debug, ensurePonytailConfigValue, execP, parseJsonObject, readPluginsPackage, writeIfChanged, } from './common.js';
+import { BUN_BIN_DIR, BUN_BIN, COMBO_PRESET_MODES, HOME, IS_WINDOWS, NPM_BIN, OMP_AGENT_DIR, OMP_PLUGINS_DIR, OMP_BIN, PACKAGE_NAME, PACKAGE_VERSION, RTK_BINARY_NAME, args, allowUnverified, applyUpdate, bundledPonytailSpec, cavemanDefaultFlag, comboDefaultFlag, command, dryRun, ponytailDefaultFlag, pstackDefaultFlag, profileFlagsGiven, rtkDefaultFlag, verbose, yes, dashboardExport, dashboardPort, currency, debug, ensurePonytailConfigValue, execP, parseJsonObject, readPluginsPackage, writeIfChanged, } from './common.js';
 import { askInteractiveChoice, askInteractiveConfirm, closeRL, execNetwork, tty, withInteractiveSpinner, withInteractiveTask, sayTagged } from './interactive.js';
 import { printWelcome } from './banner.js';
 import { checkForUpdate, runLatestUpdate } from './update.js';
@@ -80,11 +80,11 @@ async function stepPonytail(pluginsDir, options) {
     else {
         // Reinstall only when the self-plugin step did not materialize it.
         try {
-            await execNetwork('Installing bundled Ponytail', 'npm', ['install', '--no-audit', '--no-fund'], { cwd: pluginsDir, timeout: 180000 });
+            await execNetwork('Installing bundled Ponytail', NPM_BIN, ['install', '--no-audit', '--no-fund'], { cwd: pluginsDir, timeout: 180000 });
         }
         catch {
             try {
-                await execNetwork('Installing bundled Ponytail', 'bun', ['install'], { cwd: pluginsDir, timeout: 180000 });
+                await execNetwork('Installing bundled Ponytail', BUN_BIN, ['install'], { cwd: pluginsDir, timeout: 180000 });
             }
             catch (e) {
                 sayTagged(`  [fail] Could not install bundled ponytail: ${e.message}`);
@@ -136,11 +136,11 @@ async function stepSelfPlugin(pluginsDir, options) {
     await fs.mkdir(pluginsDir, { recursive: true });
     await fs.writeFile(pkgPath, JSON.stringify(pkg, null, 2) + '\n', 'utf8');
     try {
-        await execNetwork('Installing Tersio plugin dependencies', 'npm', ['install', '--no-audit', '--no-fund'], { cwd: pluginsDir, timeout: 180000 });
+        await execNetwork('Installing Tersio plugin dependencies', NPM_BIN, ['install', '--no-audit', '--no-fund'], { cwd: pluginsDir, timeout: 180000 });
     }
     catch {
         try {
-            await execNetwork('Installing Tersio plugin dependencies', 'bun', ['install'], { cwd: pluginsDir, timeout: 180000 });
+            await execNetwork('Installing Tersio plugin dependencies', BUN_BIN, ['install'], { cwd: pluginsDir, timeout: 180000 });
         }
         catch (e) {
             sayTagged(`  [fail] Could not install ${PACKAGE_NAME} into plugins dir: ${e.message}`);
@@ -411,9 +411,12 @@ async function stepRtkFilter(extDir, options) {
         console.log('  RTK filter — install built-in tool output filtering');
     await copySources(extDir, filesUnder('rtk'), 'rtk/filter.ts', options);
 }
-// rule.md is a deliberate fork of skills/caveman/SKILL.md: a blind sync would drop the mode switch line.
+// rule.md and rule-lite.md are our forks and always ship bundled; the other two track upstream and keep a usable body when the fetch fails.
 const CAVEMAN_RULES = [
     ['rule.md', null],
+    ['rule-lite.md', null],
+    ['rule-megacave-lite.md', null],
+    ['rule-megacave-ultra.md', null],
     ['rule-ultra.md', CAVEMAN_REMOTE_ULTRA],
     ['rule-megacave.md', CAVEMAN_REMOTE_MEGACAVE],
 ];
@@ -545,7 +548,8 @@ async function stepOpencode(options) {
         await fs.mkdir(path.dirname(configPath), { recursive: true });
         await fs.rm(path.join(HOME, '.config', 'opencode', 'plugins', 'rtk.ts'), { force: true }).catch(() => { });
     }
-    await writeIfChanged(configPath, `${JSON.stringify(config, null, 2)}\n`, options);
+    // The user's own config, so keep the previous copy beside it.
+    await writeIfChanged(configPath, `${JSON.stringify(config, null, 2)}\n`, { ...options, backup: true });
 }
 async function resolveProfile(opts = {}) {
     // Seed from the stored defaults so flag-less runs keep them.
@@ -1007,6 +1011,7 @@ async function runInstall(forcedHost) {
     await capture('shared', () => stepSharedSessionState(extDir, installOptions));
     await capture('rtk session', () => stepRtkSession(extDir, installOptions));
     await capture('rtk filter', () => stepRtkFilter(extDir, installOptions));
+    await capture('timing', () => stepTiming(extDir, installOptions));
     await capture('caveman', () => stepCaveman(extDir, installOptions));
     await capture('combo', () => stepCombo(extDir, installOptions));
     await capture('pstack', () => stepPstack(extDir, installOptions));

package/dist/cli/manifest.js

@@ -1,10 +1,28 @@
 // Single list of install writes, shared by installer, doctor, and tests.
 import path from 'node:path';
-import { readFileSync } from 'node:fs';
+import { readdirSync, readFileSync } from 'node:fs';
 import { fileURLToPath } from 'node:url';
 import { findPackageRoot, readTextIfExists } from '../extensions/shared/utils.js';
 import { writeIfChanged } from './common.js';
 export const EXT_DIR = path.join(findPackageRoot(path.dirname(fileURLToPath(import.meta.url))), 'extensions');
+/** Every pstack leaf, playbook, and skill the index routes to. */
+function pstackTreeFiles() {
+    const root = path.join(EXT_DIR, "pstack");
+    const out = [];
+    const walk = (dir, rel) => {
+        for (const entry of readdirSync(dir, { withFileTypes: true })) {
+            const child = path.join(dir, entry.name);
+            const relChild = rel ? `${rel}/${entry.name}` : entry.name;
+            if (entry.isDirectory())
+                walk(child, relChild);
+            else if (entry.name.endsWith(".md"))
+                out.push(`pstack/${relChild}`);
+        }
+    };
+    walk(root, "");
+    return out.toSorted();
+}
+export const TREE_PSTACK_FILES = pstackTreeFiles();
 /** Every file in the tree, as paths relative to the extensions directory. */
 export const TREE_FILES = [
     'shared/host.ts',
@@ -17,12 +35,17 @@ export const TREE_FILES = [
     'shared/pricing.ts',
     'shared/carbon.ts',
     'shared/utils.ts',
+    'shared/rtk-eligible.ts',
     'caveman/index.ts',
     'caveman/rule.md',
+    'caveman/rule-lite.md',
+    'caveman/rule-megacave-lite.md',
+    'caveman/rule-megacave-ultra.md',
     'caveman/rule-ultra.md',
     'caveman/rule-megacave.md',
     'pstack/index.ts',
     'pstack/rule.md',
+    ...TREE_PSTACK_FILES,
     'rtk/session.ts',
     'rtk/filter.ts',
     'timing/index.ts',
@@ -108,10 +131,7 @@ export function shippedOmpManifest() {
         return null;
     }
 }
-/**
- * Write the shipped `omp` block over an installed plugin's manifest. The tree files come from this
- * build, so an entry added here reaches the host only when its manifest names it.
- */
+// Write the shipped `omp` block over an installed plugin's manifest: an entry added here reaches the host only when its manifest names it.
 export async function syncPluginManifest(pluginDir, options = {}) {
     const omp = shippedOmpManifest();
     if (omp === null)

package/dist/cli/profile.js

@@ -62,11 +62,12 @@ async function storedProfile() {
     return storedProfileSync();
 }
 function legacyOmpLockPath() {
-    const configHome = process.env.XDG_CONFIG_HOME || path.join(os.homedir(), '.config');
+    const home = process.env.HOME || process.env.USERPROFILE || os.homedir();
+    const configHome = process.env.XDG_CONFIG_HOME || path.join(home, '.config');
     return [
-        path.join(os.homedir(), '.omp', 'plugins', 'omp-plugins.lock.json'),
+        path.join(home, '.omp', 'plugins', 'omp-plugins.lock.json'),
         path.join(configHome, 'omp', 'plugins', 'omp-plugins.lock.json'),
-    ].find((p) => existsSync(p)) ?? path.join(os.homedir(), '.omp', 'plugins', 'omp-plugins.lock.json');
+    ].find((p) => existsSync(p)) ?? path.join(home, '.omp', 'plugins', 'omp-plugins.lock.json');
 }
 function parseStored(raw) {
     if (!raw)
@@ -83,6 +84,29 @@ function parseStored(raw) {
         return null;
     }
 }
+// Upstream Ponytail's pi extension reads its own config for the session default, so the saved default
+// is mirrored there. Without it a headless pi session starts at upstream's default and never injects.
+function ponytailConfigFile() {
+    const base = (process.env.XDG_CONFIG_HOME || '').trim() || path.join(os.homedir(), '.config');
+    return path.join(base, 'ponytail', 'config.json');
+}
+async function mirrorPonytailDefault(mode, options) {
+    const file = ponytailConfigFile();
+    if (options.dryRun) {
+        if (verbose && !options.quiet)
+            console.log(`  [dry-run] would write the Ponytail default to ${file}`);
+        return;
+    }
+    try {
+        const existing = JSON.parse(readTextIfExistsSync(file) ?? '{}');
+        if (existing.defaultMode === mode)
+            return;
+        await fs.mkdir(path.dirname(file), { recursive: true });
+        await fs.writeFile(file, `${JSON.stringify({ ...existing, defaultMode: mode }, null, 2)}\n`, 'utf8');
+        console.log(`  [write] Ponytail default in ${file}`);
+    }
+    catch { /* upstream's config is best-effort; its own default stands */ }
+}
 // Persist profile where every host reads it. `omp plugin config get` no longer reports it; `tersio settings` does.
 async function writePluginSettings(profile, options) {
     const file = tersioSettingsFile();
@@ -106,6 +130,7 @@ async function writePluginSettings(profile, options) {
     await fs.mkdir(path.dirname(file), { recursive: true });
     await fs.writeFile(file, `${JSON.stringify(values, null, 2)}\n`, 'utf8');
     console.log(`  [write] Session defaults in ${file}`);
+    await mirrorPonytailDefault(profile.ponytailDefault, options);
 }
 function formatProfile(profile) {
     return `combo=${profile.comboDefault} (caveman=${profile.cavemanDefault} · rtk=${profile.rtkDefault ? 'on' : 'off'} · ponytail=${profile.ponytailDefault} · pstack=${profile.pstackDefault}) · currency=${profile.currency}`;

package/dist/cli/rtk-wiring.js

@@ -3,6 +3,7 @@ import { existsSync, promises as fs } from 'node:fs';
 import os from 'node:os';
 import path from 'node:path';
 import { execFile } from 'node:child_process';
+import { shimCommand } from '../extensions/shared/utils.js';
 function debugWire(options, msg) {
     if (!options.quiet)
         console.log(`  ${msg}`);
@@ -14,17 +15,19 @@ function shortWiringError(e) {
     return why.slice(0, 200);
 }
 function execFileP(cmd, args, timeout) {
-    return new Promise((resolve, reject) => {
-        execFile(cmd, args, { timeout, encoding: 'utf8' }, (err, stdout, stderr) => {
-            if (err) {
-                err.stderr = String(stderr || '');
-                reject(err);
-            }
-            else {
-                resolve({ stdout: String(stdout), stderr: String(stderr) });
-            }
-        });
+    const { promise, resolve, reject } = Promise.withResolvers();
+    // A `.cmd` shim cannot be spawned directly on Windows, so it runs through the shell.
+    const shim = shimCommand(cmd, args);
+    execFile(shim.cmd, shim.args, { timeout, encoding: 'utf8' }, (err, stdout, stderr) => {
+        if (err) {
+            err.stderr = String(stderr || '');
+            reject(err);
+        }
+        else {
+            resolve({ stdout: String(stdout), stderr: String(stderr) });
+        }
     });
+    return promise;
 }
 async function runWire(rtkBin, spec, options) {
     if (!options.dryRun)

package/dist/cli/uninstall.js

@@ -306,7 +306,7 @@ async function runUninstall(options = {}) {
     }
     // Cleared last: writeConfigLines above would just make a fresh one.
     const cavemanDir = path.join(pluginsDir, 'node_modules', PACKAGE_NAME, 'extensions', 'caveman-session');
-    for (const backup of [`${configPath}.bak`, path.join(cavemanDir, 'rule.md.bak'), path.join(cavemanDir, 'rule-ultra.md.bak'), path.join(cavemanDir, 'rule-megacave.md.bak')]) {
+    for (const backup of [`${configPath}.bak`, path.join(cavemanDir, 'rule.md.bak'), path.join(cavemanDir, 'rule-lite.md.bak'), path.join(cavemanDir, 'rule-megacave-lite.md.bak'), path.join(cavemanDir, 'rule-megacave-ultra.md.bak'), path.join(cavemanDir, 'rule-ultra.md.bak'), path.join(cavemanDir, 'rule-megacave.md.bak')]) {
         await removeUninstallTarget(backup, shouldDryRun, false);
     }
     // Remove the bundled Ponytail copy; its config.yml entry is already filtered.

package/dist/cli/usage.js

@@ -215,6 +215,11 @@ function printReport(report) {
         ['Tokens', `${fmt(t.input)} in · ${fmt(t.output)} out · ${fmt(t.cacheRead)} cache read · ${fmt(t.cacheWrite)} cache write`],
         ['Cost', `${formatCurrency(report.usd, report.currency)}${report.priced ? '' : ' (includes default pricing)'} · ~${formatCurrency(report.savedUsd, report.currency)} cache-saved (est.) · ~${report.co2g.toFixed(1)}g CO2 (est.)${costNote}`],
         ['RTK adoption', `${fmt(a.rtkCalls)}/${fmt(a.eligibleCalls)} eligible Bash calls use RTK (${a.adoptionPct.toFixed(1)}%) · ${fmt(a.missedCalls)} missed · recall ${report.rtkRecall.available ? `${report.rtkRecall.mode} (${report.rtkRecall.entries})` : 'unavailable'}`],
+        // A blended number hides a quiet host, so each host reporting bash calls gets its own row.
+        ...Object.entries(a.byHost)
+            .filter(([, c]) => c.bashCalls > 0)
+            .sort((x, y) => y[1].eligibleCalls - x[1].eligibleCalls)
+            .map(([name, c]) => [`RTK — ${name}`, `${fmt(c.rtkCalls)}/${fmt(c.eligibleCalls)} eligible calls (${c.adoptionPct.toFixed(1)}%) · ${fmt(c.missedCalls)} missed · ${fmt(c.bashCalls)} bash calls`]),
     ], [false, false], 118))
         console.log(l);
     if (measuredCount > 0) {

package/dist/extensions/caveman/index.js

@@ -5,9 +5,10 @@ import { dirname, join } from 'node:path';
 import { injectPromptText, onHostEvent, setExtensionLabel } from '../shared/host.js';
 import { announceStatus, formatCavemanStatus } from '../shared/status.js';
 import { readCavemanDefault } from '../shared/plugin-settings.js';
-const CAVERN_DIR = dirname(fileURLToPath(import.meta.url));
-// Upstream ships one skill per register: default, ultracave, megacave.
-const RULE_FILES = { lite: 'rule.md', full: 'rule.md', ultra: 'rule-ultra.md', 'megacave-lite': 'rule-megacave.md', 'megacave-full': 'rule-megacave.md', 'megacave-ultra': 'rule-megacave.md' };
+import { ruleDir } from '../shared/utils.js';
+const CAVERN_DIR = ruleDir('caveman', dirname(fileURLToPath(import.meta.url)));
+// `rule.md`, `rule-ultra.md`, and `rule-megacave.md` track upstream and are refetched; `lite`, `megacave-lite`, and `megacave-ultra` are our forks and ship bundled.
+const RULE_FILES = { lite: 'rule-lite.md', full: 'rule.md', ultra: 'rule-ultra.md', 'megacave-lite': 'rule-megacave-lite.md', 'megacave-full': 'rule-megacave.md', 'megacave-ultra': 'rule-megacave-ultra.md' };
 const DEFAULT_MODE = 'off';
 // A rule file is immutable for the process, so read each level once; reinstalling needs a restart.
 const instructionCache = new Map();