@krtclcdy/tersio 2.23.0 → 2.24.0

package/extensions/combo-toggle/index.ts

@@ -1,12 +1,10 @@
-// /combo session toggle — set all three (caveman, rtk, ponytail) at once.
-// Modes: off | medium | balanced | max
+// /combo session toggle: off | medium | balanced | max.
 
 import os from 'node:os';
 import path from 'node:path';
-import { createRequire } from 'node:module';
+import { fileURLToPath, pathToFileURL } from 'node:url';
 import {
   activeModesSummary,
-  asPromptArray,
   COMBO_LEVELS,
   getSharedComboState,
   isComboPresetActive,
@@ -19,22 +17,26 @@ import {
   setSharedComboListener,
   setSharedComboMode,
   systemPromptIncludes,
+  themeStatus,
 } from '../shared/session-state.ts';
+import { hostSelect, injectPromptText, onHostEvent, setExtensionLabel } from '../shared/host.ts';
 import {
   isComboSetupComplete,
   readComboDefault,
   readPonytailDefault,
   saveComboSetup,
 } from '../shared/plugin-settings.ts';
+import { findHoistedPackage } from '../lib/utils.ts';
 import type { ComboState, ExtensionApi, ExtensionCtx, SystemPromptEvent } from '../shared/types.ts';
 
-const require = createRequire(import.meta.url);
+const EXTENSION_DIR = path.dirname(fileURLToPath(import.meta.url));
 
 const PONYTAIL_FALLBACK_INTENSITY: Record<string, string> = {
   lite: 'Prefer the simplest correct solution.',
 };
 
-function ponytailFallback(mode: string): string {
+// Fallback text when Ponytail cannot be found; exported for its own test.
+export function ponytailFallback(mode: string): string {
   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.`;
 }
@@ -43,26 +45,25 @@ function levelSummary(state: ComboState): string {
   return `caveman=${state.caveman} rtk=${state.rtk} ponytail=${state.ponytail}`;
 }
 
-function loadPonytailInstructions(mode: string): string {
-  try {
-    const installed = path.join(
-      os.homedir(),
-      '.omp',
-      'plugins',
-      'node_modules',
-      '@dietrichgebert',
-      'ponytail',
-      'hooks',
-      'ponytail-instructions.js'
-    );
-    const { getPonytailInstructions } = require(installed) as { getPonytailInstructions?: (mode: string) => string };
-    if (typeof getPonytailInstructions === 'function') return getPonytailInstructions(mode);
-  } catch { }
+// 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: string): Promise<string> {
+  const installed = findHoistedPackage('@dietrichgebert/ponytail', EXTENSION_DIR, 'hooks', 'ponytail-instructions.js');
+  if (installed) {
+    try {
+      const loaded = await import(pathToFileURL(installed).href) as {
+        getPonytailInstructions?: (level: string) => string;
+        default?: { getPonytailInstructions?: (level: string) => string };
+      };
+      const build = loaded.getPonytailInstructions ?? loaded.default?.getPonytailInstructions;
+      if (build) return build(mode);
+    } catch { /* fall through to the built-in text */ }
+  }
   return ponytailFallback(mode);
 }
 
 export default function comboToggleExtension(pi: ExtensionApi): void {
-  pi.setLabel?.('Combo session toggle (all 3 add-ons)');
+  setExtensionLabel(pi, 'Combo session toggle (all 3 add-ons)');
 
   let lastCtx: ExtensionCtx | undefined = undefined;
   let setupPrompted = false;
@@ -71,32 +72,25 @@ export default function comboToggleExtension(pi: ExtensionApi): void {
     lastCtx = paintableCtx(lastCtx, ctx);
     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: string): void {
     const modes = COMBO_LEVELS[level];
     pi.appendEntry?.('caveman-mode', { mode: modes.caveman });
@@ -115,8 +109,7 @@ export default function comboToggleExtension(pi: ExtensionApi): void {
     return useState(reconcileSharedComboEntries(sessionEntries(ctx)), ctx);
   }
   function listen(ctx?: ExtensionCtx): void {
-    // 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);
   }
 
@@ -174,7 +167,7 @@ export default function comboToggleExtension(pi: ExtensionApi): void {
   async function runFirstRunSetup(ctx?: ExtensionCtx): Promise<void> {
     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' },
@@ -192,9 +185,7 @@ export default function comboToggleExtension(pi: ExtensionApi): void {
     track(ctx);
     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' ||
@@ -207,10 +198,8 @@ export default function comboToggleExtension(pi: ExtensionApi): void {
         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) {
@@ -221,7 +210,7 @@ export default function comboToggleExtension(pi: ExtensionApi): void {
   });
 
   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);
     });
@@ -233,8 +222,8 @@ export default function comboToggleExtension(pi: ExtensionApi): void {
 
     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.

package/extensions/lib/utils.js

@@ -1,5 +1,5 @@
-// Shared helpers for the installer and the AI add-ons updater.
-// Node built-ins only — this module must stay dependency-free.
+// Shared helpers for the installer and the AI add-ons updater. Node built-ins
+// only — this module must stay dependency-free.
 import { createHash } from 'node:crypto';
 import { accessSync, constants, createWriteStream, existsSync, mkdirSync, renameSync, statSync } from 'node:fs';
 import fs from 'node:fs/promises';
@@ -7,7 +7,6 @@ import https from 'node:https';
 import os from 'node:os';
 import path from 'node:path';
 // Promise.withResolvers is Node 22+; the package supports Node 18+.
-// ponytail: swap for the built-in when engines bumps to >=22.
 export function withResolvers() {
     let resolve;
     let reject;
@@ -42,13 +41,36 @@ export function resolveRtkBinary(managedDir = path.join(os.homedir(), '.bun', 'b
 export function rtkPlatformSpec(platform = process.platform, arch = process.arch) {
     return RTK_PLATFORM_SPECS[`${platform}/${arch}`] || null;
 }
-// Single source for the 3xx+location redirect rule shared by httpsGet/httpsDownload.
+// The 3xx+location redirect rule shared by httpsGet/httpsDownload.
 function redirectNext(res, url) {
     if (res.statusCode !== undefined && res.statusCode >= 300 && res.statusCode < 400 && res.headers.location) {
         return new URL(res.headers.location, url).href;
     }
     return null;
 }
+// pi sets PI_CODING_AGENT; OMP does not. OMP does read PI_CODING_AGENT_DIR as
+// its own relocation variable, so the override only counts under that marker.
+export function isPiProcess() {
+    return process.env.PI_CODING_AGENT === 'true';
+}
+export function piAgentDir() {
+    const override = process.env.PI_CODING_AGENT_DIR;
+    return isPiProcess() && override ? override : path.join(os.homedir(), '.pi', 'agent');
+}
+// Ponytail is a Tersio dependency that npm hoists, so it can sit in Tersio's
+// node_modules, a host's plugin dir, or beside it. Walking up covers all.
+export function findHoistedPackage(pkg, fromDir, ...relInside) {
+    let dir = fromDir;
+    for (;;) {
+        const candidate = path.join(dir, 'node_modules', ...pkg.split('/'), ...relInside);
+        if (existsSync(candidate))
+            return candidate;
+        const parent = path.dirname(dir);
+        if (parent === dir)
+            return null;
+        dir = parent;
+    }
+}
 export function httpsGet(url, opts = {}) {
     const { promise, resolve, reject } = withResolvers();
     const maxRedirects = opts.maxRedirects ?? 5;
@@ -70,7 +92,7 @@ export function httpsGet(url, opts = {}) {
             return;
         }
         let body = '';
-        // ponytail: streamed accumulation — fine for tens of KB; stream-pipe if assets ever exceed a few MB.
+        // Streamed accumulation: fine for tens of KB.
         res.setEncoding('utf8');
         res.on('data', (chunk) => { body += chunk; });
         res.on('end', () => resolve(body));
@@ -113,7 +135,13 @@ export function httpsDownload(url, dest, opts = {}) {
     return promise;
 }
 export async function fetchJson(url) {
-    return JSON.parse(await httpsGet(url));
+    const body = await httpsGet(url);
+    try {
+        return JSON.parse(body);
+    }
+    catch {
+        throw new Error(`${url} did not return JSON`);
+    }
 }
 export function sha256Hex(text) {
     return createHash('sha256').update(text, 'utf8').digest('hex');
@@ -166,9 +194,8 @@ export async function readTextIfExists(p) {
         return null;
     }
 }
-// Tersio-owned data home: ~/.tersio (Windows: %USERPROFILE%\.tersio).
-// First use moves legacy ~/.omp/plugins/tersio-* files over, so existing
-// installs keep their history.
+// Tersio-owned data home: ~/.tersio. First use moves legacy
+// ~/.omp/plugins/tersio-* files over so existing installs keep their history.
 const migratedTersioFiles = new Set();
 export function tersioHome() {
     return path.join(os.homedir(), '.tersio');

package/extensions/lib/utils.ts

@@ -1,5 +1,5 @@
-// Shared helpers for the installer and the AI add-ons updater.
-// Node built-ins only — this module must stay dependency-free.
+// Shared helpers for the installer and the AI add-ons updater. Node built-ins
+// only — this module must stay dependency-free.
 
 import { createHash } from 'node:crypto';
 import { accessSync, constants, createWriteStream, existsSync, mkdirSync, renameSync, statSync } from 'node:fs';
@@ -14,7 +14,6 @@ export interface HttpOptions {
 }
 
 // Promise.withResolvers is Node 22+; the package supports Node 18+.
-// ponytail: swap for the built-in when engines bumps to >=22.
 export function withResolvers<T>(): PromiseWithResolvers<T> {
   let resolve!: (value: T | PromiseLike<T>) => void;
   let reject!: (reason?: unknown) => void;
@@ -66,7 +65,7 @@ export function rtkPlatformSpec(platform: string = process.platform, arch: strin
   return RTK_PLATFORM_SPECS[`${platform}/${arch}`] || null;
 }
 
-// Single source for the 3xx+location redirect rule shared by httpsGet/httpsDownload.
+// The 3xx+location redirect rule shared by httpsGet/httpsDownload.
 function redirectNext(res: { statusCode?: number; headers: { location?: string } }, url: string): string | null {
   if (res.statusCode !== undefined && res.statusCode >= 300 && res.statusCode < 400 && res.headers.location) {
     return new URL(res.headers.location, url).href;
@@ -74,6 +73,30 @@ function redirectNext(res: { statusCode?: number; headers: { location?: string }
   return null;
 }
 
+// pi sets PI_CODING_AGENT; OMP does not. OMP does read PI_CODING_AGENT_DIR as
+// its own relocation variable, so the override only counts under that marker.
+export function isPiProcess(): boolean {
+  return process.env.PI_CODING_AGENT === 'true';
+}
+
+export function piAgentDir(): string {
+  const override = process.env.PI_CODING_AGENT_DIR;
+  return isPiProcess() && override ? override : path.join(os.homedir(), '.pi', 'agent');
+}
+
+// Ponytail is a Tersio dependency that npm hoists, so it can sit in Tersio's
+// node_modules, a host's plugin dir, or beside it. Walking up covers all.
+export function findHoistedPackage(pkg: string, fromDir: string, ...relInside: string[]): string | null {
+  let dir = fromDir;
+  for (;;) {
+    const candidate = path.join(dir, 'node_modules', ...pkg.split('/'), ...relInside);
+    if (existsSync(candidate)) return candidate;
+    const parent = path.dirname(dir);
+    if (parent === dir) return null;
+    dir = parent;
+  }
+}
+
 export function httpsGet(url: string, opts: HttpOptions = {}): Promise<string> {
   const { promise, resolve, reject } = withResolvers<string>();
   const maxRedirects = opts.maxRedirects ?? 5;
@@ -87,7 +110,7 @@ export function httpsGet(url: string, opts: HttpOptions = {}): Promise<string> {
     }
     if (res.statusCode !== 200) { res.resume(); reject(new Error(`HTTP ${res.statusCode} for ${url}`)); return; }
     let body = '';
-    // ponytail: streamed accumulation — fine for tens of KB; stream-pipe if assets ever exceed a few MB.
+    // Streamed accumulation: fine for tens of KB.
     res.setEncoding('utf8');
     res.on('data', (chunk) => { body += chunk; });
     res.on('end', () => resolve(body));
@@ -124,7 +147,12 @@ export function httpsDownload(url: string, dest: string, opts: HttpOptions = {})
 }
 
 export async function fetchJson<T>(url: string): Promise<T> {
-  return JSON.parse(await httpsGet(url)) as T;
+  const body = await httpsGet(url);
+  try {
+    return JSON.parse(body) as T;
+  } catch {
+    throw new Error(`${url} did not return JSON`);
+  }
 }
 
 export function sha256Hex(text: string): string {
@@ -172,15 +200,15 @@ export async function readTextIfExists(p: string): Promise<string | null> {
   try { return await fs.readFile(p, 'utf8'); } catch { return null; }
 }
 
-// Tersio-owned data home: ~/.tersio (Windows: %USERPROFILE%\.tersio).
-// First use moves legacy ~/.omp/plugins/tersio-* files over, so existing
-// installs keep their history.
+// Tersio-owned data home: ~/.tersio. First use moves legacy
+// ~/.omp/plugins/tersio-* files over so existing installs keep their history.
 const migratedTersioFiles = new Set<string>();
 
 export function tersioHome(): string {
   return path.join(os.homedir(), '.tersio');
 }
 
+
 export function tersioDataPath(name: string, legacy: string): string {
   const dest = path.join(tersioHome(), name);
   if (!migratedTersioFiles.has(name)) {

package/extensions/rtk-session/index.js

@@ -1,4 +1,5 @@
-import { activeModesSummary, asPromptArray, getSharedComboState, isComboPresetActive, isOmpSubagentPrompt, lastCustomValue, normalizeInputCommand, paintStatusBar, paintableCtx, reconcileSharedComboEntries, sessionEntries, setSharedComboListener, setSharedComboMode } from '../shared/session-state.js';
+import { activeModesSummary, getSharedComboState, isComboPresetActive, isOmpSubagentPrompt, lastCustomValue, normalizeInputCommand, paintStatusBar, paintableCtx, reconcileSharedComboEntries, sessionEntries, setSharedComboListener, setSharedComboMode } from '../shared/session-state.js';
+import { injectPromptText, onHostEvent, setExtensionLabel, stringArrayToolParams } from '../shared/host.js';
 import { readRtkDefault } from '../shared/plugin-settings.js';
 const DEFAULT_ENABLED = false;
 function asBoolean(value) {
@@ -21,7 +22,6 @@ function setRtkProcessEnabled(enabled) {
 }
 const RTK_PROMPT = `RTK guidance active. RTK automatically rewrites eligible Bash calls through the installed rtk hook. Prefer rtk for noisy shell output, but use exact raw output for state changes, checksums, patches, and diagnostics that need full bytes.`;
 export default function rtkSessionExtension(pi) {
-    const { z } = pi.zod;
     let enabled = DEFAULT_ENABLED;
     let isActive = false;
     let lastCtx = undefined;
@@ -45,7 +45,7 @@ export default function rtkSessionExtension(pi) {
         const active = activeModesSummary(getSharedComboState());
         ctx?.ui?.notify?.(enabled ? `RTK on — compact shell output for this session. Active: ${active}.` : `RTK off. Active: ${active}.`, 'info');
     }
-    pi.setLabel?.('RTK session toggle');
+    setExtensionLabel(pi, 'RTK session toggle');
     // Live mirror: a /tersio or /combo switch publishes shared state — adopt
     // it at once so the next turn and the rtk_run gate see it, no reload.
     function syncFromShared(state) {
@@ -77,8 +77,9 @@ export default function rtkSessionExtension(pi) {
         name: 'rtk_run',
         label: 'RTK Run',
         description: 'Run the installed `rtk` binary for compact command output when RTK mode is enabled.',
-        parameters: z.object({
-            args: z.array(z.string()).min(1).describe("Arguments passed to rtk, e.g. ['git','status'] or ['read','src/index.ts']"),
+        parameters: stringArrayToolParams(pi, 'args', {
+            minItems: 1,
+            description: "Arguments passed to rtk, e.g. ['git','status'] or ['read','src/index.ts']",
         }),
         async execute(_toolCallId, params, signal, onUpdate, ctx) {
             if (!enabled) {
@@ -98,7 +99,7 @@ export default function rtkSessionExtension(pi) {
             };
         },
     });
-    pi.on('input', async (event) => {
+    onHostEvent(pi, 'input', async (event) => {
         if (event?.source === 'extension')
             return;
         const t = normalizeInputCommand(event?.text);
@@ -125,7 +126,7 @@ export default function rtkSessionExtension(pi) {
         restoreEnabled(ctx);
         ctx?.ui?.notify?.(`RTK loaded: ${enabled ? 'on' : 'off'}`, 'info');
     });
-    pi.on('session_branch', async (_event, ctx) => {
+    onHostEvent(pi, 'session_branch', async (_event, ctx) => {
         restoreEnabled(ctx);
     });
     pi.on('session_tree', async (_event, ctx) => {
@@ -143,7 +144,6 @@ export default function rtkSessionExtension(pi) {
         const active = isOmpSubagentPrompt(event.systemPrompt) ? getSharedComboState().rtk === 'on' : enabled;
         if (!active)
             return;
-        const base = asPromptArray(event.systemPrompt);
-        return { systemPrompt: [...base, RTK_PROMPT] };
+        return injectPromptText(pi, event, RTK_PROMPT);
     });
 }

package/extensions/rtk-session/index.ts

@@ -1,4 +1,5 @@
-import { activeModesSummary, asPromptArray, getSharedComboState, isComboPresetActive, isOmpSubagentPrompt, lastCustomValue, normalizeInputCommand, paintStatusBar, paintableCtx, reconcileSharedComboEntries, sessionEntries, setSharedComboListener, setSharedComboMode } from '../shared/session-state.ts';
+import { activeModesSummary, getSharedComboState, isComboPresetActive, isOmpSubagentPrompt, lastCustomValue, normalizeInputCommand, paintStatusBar, paintableCtx, reconcileSharedComboEntries, sessionEntries, setSharedComboListener, setSharedComboMode } from '../shared/session-state.ts';
+import { injectPromptText, onHostEvent, setExtensionLabel, stringArrayToolParams } from '../shared/host.ts';
 import { readRtkDefault } from '../shared/plugin-settings.ts';
 import type { ExtensionApi, ExtensionCtx, InputEvent, SessionEntry, SystemPromptEvent } from '../shared/types.ts';
 
@@ -22,13 +23,7 @@ function setRtkProcessEnabled(enabled: boolean): void {
 
 const RTK_PROMPT = `RTK guidance active. RTK automatically rewrites eligible Bash calls through the installed rtk hook. Prefer rtk for noisy shell output, but use exact raw output for state changes, checksums, patches, and diagnostics that need full bytes.`;
 
-interface ZodChain {
-  min: (n: number) => ZodChain;
-  describe: (text: string) => ZodChain;
-}
-
 export default function rtkSessionExtension(pi: ExtensionApi): void {
-  const { z } = pi.zod as { z: { object: (shape: Record<string, unknown>) => Record<string, unknown>; array: (el: unknown) => ZodChain; string: () => ZodChain } };
   let enabled = DEFAULT_ENABLED;
   let isActive = false;
   let lastCtx: ExtensionCtx | undefined = undefined;
@@ -54,7 +49,7 @@ export default function rtkSessionExtension(pi: ExtensionApi): void {
     ctx?.ui?.notify?.(enabled ? `RTK on — compact shell output for this session. Active: ${active}.` : `RTK off. Active: ${active}.`, 'info');
   }
 
-  pi.setLabel?.('RTK session toggle');
+  setExtensionLabel(pi, 'RTK session toggle');
 
   // Live mirror: a /tersio or /combo switch publishes shared state — adopt
   // it at once so the next turn and the rtk_run gate see it, no reload.
@@ -88,8 +83,9 @@ export default function rtkSessionExtension(pi: ExtensionApi): void {
     name: 'rtk_run',
     label: 'RTK Run',
     description: 'Run the installed `rtk` binary for compact command output when RTK mode is enabled.',
-    parameters: z.object({
-      args: z.array(z.string()).min(1).describe("Arguments passed to rtk, e.g. ['git','status'] or ['read','src/index.ts']"),
+    parameters: stringArrayToolParams(pi, 'args', {
+      minItems: 1,
+      description: "Arguments passed to rtk, e.g. ['git','status'] or ['read','src/index.ts']",
     }),
     async execute(_toolCallId, params, signal, onUpdate, ctx) {
       if (!enabled) {
@@ -110,7 +106,7 @@ export default function rtkSessionExtension(pi: ExtensionApi): void {
     },
   });
 
-  pi.on<InputEvent>('input', async (event) => {
+  onHostEvent<InputEvent>(pi, 'input', async (event) => {
     if (event?.source === 'extension') return;
     const t = normalizeInputCommand(event?.text);
     if (t === 'rtk on' || t === 'use rtk') setEnabled(true);
@@ -136,7 +132,7 @@ export default function rtkSessionExtension(pi: ExtensionApi): void {
     ctx?.ui?.notify?.(`RTK loaded: ${enabled ? 'on' : 'off'}`, 'info');
   });
 
-  pi.on('session_branch', async (_event, ctx) => {
+  onHostEvent(pi, 'session_branch', async (_event, ctx) => {
     restoreEnabled(ctx);
   });
 
@@ -157,7 +153,6 @@ export default function rtkSessionExtension(pi: ExtensionApi): void {
   pi.on<SystemPromptEvent>('before_agent_start', async (event) => {
     const active = isOmpSubagentPrompt(event.systemPrompt) ? getSharedComboState().rtk === 'on' : enabled;
     if (!active) return;
-    const base = asPromptArray(event.systemPrompt);
-    return { systemPrompt: [...base, RTK_PROMPT] };
+    return injectPromptText(pi, event, RTK_PROMPT);
   });
 }

package/extensions/shared/carbon.js

@@ -1,14 +1,11 @@
 // extensions/shared/carbon.ts — CO2/energy footprints, EcoLogits-style.
 //
 // Port of the EcoLogits v0.8.2 LLM impact model (genai-impact/ecologits,
-// MPL-2.0 — see ECO_NOTICE.md), following the same served-estimate approach
-// as honey-for-devs' hooks/eco.js: the faithful single-stream (batch-1)
-// ceiling divided by serving_concurrency for continuous-batching amortization.
-//
-// Model params come from EcoLogits' registry where it covers the model;
-// otherwise a documented class borrow (never a silent guess — every borrow
-// carries its source). Unknown ids fall to the gpt-4o default. Everything
-// rendered from here must carry ~est. and never merge with measured figures.
+// MPL-2.0 — see ECO_NOTICE.md): the single-stream (batch-1) ceiling divided by
+// serving_concurrency for continuous-batching amortization. Model params come
+// from EcoLogits' registry, else a documented class borrow; unknown ids fall
+// to the gpt-4o default. Render everything from here as ~est., never merged
+// with measured figures.
 // EcoLogits 0.8.2 constants — kWh, kgCO2eq, seconds, GB.
 const Q_BITS = 4;
 const E_ALPHA = 8.91e-8;

package/extensions/shared/carbon.ts

@@ -1,14 +1,11 @@
 // extensions/shared/carbon.ts — CO2/energy footprints, EcoLogits-style.
 //
 // Port of the EcoLogits v0.8.2 LLM impact model (genai-impact/ecologits,
-// MPL-2.0 — see ECO_NOTICE.md), following the same served-estimate approach
-// as honey-for-devs' hooks/eco.js: the faithful single-stream (batch-1)
-// ceiling divided by serving_concurrency for continuous-batching amortization.
-//
-// Model params come from EcoLogits' registry where it covers the model;
-// otherwise a documented class borrow (never a silent guess — every borrow
-// carries its source). Unknown ids fall to the gpt-4o default. Everything
-// rendered from here must carry ~est. and never merge with measured figures.
+// MPL-2.0 — see ECO_NOTICE.md): the single-stream (batch-1) ceiling divided by
+// serving_concurrency for continuous-batching amortization. Model params come
+// from EcoLogits' registry, else a documented class borrow; unknown ids fall
+// to the gpt-4o default. Render everything from here as ~est., never merged
+// with measured figures.
 
 export interface ModelCarbon {
   activeB: number;

package/extensions/shared/host.js

@@ -0,0 +1,68 @@
+// extensions/shared/host.ts — one extension source, two agent hosts.
+//
+// OMP is a fork of pi, and six surfaces differ: tool schemas (OMP injects
+// `pi.zod`, pi takes any object it forwards as JSON Schema), `setLabel`
+// (pi's takes an entryId, so an extension name must never reach it),
+// `session_branch` (pi reports that switch as `session_tree`), select options
+// (pi takes plain strings), the status-bar theme (pi has no ctx.ui.theme), and
+// prompt injection (pi appends to its sections rather than replacing them).
+//
+// The host is read from the API shape, never a name or an env marker: OMP is
+// the fork that injects zod, and pi does not, including through the SDK.
+import { asPromptArray } from './session-state.js';
+export function isPiHost(pi) {
+    return !pi.zod;
+}
+export function setExtensionLabel(pi, label) {
+    if (isPiHost(pi))
+        return;
+    pi.setLabel?.(label);
+}
+export function onHostEvent(pi, event, handler) {
+    if (event === 'session_branch' && isPiHost(pi))
+        return;
+    pi.on(event, handler);
+}
+// Returns the option's label on both hosts: pi renders plain strings, so the
+// description rides along inside the label and is stripped back out.
+export async function hostSelect(pi, ui, title, options, dialogOptions) {
+    if (!ui?.select)
+        return undefined;
+    if (!isPiHost(pi))
+        return ui.select(title, options, dialogOptions);
+    const shown = options.map((option) => (option.description ? `${option.label} — ${option.description}` : option.label));
+    const picked = await ui.select(title, shown, dialogOptions);
+    if (picked === undefined)
+        return undefined;
+    return options[shown.indexOf(picked)]?.label ?? picked;
+}
+// What a `before_agent_start` handler hands back; undefined once pi was
+// updated in place.
+export function injectPromptText(pi, event, text) {
+    if (!isPiHost(pi))
+        return { systemPrompt: [...asPromptArray(event.systemPrompt), text] };
+    // Appending keeps pi's sections and the transcript diff; replacing the
+    // prompt the OMP way would drop every section.
+    const options = event.systemPromptOptions;
+    if (options && typeof options.appendSystemPrompt === 'string') {
+        options.appendSystemPrompt = [options.appendSystemPrompt, text].filter(Boolean).join('\n\n');
+        return undefined;
+    }
+    return { systemPrompt: `${asPromptArray(event.systemPrompt).join('\n\n')}\n\n${text}` };
+}
+// One string-array argument in the active host's dialect. pi only requires an
+// object, so a JSON Schema literal suffices and no `typebox` import is needed.
+export function stringArrayToolParams(pi, name, spec = {}) {
+    if (!isPiHost(pi)) {
+        const { z } = pi.zod;
+        const array = z.array(z.string());
+        const constrained = spec.minItems ? array.min(spec.minItems) : array;
+        return z.object({ [name]: spec.description ? constrained.describe(spec.description) : constrained });
+    }
+    const array = { type: 'array', items: { type: 'string' } };
+    if (spec.minItems)
+        array.minItems = spec.minItems;
+    if (spec.description)
+        array.description = spec.description;
+    return { type: 'object', properties: { [name]: array }, required: [name] };
+}