@krtclcdy/tersio 2.25.4 → 2.25.6

package/dist/cli/manifest.js

@@ -1,13 +1,10 @@
 // Single list of install writes, shared by installer, doctor, and tests.
 import path from 'node:path';
+import { readFileSync } from 'node:fs';
 import { fileURLToPath } from 'node:url';
-import { findPackageRoot } from '../extensions/lib/utils.js';
+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');
-/** Root entrypoint OpenCode resolves for the installed tree; re-exports the versioned entry beside it. Built by join so the path never reads as a relative import (repo-integrity scans literals). */
-const SERVER_SPEC = `./${['opencode', 'server.ts'].join('/')}`;
-export const OPENCODE_SERVER_SHIM = `// Generated by \`tersio install --host opencode\`: OpenCode resolves <pluginDir>/server.ts.
-export { default } from "${SERVER_SPEC}";
-`;
 /** Every file in the tree, as paths relative to the extensions directory. */
 export const TREE_FILES = [
     'shared/host.ts',
@@ -16,19 +13,23 @@ export const TREE_FILES = [
     'shared/types.ts',
     'shared/plugin-settings.ts',
     'shared/usage-ledger.ts',
+    'shared/sqlite.ts',
     'shared/pricing.ts',
     'shared/carbon.ts',
-    'lib/utils.ts',
-    'caveman-session/index.ts',
-    'caveman-session/rule.md',
-    'caveman-session/rule-ultra.md',
-    'caveman-session/rule-megacave.md',
-    'rtk-session/index.ts',
-    'rtk-filter/index.ts',
-    'combo-toggle/index.ts',
-    'tersio-commands/index.ts',
-    'ai-addons-updater/index.ts',
-    'opencode/server.ts',
+    'shared/utils.ts',
+    'caveman/index.ts',
+    'caveman/rule.md',
+    'caveman/rule-ultra.md',
+    'caveman/rule-megacave.md',
+    'pstack/index.ts',
+    'pstack/rule.md',
+    'rtk/session.ts',
+    'rtk/filter.ts',
+    'timing/index.ts',
+    'combo/index.ts',
+    'commands/index.ts',
+    'updater/index.ts',
+    'server.ts',
 ];
 export function sourcePath(relative) {
     return path.join(EXT_DIR, ...relative.split('/'));
@@ -42,3 +43,110 @@ export function filesUnder(dir) {
     }
     return found;
 }
+/** The entries at the extensions root, which `filesUnder` cannot name because it takes a directory. */
+export function rootFiles() {
+    return TREE_FILES.filter((file) => !file.includes('/')).map((file) => [sourcePath(file), file]);
+}
+/** The OpenCode plugin entry: imports `@opencode/plugin`, absent from omp and pi loaders, so it ships there alone. */
+export const OPENCODE_ENTRY = 'server.ts';
+/** pi's rtk entry manifest, generated rather than copied: no other host loads rtk that way. */
+export const PI_RTK_MANIFEST = 'rtk/package.json';
+/** pi's rtk entry manifest, generated rather than copied: no other host loads rtk that way. */
+export const PI_RTK_MANIFEST_BODY = `${JSON.stringify({ pi: { extensions: ['./session.ts', './filter.ts'] } }, null, 2)}\n`;
+/** Files the install generates, keyed by tree path, so one repair path handles copied and generated alike. */
+export const GENERATED_TREE_FILES = {
+    [PI_RTK_MANIFEST]: PI_RTK_MANIFEST_BODY,
+};
+/** The files one host's extension tree holds. The package tree holds all of them. */
+export function treeFilesFor(id) {
+    if (id === 'opencode')
+        return TREE_FILES;
+    const files = TREE_FILES.filter((file) => file !== OPENCODE_ENTRY);
+    return id === 'pi' ? [...files, PI_RTK_MANIFEST] : files;
+}
+/** Obsolete install debris; explicit, not a sweep, because these trees are shared with tersio's other steps. */
+const OBSOLETE_DIRS = ['caveman-session', 'rtk-filter', 'rtk-session', 'combo-toggle', 'tersio-commands', 'ai-addons-updater', 'lib', 'opencode'];
+/** Debris test for a tree-relative path; one definition shared by detection and repair. */
+export function isObsoleteTreeFile(rel, id) {
+    if (rel.endsWith('.bak') || rel === '.DS_Store')
+        return true;
+    if (OBSOLETE_DIRS.includes(rel.split('/')[0]))
+        return true;
+    return rel === 'server.ts' && id !== 'opencode';
+}
+/** A tree file's text: copied files come from the repo, generated ones from their own definition. */
+export function treeFileText(file) {
+    const generated = GENERATED_TREE_FILES[file];
+    if (generated !== undefined)
+        return generated;
+    try {
+        return readFileSync(sourcePath(file), 'utf8');
+    }
+    catch {
+        return null;
+    }
+}
+/** The ponytail ruleset this build ships, copied to every host that cannot install the package. */
+export const PONYTAIL_SKILL_NAMES = ['ponytail', 'ponytail-audit', 'ponytail-debt', 'ponytail-gain', 'ponytail-help', 'ponytail-review'];
+/** The OpenCode bundle: no node_modules there, so the ruleset rides along as files. */
+export const PONYTAIL_BUNDLE_FILES = [
+    'hooks/ponytail-instructions.js',
+    'hooks/ponytail-config.js',
+    ...PONYTAIL_SKILL_NAMES.map((skill) => `skills/${skill}/SKILL.md`),
+];
+/** pi's local package: the same ruleset, plus the extension that injects it. */
+export const PI_PONYTAIL_FILES = ['pi-extension/index.js', ...PONYTAIL_BUNDLE_FILES];
+/** The shipped package manifest, one level above the extension tree. */
+const MANIFEST_PATH = path.join(path.dirname(EXT_DIR), 'package.json');
+/** The `omp` block a host reads for what to load: extensions, features, and the settings schema. */
+export function shippedOmpManifest() {
+    try {
+        const pkg = JSON.parse(readFileSync(MANIFEST_PATH, 'utf8'));
+        return typeof pkg.omp === 'object' && pkg.omp !== null ? pkg.omp : null;
+    }
+    catch {
+        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.
+ */
+export async function syncPluginManifest(pluginDir, options = {}) {
+    const omp = shippedOmpManifest();
+    if (omp === null)
+        return;
+    const pkgPath = path.join(pluginDir, 'package.json');
+    let pkg;
+    try {
+        pkg = JSON.parse(readFileSync(pkgPath, 'utf8'));
+    }
+    catch {
+        return;
+    }
+    if (JSON.stringify(pkg.omp) === JSON.stringify(omp))
+        return;
+    pkg.omp = omp;
+    await writeIfChanged(pkgPath, `${JSON.stringify(pkg, null, 2)}\n`, options);
+}
+/** Copy bundled files into `dest`; misses are reported and skipped, `skip` keeps newer fetched rule bodies. */
+export async function syncTreeFiles(dest, files, options, skip) {
+    const missing = [];
+    for (const file of files) {
+        if (skip?.(file))
+            continue;
+        const generated = GENERATED_TREE_FILES[file];
+        if (generated !== undefined) {
+            await writeIfChanged(path.join(dest, ...file.split('/')), generated, options);
+            continue;
+        }
+        const from = sourcePath(file);
+        const text = await readTextIfExists(from);
+        if (text === null) {
+            missing.push(from);
+            continue;
+        }
+        await writeIfChanged(path.join(dest, ...file.split('/')), text, options);
+    }
+    return missing;
+}

package/dist/cli/profile.js

@@ -1,10 +1,10 @@
 // cli/profile.ts — session-start defaults and the display-currency default,
 import { existsSync, promises as fs, readFileSync } from 'node:fs';
 import path from 'node:path';
-import { CAVEMAN_DEFAULTS, COMBO_PRESET_MODES, PACKAGE_NAME, PONYTAIL_DEFAULTS, verbose, } from './common.js';
+import { CAVEMAN_DEFAULTS, COMBO_PRESET_MODES, PACKAGE_NAME, PONYTAIL_DEFAULTS, PSTACK_DEFAULTS, verbose, } from './common.js';
 import os from 'node:os';
 import { DEFAULT_CURRENCY, isCurrencyCode } from './currency.js';
-import { readTextIfExists } from '../extensions/lib/utils.js';
+import { readTextIfExists } from '../extensions/shared/utils.js';
 import { tersioSettingsFile } from '../extensions/shared/plugin-settings.js';
 function readTextIfExistsSync(file) {
     try {
@@ -21,12 +21,13 @@ function defaultProfile() {
         cavemanDefault: 'off',
         rtkDefault: false,
         ponytailDefault: 'off',
+        pstackDefault: 'off',
         currency: DEFAULT_CURRENCY,
         backupSchedule: 'monthly',
         subagentMarkers: [],
     };
 }
-// Seed once from OMP plugin settings so a pre-~/.tersio install keeps its values. Sync: awaiting let piped stdin arrive before `ask()` attached, so a scripted answer was swallowed and a destructive confirm defaulted to abort.
+// Seed from OMP settings so pre-~/.tersio installs keep values. Sync: awaiting let piped stdin beat `ask()`.
 function storedProfileSync() {
     const base = defaultProfile();
     const stored = parseStored(readTextIfExistsSync(tersioSettingsFile()) ?? readTextIfExistsSync(legacyOmpLockPath()));
@@ -44,6 +45,8 @@ function applyStored(base, stored) {
         base.rtkDefault = stored.rtkDefault;
     if (typeof stored.ponytailDefault === 'string' && PONYTAIL_DEFAULTS.has(stored.ponytailDefault))
         base.ponytailDefault = stored.ponytailDefault;
+    if (typeof stored.pstackDefault === 'string' && PSTACK_DEFAULTS.has(stored.pstackDefault))
+        base.pstackDefault = stored.pstackDefault;
     if (typeof stored.currency === 'string' && isCurrencyCode(stored.currency.trim().toUpperCase())) {
         base.currency = stored.currency.trim().toUpperCase();
     }
@@ -80,7 +83,7 @@ function parseStored(raw) {
         return null;
     }
 }
-// Persist the profile where every host reads it. `omp plugin config get` no longer reports it; `tersio settings` does.
+// 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();
     const values = {
@@ -90,6 +93,7 @@ async function writePluginSettings(profile, options) {
         cavemanDefault: profile.cavemanDefault,
         rtkDefault: profile.rtkDefault,
         ponytailDefault: profile.ponytailDefault,
+        pstackDefault: profile.pstackDefault,
         currency: profile.currency,
         backupSchedule: profile.backupSchedule,
         ...(profile.subagentMarkers.length > 0 ? { subagentMarkers: profile.subagentMarkers } : {}),
@@ -104,21 +108,22 @@ async function writePluginSettings(profile, options) {
     console.log(`  [write] Session defaults in ${file}`);
 }
 function formatProfile(profile) {
-    return `combo=${profile.comboDefault} (caveman=${profile.cavemanDefault} · rtk=${profile.rtkDefault ? 'on' : 'off'} · ponytail=${profile.ponytailDefault}) · currency=${profile.currency}`;
+    return `combo=${profile.comboDefault} (caveman=${profile.cavemanDefault} · rtk=${profile.rtkDefault ? 'on' : 'off'} · ponytail=${profile.ponytailDefault} · pstack=${profile.pstackDefault}) · currency=${profile.currency}`;
 }
 export { defaultProfile, formatProfile, storedProfile, storedProfileSync, writePluginSettings };
 /** The status line the extensions print, read from the persisted profile. */
 export function formatCliStatus(profile) {
-    const { comboDefault, cavemanDefault, rtkDefault, ponytailDefault } = profile;
-    if (comboDefault === 'off' && cavemanDefault === 'off' && !rtkDefault && ponytailDefault === 'off') {
+    const { comboDefault, cavemanDefault, rtkDefault, ponytailDefault, pstackDefault } = profile;
+    if (comboDefault === 'off' && cavemanDefault === 'off' && !rtkDefault && ponytailDefault === 'off' && pstackDefault === 'off') {
         return '🧩 combo OFF';
     }
     const preset = COMBO_PRESET_MODES[comboDefault];
     const isPreset = preset !== undefined
         && preset.caveman === cavemanDefault
         && preset.rtk === rtkDefault
-        && preset.ponytail === ponytailDefault;
+        && preset.ponytail === ponytailDefault
+        && preset.pstack === pstackDefault;
     const level = isPreset ? comboDefault.toUpperCase() : 'CUSTOM';
     const rtk = rtkDefault ? 'ON' : 'OFF';
-    return `🧩 combo ${level}: 🪨caveman=${cavemanDefault.toUpperCase()} ⚡rtk=${rtk} 🦥ponytail=${ponytailDefault.toUpperCase()}`;
+    return `🧩 combo ${level}: 🪨caveman=${cavemanDefault.toUpperCase()} ⚡rtk=${rtk} 🦥ponytail=${ponytailDefault.toUpperCase()} 🥔pstack=${pstackDefault.toUpperCase()}`;
 }

package/dist/cli/rtk-wiring.js

@@ -61,7 +61,7 @@ function rtkExtensionPath() {
     const home = process.env.HOME || process.env.USERPROFILE || os.homedir();
     return path.join(home, '.omp', 'agent', 'extensions', 'rtk.ts');
 }
-// Append rtk.ts after the existing entries (or create the key) so the wire takes effect on the next OMP start.
+// Append rtk.ts so the wire takes effect on the next OMP start.
 export async function ensureRtkInConfig(options) {
     const home = process.env.HOME || process.env.USERPROFILE || os.homedir();
     const configPath = path.join(home, '.omp', 'agent', 'config.yml');

package/dist/cli/settings.js

@@ -1,5 +1,5 @@
 // cli/settings.ts — view/edit session-start defaults and the display currency.
-import { CAVEMAN_DEFAULTS, COMBO_DEFAULTS, COMBO_PRESET_MODES, PONYTAIL_DEFAULTS, cavemanDefaultFlag, comboDefaultFlag, currency, currencyGiven, diagScheduleFlag, dryRun, ponytailDefaultFlag, profileFlagsGiven, rtkDefaultFlag, settingArg, subagentMarkerFlags, subagentMarkersGiven, } from './common.js';
+import { CAVEMAN_DEFAULTS, COMBO_DEFAULTS, COMBO_PRESET_MODES, PONYTAIL_DEFAULTS, PSTACK_DEFAULTS, cavemanDefaultFlag, comboDefaultFlag, currency, currencyGiven, diagScheduleFlag, dryRun, ponytailDefaultFlag, pstackDefaultFlag, profileFlagsGiven, rtkDefaultFlag, settingArg, subagentMarkerFlags, subagentMarkersGiven, } from './common.js';
 import { tersioSettingsFile } from '../extensions/shared/plugin-settings.js';
 import { CURRENCY_CODES } from './currency.js';
 import { textTable } from './usage.js';
@@ -14,12 +14,15 @@ function applyFlags(base) {
     next.cavemanDefault = preset.caveman;
     next.rtkDefault = preset.rtk;
     next.ponytailDefault = preset.ponytail;
+    next.pstackDefault = preset.pstack;
     if (cavemanDefaultFlag !== undefined)
         next.cavemanDefault = cavemanDefaultFlag;
     if (rtkDefaultFlag !== undefined)
         next.rtkDefault = rtkDefaultFlag === 'on';
     if (ponytailDefaultFlag !== undefined)
         next.ponytailDefault = ponytailDefaultFlag;
+    if (pstackDefaultFlag !== undefined)
+        next.pstackDefault = pstackDefaultFlag;
     if (subagentMarkersGiven)
         next.subagentMarkers = subagentMarkerFlags;
     if (currencyGiven)
@@ -41,6 +44,7 @@ async function askProfile(current) {
         cavemanDefault: preset.caveman,
         rtkDefault: preset.rtk,
         ponytailDefault: preset.ponytail,
+        pstackDefault: preset.pstack,
         currency: current.currency,
         backupSchedule: current.backupSchedule,
         subagentMarkers: current.subagentMarkers,
@@ -82,11 +86,11 @@ async function askDiagSchedule(current) {
         return null;
     return picked.value;
 }
-const SETTING_NAMES = ['combo', 'caveman', 'rtk', 'ponytail', 'currency', 'diagnosis', 'markers'];
+const SETTING_NAMES = ['combo', 'caveman', 'rtk', 'ponytail', 'pstack', 'currency', 'diagnosis', 'markers'];
 function settingsUsage() {
-    console.log('  Usage: tersio settings [combo|caveman|rtk|ponytail|currency|diagnosis|markers] [--combo-default off|medium|balanced|max] [--caveman-default off|lite|full|ultra|megacave-lite|megacave-full|megacave-ultra] [--rtk-default on|off] [--ponytail-default off|lite|full|ultra] [--currency USD|PHP|EUR|GBP|JPY|KRW|SGD|AUD|CAD|INR] [--diag-schedule manual|daily|weekly|monthly] [--subagent-marker <text>]... [--dry-run]');
+    console.log('  Usage: tersio settings [combo|caveman|rtk|ponytail|pstack|currency|diagnosis|markers] [--combo-default off|medium|balanced|max] [--caveman-default off|lite|full|ultra|megacave-lite|megacave-full|megacave-ultra] [--rtk-default on|off] [--ponytail-default off|lite|full|ultra] [--pstack-default on|off] [--currency USD|PHP|EUR|GBP|JPY|KRW|SGD|AUD|CAD|INR] [--diag-schedule manual|daily|weekly|monthly] [--subagent-marker <text>]... [--dry-run]');
 }
-// Single-setting jump: `tersio settings diagnosis` prompts only that value instead of walking the whole chain. Returns false when aborted.
+// Single-setting jump: prompts only that value instead of walking the whole chain; null when aborted.
 async function runSingleSetting(name, current, nextDiag) {
     const next = { ...current };
     let diag = nextDiag;
@@ -105,6 +109,7 @@ async function runSingleSetting(name, current, nextDiag) {
             next.cavemanDefault = preset.caveman;
             next.rtkDefault = preset.rtk;
             next.ponytailDefault = preset.ponytail;
+            next.pstackDefault = preset.pstack;
             break;
         }
         case 'caveman': {
@@ -135,6 +140,15 @@ async function runSingleSetting(name, current, nextDiag) {
             next.ponytailDefault = picked.value;
             break;
         }
+        case 'pstack': {
+            const picked = await askInteractiveChoice('pstack default (rigor mode)', [...PSTACK_DEFAULTS].map((v) => ({
+                value: v, label: v,
+            })), next.pstackDefault);
+            if (picked.status !== 'selected')
+                return null;
+            next.pstackDefault = picked.value;
+            break;
+        }
         case 'currency': {
             const picked = await askInteractiveChoice('Display currency (usage/dashboard reports)', CURRENCY_CODES.map((v) => ({
                 value: v, label: v,
@@ -173,6 +187,7 @@ function printSettingsTable(current) {
         ['caveman', current.cavemanDefault, [...CAVEMAN_DEFAULTS].join(' | ')],
         ['rtk', current.rtkDefault ? 'on' : 'off', 'on | off'],
         ['ponytail', current.ponytailDefault, [...PONYTAIL_DEFAULTS].join(' | ')],
+        ['pstack', current.pstackDefault, [...PSTACK_DEFAULTS].join(' | ')],
         ['diagnosis', readDiagSchedule(), 'manual | daily | weekly | monthly'],
         ['markers', current.subagentMarkers.length === 0 ? 'default' : current.subagentMarkers.join(' | '), 'host subagent prompt text'],
     ];
@@ -180,7 +195,7 @@ function printSettingsTable(current) {
         console.log(l);
     }
     console.log(`  Stored: ${tersioSettingsFile()}`);
-    console.log(`  Combo ${current.comboDefault} sets caveman/rtk/ponytail. Tune one: tersio settings <name>`);
+    console.log(`  Combo ${current.comboDefault} sets all four modes. Tune one: tersio settings <name>`);
 }
 async function runSettings() {
     const current = await storedProfile();

package/dist/cli/uninstall.js

@@ -4,19 +4,30 @@ import path from 'node:path';
 import { BUN_BIN_DIR, HOME, OMP_AGENT_DIR, OMP_PLUGINS_DIR, PACKAGE_NAME, RTK_BINARY_NAME, args, dryRun, keepPonytail, removePonytail, removeRtk, yes, debug, writeConfigLines, } from './common.js';
 import { askInteractiveChoice, closeRL, confirmDestructive, tty, sayTagged } from './interactive.js';
 import { detectHosts, hostHint, hostLabel, parseHostArg } from './hosts.js';
-import { piAgentDir, readTextIfExists } from '../extensions/lib/utils.js';
+import { piAgentDir, readTextIfExists } from '../extensions/shared/utils.js';
 import { tersioSettingsFile } from '../extensions/shared/plugin-settings.js';
 // The pi tree mirrors the OMP one. Ponytail and rtk stay: a package and a shared binary are not ours to delete.
 const PONYTAIL_PKG = '@dietrichgebert/ponytail';
 const PI_TREE_DIRS = [
+    // What an install writes now.
+    'caveman',
+    'pstack',
+    'rtk',
+    'updater',
+    'combo',
+    'commands',
+    'shared',
+    'server.ts',
+    // Legacy: a tree an older build wrote, or a foreign name that was never shipped here.
     'caveman-session',
     'rtk-session',
+    'rtk-filter',
     'ai-addons-updater',
     'combo-toggle',
     'tersio-commands',
-    'shared',
     'lib',
     'opencode',
+    'aaa-combo-boot',
 ];
 // One `pi remove`, for both packages the installer adds there.
 async function piRemove(spec, shouldDryRun) {
@@ -90,7 +101,7 @@ async function removePiLayer(host, shouldDryRun, shouldRemovePonytail, shouldRem
         await removeCopiedPonytailSkills(shouldDryRun);
     }
     await Promise.all(targets.map((t) => removeUninstallTarget(t, shouldDryRun)));
-    // rtk's wiring is a loose file, not one of the tree dirs, so it survived --remove-rtk on pi while OMP removed its copy.
+    // rtk's wiring is a loose file, not a tree dir, so it survived --remove-rtk on pi while OMP removed its copy.
     if (shouldRemoveRtk) {
         await removeUninstallTarget(rtkWiring, shouldDryRun, false);
         await removeUninstallTarget(path.join(BUN_BIN_DIR, RTK_BINARY_NAME), shouldDryRun, false);
@@ -237,15 +248,21 @@ async function runUninstall(options = {}) {
     const pluginsDir = OMP_PLUGINS_DIR;
     const ponytailPkgDir = path.join(pluginsDir, 'node_modules', '@dietrichgebert', 'ponytail');
     const targets = [
+        // What an install writes now.
+        'caveman',
+        'rtk',
+        'updater',
+        'combo',
+        'commands',
+        'shared',
+        // Legacy: a tree an older build wrote into the agent tree, or a foreign name never shipped here.
         'caveman-session',
         'rtk-session',
+        'rtk-filter',
         'ai-addons-updater',
         'combo-toggle',
         'tersio-commands',
-        'shared',
-        // Only the updater reads it, and it runs before this.
         'lib',
-        // Legacy: imports session-state.js, so it warns once that module is gone.
         'aaa-combo-boot',
         // Foreign to the OMP loader; never shipped here on purpose.
         'opencode',
@@ -265,7 +282,6 @@ async function runUninstall(options = {}) {
         return false;
     // Remove extension directories (independent paths, so concurrently).
     await Promise.all(targets.map((t) => removeUninstallTarget(t, shouldDryRun)));
-    // Remove Combo, mode-reinforcement, and rtk registrations; Ponytail on request.
     const configRaw = await readTextIfExists(configPath);
     if (configRaw) {
         let lines = configRaw.split('\n');
@@ -275,7 +291,7 @@ async function runUninstall(options = {}) {
                 return false;
             if (shouldRemovePonytail && l.includes('ponytail') && l.includes('pi-extension'))
                 return false;
-            // Our rtk wiring, absolute or relative. Leaving it listed would keep OMP loading a hook for a package that is no longer installed.
+            // Our rtk wiring, absolute or relative. Leaving it listed would keep OMP loading a hook for an uninstalled package.
             const entry = l.trim().replace(/^-\s*/, '').replace(/^['"]|['"]$/g, '');
             if (entry.endsWith(`extensions${path.sep}rtk.ts`) || entry.endsWith('extensions/rtk.ts'))
                 return false;

package/dist/cli/update.js

@@ -4,9 +4,9 @@ import path from 'node:path';
 import { spawn } from 'node:child_process';
 import { IS_WINDOWS, OMP_PLUGINS_DIR, PACKAGE_BIN, PACKAGE_NAME, PACKAGE_VERSION, args, dryRun, execP, parseJsonObject, verbose, } from './common.js';
 import { execNetwork, sayTagged } from './interactive.js';
-import { readTextIfExists, resolveRtkBinary, tersioDataPath } from '../extensions/lib/utils.js';
+import { readTextIfExists, resolveRtkBinary, tersioDataPath } from '../extensions/shared/utils.js';
 import { refreshPrices } from '../extensions/shared/pricing.js';
-import { CAVEMAN_REMOTE_ULTRA, CAVEMAN_REMOTE_MEGACAVE, RTK_RELEASE_API, httpsGet, normalizeRtkVersion, sha256Hex, } from '../extensions/lib/utils.js';
+import { CAVEMAN_REMOTE_ULTRA, CAVEMAN_REMOTE_MEGACAVE, RTK_RELEASE_API, httpsGet, normalizeRtkVersion, sha256Hex, } from '../extensions/shared/utils.js';
 import { parseHostArg } from './hosts.js';
 const UPDATE_CHECK_TTL_MS = 6 * 60 * 60 * 1000;
 function newerThan(a, b) {
@@ -35,7 +35,7 @@ async function latestPublishedVersion() {
         return null;
     }
 }
-// A newer published version, null when up to date, 'unknown' when the registry is unreachable. Cached for a TTL unless force, which must not trust a cache.
+// A newer version, null when up to date, 'unknown' when the registry is unreachable. Cached for a TTL unless force.
 async function checkForUpdate(force = false) {
     const cachePath = tersioDataPath('update-check.json', 'tersio-update-check.json');
     const cached = parseJsonObject(await readTextIfExists(cachePath));
@@ -48,7 +48,7 @@ async function checkForUpdate(force = false) {
         await fs.writeFile(cachePath, JSON.stringify({ latest, lastCheck: Date.now() }) + '\n', 'utf8').catch(() => { });
         return newerThan(latest, PACKAGE_VERSION) ? latest : null;
     }
-    // Unreachable registry: a stale cache naming a newer release is still actionable, else report unknown so nobody claims "latest".
+    // Unreachable registry: a stale cache naming a newer release is actionable, else unknown, so none claim "latest".
     return cached?.latest && newerThan(cached.latest, PACKAGE_VERSION) ? cached.latest : 'unknown';
 }
 // Race a probe against a timeout; failures resolve null so nothing blocks.
@@ -74,12 +74,12 @@ async function execInherit(cmd, args) {
     if (code !== 0)
         throw new Error(`${cmd} exited with code ${code}`);
 }
-// Current → latest per add-on. Every probe is capped and nullable, and the plan prints `unknown` for anything unreachable.
+// Current → latest per add-on. Probes are capped and nullable; the plan prints `unknown` for anything unreachable.
 async function probeUpdatePlan(cliLatest) {
     const rtkBin = resolveRtkBinary();
     const ponytailPkg = path.join(OMP_PLUGINS_DIR, 'node_modules', '@dietrichgebert', 'ponytail', 'package.json');
     // rule.md ships with the release; only the tracked bodies can go stale.
-    const tersioRule = (name) => path.join(OMP_PLUGINS_DIR, 'node_modules', '@krtclcdy', 'tersio', 'extensions', 'caveman-session', name);
+    const tersioRule = (name) => path.join(OMP_PLUGINS_DIR, 'node_modules', '@krtclcdy', 'tersio', 'extensions', 'caveman', name);
     const controller = new AbortController();
     const [rtkLocal, rtkRelease, ruleLocal, ruleRemote, ponytailLocalText] = await Promise.all([
         settle(rtkBin ? execP(rtkBin, ['--version'], { timeout: 5000 }).then((r) => normalizeRtkVersion(r.stdout.trim() || r.stderr.trim()) || null) : Promise.resolve(null), 6000),
@@ -98,7 +98,7 @@ async function probeUpdatePlan(cliLatest) {
         ponytail: ponytailLocalText ? parseJsonObject(ponytailLocalText)?.version ?? null : null,
     };
 }
-// Every add-on prints a version jump when stale, "up to date" otherwise, and "unknown" when its source cannot be reached.
+// Every add-on prints a version jump when stale, "up to date" otherwise, and "unknown" when unreachable.
 function planLines(plan) {
     const stale = [];
     const status = [];
@@ -147,7 +147,6 @@ async function runLatestUpdate() {
     // `--prefer-online` beats the local cache, so a stale @latest cannot pin down.
     const cliLatest = await latestPublishedVersion();
     const target = cliLatest && /^\d+\.\d+\.\d+$/.test(cliLatest) ? `@${cliLatest}` : '@latest';
-    // Best-effort: unreachable probes print as unknown.
     const plan = await probeUpdatePlan(cliLatest);
     const { stale, status } = planLines(plan);
     if (dryRun) {
@@ -181,7 +180,7 @@ async function runLatestUpdate() {
         process.exitCode = 1;
         return;
     }
-    // The npx delegation below only refreshes the OMP-side files; the globally installed CLI keeps its old version until npm -g runs. Refresh both.
+    // The npx delegation below only refreshes the OMP-side files; the global CLI keeps its old version until npm -g runs.
     const globalArgs = IS_WINDOWS
         ? ['/d', '/s', '/c', 'npm', 'install', '-g', `${PACKAGE_NAME}${target}`, '--no-audit', '--no-fund', '--prefer-online']
         : ['install', '-g', `${PACKAGE_NAME}${target}`, '--no-audit', '--no-fund', '--prefer-online'];
@@ -211,7 +210,7 @@ async function runLatestUpdate() {
         ...forwardedArgs,
     ];
     const npmCommandArgs = IS_WINDOWS ? ['/d', '/s', '/c', 'npm', ...npmArgs] : npmArgs;
-    // Inherited stdio, no outer spinner; the delegated installer runs quiet and this parent owns both the plan line and the closing summary.
+    // Inherited stdio, no outer spinner; the quiet installer runs, so this parent owns the plan line and closing summary.
     try {
         await execInherit(npmCommand, npmCommandArgs);
         console.log(`Done — tersio ${plan.cli ?? PACKAGE_VERSION} and add-ons updated.`);