@krtclcdy/tersio 2.24.1 → 2.25.1

package/cli/manifest.js

@@ -2,10 +2,16 @@
 import path from 'node:path';
 import { fileURLToPath } from 'node:url';
 export const EXT_DIR = path.join(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',
     'shared/session-state.ts',
+    'shared/status.ts',
     'shared/types.ts',
     'shared/plugin-settings.ts',
     'shared/usage-ledger.ts',
@@ -18,6 +24,7 @@ export const TREE_FILES = [
     'combo-toggle/index.ts',
     'tersio-commands/index.ts',
     'ai-addons-updater/index.ts',
+    'opencode/server.ts',
 ];
 export function sourcePath(relative) {
     return path.join(EXT_DIR, ...relative.split('/'));

package/cli/profile.js

@@ -1,12 +1,19 @@
 // cli/profile.ts — session-start defaults and the display-currency default,
-// stored in ~/.tersio/settings.json. Shared by install and settings.
-import { existsSync, promises as fs } from 'node:fs';
+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 os from 'node:os';
 import { DEFAULT_CURRENCY, isCurrencyCode } from './currency.js';
 import { readTextIfExists } from '../extensions/lib/utils.js';
 import { tersioSettingsFile } from '../extensions/shared/plugin-settings.js';
+function readTextIfExistsSync(file) {
+    try {
+        return existsSync(file) ? readFileSync(file, 'utf8') : null;
+    }
+    catch {
+        return null;
+    }
+}
 export const BACKUP_SCHEDULES = new Set(['manual', 'daily', 'weekly', 'monthly']);
 function defaultProfile() {
     return {
@@ -16,16 +23,19 @@ function defaultProfile() {
         ponytailDefault: 'off',
         currency: DEFAULT_CURRENCY,
         backupSchedule: 'monthly',
+        subagentMarkers: [],
     };
 }
-// Seed once from OMP plugin settings so a pre-~/.tersio install keeps its values.
-async function storedProfile() {
+// 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.
+function storedProfileSync() {
     const base = defaultProfile();
-    const stored = (await readTextIfExists(tersioSettingsFile())) !== null
-        ? parseStored(await readTextIfExists(tersioSettingsFile()))
-        : parseStored(await readTextIfExists(legacyOmpLockPath()));
+    const stored = parseStored(readTextIfExistsSync(tersioSettingsFile()) ?? readTextIfExistsSync(legacyOmpLockPath()));
     if (!stored)
         return base;
+    applyStored(base, stored);
+    return base;
+}
+function applyStored(base, stored) {
     if (typeof stored.comboDefault === 'string' && stored.comboDefault in COMBO_PRESET_MODES)
         base.comboDefault = stored.comboDefault;
     if (typeof stored.cavemanDefault === 'string' && CAVEMAN_DEFAULTS.has(stored.cavemanDefault))
@@ -40,7 +50,13 @@ async function storedProfile() {
     if (typeof stored.backupSchedule === 'string' && BACKUP_SCHEDULES.has(stored.backupSchedule)) {
         base.backupSchedule = stored.backupSchedule;
     }
-    return base;
+    if (Array.isArray(stored.subagentMarkers)) {
+        // An empty marker would match every turn.
+        base.subagentMarkers = stored.subagentMarkers.filter((m) => typeof m === 'string' && m.trim() !== '');
+    }
+}
+async function storedProfile() {
+    return storedProfileSync();
 }
 function legacyOmpLockPath() {
     const configHome = process.env.XDG_CONFIG_HOME || path.join(os.homedir(), '.config');
@@ -64,8 +80,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 the 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 = {
@@ -77,6 +92,7 @@ async function writePluginSettings(profile, options) {
         ponytailDefault: profile.ponytailDefault,
         currency: profile.currency,
         backupSchedule: profile.backupSchedule,
+        ...(profile.subagentMarkers.length > 0 ? { subagentMarkers: profile.subagentMarkers } : {}),
     };
     if (options.dryRun) {
         if (verbose && !options.quiet)
@@ -90,4 +106,19 @@ async function writePluginSettings(profile, options) {
 function formatProfile(profile) {
     return `combo=${profile.comboDefault} (caveman=${profile.cavemanDefault} · rtk=${profile.rtkDefault ? 'on' : 'off'} · ponytail=${profile.ponytailDefault}) · currency=${profile.currency}`;
 }
-export { defaultProfile, formatProfile, storedProfile, writePluginSettings };
+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') {
+        return '🧩 combo OFF';
+    }
+    const preset = COMBO_PRESET_MODES[comboDefault];
+    const isPreset = preset !== undefined
+        && preset.caveman === cavemanDefault
+        && preset.rtk === rtkDefault
+        && preset.ponytail === ponytailDefault;
+    const level = isPreset ? comboDefault.toUpperCase() : 'CUSTOM';
+    const rtk = rtkDefault ? 'ON' : 'OFF';
+    return `🧩 combo ${level}: 🪨caveman=${cavemanDefault.toUpperCase()} ⚡rtk=${rtk} 🦥ponytail=${ponytailDefault.toUpperCase()}`;
+}

package/cli/rtk-wiring.js

@@ -26,25 +26,39 @@ function execFileP(cmd, args, timeout) {
         });
     });
 }
-// Idempotent: rtk rewrites its file on every init run.
-export async function wireRtkOmp(rtkBin, options = {}) {
+async function runWire(rtkBin, spec, options) {
     if (!options.dryRun)
-        debugWire(options, 'Wiring rtk → OMP (bash tool_call rewrite)…');
+        debugWire(options, `Wiring rtk → ${spec.host} (${spec.mechanism} rewrite)…`);
     if (options.dryRun)
         return true;
-    const wired = await runRtkInit(rtkBin, options);
-    if (!wired)
+    try {
+        await tryRtkInit(rtkBin, spec.initArgs);
+    }
+    catch (e) {
+        console.log(`  [warn] could not wire rtk → ${spec.host}: ${shortWiringError(e)}`);
+        console.log(`  [hint] Manual: ${spec.hint}`);
+        return false;
+    }
+    return true;
+}
+export async function wireRtkOmp(rtkBin, options = {}) {
+    if (!(await runWire(rtkBin, { host: 'OMP', mechanism: 'bash tool_call', initArgs: ['init', '-g', '--agent', 'omp'], hint: 'rtk init -g --agent omp (needs rtk >= 0.49)' }, options)))
         return false;
     await ensureRtkInConfig(options);
     return true;
 }
+export async function wireRtkOpencode(rtkBin, options = {}) {
+    return runWire(rtkBin, { host: 'OpenCode', mechanism: 'tool.execute.before', initArgs: ['init', '-g', '--opencode'], hint: 'rtk init -g --opencode' }, options);
+}
+export async function wireRtkPi(rtkBin, options = {}) {
+    return runWire(rtkBin, { host: 'pi', mechanism: 'bash tool_call', initArgs: ['init', '-g', '--agent', 'pi'], hint: 'rtk init -g --agent pi' }, options);
+}
 // The rtk.ts path rtk init writes (OMP_AGENT_DIR inlined; see header note).
 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 after the existing entries (or create the key) 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');
@@ -81,26 +95,14 @@ export async function ensureRtkInConfig(options) {
         console.log(`  [warn] could not register rtk in config.yml: ${e.message}`);
     }
 }
-async function runRtkInit(rtkBin, options) {
+async function tryRtkInit(rtkBin, initArgs) {
     try {
-        await execFileP(rtkBin, ['init', '-g', '--agent', 'omp'], 30000);
-        debugWire(options, 'rtk OMP extension wired');
-        return true;
+        await execFileP(rtkBin, initArgs, 30000);
+        return;
     }
-    catch (first) {
-        // A fresh binary can lose its first exec to macOS Gatekeeper, so settle and
-        // retry once before reporting failure.
-        await new Promise((resolve) => setTimeout(resolve, 2000));
-        try {
-            await execFileP(rtkBin, ['init', '-g', '--agent', 'omp'], 30000);
-            debugWire(options, 'rtk OMP extension wired');
-            return true;
-        }
-        catch (e) {
-            void first;
-            console.log(`  [warn] could not wire rtk → OMP: ${shortWiringError(e)}`);
-            console.log('  [hint] Manual: rtk init -g --agent omp (needs rtk >= 0.49)');
-            return false;
-        }
+    catch {
+        // A fresh binary can lose its first exec to macOS Gatekeeper: settle, then retry once.
     }
+    await new Promise((resolve) => setTimeout(resolve, 2000));
+    await execFileP(rtkBin, initArgs, 30000);
 }

package/cli/settings.js

@@ -1,10 +1,10 @@
 // cli/settings.ts — view/edit session-start defaults and the display currency.
 import path from 'node:path';
-import { CAVEMAN_DEFAULTS, COMBO_DEFAULTS, COMBO_PRESET_MODES, OMP_PLUGINS_DIR, PACKAGE_NAME, PONYTAIL_DEFAULTS, cavemanDefaultFlag, comboDefaultFlag, currency, currencyGiven, diagScheduleFlag, dryRun, ponytailDefaultFlag, profileFlagsGiven, rtkDefaultFlag, settingArg, } from './common.js';
+import { CAVEMAN_DEFAULTS, COMBO_DEFAULTS, COMBO_PRESET_MODES, OMP_PLUGINS_DIR, PACKAGE_NAME, PONYTAIL_DEFAULTS, cavemanDefaultFlag, comboDefaultFlag, currency, currencyGiven, diagScheduleFlag, dryRun, ponytailDefaultFlag, profileFlagsGiven, rtkDefaultFlag, settingArg, subagentMarkerFlags, subagentMarkersGiven, } from './common.js';
 import { CURRENCY_CODES } from './currency.js';
 import { textTable } from './usage.js';
-import { askInteractiveChoice, closeRL, tty } from './interactive.js';
-import { formatProfile, storedProfile, writePluginSettings } from './profile.js';
+import { ask, askInteractiveChoice, closeRL, tty } from './interactive.js';
+import { formatCliStatus, formatProfile, storedProfile, writePluginSettings } from './profile.js';
 import { readDiagSchedule, setDiagSchedule } from './dashboard.js';
 function applyFlags(base) {
     const next = { ...base };
@@ -20,6 +20,8 @@ function applyFlags(base) {
         next.rtkDefault = rtkDefaultFlag === 'on';
     if (ponytailDefaultFlag !== undefined)
         next.ponytailDefault = ponytailDefaultFlag;
+    if (subagentMarkersGiven)
+        next.subagentMarkers = subagentMarkerFlags;
     if (currencyGiven)
         next.currency = currency;
     return next;
@@ -41,6 +43,7 @@ async function askProfile(current) {
         ponytailDefault: preset.ponytail,
         currency: current.currency,
         backupSchedule: current.backupSchedule,
+        subagentMarkers: current.subagentMarkers,
     };
     const caveman = await askInteractiveChoice('Caveman default', [...CAVEMAN_DEFAULTS].map((v) => ({
         value: v, label: v,
@@ -67,8 +70,26 @@ async function askProfile(current) {
     if (cur.status !== 'selected')
         return null;
     next.currency = cur.value;
+    const markers = await askSubagentMarkers(next.subagentMarkers);
+    if (markers === null)
+        return null;
+    next.subagentMarkers = markers;
     return next;
 }
+// One marker per line; an empty line ends the list. Null aborts.
+async function askSubagentMarkers(current) {
+    console.log('  Subagent prompt markers (one per line, empty line to finish).');
+    if (current.length > 0)
+        console.log(`  Current: ${current.join(' | ')}`);
+    const entered = [];
+    for (;;) {
+        const line = (await ask(`  marker ${entered.length + 1}: `)).trim();
+        if (line === '')
+            break;
+        entered.push(line);
+    }
+    return entered;
+}
 async function askDiagSchedule(current) {
     const picked = await askInteractiveChoice('Diagnosis auto-check', [
         { value: 'manual', label: 'manual', hint: 'check on open' },
@@ -80,12 +101,11 @@ async function askDiagSchedule(current) {
         return null;
     return picked.value;
 }
-const SETTING_NAMES = ['combo', 'caveman', 'rtk', 'ponytail', 'currency', 'diagnosis'];
+const SETTING_NAMES = ['combo', 'caveman', 'rtk', 'ponytail', 'currency', 'diagnosis', 'markers'];
 function settingsUsage() {
-    console.log('  Usage: tersio settings [combo|caveman|rtk|ponytail|currency|diagnosis] [--combo-default off|medium|balanced|max] [--caveman-default off|lite|full|ultra|wenyan-lite|wenyan-full|wenyan-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] [--dry-run]');
+    console.log('  Usage: tersio settings [combo|caveman|rtk|ponytail|currency|diagnosis|markers] [--combo-default off|medium|balanced|max] [--caveman-default off|lite|full|ultra|wenyan-lite|wenyan-full|wenyan-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]');
 }
-// Single-setting jump: `tersio settings diagnosis` prompts only that value
-// instead of walking the whole chain. Returns false when aborted.
+// Single-setting jump: `tersio settings diagnosis` prompts only that value instead of walking the whole chain. Returns false when aborted.
 async function runSingleSetting(name, current, nextDiag) {
     const next = { ...current };
     let diag = nextDiag;
@@ -150,6 +170,13 @@ async function runSingleSetting(name, current, nextDiag) {
             diag = picked;
             break;
         }
+        case 'markers': {
+            const markers = await askSubagentMarkers(next.subagentMarkers);
+            if (markers === null)
+                return null;
+            next.subagentMarkers = markers;
+            break;
+        }
         default: {
             console.error(`[fail] Invalid setting: ${name}. Valid: ${SETTING_NAMES.join(', ')}`);
             process.exit(1);
@@ -166,6 +193,7 @@ function printSettingsTable(current) {
         ['rtk', current.rtkDefault ? 'on' : 'off', 'on | off'],
         ['ponytail', current.ponytailDefault, [...PONYTAIL_DEFAULTS].join(' | ')],
         ['diagnosis', readDiagSchedule(), 'manual | daily | weekly | monthly'],
+        ['markers', current.subagentMarkers.length === 0 ? 'default' : current.subagentMarkers.join(' | '), 'host subagent prompt text'],
     ];
     for (const l of textTable(['Setting', 'Current', 'Valid values'], rows, [false, false, false], 64)) {
         console.log(l);
@@ -201,7 +229,7 @@ async function runSettings() {
         next = single.profile;
         nextDiag = single.diag;
     }
-    else if (profileFlagsGiven || currencyGiven || diagScheduleFlag !== undefined) {
+    else if (profileFlagsGiven || currencyGiven || diagScheduleFlag !== undefined || subagentMarkersGiven) {
         next = applyFlags(current);
     }
     else if (tty()) {
@@ -232,6 +260,7 @@ async function runSettings() {
     }
     await writePluginSettings(next, {});
     setDiagSchedule(nextDiag);
+    console.log(`  ${formatCliStatus(next)}`);
     console.log(`  Defaults: ${formatProfile(next)} · diagnosis=${nextDiag}`);
     console.log('  Applies to fresh sessions only — anything persisted with /combo, /caveman, or /rtk wins.');
     console.log('  Currency applies to usage/dashboard reports; --currency overrides it per run.');

package/cli/uninstall.js

@@ -1,14 +1,13 @@
 // cli/uninstall.ts — remove managed extensions, plugins, and binaries.
 import { promises as fs } from 'node:fs';
 import path from 'node:path';
-import { BUN_BIN_DIR, OMP_AGENT_DIR, OMP_PLUGINS_DIR, PACKAGE_NAME, RTK_BINARY_NAME, args, dryRun, keepPonytail, removePonytail, removeRtk, yes, debug, writeConfigLines, } from './common.js';
+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 { findHoistedPackage, piAgentDir, readTextIfExists } from '../extensions/lib/utils.js';
 import { fileURLToPath } from 'node:url';
 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.
+// 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 = [
     'caveman-session',
@@ -18,6 +17,7 @@ const PI_TREE_DIRS = [
     'tersio-commands',
     'shared',
     'lib',
+    'opencode',
 ];
 // One `pi remove`, for both packages the installer adds there.
 async function piRemove(spec, shouldDryRun) {
@@ -79,8 +79,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 one of the tree dirs, 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);
@@ -186,6 +185,39 @@ async function runUninstall(options = {}) {
         closeRL();
         return removed;
     }
+    if (host === 'opencode') {
+        const dir = path.join(HOME, '.config', 'opencode', 'plugins', 'tersio');
+        const configPath = path.join(HOME, '.config', 'opencode', 'opencode.json');
+        if (!selected.installed && !selected.declared) {
+            sayTagged(`  [skip] ${selected.label} — nothing installed (${selected.installCmd})`);
+            closeRL();
+            return false;
+        }
+        console.log('Will remove:');
+        console.log(`  ${dir}`);
+        console.log(`  ${path.join(HOME, '.config', 'opencode', 'plugins', 'rtk.ts')} (rtk auto-wrap; reinstall with: rtk init -g --opencode)`);
+        console.log(`  the tersio entry in ${configPath}`);
+        if (!confirmed && !(await confirmDestructive('Remove these Tersio files?'))) {
+            closeRL();
+            return false;
+        }
+        await removeUninstallTarget(dir, shouldDryRun);
+        await removeUninstallTarget(path.join(HOME, '.config', 'opencode', 'plugins', 'rtk.ts'), shouldDryRun, false);
+        if (!shouldDryRun) {
+            try {
+                const raw = await readTextIfExists(configPath);
+                const config = raw ? JSON.parse(raw) : {};
+                if (Array.isArray(config.plugins)) {
+                    config.plugins = config.plugins.filter((p) => typeof p !== 'string' || !p.includes('/opencode/plugins/tersio/'));
+                    await fs.writeFile(configPath, `${JSON.stringify(config, null, 2)}\n`, 'utf8');
+                }
+            }
+            catch { /* config missing or not JSON; nothing to scrub */ }
+        }
+        console.log('\nDone. Restart OpenCode to drop the plugin.');
+        closeRL();
+        return true;
+    }
     if (!selected.installed)
         sayTagged(`  [note] ${selected.label} has no tersio install; removing what is left behind.`);
     const extDir = path.join(OMP_AGENT_DIR, 'extensions');
@@ -204,6 +236,8 @@ async function runUninstall(options = {}) {
         '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',
     ].map((dir) => path.join(extDir, dir));
     console.log('Will remove:');
     for (const t of targets) {
@@ -230,8 +264,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 a package that is no longer installed.
             const entry = l.trim().replace(/^-\s*/, '').replace(/^['"]|['"]$/g, '');
             if (entry.endsWith(`extensions${path.sep}rtk.ts`) || entry.endsWith('extensions/rtk.ts'))
                 return false;

package/cli/update.js

@@ -2,11 +2,12 @@
 import { promises as fs } from 'node:fs';
 import path from 'node:path';
 import { spawn } from 'node:child_process';
-import { IS_WINDOWS, OMP_PLUGINS_DIR, PACKAGE_BIN, PACKAGE_NAME, PACKAGE_VERSION, dryRun, execP, parseJsonObject, verbose, } from './common.js';
+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 { refreshPrices } from '../extensions/shared/pricing.js';
 import { CAVEMAN_REMOTE_RULE, RTK_RELEASE_API, httpsGet, normalizeRtkVersion, sha256Hex, } from '../extensions/lib/utils.js';
+import { parseHostArg } from './hosts.js';
 const UPDATE_CHECK_TTL_MS = 6 * 60 * 60 * 1000;
 function newerThan(a, b) {
     const pa = a.replace(/^v/, '').split('.').map((n) => parseInt(n, 10) || 0);
@@ -34,8 +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 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.
 async function checkForUpdate(force = false) {
     const cachePath = tersioDataPath('update-check.json', 'tersio-update-check.json');
     const cached = parseJsonObject(await readTextIfExists(cachePath));
@@ -48,8 +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 still actionable, else report unknown so nobody claims "latest".
     return cached?.latest && newerThan(cached.latest, PACKAGE_VERSION) ? cached.latest : 'unknown';
 }
 // Race a probe against a timeout; failures resolve null so nothing blocks.
@@ -75,8 +74,7 @@ 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. Every probe is capped and nullable, and 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');
@@ -97,8 +95,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 its source cannot be reached.
 function planLines(plan) {
     const stale = [];
     const status = [];
@@ -131,6 +128,18 @@ async function runLatestUpdate() {
         forwardedArgs.push('--dry-run');
     if (verbose)
         forwardedArgs.push('--verbose');
+    // A pinned host refreshes that host's tree; bare update keeps the OMP default.
+    let pinned;
+    try {
+        pinned = parseHostArg(args);
+    }
+    catch (e) {
+        console.error(`[fail] ${e.message}`);
+        process.exitCode = 1;
+        return;
+    }
+    if (pinned)
+        forwardedArgs.push('--host', pinned);
     const npmCommand = IS_WINDOWS ? process.env.ComSpec || 'cmd.exe' : 'npm';
     // `--prefer-online` beats the local cache, so a stale @latest cannot pin down.
     const cliLatest = await latestPublishedVersion();
@@ -169,8 +178,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 globally installed CLI keeps its old version until npm -g runs. Refresh both.
     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'];
@@ -200,11 +208,11 @@ 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 delegated installer runs quiet and this parent owns both the plan line and the closing summary.
     try {
         await execInherit(npmCommand, npmCommandArgs);
-        console.log(`Done — tersio ${plan.cli ?? PACKAGE_VERSION}. Restart OMP.`);
+        const hostName = pinned === 'pi' ? 'pi' : pinned === 'opencode' ? 'OpenCode' : 'OMP';
+        console.log(`Done — tersio ${plan.cli ?? PACKAGE_VERSION}. Restart ${hostName}.`);
         if (!dryRun) {
             try {
                 await refreshPrices();

package/cli/usage.js

@@ -1,13 +1,12 @@
 // cli/usage.ts — ledger + session-token usage report, tokscale-style.
-import { co2GramsFor, displayModelId, energyWhFor, importSessionTokens, ledgerPath, priceFor, readResetWatermark, readRtkAdoption, readRtkRecallDiagnostics, readUsage, refreshPricesIfStale, sessionsDir, usdCost, } from '../extensions/shared/usage-ledger.js';
+import { co2GramsFor, displayModelId, energyWhFor, foldModelsByLabel, importSessionTokens, ledgerPath, priceFor, readResetWatermark, readRtkAdoption, readRtkRecallDiagnostics, readUsage, refreshPricesIfStale, sessionsDir, usdCost, } from '../extensions/shared/usage-ledger.js';
 import { resolveRtkBinary } from '../extensions/lib/utils.js';
 import { readRtkGain } from '../extensions/shared/rtk-gain.js';
-import { readUsageDb, syncUsageDb, usageDbPath } from '../extensions/shared/usage-store.js';
+import { readUsageDb, reparseGuardReport, syncUsageDb, usageDbPath } from '../extensions/shared/usage-store.js';
 import { withInteractiveSpinner } from './interactive.js';
 import { PACKAGE_VERSION, currency } from './common.js';
 import { formatCurrency } from './currency.js';
-// RTK's history is machine-wide; rows group by command alone. 2000 groups
-// covers a long history while still bounding /data.json.
+// RTK's history is machine-wide; rows group by command alone. 2000 groups covers a long history while still bounding /data.json.
 const RTK_COMMAND_ROWS = 2000;
 export function summarizeUsage(rows) {
     refreshPricesIfStale();
@@ -18,8 +17,7 @@ export function summarizeUsage(rows) {
         detailCounts[r.detail] = (detailCounts[r.detail] ?? 0) + 1;
     }
     const byDetail = Object.entries(detailCounts).sort((a, b) => b[1] - a[1]).slice(0, 10);
-    // usage.db is a cache of the same per-message rows: sync best-effort, read
-    // stored, fall back to the live parse when the store is missing or stale.
+    // usage.db is a cache of the same per-message rows: sync best-effort, read stored, fall back to the live parse when the store is missing or stale.
     let synced = false;
     try {
         synced = syncUsageDb();
@@ -27,6 +25,9 @@ export function summarizeUsage(rows) {
     catch {
         synced = false;
     }
+    const guard = reparseGuardReport();
+    if (guard)
+        console.warn(`[warn] usage mirror: ${guard}`);
     let stored = null;
     try {
         stored = readUsageDb()?.tokens ?? null;
@@ -42,19 +43,43 @@ export function summarizeUsage(rows) {
     let savedUsd = 0;
     const byModelUsd = {};
     const byModelBucketUsd = {};
+    const byHost = {};
+    const byDayModel = {};
     let co2g = 0;
     let energyWh = 0;
+    const addTok = (into, t) => {
+        into.input += t.input;
+        into.output += t.output;
+        into.cacheRead += t.cacheRead;
+        into.cacheWrite += t.cacheWrite;
+    };
+    // Price by exact key first (gateways can differ), then fold every map under the display label.
+    const folded = foldModelsByLabel(session.byModel, session.byModelMessages);
     for (const [model, t] of Object.entries(session.byModel)) {
         const c = usdCost(t, model);
         usd += c.usd;
-        byModelUsd[model] = c.usd;
-        byModelBucketUsd[model] = c.buckets;
+        const label = displayModelId(model);
+        byModelUsd[label] = (byModelUsd[label] ?? 0) + c.usd;
+        byModelBucketUsd[label] ??= { input: 0, output: 0, cacheRead: 0, cacheWrite: 0 };
+        addTok(byModelBucketUsd[label], c.buckets);
+        for (const [host, hb] of Object.entries(session.byHost[model] ?? {})) {
+            byHost[label] ??= {};
+            byHost[label][host] ??= { input: 0, output: 0, cacheRead: 0, cacheWrite: 0 };
+            addTok(byHost[label][host], hb);
+        }
         co2g += co2GramsFor(model, t.output);
         energyWh += energyWhFor(model, t.output);
         if (!c.priced)
             priced = false;
         savedUsd += (t.cacheRead / 1e6) * priceFor(model).price.input;
     }
+    for (const [day, per] of Object.entries(session.byDayModel)) {
+        for (const [model, n] of Object.entries(per)) {
+            const label = displayModelId(model);
+            byDayModel[day] ??= {};
+            byDayModel[day][label] = (byDayModel[day][label] ?? 0) + n;
+        }
+    }
     const byTool = Object.entries(session.byTool).sort((a, b) => b[1] - a[1]).slice(0, 10);
     return {
         total: rows.length,
@@ -64,12 +89,13 @@ export function summarizeUsage(rows) {
         empty: rows.length === 0 && session.messages === 0,
         messages: session.messages,
         tokens: session.totals,
-        byModel: session.byModel,
+        byModel: folded.byModel,
         byModelUsd,
         byModelBucketUsd,
-        byModelMessages: session.byModelMessages,
+        byModelMessages: folded.byModelMessages,
+        byHost,
         byDay: session.byDay,
-        byDayModel: session.byDayModel,
+        byDayModel,
         byTool,
         recent: session.recent.map((r) => ({
             ...r,
@@ -117,8 +143,7 @@ const ROW_CAP = 15;
 function pad(s, n) {
     return s.length >= n ? s : s + ' '.repeat(n - s.length);
 }
-// Box-drawing table, plain text (piped-safe, byte-stable). Numeric columns
-// right-align; long cells truncate with an ellipsis. Shared with cli/settings.ts.
+// Box-drawing table, plain text (piped-safe, byte-stable). Numeric columns right-align; long cells truncate with an ellipsis. Shared with cli/settings.ts.
 function textTable(headers, rows, right = [], maxW = 32) {
     const cells = [headers, ...rows].map((r) => r.map((c) => (c.length > maxW ? c.slice(0, maxW - 1) + '…' : c)));
     const widths = headers.map((_, i) => Math.max(...cells.map((r) => r[i].length)));
@@ -153,7 +178,7 @@ function printReport(report) {
             const mt = b.input + b.output + b.cacheRead + b.cacheWrite;
             const hit = b.input + b.cacheRead ? (b.cacheRead / (b.input + b.cacheRead)) * 100 : 0;
             const usd = report.byModelUsd[model] ?? 0;
-            return [displayModelId(model), fmt(b.input), fmt(b.output), `${fmt(b.cacheRead)}/${fmt(b.cacheWrite)}`, formatCurrency(usd, report.currency), `${hit.toFixed(1)}%`, `${bar(mt / top, 8)} ${fmtShort(mt)}`];
+            return [model, fmt(b.input), fmt(b.output), `${fmt(b.cacheRead)}/${fmt(b.cacheWrite)}`, formatCurrency(usd, report.currency), `${hit.toFixed(1)}%`, `${bar(mt / top, 8)} ${fmtShort(mt)}`];
         });
         for (const l of textTable(['Model', 'Input', 'Output', 'Cache r/w', report.currency, 'Hit', 'Share'], mrows, [false, true, true, true, true, true, false])) {
             console.log(l);