@krtclcdy/tersio 2.23.0 → 2.24.1

package/extensions/combo-toggle/index.js

@@ -1,65 +1,72 @@
-// /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, normalizeComboLevel, paintableCtx, reconcileSharedComboEntries, sessionEntries, setSharedComboLevel, statusUi, 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) {
         lastCtx = paintableCtx(lastCtx, ctx);
-        const c = lastCtx;
-        if (!c?.ui?.setStatus)
+        const ui = statusUi(lastCtx);
+        if (!ui)
             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);
+            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('caveman', undefined);
-        c.ui.setStatus('rtk', undefined);
-        c.ui.setStatus('ponytail', undefined);
+        ui.setStatus('combo', themeStatus(ui, '🧩', `combo ${lvl}: 🪨caveman=${c0} ⚡rtk=${r} 🦥ponytail=${p}`, true));
+        // Our bar is canonical for the preset, so clear any sibling bar.
+        ui.setStatus('caveman', undefined);
+        ui.setStatus('rtk', undefined);
+        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,10 +84,8 @@ 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.
         if (ctx?.hasUI)
-            setSharedComboListener(useState);
+            setSharedComboListener('combo', useState);
     }
     function track(ctx) {
         listen(ctx);
@@ -119,7 +124,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 +142,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 +154,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 +165,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);
@@ -173,13 +174,10 @@ export default function comboToggleExtension(pi) {
     pi.on('before_agent_start', async (event, ctx) => {
         if (ctx?.hasUI)
             reconcile(ctx);
-        if (!isOmpSubagentPrompt(event.systemPrompt))
-            return;
         const mode = getSharedComboState().ponytail;
         if (mode === 'off' || systemPromptIncludes(event.systemPrompt, 'PONYTAIL MODE ACTIVE'))
             return;
-        const base = asPromptArray(event.systemPrompt);
-        return { systemPrompt: [...base, loadPonytailInstructions(mode)] };
+        return injectPromptText(pi, event, await loadPonytailInstructions(mode));
     });
     // Slash commands only; natural-language input caused accidental toggles and has no reload context.
 }

package/extensions/combo-toggle/index.ts

@@ -1,40 +1,41 @@
-// /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,
-  isOmpSubagentPrompt,
   normalizeComboLevel,
   paintableCtx,
   reconcileSharedComboEntries,
   sessionEntries,
   setSharedComboLevel,
+  statusUi,
   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,60 +44,52 @@ 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;
 
   function syncStatus(ctx?: ExtensionCtx): 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.
+    const ui = statusUi(lastCtx);
+    if (!ui) return;
+    // One unified bar replaces the per-extension bars while a preset is active.
     if (!isComboPresetActive()) {
-      c.ui.setStatus('combo', undefined);
+      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('caveman', undefined);
-    c.ui.setStatus('rtk', undefined);
-    c.ui.setStatus('ponytail', undefined);
+    ui.setStatus('combo', themeStatus(ui, '🧩', `combo ${lvl}: 🪨caveman=${c0} ⚡rtk=${r} 🦥ponytail=${p}`, true));
+    // Our bar is canonical for the preset, so clear any sibling bar.
+    ui.setStatus('caveman', undefined);
+    ui.setStatus('rtk', undefined);
+    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,9 +108,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.
-    if (ctx?.hasUI) setSharedComboListener(useState);
+    if (ctx?.hasUI) setSharedComboListener('combo', useState);
   }
 
   function track(ctx?: ExtensionCtx): void {
@@ -174,7 +165,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 +183,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 +196,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 +208,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);
     });
@@ -229,12 +216,9 @@ export default function comboToggleExtension(pi: ExtensionApi): void {
 
   pi.on<SystemPromptEvent>('before_agent_start', async (event, ctx) => {
     if (ctx?.hasUI) reconcile(ctx);
-    if (!isOmpSubagentPrompt(event.systemPrompt)) return;
-
     const mode = getSharedComboState().ponytail;
     if (mode === 'off' || systemPromptIncludes(event.systemPrompt, 'PONYTAIL MODE ACTIVE')) return;
-    const base = asPromptArray(event.systemPrompt);
-    return { systemPrompt: [...base, loadPonytailInstructions(mode)] };
+    return injectPromptText(pi, event, await loadPonytailInstructions(mode));
   });
 
   // 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,11 +194,14 @@ 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() {
+    // Matches the other TERSIO_* overrides so a test never reads the real home.
+    const override = process.env.TERSIO_HOME;
+    if (override && override.trim() !== '')
+        return override;
     return path.join(os.homedir(), '.tersio');
 }
 export function tersioDataPath(name, legacy) {

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,18 @@ 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 {
+  // Matches the other TERSIO_* overrides so a test never reads the real home.
+  const override = process.env.TERSIO_HOME;
+  if (override && override.trim() !== '') return override;
   return path.join(os.homedir(), '.tersio');
 }
 
+
 export function tersioDataPath(name: string, legacy: string): string {
   const dest = path.join(tersioHome(), name);
   if (!migratedTersioFiles.has(name)) {