@krtclcdy/tersio 2.23.0 → 2.24.1

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) => {
@@ -303,15 +310,16 @@ export default function aiAddonsUpdaterExtension(pi) {
             const cleanParts = parts.filter((p) => p !== '--dry-run' && p !== 'dry-run');
             const sub = cleanParts[0];
             if (sub === 'check' || sub === 'status') {
-                const summary = await checkAddons(ctx);
+                await checkAddons(ctx);
                 notify(ctx, 'ai-addons check complete.', 'info');
-                return summary;
+                return;
             }
             if (sub === 'update' && cleanParts[1]) {
-                return runAddonUpdate(pi, ctx, cleanParts.slice(1).join(' '), dryRun);
+                await runAddonUpdate(pi, ctx, cleanParts.slice(1).join(' '), dryRun);
+                return;
             }
-            const m = 'Usage: /ai-addons <check|status|update ponytail|rtk|caveman|all> [--dry-run]';
-            return report(ctx, m, 'warning');
+            report(ctx, 'Usage: /ai-addons <check|status|update ponytail|rtk|caveman|all> [--dry-run]', 'warning');
+            return;
         },
     });
 }

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 ---
 
@@ -56,7 +54,7 @@ interface AddonUpdaterCtx {
 
 interface AddonUpdaterPi {
   setLabel?: (label: string) => void;
-  registerCommand?: (name: string, config: { description: string; handler: (args: string, ctx: AddonUpdaterCtx) => Promise<string> }) => void;
+  registerCommand?: (name: string, config: { description: string; handler: (args: string, ctx: AddonUpdaterCtx) => Promise<void> }) => void;
   exec?: (cmd: string, args: string[], opts?: { cwd?: string }) => Promise<{ stdout: string; stderr: string; code: number }>;
   cwd?: string;
 }
@@ -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]',
@@ -355,15 +355,16 @@ export default function aiAddonsUpdaterExtension(pi: AddonUpdaterPi): void {
       const sub = cleanParts[0];
 
       if (sub === 'check' || sub === 'status') {
-        const summary = await checkAddons(ctx);
+        await checkAddons(ctx);
         notify(ctx, 'ai-addons check complete.', 'info');
-        return summary;
+        return;
       }
       if (sub === 'update' && cleanParts[1]) {
-        return runAddonUpdate(pi, ctx, cleanParts.slice(1).join(' '), dryRun);
+        await runAddonUpdate(pi, ctx, cleanParts.slice(1).join(' '), dryRun);
+        return;
       }
-      const m = 'Usage: /ai-addons <check|status|update ponytail|rtk|caveman|all> [--dry-run]';
-      return report(ctx, m, 'warning');
+      report(ctx, 'Usage: /ai-addons <check|status|update ponytail|rtk|caveman|all> [--dry-run]', 'warning');
+      return;
     },
   });
 }

package/extensions/caveman-session/index.js

@@ -1,31 +1,18 @@
 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, statusUi, systemPromptIncludes } 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');
-const FALLBACK_FULL_RULE = `Caveman full active for this session.
-Respond terse like smart caveman. Keep all technical substance. Drop filler, pleasantries, and hedging.
-
-Rules:
-- Drop articles where meaning stays clear. Keep fragments and short sentences.
-- Keep technical terms, code, commands, paths, API names, numbers, units, and errors exact.
-- Never invent abbreviations or causal arrows. Do not add words to sound caveman.
-- Use ASD-STE100 Simplified Technical English. Keep one idea per sentence, target 20 words, active voice, and consistent terms.
-- Make no tool-call narration. Use no decorative tables or emoji.
-- Preserve the user's reply language. Compress style, not language.
-- Drop caveman for security warnings, irreversible actions, ambiguous multi-step sequences, or requests to clarify.
-- Write code, comments, commits, docs, issues, pull requests, and third-party messages in normal prose.
-
-Default: **full**. Switch: \`/caveman lite|full|ultra|wenyan-lite|wenyan-full|wenyan-ultra|off\`. Stop: "stop caveman" or "normal mode".`;
-// ponytail: synchronous read each full-mode injection; ceiling = small file, cold session start. Upgrade path: cache file contents + mtime, invalidate on change.
+// Fail loud: a wrong rule reads to the model as the real one.
 function readFullRule() {
     try {
         return readFileSync(RULE_PATH, 'utf8');
     }
     catch {
-        return FALLBACK_FULL_RULE;
+        return 'Caveman full requested, but rule.md is missing. Run: tersio doctor --fix extensions';
     }
 }
 const DEFAULT_MODE = 'off';
@@ -52,15 +39,15 @@ export default function cavemanSessionExtension(pi) {
     let lastCtx = undefined;
     function syncStatus(ctx) {
         lastCtx = paintableCtx(lastCtx, ctx);
-        const c = lastCtx;
-        if (!c?.ui?.setStatus)
+        const ui = statusUi(lastCtx);
+        if (!ui)
             return;
         // Combo owns the bar when any preset is active; keep ours empty to avoid duplication.
         if (isComboPresetActive() || currentMode === 'off') {
-            c.ui.setStatus('caveman', undefined);
+            ui.setStatus('caveman', undefined);
             return;
         }
-        paintStatusBar(c.ui, 'caveman', '🪨', `caveman: ${currentMode.toUpperCase()}`, isActive);
+        paintStatusBar(ui, 'caveman', '🪨', `caveman: ${currentMode.toUpperCase()}`, isActive);
     }
     function setMode(mode, ctx) {
         const normalized = normalizeMode('caveman', mode);
@@ -77,10 +64,8 @@ export default function cavemanSessionExtension(pi) {
         ctx?.ui?.notify?.(msg, 'info');
         return true;
     }
-    pi.setLabel?.('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.
+    setExtensionLabel(pi, 'Caveman session toggle');
+    // Adopt a /tersio or /combo switch at once, so the next turn needs no reload.
     function syncFromShared(state) {
         const mode = normalizeMode('caveman', state.caveman);
         if (mode) {
@@ -88,7 +73,7 @@ export default function cavemanSessionExtension(pi) {
             syncStatus();
         }
     }
-    setSharedComboListener(syncFromShared);
+    setSharedComboListener('caveman', syncFromShared);
     pi.registerCommand?.('caveman', {
         description: 'Toggle terse caveman replies for this session',
         handler: async (args, ctx) => {
@@ -106,7 +91,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))
@@ -114,10 +99,7 @@ export default function cavemanSessionExtension(pi) {
     });
     function restoreMode(ctx) {
         const entries = sessionEntries(ctx);
-        // Publish the persisted combo state (incl. combo-level) before painting:
-        // bar suppression reads the in-process bridge, which is empty in a fresh
-        // host until the combo extension reconciles — and its reconcile is
-        // UI-gated. Deriving it here makes suppression independent of load order.
+        // Derive the bridge here so bar suppression does not depend on load order.
         reconcileSharedComboEntries(entries);
         // Persisted session state wins; a fresh session falls back to the
         // installer/user-configured default (off unless configured).
@@ -129,7 +111,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 +133,10 @@ export default function cavemanSessionExtension(pi) {
         if (!def)
             return;
         const instruction = typeof def === 'function' ? def() : def;
-        const base = asPromptArray(event.systemPrompt);
-        return { systemPrompt: [...base, instruction] };
+        // Skip when already present, so a host that re-presents the mutated prompt
+        // cannot stack it; matching the whole instruction keeps upstream rule.md intact.
+        if (systemPromptIncludes(event.systemPrompt, instruction))
+            return;
+        return injectPromptText(pi, event, instruction);
     });
 }

package/extensions/caveman-session/index.ts

@@ -1,31 +1,19 @@
 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, statusUi, systemPromptIncludes } 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';
 
 const CAVERN_DIR = dirname(fileURLToPath(import.meta.url));
 const RULE_PATH = join(CAVERN_DIR, 'rule.md');
 
-const FALLBACK_FULL_RULE = `Caveman full active for this session.
-Respond terse like smart caveman. Keep all technical substance. Drop filler, pleasantries, and hedging.
-
-Rules:
-- Drop articles where meaning stays clear. Keep fragments and short sentences.
-- Keep technical terms, code, commands, paths, API names, numbers, units, and errors exact.
-- Never invent abbreviations or causal arrows. Do not add words to sound caveman.
-- Use ASD-STE100 Simplified Technical English. Keep one idea per sentence, target 20 words, active voice, and consistent terms.
-- Make no tool-call narration. Use no decorative tables or emoji.
-- Preserve the user's reply language. Compress style, not language.
-- Drop caveman for security warnings, irreversible actions, ambiguous multi-step sequences, or requests to clarify.
-- Write code, comments, commits, docs, issues, pull requests, and third-party messages in normal prose.
-
-Default: **full**. Switch: \`/caveman lite|full|ultra|wenyan-lite|wenyan-full|wenyan-ultra|off\`. Stop: "stop caveman" or "normal mode".`;
-
-// ponytail: synchronous read each full-mode injection; ceiling = small file, cold session start. Upgrade path: cache file contents + mtime, invalidate on change.
+// Fail loud: a wrong rule reads to the model as the real one.
 function readFullRule(): string {
-  try { return readFileSync(RULE_PATH, 'utf8'); } catch { return FALLBACK_FULL_RULE; }
+  try { return readFileSync(RULE_PATH, 'utf8'); } catch {
+    return 'Caveman full requested, but rule.md is missing. Run: tersio doctor --fix extensions';
+  }
 }
 
 const DEFAULT_MODE = 'off';
@@ -56,14 +44,14 @@ export default function cavemanSessionExtension(pi: ExtensionApi): void {
 
   function syncStatus(ctx?: ExtensionCtx): void {
     lastCtx = paintableCtx(lastCtx, ctx);
-    const c = lastCtx;
-    if (!c?.ui?.setStatus) return;
+    const ui = statusUi(lastCtx);
+    if (!ui) return;
     // Combo owns the bar when any preset is active; keep ours empty to avoid duplication.
     if (isComboPresetActive() || currentMode === 'off') {
-      c.ui.setStatus('caveman', undefined);
+      ui.setStatus('caveman', undefined);
       return;
     }
-    paintStatusBar(c.ui, 'caveman', '🪨', `caveman: ${currentMode.toUpperCase()}`, isActive);
+    paintStatusBar(ui, 'caveman', '🪨', `caveman: ${currentMode.toUpperCase()}`, isActive);
   }
 
   function setMode(mode: string, ctx?: ExtensionCtx): boolean {
@@ -81,11 +69,9 @@ 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.
-  // Stable identity, so the bridge set dedupes across re-inits.
+  // Adopt a /tersio or /combo switch at once, so the next turn needs no reload.
   function syncFromShared(state: { caveman: string }): void {
     const mode = normalizeMode('caveman', state.caveman);
     if (mode) {
@@ -93,7 +79,7 @@ export default function cavemanSessionExtension(pi: ExtensionApi): void {
       syncStatus();
     }
   }
-  setSharedComboListener(syncFromShared);
+  setSharedComboListener('caveman', syncFromShared);
   pi.registerCommand?.('caveman', {
     description: 'Toggle terse caveman replies for this session',
     handler: async (args, ctx) => {
@@ -112,17 +98,14 @@ 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');
   });
 
   function restoreMode(ctx?: ExtensionCtx): void {
     const entries = sessionEntries(ctx);
-    // Publish the persisted combo state (incl. combo-level) before painting:
-    // bar suppression reads the in-process bridge, which is empty in a fresh
-    // host until the combo extension reconciles — and its reconcile is
-    // UI-gated. Deriving it here makes suppression independent of load order.
+    // Derive the bridge here so bar suppression does not depend on load order.
     reconcileSharedComboEntries(entries);
     // Persisted session state wins; a fresh session falls back to the
     // installer/user-configured default (off unless configured).
@@ -136,7 +119,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 +143,9 @@ 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] };
+    // Skip when already present, so a host that re-presents the mutated prompt
+    // cannot stack it; matching the whole instruction keeps upstream rule.md intact.
+    if (systemPromptIncludes(event.systemPrompt, instruction)) return;
+    return injectPromptText(pi, event, instruction);
   });
 }