@krtclcdy/tersio 2.24.0 → 2.24.1

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

@@ -310,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

@@ -54,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;
 }
@@ -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,32 +1,18 @@
 import { readFileSync } from 'node:fs';
 import { fileURLToPath } from 'node:url';
-import { activeModesSummary, 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';
@@ -53,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);
@@ -79,9 +65,7 @@ export default function cavemanSessionExtension(pi) {
         return true;
     }
     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) {
         const mode = normalizeMode('caveman', state.caveman);
         if (mode) {
@@ -89,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) => {
@@ -115,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).
@@ -152,6 +133,10 @@ export default function cavemanSessionExtension(pi) {
         if (!def)
             return;
         const instruction = typeof def === 'function' ? def() : def;
+        // 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,6 +1,6 @@
 import { readFileSync } from 'node:fs';
 import { fileURLToPath } from 'node:url';
-import { activeModesSummary, 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';
@@ -9,24 +9,11 @@ import type { ExtensionApi, ExtensionCtx, InputEvent, SessionEntry, SystemPrompt
 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';
@@ -57,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 {
@@ -84,9 +71,7 @@ export default function cavemanSessionExtension(pi: ExtensionApi): void {
 
   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) {
@@ -94,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) => {
@@ -120,10 +105,7 @@ export default function cavemanSessionExtension(pi: ExtensionApi): void {
 
   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).
@@ -161,6 +143,9 @@ export default function cavemanSessionExtension(pi: ExtensionApi): void {
     const def = INSTRUCTIONS[mode];
     if (!def) return;
     const instruction = typeof def === 'function' ? def() : def;
+    // 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/combo-toggle/index.js

@@ -9,7 +9,7 @@ var __rewriteRelativeImportExtension = (this && this.__rewriteRelativeImportExte
 };
 import path from 'node:path';
 import { fileURLToPath, pathToFileURL } from 'node:url';
-import { activeModesSummary, COMBO_LEVELS, getSharedComboState, isComboPresetActive, isOmpSubagentPrompt, normalizeComboLevel, paintableCtx, reconcileSharedComboEntries, sessionEntries, setSharedComboLevel, setSharedComboListener, setSharedComboMode, systemPromptIncludes, themeStatus, } from '../shared/session-state.js';
+import { 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';
 import { findHoistedPackage } from '../lib/utils.js';
@@ -46,12 +46,12 @@ export default function comboToggleExtension(pi) {
     let setupPrompted = false;
     function syncStatus(ctx) {
         lastCtx = paintableCtx(lastCtx, ctx);
-        const c = lastCtx;
-        if (!c?.ui?.setStatus)
+        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 a cache: siblings reconcile it first.
@@ -60,11 +60,11 @@ export default function comboToggleExtension(pi) {
         const r = state.rtk.toUpperCase();
         const p = state.ponytail.toUpperCase();
         const lvl = state.level.toUpperCase();
-        c.ui.setStatus('combo', themeStatus(c.ui, '🧩', `combo ${lvl}: 🪨caveman=${c0} ⚡rtk=${r} 🦥ponytail=${p}`, true));
+        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.
-        c.ui.setStatus('caveman', undefined);
-        c.ui.setStatus('rtk', undefined);
-        c.ui.setStatus('ponytail', undefined);
+        ui.setStatus('caveman', undefined);
+        ui.setStatus('rtk', undefined);
+        ui.setStatus('ponytail', undefined);
     }
     // Siblings restore from these entries, so the fallback must write them too.
     function persistPreset(level) {
@@ -84,9 +84,8 @@ export default function comboToggleExtension(pi) {
         return useState(reconcileSharedComboEntries(sessionEntries(ctx)), ctx);
     }
     function listen(ctx) {
-        // Stable identity: the bridge set dedupes, so repeat calls register once.
         if (ctx?.hasUI)
-            setSharedComboListener(useState);
+            setSharedComboListener('combo', useState);
     }
     function track(ctx) {
         listen(ctx);
@@ -175,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 instructions = await loadPonytailInstructions(mode);
-        return injectPromptText(pi, event, instructions);
+        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,6 +1,5 @@
 // /combo session toggle: off | medium | balanced | max.
 
-import os from 'node:os';
 import path from 'node:path';
 import { fileURLToPath, pathToFileURL } from 'node:url';
 import {
@@ -8,12 +7,12 @@ import {
   COMBO_LEVELS,
   getSharedComboState,
   isComboPresetActive,
-  isOmpSubagentPrompt,
   normalizeComboLevel,
   paintableCtx,
   reconcileSharedComboEntries,
   sessionEntries,
   setSharedComboLevel,
+  statusUi,
   setSharedComboListener,
   setSharedComboMode,
   systemPromptIncludes,
@@ -70,11 +69,11 @@ export default function comboToggleExtension(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;
     // 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 a cache: siblings reconcile it first.
@@ -83,11 +82,11 @@ export default function comboToggleExtension(pi: ExtensionApi): void {
     const r = state.rtk.toUpperCase();
     const p = state.ponytail.toUpperCase();
     const lvl = state.level.toUpperCase();
-    c.ui.setStatus('combo', themeStatus(c.ui, '🧩', `combo ${lvl}: 🪨caveman=${c0} ⚡rtk=${r} 🦥ponytail=${p}`, true));
+    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.
-    c.ui.setStatus('caveman', undefined);
-    c.ui.setStatus('rtk', undefined);
-    c.ui.setStatus('ponytail', undefined);
+    ui.setStatus('caveman', undefined);
+    ui.setStatus('rtk', undefined);
+    ui.setStatus('ponytail', undefined);
   }
 
   // Siblings restore from these entries, so the fallback must write them too.
@@ -109,8 +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 repeat calls register once.
-    if (ctx?.hasUI) setSharedComboListener(useState);
+    if (ctx?.hasUI) setSharedComboListener('combo', useState);
   }
 
   function track(ctx?: ExtensionCtx): void {
@@ -218,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 instructions = await loadPonytailInstructions(mode);
-    return injectPromptText(pi, event, instructions);
+    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

@@ -198,6 +198,10 @@ export async function readTextIfExists(p) {
 // ~/.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

@@ -205,6 +205,9 @@ export async function readTextIfExists(p: string): Promise<string | null> {
 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');
 }
 

package/extensions/rtk-session/index.js

@@ -1,4 +1,4 @@
-import { activeModesSummary, getSharedComboState, isComboPresetActive, isOmpSubagentPrompt, lastCustomValue, normalizeInputCommand, paintStatusBar, paintableCtx, reconcileSharedComboEntries, sessionEntries, setSharedComboListener, setSharedComboMode } from '../shared/session-state.js';
+import { activeModesSummary, getSharedComboState, isComboPresetActive, isOmpSubagentPrompt, lastCustomValue, paintStatusBar, paintableCtx, reconcileSharedComboEntries, sessionEntries, setSharedComboListener, setSharedComboMode, statusUi, systemPromptIncludes } 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;
@@ -25,17 +25,20 @@ export default function rtkSessionExtension(pi) {
     let enabled = DEFAULT_ENABLED;
     let isActive = false;
     let lastCtx = undefined;
+    function fail(text) {
+        return { isError: true, content: [{ type: 'text', text }], details: { enabled } };
+    }
     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() || !enabled) {
-            c.ui.setStatus('rtk', undefined);
+            ui.setStatus('rtk', undefined);
             return;
         }
-        paintStatusBar(c.ui, 'rtk', '⚡', 'rtk: ON', isActive);
+        paintStatusBar(ui, 'rtk', '⚡', 'rtk: ON', isActive);
     }
     function setEnabled(next, ctx) {
         enabled = Boolean(next);
@@ -53,7 +56,7 @@ export default function rtkSessionExtension(pi) {
         setRtkProcessEnabled(enabled);
         syncStatus();
     }
-    setSharedComboListener(syncFromShared);
+    setSharedComboListener('rtk', syncFromShared);
     pi.registerCommand?.('rtk', {
         description: 'Toggle RTK compact shell-output guidance for this session',
         handler: async (args, ctx) => {
@@ -82,38 +85,28 @@ export default function rtkSessionExtension(pi) {
             description: "Arguments passed to rtk, e.g. ['git','status'] or ['read','src/index.ts']",
         }),
         async execute(_toolCallId, params, signal, onUpdate, ctx) {
-            if (!enabled) {
+            if (!enabled)
+                return fail('RTK mode is off. Run /rtk on for this session, or use bash explicitly.');
+            if (typeof pi.exec !== 'function')
+                return fail('This host cannot run rtk.');
+            onUpdate?.({ content: [{ type: 'text', text: `rtk ${params.args.join(' ')}` }], details: { phase: 'start' } });
+            try {
+                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: true,
-                    content: [{ type: 'text', text: 'RTK mode is off. Run /rtk on for this session, or use bash explicitly.' }],
-                    details: { enabled },
+                    isError: result.code !== 0,
+                    content: [{ type: 'text', text: text || `rtk exited ${result.code}` }],
+                    details: { code: result.code, killed: result.killed, enabled },
                 };
             }
-            onUpdate?.({ content: [{ type: 'text', text: `rtk ${params.args.join(' ')}` }], details: { phase: 'start' } });
-            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,
-                content: [{ type: 'text', text: text || `rtk exited ${result.code}` }],
-                details: { code: result.code, killed: result.killed, enabled },
-            };
+            catch (e) {
+                return fail(`rtk could not run: ${e instanceof Error ? e.message : String(e)}`);
+            }
         },
     });
-    onHostEvent(pi, 'input', async (event) => {
-        if (event?.source === 'extension')
-            return;
-        const t = normalizeInputCommand(event?.text);
-        if (t === 'rtk on' || t === 'use rtk')
-            setEnabled(true);
-        if (t === 'rtk off' || t === 'stop rtk')
-            setEnabled(false);
-    });
     function restoreEnabled(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).
@@ -144,6 +137,9 @@ export default function rtkSessionExtension(pi) {
         const active = isOmpSubagentPrompt(event.systemPrompt) ? getSharedComboState().rtk === 'on' : enabled;
         if (!active)
             return;
+        // Skip when already present, so a host that re-presents the prompt cannot stack it.
+        if (systemPromptIncludes(event.systemPrompt, RTK_PROMPT))
+            return;
         return injectPromptText(pi, event, RTK_PROMPT);
     });
 }

package/extensions/rtk-session/index.ts

@@ -1,7 +1,7 @@
-import { activeModesSummary, getSharedComboState, isComboPresetActive, isOmpSubagentPrompt, lastCustomValue, normalizeInputCommand, paintStatusBar, paintableCtx, reconcileSharedComboEntries, sessionEntries, setSharedComboListener, setSharedComboMode } from '../shared/session-state.ts';
+import { activeModesSummary, getSharedComboState, isComboPresetActive, isOmpSubagentPrompt, lastCustomValue, paintStatusBar, paintableCtx, reconcileSharedComboEntries, sessionEntries, setSharedComboListener, setSharedComboMode, statusUi, systemPromptIncludes } 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';
+import type { ExtensionApi, ExtensionCtx, SessionEntry, SystemPromptEvent } from '../shared/types.ts';
 
 const DEFAULT_ENABLED = false;
 
@@ -28,16 +28,20 @@ export default function rtkSessionExtension(pi: ExtensionApi): void {
   let isActive = false;
   let lastCtx: ExtensionCtx | undefined = undefined;
 
+  function fail(text: string) {
+    return { isError: true as const, content: [{ type: 'text' as const, text }], details: { enabled } };
+  }
+
   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() || !enabled) {
-      c.ui.setStatus('rtk', undefined);
+      ui.setStatus('rtk', undefined);
       return;
     }
-    paintStatusBar(c.ui, 'rtk', '⚡', 'rtk: ON', isActive);
+    paintStatusBar(ui, 'rtk', '⚡', 'rtk: ON', isActive);
   }
 
   function setEnabled(next: unknown, ctx?: ExtensionCtx): void {
@@ -58,7 +62,7 @@ export default function rtkSessionExtension(pi: ExtensionApi): void {
     setRtkProcessEnabled(enabled);
     syncStatus();
   }
-  setSharedComboListener(syncFromShared);
+  setSharedComboListener('rtk', syncFromShared);
   pi.registerCommand?.('rtk', {
     description: 'Toggle RTK compact shell-output guidance for this session',
     handler: async (args, ctx) => {
@@ -88,36 +92,26 @@ export default function rtkSessionExtension(pi: ExtensionApi): void {
       description: "Arguments passed to rtk, e.g. ['git','status'] or ['read','src/index.ts']",
     }),
     async execute(_toolCallId, params, signal, onUpdate, ctx) {
-      if (!enabled) {
+      if (!enabled) return fail('RTK mode is off. Run /rtk on for this session, or use bash explicitly.');
+      if (typeof pi.exec !== 'function') return fail('This host cannot run rtk.');
+      onUpdate?.({ content: [{ type: 'text', text: `rtk ${params.args.join(' ')}` }], details: { phase: 'start' } });
+      try {
+        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: true,
-          content: [{ type: 'text', text: 'RTK mode is off. Run /rtk on for this session, or use bash explicitly.' }],
-          details: { enabled },
+          isError: result.code !== 0,
+          content: [{ type: 'text', text: text || `rtk exited ${result.code}` }],
+          details: { code: result.code, killed: result.killed, enabled },
         };
+      } catch (e) {
+        return fail(`rtk could not run: ${e instanceof Error ? e.message : String(e)}`);
       }
-      onUpdate?.({ content: [{ type: 'text', text: `rtk ${params.args.join(' ')}` }], details: { phase: 'start' } });
-      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,
-        content: [{ type: 'text', text: text || `rtk exited ${result.code}` }],
-        details: { code: result.code, killed: result.killed, enabled },
-      };
     },
   });
 
-  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);
-    if (t === 'rtk off' || t === 'stop rtk') setEnabled(false);
-  });
   function restoreEnabled(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).
@@ -153,6 +147,8 @@ 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;
+    // Skip when already present, so a host that re-presents the prompt cannot stack it.
+    if (systemPromptIncludes(event.systemPrompt, RTK_PROMPT)) return;
     return injectPromptText(pi, event, RTK_PROMPT);
   });
 }

package/extensions/shared/carbon.js

@@ -1,11 +1,4 @@
-// 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): 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 v0.8.2 port; always render as ~est, never merged with measured.
 // EcoLogits 0.8.2 constants — kWh, kgCO2eq, seconds, GB.
 const Q_BITS = 4;
 const E_ALPHA = 8.91e-8;
@@ -28,6 +21,8 @@ const GRIDS = {
 };
 // Serving amortization: single-stream ceiling ÷ concurrency ≈ served impact.
 export const SERVING_CONCURRENCY = 32;
+/** EcoLogits release this port tracks, so a UI can name it instead of guessing. */
+export const ECOLOGITS_VERSION = '0.8.2';
 // Registry values verbatim from EcoLogits' model_repository; borrows cite
 // the public param disclosure they stand in for (MoE active/total).
 const TABLE = [