@krtclcdy/tersio 2.23.0 → 2.24.0

package/extensions/ai-addons-updater/index.js

@@ -1,21 +1,26 @@
-// OMP extension: /ai-addons manual updater for Ponytail, RTK, Caveman.
-// Built-in Node modules only. Default off; registers a single slash command.
-// ponytail: `skipped: none` — semantics match one-liner: fetch + compare + run install.
-// rtk: `skipped: signature verification` — checksums.txt ships only SHA256 of release assets; add sigchain when upstream publishes a signing key.
-// caveman: `skipped: none` — exactly the ask: write rule.md, report old/new hash.
+// /ai-addons manual updater. Node built-ins only. RTK ships SHA256 checksums
+// with no signature, so checksum-only is the best available.
 import { execFileSync } from 'node:child_process';
 import { createHash } from 'node:crypto';
 import fs from 'node:fs/promises';
 import os from 'node:os';
 import path from 'node:path';
-import { CAVEMAN_REMOTE_RULE as CAVEMAN_REMOTE, RTK_RELEASE_API, fetchJson, findFile, httpsGet, httpsDownload, sha256Hex, parseChecksum, normalizeRtkVersion, readTextIfExists, rtkPlatformSpec, resolveRtkBinary, } from '../lib/utils.js';
+import { fileURLToPath } from 'node:url';
+import { setExtensionLabel } from '../shared/host.js';
+import { CAVEMAN_REMOTE_RULE as CAVEMAN_REMOTE, RTK_RELEASE_API, fetchJson, findFile, findHoistedPackage, httpsGet, httpsDownload, isPiProcess, sha256Hex, parseChecksum, normalizeRtkVersion, readTextIfExists, rtkPlatformSpec, resolveRtkBinary, } from '../lib/utils.js';
 const IS_WINDOWS = process.platform === 'win32';
-const HOME = os.homedir();
+const EXTENSION_DIR = path.dirname(fileURLToPath(import.meta.url));
 const PONYTAIL_REMOTE = 'https://raw.githubusercontent.com/DietrichGebert/ponytail/main/package.json';
-const PONYTAIL_LOCAL = path.join(HOME, '.omp', 'plugins', 'node_modules', '@dietrichgebert', 'ponytail', 'package.json');
 const RTK_BINARY = resolveRtkBinary();
-const CAVEMAN_LOCAL = path.join(HOME, '.omp', 'plugins', 'node_modules', '@krtclcdy', 'tersio', 'extensions', 'caveman-session', 'rule.md');
-const RELOAD_MSG = 'Reminder: restart OMP (or reload extensions) for updates to take effect.';
+// Beside this file, not a host path: that is the rule.md /caveman reads.
+const CAVEMAN_LOCAL = path.join(EXTENSION_DIR, '..', 'caveman-session', 'rule.md');
+const HOST_NAME = isPiProcess() ? 'Pi' : 'OMP';
+const RELOAD_MSG = `Reminder: restart ${HOST_NAME} (or reload extensions) for updates to take effect.`;
+// Ponytail is a hoisted dependency, so the installed copy is found by walking
+// up rather than by naming a host directory.
+function ponytailLocal() {
+    return findHoistedPackage('@dietrichgebert/ponytail', EXTENSION_DIR, 'package.json');
+}
 function notify(ctx, msg, level) {
     ctx?.ui?.notify?.(String(msg), level);
 }
@@ -29,16 +34,25 @@ function shortHash(text) {
 function checkFailed(name, e) {
     return { text: `${name} check failed: ${e.message}`, level: 'warning' };
 }
-// Single error-handling source for the three probes; messages unchanged.
 function runCheck(name, probe) {
     return probe().then((text) => ({ text, level: 'info' }), (e) => checkFailed(name, e));
 }
-// Check: no mutation. Probes run concurrently via checkAddons below.
+// A missing file is "not installed"; an unreadable one is a reportable fault.
+function parsePackageVersion(raw) {
+    if (!raw)
+        return null;
+    try {
+        return JSON.parse(raw).version ?? null;
+    }
+    catch {
+        throw new Error('ponytail package.json is not readable JSON');
+    }
+}
 function checkPonytail() {
     return runCheck('Ponytail', async () => {
         const remoteJson = await fetchJson(PONYTAIL_REMOTE);
-        const localRaw = await readTextIfExists(PONYTAIL_LOCAL);
-        const localVer = localRaw ? JSON.parse(localRaw).version ?? null : null;
+        const localRaw = await readTextIfExists(ponytailLocal() ?? '');
+        const localVer = parsePackageVersion(localRaw);
         const remoteVer = remoteJson.version;
         const status = !localVer ? 'not installed'
             : localVer === remoteVer ? 'up to date'
@@ -120,13 +134,10 @@ async function checkAddons(ctx) {
     return lines.join('\n');
 }
 async function updatePonytail(pi, ctx, dryRun = false) {
-    // Bundled with tersio: no separate package to refresh. `tersio update`
-    // pulls the bundled copy with the CLI.
+    // Bundled with tersio: `tersio update` pulls the copy with the CLI.
     let localVer = null;
     try {
-        const raw = await readTextIfExists(PONYTAIL_LOCAL);
-        if (raw)
-            localVer = JSON.parse(raw).version ?? null;
+        localVer = parsePackageVersion(await readTextIfExists(ponytailLocal() ?? ''));
     }
     catch {
         localVer = null;
@@ -150,7 +161,6 @@ async function updateRtk(ctx, dryRun = false) {
     const assets = Array.isArray(release.assets) ? release.assets : [];
     if (!RTK_BINARY)
         return report(ctx, 'RTK: executable not found in PATH', 'warning');
-    // Cross-platform asset selection (mirrors installer stepRtk)
     const PLATFORM = process.platform;
     const ARCH = process.arch;
     const spec = rtkPlatformSpec(PLATFORM, ARCH);
@@ -179,7 +189,6 @@ async function updateRtk(ctx, dryRun = false) {
             httpsDownload(asset.browser_download_url, archivePath),
             httpsDownload(checksAsset.browser_download_url, checksPath),
         ]);
-        // Verify SHA256 against checksums.txt
         const checks = await fs.readFile(checksPath, 'utf8');
         const expected = parseChecksum(checks, asset.name);
         if (!expected) {
@@ -193,7 +202,6 @@ async function updateRtk(ctx, dryRun = false) {
             return report(ctx, m, 'warning');
         }
         notify(ctx, 'RTK: checksum verified.', 'info');
-        // Extract by archive format
         const extractDir = path.join(tmp, 'extracted');
         await fs.mkdir(extractDir, { recursive: true });
         if (asset.name.endsWith('.zip')) {
@@ -225,7 +233,6 @@ async function updateRtk(ctx, dryRun = false) {
         const backupPath = `${RTK_BINARY}.bak`;
         const backedUp = await fs.copyFile(RTK_BINARY, backupPath).then(() => true, () => false);
         await fs.copyFile(rtkExtracted, RTK_BINARY);
-        // Set executable bit on Unix
         if (!IS_WINDOWS) {
             await fs.chmod(RTK_BINARY, 0o755);
         }
@@ -293,7 +300,7 @@ async function updateCaveman(ctx, dryRun = false) {
     }
 }
 export default function aiAddonsUpdaterExtension(pi) {
-    pi.setLabel?.('AI add-ons updater');
+    setExtensionLabel(pi, 'AI add-ons updater');
     pi.registerCommand?.('ai-addons', {
         description: 'Check or update AI add-ons (ponytail/rtk/caveman/all). Usage: /ai-addons <check|status|update ponytail|rtk|caveman|all> [--dry-run]',
         handler: async (args, ctx) => {

package/extensions/ai-addons-updater/index.ts

@@ -1,23 +1,24 @@
-// OMP extension: /ai-addons manual updater for Ponytail, RTK, Caveman.
-// Built-in Node modules only. Default off; registers a single slash command.
-// ponytail: `skipped: none` — semantics match one-liner: fetch + compare + run install.
-// rtk: `skipped: signature verification` — checksums.txt ships only SHA256 of release assets; add sigchain when upstream publishes a signing key.
-// caveman: `skipped: none` — exactly the ask: write rule.md, report old/new hash.
+// /ai-addons manual updater. Node built-ins only. RTK ships SHA256 checksums
+// with no signature, so checksum-only is the best available.
 
 import { execFileSync } from 'node:child_process';
 import { createHash } from 'node:crypto';
 import fs from 'node:fs/promises';
 import os from 'node:os';
 import path from 'node:path';
+import { fileURLToPath } from 'node:url';
 
+import { setExtensionLabel } from '../shared/host.ts';
 import {
   CAVEMAN_REMOTE_RULE as CAVEMAN_REMOTE,
   RTK_RELEASE_API,
   RtkRelease,
   fetchJson,
   findFile,
+  findHoistedPackage,
   httpsGet,
   httpsDownload,
+  isPiProcess,
   sha256Hex,
   parseChecksum,
   normalizeRtkVersion,
@@ -27,23 +28,20 @@ import {
 } from '../lib/utils.ts';
 
 const IS_WINDOWS = process.platform === 'win32';
-const HOME = os.homedir();
+const EXTENSION_DIR = path.dirname(fileURLToPath(import.meta.url));
 
 const PONYTAIL_REMOTE = 'https://raw.githubusercontent.com/DietrichGebert/ponytail/main/package.json';
-const PONYTAIL_LOCAL = path.join(HOME, '.omp', 'plugins', 'node_modules', '@dietrichgebert', 'ponytail', 'package.json');
 const RTK_BINARY = resolveRtkBinary();
-const CAVEMAN_LOCAL = path.join(
-  HOME,
-  '.omp',
-  'plugins',
-  'node_modules',
-  '@krtclcdy',
-  'tersio',
-  'extensions',
-  'caveman-session',
-  'rule.md',
-);
-const RELOAD_MSG = 'Reminder: restart OMP (or reload extensions) for updates to take effect.';
+// Beside this file, not a host path: that is the rule.md /caveman reads.
+const CAVEMAN_LOCAL = path.join(EXTENSION_DIR, '..', 'caveman-session', 'rule.md');
+const HOST_NAME = isPiProcess() ? 'Pi' : 'OMP';
+const RELOAD_MSG = `Reminder: restart ${HOST_NAME} (or reload extensions) for updates to take effect.`;
+
+// Ponytail is a hoisted dependency, so the installed copy is found by walking
+// up rather than by naming a host directory.
+function ponytailLocal(): string | null {
+  return findHoistedPackage('@dietrichgebert/ponytail', EXTENSION_DIR, 'package.json');
+}
 
 // --- Types ---
 
@@ -85,17 +83,25 @@ function checkFailed(name: string, e: unknown): AddonStatus {
   return { text: `${name} check failed: ${(e as Error).message}`, level: 'warning' };
 }
 
-// Single error-handling source for the three probes; messages unchanged.
 function runCheck(name: string, probe: () => Promise<string>): Promise<AddonStatus> {
   return probe().then((text) => ({ text, level: 'info' as const }), (e) => checkFailed(name, e));
 }
 
-// Check: no mutation. Probes run concurrently via checkAddons below.
+// A missing file is "not installed"; an unreadable one is a reportable fault.
+function parsePackageVersion(raw: string | null): string | null {
+  if (!raw) return null;
+  try {
+    return (JSON.parse(raw) as { version?: string }).version ?? null;
+  } catch {
+    throw new Error('ponytail package.json is not readable JSON');
+  }
+}
+
 function checkPonytail(): Promise<AddonStatus> {
   return runCheck('Ponytail', async () => {
     const remoteJson = await fetchJson<{ version?: string }>(PONYTAIL_REMOTE);
-    const localRaw = await readTextIfExists(PONYTAIL_LOCAL);
-    const localVer = localRaw ? (JSON.parse(localRaw) as { version?: string }).version ?? null : null;
+    const localRaw = await readTextIfExists(ponytailLocal() ?? '');
+    const localVer = parsePackageVersion(localRaw);
     const remoteVer = remoteJson.version;
     const status = !localVer ? 'not installed'
       : localVer === remoteVer ? 'up to date'
@@ -175,12 +181,10 @@ async function checkAddons(ctx: AddonUpdaterCtx): Promise<string> {
 }
 
 async function updatePonytail(pi: AddonUpdaterPi, ctx: AddonUpdaterCtx, dryRun = false): Promise<string> {
-  // Bundled with tersio: no separate package to refresh. `tersio update`
-  // pulls the bundled copy with the CLI.
+  // Bundled with tersio: `tersio update` pulls the copy with the CLI.
   let localVer: string | null = null;
   try {
-    const raw = await readTextIfExists(PONYTAIL_LOCAL);
-    if (raw) localVer = (JSON.parse(raw) as { version?: string }).version ?? null;
+    localVer = parsePackageVersion(await readTextIfExists(ponytailLocal() ?? ''));
   } catch { localVer = null; }
   void pi;
   const m = dryRun
@@ -201,7 +205,6 @@ async function updateRtk(ctx: AddonUpdaterCtx, dryRun = false): Promise<string>
   const assets = Array.isArray(release.assets) ? release.assets : [];
   if (!RTK_BINARY) return report(ctx, 'RTK: executable not found in PATH', 'warning');
 
-  // Cross-platform asset selection (mirrors installer stepRtk)
   const PLATFORM = process.platform;
   const ARCH = process.arch;
   const spec = rtkPlatformSpec(PLATFORM, ARCH);
@@ -234,7 +237,6 @@ async function updateRtk(ctx: AddonUpdaterCtx, dryRun = false): Promise<string>
       httpsDownload(asset.browser_download_url, archivePath),
       httpsDownload(checksAsset.browser_download_url, checksPath),
     ]);
-    // Verify SHA256 against checksums.txt
     const checks = await fs.readFile(checksPath, 'utf8');
     const expected = parseChecksum(checks, asset.name);
     if (!expected) {
@@ -249,7 +251,6 @@ async function updateRtk(ctx: AddonUpdaterCtx, dryRun = false): Promise<string>
     }
     notify(ctx, 'RTK: checksum verified.', 'info');
 
-    // Extract by archive format
     const extractDir = path.join(tmp, 'extracted');
     await fs.mkdir(extractDir, { recursive: true });
 
@@ -281,7 +282,6 @@ async function updateRtk(ctx: AddonUpdaterCtx, dryRun = false): Promise<string>
 
     await fs.copyFile(rtkExtracted, RTK_BINARY);
 
-    // Set executable bit on Unix
     if (!IS_WINDOWS) {
       await fs.chmod(RTK_BINARY, 0o755);
     }
@@ -343,7 +343,7 @@ async function updateCaveman(ctx: AddonUpdaterCtx, dryRun = false): Promise<stri
 }
 
 export default function aiAddonsUpdaterExtension(pi: AddonUpdaterPi): void {
-  pi.setLabel?.('AI add-ons updater');
+  setExtensionLabel(pi, 'AI add-ons updater');
 
   pi.registerCommand?.('ai-addons', {
     description: 'Check or update AI add-ons (ponytail/rtk/caveman/all). Usage: /ai-addons <check|status|update ponytail|rtk|caveman|all> [--dry-run]',

package/extensions/caveman-session/index.js

@@ -1,7 +1,8 @@
 import { readFileSync } from 'node:fs';
 import { fileURLToPath } from 'node:url';
-import { activeModesSummary, asPromptArray, getSharedComboState, isComboPresetActive, isOmpSubagentPrompt, lastCustomValue, normalizeInputCommand, normalizeMode, paintStatusBar, paintableCtx, reconcileSharedComboEntries, sessionEntries, setSharedComboListener, setSharedComboMode } from '../shared/session-state.js';
+import { activeModesSummary, getSharedComboState, isComboPresetActive, isOmpSubagentPrompt, lastCustomValue, normalizeInputCommand, normalizeMode, paintStatusBar, paintableCtx, reconcileSharedComboEntries, sessionEntries, setSharedComboListener, setSharedComboMode } from '../shared/session-state.js';
 import { dirname, join } from 'node:path';
+import { injectPromptText, onHostEvent, setExtensionLabel } from '../shared/host.js';
 import { readCavemanDefault } from '../shared/plugin-settings.js';
 const CAVERN_DIR = dirname(fileURLToPath(import.meta.url));
 const RULE_PATH = join(CAVERN_DIR, 'rule.md');
@@ -77,7 +78,7 @@ export default function cavemanSessionExtension(pi) {
         ctx?.ui?.notify?.(msg, 'info');
         return true;
     }
-    pi.setLabel?.('Caveman session toggle');
+    setExtensionLabel(pi, 'Caveman session toggle');
     // Live mirror: a /tersio or /combo switch publishes shared state — adopt
     // it at once so the next turn injects the new mode with no session reload.
     // Stable identity, so the bridge set dedupes across re-inits.
@@ -106,7 +107,7 @@ export default function cavemanSessionExtension(pi) {
             }
         },
     });
-    pi.on('input', async (event) => {
+    onHostEvent(pi, 'input', async (event) => {
         if (event?.source === 'extension')
             return;
         if (currentMode !== 'off' && isOffCommand(event?.text))
@@ -129,7 +130,7 @@ export default function cavemanSessionExtension(pi) {
         restoreMode(ctx);
         ctx?.ui?.notify?.(`Caveman loaded: ${currentMode}`, 'info');
     });
-    pi.on('session_branch', async (_event, ctx) => {
+    onHostEvent(pi, 'session_branch', async (_event, ctx) => {
         restoreMode(ctx);
     });
     pi.on('session_tree', async (_event, ctx) => {
@@ -151,7 +152,6 @@ export default function cavemanSessionExtension(pi) {
         if (!def)
             return;
         const instruction = typeof def === 'function' ? def() : def;
-        const base = asPromptArray(event.systemPrompt);
-        return { systemPrompt: [...base, instruction] };
+        return injectPromptText(pi, event, instruction);
     });
 }

package/extensions/caveman-session/index.ts

@@ -1,7 +1,8 @@
 import { readFileSync } from 'node:fs';
 import { fileURLToPath } from 'node:url';
-import { activeModesSummary, asPromptArray, getSharedComboState, isComboPresetActive, isOmpSubagentPrompt, lastCustomValue, normalizeInputCommand, normalizeMode, paintStatusBar, paintableCtx, reconcileSharedComboEntries, sessionEntries, setSharedComboListener, setSharedComboMode } from '../shared/session-state.ts';
+import { activeModesSummary, getSharedComboState, isComboPresetActive, isOmpSubagentPrompt, lastCustomValue, normalizeInputCommand, normalizeMode, paintStatusBar, paintableCtx, reconcileSharedComboEntries, sessionEntries, setSharedComboListener, setSharedComboMode } from '../shared/session-state.ts';
 import { dirname, join } from 'node:path';
+import { injectPromptText, onHostEvent, setExtensionLabel } from '../shared/host.ts';
 import { readCavemanDefault } from '../shared/plugin-settings.ts';
 import type { ExtensionApi, ExtensionCtx, InputEvent, SessionEntry, SystemPromptEvent } from '../shared/types.ts';
 
@@ -81,7 +82,7 @@ export default function cavemanSessionExtension(pi: ExtensionApi): void {
     return true;
   }
 
-  pi.setLabel?.('Caveman session toggle');
+  setExtensionLabel(pi, 'Caveman session toggle');
 
   // Live mirror: a /tersio or /combo switch publishes shared state — adopt
   // it at once so the next turn injects the new mode with no session reload.
@@ -112,7 +113,7 @@ export default function cavemanSessionExtension(pi: ExtensionApi): void {
     },
   });
 
-  pi.on<InputEvent>('input', async (event) => {
+  onHostEvent<InputEvent>(pi, 'input', async (event) => {
     if (event?.source === 'extension') return;
     if (currentMode !== 'off' && isOffCommand(event?.text)) setMode('off');
   });
@@ -136,7 +137,7 @@ export default function cavemanSessionExtension(pi: ExtensionApi): void {
     ctx?.ui?.notify?.(`Caveman loaded: ${currentMode}`, 'info');
   });
 
-  pi.on('session_branch', async (_event, ctx) => {
+  onHostEvent(pi, 'session_branch', async (_event, ctx) => {
     restoreMode(ctx);
   });
 
@@ -160,7 +161,6 @@ export default function cavemanSessionExtension(pi: ExtensionApi): void {
     const def = INSTRUCTIONS[mode];
     if (!def) return;
     const instruction = typeof def === 'function' ? def() : def;
-    const base = asPromptArray(event.systemPrompt);
-    return { systemPrompt: [...base, instruction] };
+    return injectPromptText(pi, event, instruction);
   });
 }

package/extensions/combo-toggle/index.js

@@ -1,33 +1,47 @@
-// /combo session toggle — set all three (caveman, rtk, ponytail) at once.
-// Modes: off | medium | balanced | max
-import os from 'node:os';
+// /combo session toggle: off | medium | balanced | max.
+var __rewriteRelativeImportExtension = (this && this.__rewriteRelativeImportExtension) || function (path, preserveJsx) {
+    if (typeof path === "string" && /^\.\.?\//.test(path)) {
+        return path.replace(/\.(tsx)$|((?:\.d)?)((?:\.[^./]+?)?)\.([cm]?)ts$/i, function (m, tsx, d, ext, cm) {
+            return tsx ? preserveJsx ? ".jsx" : ".js" : d && (!ext || !cm) ? m : (d + ext + "." + cm.toLowerCase() + "js");
+        });
+    }
+    return path;
+};
 import path from 'node:path';
-import { createRequire } from 'node:module';
-import { activeModesSummary, asPromptArray, COMBO_LEVELS, getSharedComboState, isComboPresetActive, isOmpSubagentPrompt, normalizeComboLevel, paintableCtx, reconcileSharedComboEntries, sessionEntries, setSharedComboLevel, setSharedComboListener, setSharedComboMode, systemPromptIncludes, } from '../shared/session-state.js';
+import { fileURLToPath, pathToFileURL } from 'node:url';
+import { activeModesSummary, COMBO_LEVELS, getSharedComboState, isComboPresetActive, isOmpSubagentPrompt, normalizeComboLevel, paintableCtx, reconcileSharedComboEntries, sessionEntries, setSharedComboLevel, setSharedComboListener, setSharedComboMode, systemPromptIncludes, themeStatus, } from '../shared/session-state.js';
+import { hostSelect, injectPromptText, onHostEvent, setExtensionLabel } from '../shared/host.js';
 import { isComboSetupComplete, readComboDefault, readPonytailDefault, saveComboSetup, } from '../shared/plugin-settings.js';
-const require = createRequire(import.meta.url);
+import { findHoistedPackage } from '../lib/utils.js';
+const EXTENSION_DIR = path.dirname(fileURLToPath(import.meta.url));
 const PONYTAIL_FALLBACK_INTENSITY = {
     lite: 'Prefer the simplest correct solution.',
 };
-function ponytailFallback(mode) {
+// Fallback text when Ponytail cannot be found; exported for its own test.
+export function ponytailFallback(mode) {
     const intensity = PONYTAIL_FALLBACK_INTENSITY[mode] ?? 'Use the minimum correct solution. Delete or reuse before adding.';
     return `🦥 PONYTAIL MODE ACTIVE — level: ${mode}\n${intensity} Understand the path first and fix root causes, not symptoms. Prefer the standard library and YAGNI. Avoid speculative abstractions and dependencies. Preserve correctness. Verify changed behavior.`;
 }
 function levelSummary(state) {
     return `caveman=${state.caveman} rtk=${state.rtk} ponytail=${state.ponytail}`;
 }
-function loadPonytailInstructions(mode) {
-    try {
-        const installed = path.join(os.homedir(), '.omp', 'plugins', 'node_modules', '@dietrichgebert', 'ponytail', 'hooks', 'ponytail-instructions.js');
-        const { getPonytailInstructions } = require(installed);
-        if (typeof getPonytailInstructions === 'function')
-            return getPonytailInstructions(mode);
+// Ponytail is hoisted, so one upward walk covers every install layout. The hook
+// is CommonJS, so both namespace shapes are tried.
+async function loadPonytailInstructions(mode) {
+    const installed = findHoistedPackage('@dietrichgebert/ponytail', EXTENSION_DIR, 'hooks', 'ponytail-instructions.js');
+    if (installed) {
+        try {
+            const loaded = await import(__rewriteRelativeImportExtension(pathToFileURL(installed).href));
+            const build = loaded.getPonytailInstructions ?? loaded.default?.getPonytailInstructions;
+            if (build)
+                return build(mode);
+        }
+        catch { /* fall through to the built-in text */ }
     }
-    catch { }
     return ponytailFallback(mode);
 }
 export default function comboToggleExtension(pi) {
-    pi.setLabel?.('Combo session toggle (all 3 add-ons)');
+    setExtensionLabel(pi, 'Combo session toggle (all 3 add-ons)');
     let lastCtx = undefined;
     let setupPrompted = false;
     function syncStatus(ctx) {
@@ -35,31 +49,24 @@ export default function comboToggleExtension(pi) {
         const c = lastCtx;
         if (!c?.ui?.setStatus)
             return;
-        // Single unified bar replaces the three per-extension bars while a preset is
-        // active. In custom/off, the individual bars come back and combo stays clear.
+        // One unified bar replaces the per-extension bars while a preset is active.
         if (!isComboPresetActive()) {
             c.ui.setStatus('combo', undefined);
             return;
         }
-        // Read the live bridge, not cached extension state: sibling extensions
-        // reconcile it from persisted entries before this one runs.
+        // Read the live bridge, not a cache: siblings reconcile it first.
         const state = getSharedComboState();
-        const theme = c.ui.theme;
         const c0 = state.caveman.toUpperCase();
         const r = state.rtk.toUpperCase();
         const p = state.ponytail.toUpperCase();
         const lvl = state.level.toUpperCase();
-        const label = `combo ${lvl}: 🪨caveman=${c0} ⚡rtk=${r} 🦥ponytail=${p}`;
-        c.ui.setStatus('combo', theme?.fg ? `${theme.fg('accent', '🧩')} ${theme.fg('muted', label)}` : `🧩 ${label}`);
-        // Clobber any sibling bars another extension may have painted in a race
-        // during session_start — our bar is canonical for the duration of the preset.
+        c.ui.setStatus('combo', themeStatus(c.ui, '🧩', `combo ${lvl}: 🪨caveman=${c0} ⚡rtk=${r} 🦥ponytail=${p}`, true));
+        // Our bar is canonical for the preset, so clear any sibling bar.
         c.ui.setStatus('caveman', undefined);
         c.ui.setStatus('rtk', undefined);
         c.ui.setStatus('ponytail', undefined);
     }
-    // ponytail: same persistence as /combo — siblings (incl. upstream ponytail)
-    // restore from these entries, so the fallback must write them too or the
-    // preset evaporates on resume and ponytail never activates.
+    // Siblings restore from these entries, so the fallback must write them too.
     function persistPreset(level) {
         const modes = COMBO_LEVELS[level];
         pi.appendEntry?.('caveman-mode', { mode: modes.caveman });
@@ -77,8 +84,7 @@ export default function comboToggleExtension(pi) {
         return useState(reconcileSharedComboEntries(sessionEntries(ctx)), ctx);
     }
     function listen(ctx) {
-        // Stable identity: the bridge set dedupes, so repeated track()/command
-        // calls register once instead of stacking duplicate listeners.
+        // Stable identity: the bridge set dedupes, so repeat calls register once.
         if (ctx?.hasUI)
             setSharedComboListener(useState);
     }
@@ -119,7 +125,7 @@ export default function comboToggleExtension(pi) {
         if (setupPrompted || !ctx?.hasUI || !ctx.ui?.select || isComboSetupComplete())
             return;
         setupPrompted = true;
-        const choice = await ctx.ui.select('Session-start defaults — Combo preset', [
+        const choice = await hostSelect(pi, ctx.ui, 'Session-start defaults — Combo preset', [
             { label: 'off', description: 'Keep every Tersio mode inactive' },
             { label: 'medium', description: 'caveman=lite, rtk=on, ponytail=lite' },
             { label: 'balanced', description: 'caveman=full, rtk=on, ponytail=full' },
@@ -137,9 +143,7 @@ export default function comboToggleExtension(pi) {
         if (!ctx?.hasUI)
             syncStatus(ctx);
         await runFirstRunSetup(ctx);
-        // Installer/user-configured default applies only when no persisted *mode*
-        // state exists — unrelated session entries must not block it, or the
-        // combo bar never paints on sessions that already carry other entries.
+        // The configured default applies only when no persisted mode state exists.
         const entries = sessionEntries(ctx);
         const hasModeState = entries.some((e) => e?.type === 'custom' && (e.customType === 'combo-level' || e.customType === 'caveman-mode' ||
             e.customType === 'rtk-mode' || e.customType === 'ponytail-mode'));
@@ -151,10 +155,8 @@ export default function comboToggleExtension(pi) {
                 ctx?.ui?.notify?.(`Combo default applied: ${fallback} — ${activeModesSummary(getSharedComboState())} active for this session.`, 'info');
             }
         }
-        // Standalone ponytail default: no sibling extension restores it (upstream
-        // owns the command), so apply it here when nothing persisted a
-        // ponytail-mode entry. Skipped when it matches the active preset — the
-        // preset entry already covers that, no redundant write.
+        // No sibling restores a standalone ponytail default, so apply it here; skip
+        // it when the active preset already writes the same mode.
         if (!entries.some((e) => e?.type === 'custom' && e.customType === 'ponytail-mode')) {
             const ponytailFallback = readPonytailDefault();
             if (ponytailFallback !== 'off' && ponytailFallback !== getSharedComboState().ponytail) {
@@ -164,7 +166,7 @@ export default function comboToggleExtension(pi) {
         }
     });
     for (const event of ['session_branch', 'session_tree', 'agent_start']) {
-        pi.on(event, async (_event, ctx) => {
+        onHostEvent(pi, event, async (_event, ctx) => {
             track(ctx);
             if (event === 'agent_start')
                 await runFirstRunSetup(ctx);
@@ -178,8 +180,8 @@ export default function comboToggleExtension(pi) {
         const mode = getSharedComboState().ponytail;
         if (mode === 'off' || systemPromptIncludes(event.systemPrompt, 'PONYTAIL MODE ACTIVE'))
             return;
-        const base = asPromptArray(event.systemPrompt);
-        return { systemPrompt: [...base, loadPonytailInstructions(mode)] };
+        const instructions = await loadPonytailInstructions(mode);
+        return injectPromptText(pi, event, instructions);
     });
     // Slash commands only; natural-language input caused accidental toggles and has no reload context.
 }