@krtclcdy/tersio 2.22.1 → 2.24.0

package/extensions/lib/utils.ts

@@ -1,8 +1,8 @@
-// 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 { createWriteStream, existsSync, mkdirSync, renameSync } from 'node:fs';
+import { accessSync, constants, createWriteStream, existsSync, mkdirSync, renameSync, statSync } from 'node:fs';
 import fs from 'node:fs/promises';
 import https from 'node:https';
 import os from 'node:os';
@@ -10,10 +10,10 @@ import path from 'node:path';
 
 export interface HttpOptions {
   maxRedirects?: number;
+  signal?: AbortSignal;
 }
 
 // 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;
@@ -22,7 +22,7 @@ export function withResolvers<T>(): PromiseWithResolvers<T> {
 }
 
 export const RTK_RELEASE_API = 'https://api.github.com/repos/rtk-ai/rtk/releases/latest';
-export const CAVEMAN_REMOTE_RULE = 'https://raw.githubusercontent.com/JuliusBrussee/caveman/main/src/rules/caveman-activate.md';
+export const CAVEMAN_REMOTE_RULE = 'https://raw.githubusercontent.com/JuliusBrussee/caveman/main/skills/caveman/SKILL.md';
 
 export interface RtkPlatformSpec {
   triple: string;
@@ -47,12 +47,25 @@ const RTK_PLATFORM_SPECS: Record<string, RtkPlatformSpec> = {
   'darwin/x64': { triple: 'x86_64-apple-darwin', ext: '.tar.gz', binary: 'rtk' },
   'darwin/arm64': { triple: 'aarch64-apple-darwin', ext: '.tar.gz', binary: 'rtk' },
 };
+export function resolveRtkBinary(managedDir = path.join(os.homedir(), '.bun', 'bin')): string | null {
+  const name = process.platform === 'win32' ? 'rtk.exe' : 'rtk';
+  const candidates = (process.env.PATH || '').split(path.delimiter).filter(Boolean).map((dir) => path.join(dir, name));
+  if (managedDir) candidates.push(path.join(managedDir, name));
+  for (const candidate of candidates) {
+    try {
+      if (!statSync(candidate).isFile()) continue;
+      accessSync(candidate, constants.X_OK);
+      return candidate;
+    } catch { /* keep searching */ }
+  }
+  return null;
+}
 
 export function rtkPlatformSpec(platform: string = process.platform, arch: string = process.arch): RtkPlatformSpec | null {
   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;
@@ -60,20 +73,44 @@ 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;
-  const req = https.get(url, { headers: { 'User-Agent': 'tersio', Accept: 'application/json,*/*' } }, (res) => {
+  const req = https.get(url, { headers: { 'User-Agent': 'tersio', Accept: 'application/json,*/*' }, signal: opts.signal }, (res) => {
     const next = redirectNext(res, url);
     if (next) {
       if (maxRedirects <= 0) { res.resume(); reject(new Error(`Too many redirects fetching ${url}`)); return; }
       res.resume();
-      resolve(httpsGet(next, { maxRedirects: maxRedirects - 1 }));
+      resolve(httpsGet(next, { maxRedirects: maxRedirects - 1, signal: opts.signal }));
       return;
     }
     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));
@@ -110,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 {
@@ -158,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,6 +1,5 @@
-import os from 'node:os';
-import path from 'node:path';
-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) {
@@ -15,14 +14,14 @@ function asBoolean(value) {
 function resolveEnabled(entries) {
     return lastCustomValue(entries, 'rtk-mode', (data) => asBoolean(data?.enabled));
 }
-const IS_WINDOWS = process.platform === 'win32';
-const HOME = os.homedir();
-const RTK_BINARY = path.join(HOME, '.bun', 'bin', IS_WINDOWS ? 'rtk.exe' : 'rtk');
-const RTK_PROMPT = `RTK mode active for this session.
-Use Rust Token Killer for shell output that would otherwise be noisy. Prefer explicit RTK commands in bash: \`rtk git status\`, \`rtk git diff\`, \`rtk read <file>\`, \`rtk grep <pattern> <path>\`, \`rtk find <glob> <path>\`, \`rtk test <cmd...>\`, \`rtk tsc\`, \`rtk lint\`, or \`rtk <tool> ...\` for supported dev commands.
-Do not use RTK when exact raw output is required, when a specialized OMP tool is required by system policy, or when the command changes state and RTK would hide important confirmation text. Specialized OMP tools still win: read/glob/grep/edit/lsp stay preferred over shell equivalents.`;
+function setRtkProcessEnabled(enabled) {
+    if (enabled)
+        delete process.env.RTK_DISABLED;
+    else
+        process.env.RTK_DISABLED = '1';
+}
+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;
@@ -42,15 +41,16 @@ export default function rtkSessionExtension(pi) {
         enabled = Boolean(next);
         pi.appendEntry?.('rtk-mode', { enabled });
         setSharedComboMode('rtk', enabled);
-        syncStatus(ctx);
+        setRtkProcessEnabled(enabled);
         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) {
         enabled = state.rtk === 'on';
+        setRtkProcessEnabled(enabled);
         syncStatus();
     }
     setSharedComboListener(syncFromShared);
@@ -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) {
@@ -89,7 +90,7 @@ export default function rtkSessionExtension(pi) {
                 };
             }
             onUpdate?.({ content: [{ type: 'text', text: `rtk ${params.args.join(' ')}` }], details: { phase: 'start' } });
-            const result = await pi.exec(RTK_BINARY, params.args, { signal, cwd: ctx?.cwd || pi.cwd });
+            const result = await pi.exec('rtk', params.args, { signal, cwd: ctx?.cwd || pi.cwd });
             const text = [result.stdout, result.stderr].filter(Boolean).join('\n');
             return {
                 isError: result.code !== 0,
@@ -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);
@@ -118,13 +119,14 @@ export default function rtkSessionExtension(pi) {
         // installer/user-configured default (off unless configured).
         const persisted = resolveEnabled(entries);
         enabled = typeof persisted === 'boolean' ? persisted : readRtkDefault();
+        setRtkProcessEnabled(enabled);
         syncStatus(ctx);
     }
     pi.on('session_start', async (_event, ctx) => {
         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) => {
@@ -142,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,6 +1,5 @@
-import os from 'node:os';
-import path from 'node:path';
-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, 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';
 
@@ -17,21 +16,14 @@ function resolveEnabled(entries: SessionEntry[] | null | undefined): boolean | n
   return lastCustomValue(entries, 'rtk-mode', (data) => asBoolean(data?.enabled));
 }
 
-const IS_WINDOWS = process.platform === 'win32';
-const HOME = os.homedir();
-const RTK_BINARY = path.join(HOME, '.bun', 'bin', IS_WINDOWS ? 'rtk.exe' : 'rtk');
-
-const RTK_PROMPT = `RTK mode active for this session.
-Use Rust Token Killer for shell output that would otherwise be noisy. Prefer explicit RTK commands in bash: \`rtk git status\`, \`rtk git diff\`, \`rtk read <file>\`, \`rtk grep <pattern> <path>\`, \`rtk find <glob> <path>\`, \`rtk test <cmd...>\`, \`rtk tsc\`, \`rtk lint\`, or \`rtk <tool> ...\` for supported dev commands.
-Do not use RTK when exact raw output is required, when a specialized OMP tool is required by system policy, or when the command changes state and RTK would hide important confirmation text. Specialized OMP tools still win: read/glob/grep/edit/lsp stay preferred over shell equivalents.`;
-
-interface ZodChain {
-  min: (n: number) => ZodChain;
-  describe: (text: string) => ZodChain;
+function setRtkProcessEnabled(enabled: boolean): void {
+  if (enabled) delete process.env.RTK_DISABLED;
+  else process.env.RTK_DISABLED = '1';
 }
 
+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: 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;
@@ -52,17 +44,18 @@ export default function rtkSessionExtension(pi: ExtensionApi): void {
     enabled = Boolean(next);
     pi.appendEntry?.('rtk-mode', { enabled });
     setSharedComboMode('rtk', enabled);
-    syncStatus(ctx);
+    setRtkProcessEnabled(enabled);
     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: { rtk: string }): void {
     enabled = state.rtk === 'on';
+    setRtkProcessEnabled(enabled);
     syncStatus();
   }
   setSharedComboListener(syncFromShared);
@@ -90,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) {
@@ -102,7 +96,7 @@ export default function rtkSessionExtension(pi: ExtensionApi): void {
         };
       }
       onUpdate?.({ content: [{ type: 'text', text: `rtk ${params.args.join(' ')}` }], details: { phase: 'start' } });
-      const result = await pi.exec!(RTK_BINARY, params.args, { signal, cwd: ctx?.cwd || pi.cwd });
+      const result = await pi.exec!('rtk', params.args, { signal, cwd: ctx?.cwd || pi.cwd });
       const text = [result.stdout, result.stderr].filter(Boolean).join('\n');
       return {
         isError: result.code !== 0,
@@ -112,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);
@@ -129,6 +123,7 @@ export default function rtkSessionExtension(pi: ExtensionApi): void {
     // installer/user-configured default (off unless configured).
     const persisted = resolveEnabled(entries);
     enabled = typeof persisted === 'boolean' ? persisted : readRtkDefault();
+    setRtkProcessEnabled(enabled);
     syncStatus(ctx);
   }
 
@@ -137,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);
   });
 
@@ -158,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] };
+}

package/extensions/shared/host.ts

@@ -0,0 +1,104 @@
+// 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.ts';
+import type { ExtensionApi, ExtensionCtx, PromptInjection, SystemPromptEvent, ToolParams, UiApi } from './types.ts';
+
+/** The zod subset the one tool schema needs. */
+export interface ZodChain {
+  min: (n: number) => ZodChain;
+  describe: (text: string) => ZodChain;
+}
+
+export interface ZodFactory {
+  z: {
+    object: (shape: Record<string, unknown>) => ToolParams;
+    array: (element: unknown) => ZodChain;
+    string: () => ZodChain;
+  };
+}
+
+/** The host fields these adapters read. */
+export interface HostHandle {
+  zod?: unknown;
+  setLabel?: (...args: string[]) => void;
+}
+
+export function isPiHost(pi: HostHandle): boolean {
+  return !pi.zod;
+}
+
+export function setExtensionLabel(pi: HostHandle, label: string): void {
+  if (isPiHost(pi)) return;
+  pi.setLabel?.(label);
+}
+
+export function onHostEvent<E>(pi: ExtensionApi, event: string, handler: (event: E, ctx: ExtensionCtx) => unknown): void {
+  if (event === 'session_branch' && isPiHost(pi)) return;
+  pi.on<E>(event, handler);
+}
+
+export interface SelectOption {
+  label: string;
+  description?: string;
+}
+
+// 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: HostHandle,
+  ui: UiApi | undefined,
+  title: string,
+  options: SelectOption[],
+  dialogOptions?: Record<string, unknown>,
+): Promise<string | undefined> {
+  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: HostHandle, event: SystemPromptEvent, text: string): PromptInjection | undefined {
+  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}` };
+}
+
+export interface StringArraySpec {
+  minItems?: number;
+  description?: string;
+}
+
+// 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: ExtensionApi, name: string, spec: StringArraySpec = {}): ToolParams {
+  if (!isPiHost(pi)) {
+    const { z } = pi.zod as { z: ZodFactory['z'] };
+    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: Record<string, unknown> = { 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] };
+}

package/extensions/shared/omp-prompt.js

@@ -0,0 +1,12 @@
+// extensions/omp/omp-prompt.ts — OMP's system-prompt surface.
+// The subagent marker OMP puts in a delegated agent's prompt.
+export const OMP_SUBAGENT_MARKER = 'You are operating on a piece of work assigned to you by the main agent.';
+export function asPromptArray(systemPrompt) {
+    return Array.isArray(systemPrompt) ? systemPrompt : [systemPrompt];
+}
+export function systemPromptIncludes(systemPrompt, marker) {
+    return asPromptArray(systemPrompt).some((prompt) => typeof prompt === 'string' && prompt.includes(marker));
+}
+export function isOmpSubagentPrompt(systemPrompt) {
+    return systemPromptIncludes(systemPrompt, OMP_SUBAGENT_MARKER);
+}