@krtclcdy/tersio 2.24.1 → 2.25.1

package/extensions/shared/pricing.js

@@ -1,13 +1,11 @@
-// extensions/shared/pricing.ts — dynamic model pricing from LiteLLM. Exact id
-// → provider-prefix strip → default, reported with known:false when unpriced.
+// extensions/shared/pricing.ts — dynamic model pricing from LiteLLM. Exact id → provider-prefix strip → default, reported with known:false when unpriced.
 import fs from 'node:fs';
 import path from 'node:path';
 import { tersioDataPath } from '../lib/utils.js';
 // Sonnet-class default for unpriced models; always paired with known:false.
 export const DEFAULT_PRICE = { input: 2, output: 10, cacheRead: 0.2, cacheWrite: 2.5 };
 const LITELLM_URL = 'https://raw.githubusercontent.com/BerriAI/litellm/main/model_prices_and_context_window.json';
-// Readers use the file even when stale, and only one refresh runs per process;
-// `tersio update` still forces a fresh fetch.
+// Readers use the file even when stale, and only one refresh runs per process; `tersio update` still forces a fresh fetch.
 const CACHE_TTL_MS = 7 * 24 * 3600 * 1000;
 let refreshInflight = null;
 export function pricesCachePath() {
@@ -22,8 +20,7 @@ export function pricesUrl() {
 function toPrice(t) {
     return { input: t[0], output: t[1], cacheRead: t[2], cacheWrite: t[3] };
 }
-// Tolerate both cache shapes (compact tuples and ModelPrice objects) so a
-// version bump never orphans the cache.
+// Tolerate both cache shapes (compact tuples and ModelPrice objects) so a version bump never orphans the cache.
 function asPrice(v) {
     if (Array.isArray(v) && v.length === 4 && v.every((n) => typeof n === 'number' && Number.isFinite(n) && n >= 0)) {
         return toPrice(v);
@@ -31,14 +28,30 @@ function asPrice(v) {
     if (v && typeof v === 'object') {
         const o = v;
         if (['input', 'output', 'cacheRead', 'cacheWrite'].every((k) => typeof o[k] === 'number' && Number.isFinite(o[k]) && o[k] >= 0)) {
-            // SAFETY: the line above verified all four keys are finite numbers >= 0,
-            // which is the whole of ModelPrice.
+            // SAFETY: the line above verified all four keys are finite numbers >= 0, which is the whole of ModelPrice.
             return o;
         }
     }
     return null;
 }
+let liveCache = null;
 export function loadLivePrices() {
+    // One stat per call beats one full parse: the recent-rows map prices thousands of rows.
+    try {
+        const file = pricesCachePath();
+        const mtime = fs.statSync(file).mtimeMs;
+        if (liveCache && liveCache.path === file && liveCache.mtime === mtime)
+            return liveCache.prices;
+        const prices = readLivePrices();
+        if (prices)
+            liveCache = { path: file, mtime, prices };
+        return prices;
+    }
+    catch {
+        return null;
+    }
+}
+function readLivePrices() {
     let raw;
     try {
         raw = fs.readFileSync(pricesCachePath(), 'utf8');
@@ -69,36 +82,78 @@ export function loadLivePrices() {
 function num(v) {
     return typeof v === 'number' && Number.isFinite(v) && v >= 0 ? v : null;
 }
-// Transcripts and the feed spell one model differently; aliases stop a free
-// model reporting the default price.
+// Transcripts and the feed spell one model differently; aliases stop a free model reporting the default price.
 export const MODEL_ALIASES = [
     { id: 'space-bunny', feed: 'stealth/space-bunny-alpha' },
 ];
 export function canonicalPriceId(model) {
     const key = model.toLowerCase();
-    return MODEL_ALIASES.find((a) => a.id === key || a.feed === key)?.id ?? key;
+    // Suffix match: gateways prefix the id (opencode/kilo/stealth/space-bunny-alpha).
+    return MODEL_ALIASES.find((a) => a.id === key || a.feed === key || key.endsWith(`/${a.id}`) || key.endsWith(`/${a.feed}`))?.id ?? key;
 }
 export function priceFor(model, live) {
     const table = live === undefined ? loadLivePrices() : live;
-    // An alias goes through the same exact-then-suffix chain as any other id, so
-    // it still resolves when the feed keys it under a provider prefix.
+    if (live === undefined) {
+        const memo = priceMemo(table);
+        const hit = memo.get(model);
+        if (hit)
+            return hit;
+        const resolved = resolvePrice(model, table);
+        memo.set(model, resolved);
+        return resolved;
+    }
+    return resolvePrice(model, table);
+}
+// Recent rows repeat a handful of models; the memo turns thousands of lookups into one per model. Cleared whenever the table identity changes.
+let memoTable;
+let memo = new Map();
+function priceMemo(table) {
+    if (memoTable !== table) {
+        memoTable = table;
+        memo = new Map();
+    }
+    return memo;
+}
+// Validated once per table instead of once per lookup.
+let compiledTable = null;
+let compiledEntries = [];
+function priceEntries(table) {
+    if (compiledTable === table)
+        return compiledEntries;
+    const entries = [];
+    for (const [k, v] of Object.entries(table.exact)) {
+        const price = asPrice(v);
+        if (price)
+            entries.push([k, price]);
+    }
+    compiledTable = table;
+    compiledEntries = entries;
+    return entries;
+}
+function resolvePrice(model, table) {
+    // An alias goes through the same exact-then-suffix chain as any other id, so it still resolves when the feed keys it under a provider prefix.
     const id = MODEL_ALIASES.find((a) => a.id === model.toLowerCase())?.feed ?? model;
     if (table) {
-        const hit = asPrice(table.exact[id] ?? table.exact[id.toLowerCase()]);
+        const entries = priceEntries(table);
+        const lower = id.toLowerCase();
+        const hit = entries.find(([k]) => k === id) ?? entries.find(([k]) => k === lower);
         if (hit)
-            return { price: hit, known: true, live: true };
+            return { price: hit[1], known: true, live: true };
         // Provider-prefixed ids ("azure/gpt-4o", "dashscope/qwen-max"): match the
-        // first cached id that ends with the bare model name.
-        const name = id.toLowerCase();
-        const key = Object.keys(table.exact).find((k) => k.toLowerCase() === name || k.toLowerCase().endsWith(`/${name}`));
-        const prefixed = key ? asPrice(table.exact[key]) : null;
-        if (prefixed)
-            return { price: prefixed, known: true, live: true };
+        // first cached key that ends with the full id, then with the bare tail
+        // segment, so "codex/openai/gpt-6-luna" still finds "gpt-6-luna".
+        const name = lower;
+        const tail = name.split('/').pop() ?? name;
+        const key = entries.find(([k]) => {
+            const lk = k.toLowerCase();
+            return lk === name || lk.endsWith(`/${name}`) || lk === tail || lk.endsWith(`/${tail}`);
+        });
+        if (key)
+            return { price: key[1], known: true, live: true };
     }
     return { price: DEFAULT_PRICE, known: false, live: false };
 }
-// Fetch LiteLLM pricing and write the cache. False on any failure — callers
-// fall back silently.
+// Fetch LiteLLM pricing and write the cache. False on any failure — callers fall back silently.
 export async function refreshPrices() {
     if (refreshInflight)
         return refreshInflight;
@@ -162,8 +217,7 @@ export async function refreshPrices() {
         refreshInflight = null;
     }
 }
-// Fire-and-forget refresh when the cache is stale; readers keep the stale
-// file, so pricing never blocks.
+// Fire-and-forget refresh when the cache is stale; readers keep the stale file, so pricing never blocks.
 export function refreshPricesIfStale() {
     const live = loadLivePrices();
     if (live && Date.now() - live.fetchedAt <= CACHE_TTL_MS)

package/extensions/shared/pricing.ts

@@ -1,5 +1,4 @@
-// extensions/shared/pricing.ts — dynamic model pricing from LiteLLM. Exact id
-// → provider-prefix strip → default, reported with known:false when unpriced.
+// extensions/shared/pricing.ts — dynamic model pricing from LiteLLM. Exact id → provider-prefix strip → default, reported with known:false when unpriced.
 import fs from 'node:fs';
 import path from 'node:path';
 import { tersioDataPath } from '../lib/utils.ts';
@@ -15,8 +14,7 @@ export interface ModelPrice {
 export const DEFAULT_PRICE: ModelPrice = { input: 2, output: 10, cacheRead: 0.2, cacheWrite: 2.5 };
 
 const LITELLM_URL = 'https://raw.githubusercontent.com/BerriAI/litellm/main/model_prices_and_context_window.json';
-// Readers use the file even when stale, and only one refresh runs per process;
-// `tersio update` still forces a fresh fetch.
+// Readers use the file even when stale, and only one refresh runs per process; `tersio update` still forces a fresh fetch.
 const CACHE_TTL_MS = 7 * 24 * 3600 * 1000;
 let refreshInflight: Promise<boolean> | null = null;
 
@@ -32,8 +30,7 @@ export function pricesUrl(): string {
 
 export interface LivePrices {
   fetchedAt: number;
-  // Compact tuples [input, output, cacheRead, cacheWrite] per LiteLLM id —
-  // the full feed caches to ~1MB instead of multi-MB objects.
+  // Compact tuples [input, output, cacheRead, cacheWrite] per LiteLLM id — the full feed caches to ~1MB instead of multi-MB objects.
   exact: Record<string, [number, number, number, number]>;
   deprecated?: string[];
 }
@@ -42,8 +39,7 @@ function toPrice(t: [number, number, number, number]): ModelPrice {
   return { input: t[0], output: t[1], cacheRead: t[2], cacheWrite: t[3] };
 }
 
-// Tolerate both cache shapes (compact tuples and ModelPrice objects) so a
-// version bump never orphans the cache.
+// Tolerate both cache shapes (compact tuples and ModelPrice objects) so a version bump never orphans the cache.
 function asPrice(v: unknown): ModelPrice | null {
   if (Array.isArray(v) && v.length === 4 && v.every((n) => typeof n === 'number' && Number.isFinite(n) && n >= 0)) {
     return toPrice(v as [number, number, number, number]);
@@ -51,15 +47,30 @@ function asPrice(v: unknown): ModelPrice | null {
   if (v && typeof v === 'object') {
     const o = v as Record<string, unknown>;
     if (['input', 'output', 'cacheRead', 'cacheWrite'].every((k) => typeof o[k] === 'number' && Number.isFinite(o[k]) && (o[k] as number) >= 0)) {
-      // SAFETY: the line above verified all four keys are finite numbers >= 0,
-      // which is the whole of ModelPrice.
+      // SAFETY: the line above verified all four keys are finite numbers >= 0, which is the whole of ModelPrice.
       return o as unknown as ModelPrice;
     }
   }
   return null;
 }
 
+let liveCache: { path: string; mtime: number; prices: LivePrices } | null = null;
+
 export function loadLivePrices(): LivePrices | null {
+  // One stat per call beats one full parse: the recent-rows map prices thousands of rows.
+  try {
+    const file = pricesCachePath();
+    const mtime = fs.statSync(file).mtimeMs;
+    if (liveCache && liveCache.path === file && liveCache.mtime === mtime) return liveCache.prices;
+    const prices = readLivePrices();
+    if (prices) liveCache = { path: file, mtime, prices };
+    return prices;
+  } catch {
+    return null;
+  }
+}
+
+function readLivePrices(): LivePrices | null {
   let raw: string;
   try {
     raw = fs.readFileSync(pricesCachePath(), 'utf8');
@@ -87,36 +98,80 @@ function num(v: unknown): number | null {
   return typeof v === 'number' && Number.isFinite(v) && v >= 0 ? v : null;
 }
 
-// Transcripts and the feed spell one model differently; aliases stop a free
-// model reporting the default price.
+// Transcripts and the feed spell one model differently; aliases stop a free model reporting the default price.
 export const MODEL_ALIASES: ReadonlyArray<{ id: string; feed: string }> = [
   { id: 'space-bunny', feed: 'stealth/space-bunny-alpha' },
 ];
 
 export function canonicalPriceId(model: string): string {
   const key = model.toLowerCase();
-  return MODEL_ALIASES.find((a) => a.id === key || a.feed === key)?.id ?? key;
+  // Suffix match: gateways prefix the id (opencode/kilo/stealth/space-bunny-alpha).
+  return MODEL_ALIASES.find((a) => a.id === key || a.feed === key || key.endsWith(`/${a.id}`) || key.endsWith(`/${a.feed}`))?.id ?? key;
 }
 
 export function priceFor(model: string, live?: LivePrices | null): { price: ModelPrice; known: boolean; live: boolean } {
   const table = live === undefined ? loadLivePrices() : live;
-  // An alias goes through the same exact-then-suffix chain as any other id, so
-  // it still resolves when the feed keys it under a provider prefix.
+  if (live === undefined) {
+    const memo = priceMemo(table);
+    const hit = memo.get(model);
+    if (hit) return hit;
+    const resolved = resolvePrice(model, table);
+    memo.set(model, resolved);
+    return resolved;
+  }
+  return resolvePrice(model, table);
+}
+
+// Recent rows repeat a handful of models; the memo turns thousands of lookups into one per model. Cleared whenever the table identity changes.
+let memoTable: LivePrices | null | undefined;
+let memo = new Map<string, { price: ModelPrice; known: boolean; live: boolean }>();
+
+function priceMemo(table: LivePrices | null): Map<string, { price: ModelPrice; known: boolean; live: boolean }> {
+  if (memoTable !== table) {
+    memoTable = table;
+    memo = new Map();
+  }
+  return memo;
+}
+
+// Validated once per table instead of once per lookup.
+let compiledTable: LivePrices | null = null;
+let compiledEntries: Array<[string, ModelPrice]> = [];
+
+function priceEntries(table: LivePrices): Array<[string, ModelPrice]> {
+  if (compiledTable === table) return compiledEntries;
+  const entries: Array<[string, ModelPrice]> = [];
+  for (const [k, v] of Object.entries(table.exact)) {
+    const price = asPrice(v);
+    if (price) entries.push([k, price]);
+  }
+  compiledTable = table;
+  compiledEntries = entries;
+  return entries;
+}
+
+function resolvePrice(model: string, table: LivePrices | null): { price: ModelPrice; known: boolean; live: boolean } {
+  // An alias goes through the same exact-then-suffix chain as any other id, so it still resolves when the feed keys it under a provider prefix.
   const id = MODEL_ALIASES.find((a) => a.id === model.toLowerCase())?.feed ?? model;
   if (table) {
-    const hit = asPrice(table.exact[id] ?? table.exact[id.toLowerCase()]);
-    if (hit) return { price: hit, known: true, live: true };
+    const entries = priceEntries(table);
+    const lower = id.toLowerCase();
+    const hit = entries.find(([k]) => k === id) ?? entries.find(([k]) => k === lower);
+    if (hit) return { price: hit[1], known: true, live: true };
     // Provider-prefixed ids ("azure/gpt-4o", "dashscope/qwen-max"): match the
-    // first cached id that ends with the bare model name.
-    const name = id.toLowerCase();
-    const key = Object.keys(table.exact).find((k) => k.toLowerCase() === name || k.toLowerCase().endsWith(`/${name}`));
-    const prefixed = key ? asPrice(table.exact[key]) : null;
-    if (prefixed) return { price: prefixed, known: true, live: true };
+    // first cached key that ends with the full id, then with the bare tail
+    // segment, so "codex/openai/gpt-6-luna" still finds "gpt-6-luna".
+    const name = lower;
+    const tail = name.split('/').pop() ?? name;
+    const key = entries.find(([k]) => {
+      const lk = k.toLowerCase();
+      return lk === name || lk.endsWith(`/${name}`) || lk === tail || lk.endsWith(`/${tail}`);
+    });
+    if (key) return { price: key[1], known: true, live: true };
   }
   return { price: DEFAULT_PRICE, known: false, live: false };
 }
-// Fetch LiteLLM pricing and write the cache. False on any failure — callers
-// fall back silently.
+// Fetch LiteLLM pricing and write the cache. False on any failure — callers fall back silently.
 export async function refreshPrices(): Promise<boolean> {
   if (refreshInflight) return refreshInflight;
   refreshInflight = (async () => {
@@ -170,8 +225,7 @@ export async function refreshPrices(): Promise<boolean> {
   }
 }
 
-// Fire-and-forget refresh when the cache is stale; readers keep the stale
-// file, so pricing never blocks.
+// Fire-and-forget refresh when the cache is stale; readers keep the stale file, so pricing never blocks.
 export function refreshPricesIfStale(): void {
   const live = loadLivePrices();
   if (live && Date.now() - live.fetchedAt <= CACHE_TTL_MS) return;

package/extensions/shared/rtk-gain.js

@@ -1,11 +1,10 @@
-// Savings read from rtk history, never estimated; modes bench in BENCHMARK.md.
+// Savings read from rtk history, never estimated; modes bench in docs/BENCHMARK.md.
 import { execFileSync } from 'node:child_process';
 import fs from 'node:fs';
 import os from 'node:os';
 import path from 'node:path';
 const EMPTY = { commands: 0, saved: 0, input: 0, avgPct: 0, totalMs: 0, byCommand: [] };
-// The table shows one clipped cell, so bound the command before it crosses the
-// sqlite3 CLI and lands in every /data.json poll.
+// The table shows one clipped cell, so bound the command before it crosses the sqlite3 CLI and lands in every /data.json poll.
 const MAX_CMD_CHARS = 200;
 // A multi-line stored command would derail every row after it; flatten on read.
 const CMD_ONE_LINE = `replace(replace(replace(rtk_cmd, char(10), ' '), char(13), ' '), char(9), ' ')`;
@@ -34,8 +33,7 @@ export function readRtkGain(limit = 10, cutoffMs) {
     try {
         if (!fs.existsSync(rtkDbPath()))
             return EMPTY;
-        // View-level cutoff only: rtk's own rows stay untouched. Timestamps that do
-        // not parse land on 0 and drop out of a filtered view.
+        // View-level cutoff only: rtk's own rows stay untouched. Timestamps that do not parse land on 0 and drop out of a filtered view.
         const where = cutoffMs && cutoffMs > 0
             ? `WHERE CAST(strftime('%s', timestamp) AS INTEGER) >= ${Math.floor(cutoffMs / 1000)}`
             : '';

package/extensions/shared/rtk-gain.ts

@@ -1,4 +1,4 @@
-// Savings read from rtk history, never estimated; modes bench in BENCHMARK.md.
+// Savings read from rtk history, never estimated; modes bench in docs/BENCHMARK.md.
 import { execFileSync } from 'node:child_process';
 import fs from 'node:fs';
 import os from 'node:os';
@@ -23,8 +23,7 @@ export interface RtkGain {
 
 const EMPTY: RtkGain = { commands: 0, saved: 0, input: 0, avgPct: 0, totalMs: 0, byCommand: [] };
 
-// The table shows one clipped cell, so bound the command before it crosses the
-// sqlite3 CLI and lands in every /data.json poll.
+// The table shows one clipped cell, so bound the command before it crosses the sqlite3 CLI and lands in every /data.json poll.
 const MAX_CMD_CHARS = 200;
 
 // A multi-line stored command would derail every row after it; flatten on read.
@@ -55,8 +54,7 @@ function query(db: string, sql: string): string[][] {
 export function readRtkGain(limit = 10, cutoffMs?: number): RtkGain {
   try {
     if (!fs.existsSync(rtkDbPath())) return EMPTY;
-    // View-level cutoff only: rtk's own rows stay untouched. Timestamps that do
-    // not parse land on 0 and drop out of a filtered view.
+    // View-level cutoff only: rtk's own rows stay untouched. Timestamps that do not parse land on 0 and drop out of a filtered view.
     const where = cutoffMs && cutoffMs > 0
       ? `WHERE CAST(strftime('%s', timestamp) AS INTEGER) >= ${Math.floor(cutoffMs / 1000)}`
       : '';

package/extensions/shared/session-state.js

@@ -1,7 +1,7 @@
 import { readPluginSettings } from './plugin-settings.js';
 const BRIDGE_KEY = Symbol.for('tersio/combo-session-state');
-// A verbatim sentence from OMP's subagent prompt, so it can drift; settings.json overrides it.
-export const OMP_SUBAGENT_MARKER = 'You are operating on a piece of work assigned to you by the main agent.';
+// A verbatim sentence from omp's subagent prompt, so it can drift; read from the installed omp binary on 2026-10-01. pi has no built-in subagent prompt.
+export const OMP_SUBAGENT_MARKER = 'Worker agent: delegated tasks.';
 export const COMBO_LEVELS = Object.freeze({
     off: Object.freeze({ level: 'off', caveman: 'off', rtk: 'off', ponytail: 'off' }),
     medium: Object.freeze({ level: 'medium', caveman: 'lite', rtk: 'on', ponytail: 'lite' }),
@@ -18,6 +18,11 @@ const MODE_ENTRY_TYPES = {
     'rtk-mode': 'rtk',
     'ponytail-mode': 'ponytail',
 };
+/** True when the branch carries Tersio's own mode state; a subagent starts without it. */
+export function hasModeState(entries) {
+    return Array.isArray(entries) && entries.some((entry) => entry?.type === 'custom'
+        && (entry.customType === 'combo-level' || MODE_ENTRY_TYPES[entry.customType ?? '']));
+}
 export function normalizeMode(name, value) {
     if (name === 'rtk' && typeof value === 'boolean')
         return value ? 'on' : 'off';
@@ -86,33 +91,7 @@ export function normalizeComboLevel(value) {
         return level;
     return COMBO_ALIASES[level] ?? null;
 }
-// OMP themes status text through ctx.ui.theme.fg; pi has no ctx.ui.theme, so
-// the same string renders plain there.
-export function themeStatus(ui, indicator, label, highlight = false) {
-    const theme = ui?.theme;
-    if (!theme?.fg)
-        return `${indicator} ${label}`;
-    return `${highlight ? theme.fg('accent', indicator) : indicator} ${theme.fg('muted', label)}`;
-}
-export function paintStatusBar(ui, key, emoji, label, isActive) {
-    ui?.setStatus?.(key, themeStatus(ui, emoji, label, isActive));
-}
-export function statusUi(ctx) {
-    try {
-        const ui = ctx?.ui;
-        return ui?.setStatus ? ui : undefined;
-    }
-    catch {
-        return undefined;
-    }
-}
-// Which context a status bar paints through. Never remember a UI-less event:
-// that mutes every later bare syncStatus(), freezing the bar on a stale preset.
-export function paintableCtx(remembered, next) {
-    return statusUi(next) ? next : remembered;
-}
-// Last-wins scan for a custom session entry; skips entries whose value fails
-// to parse so a corrupt write never shadows an older valid one.
+// Last-wins scan for a custom session entry; skips entries whose value fails to parse so a corrupt write never shadows an older valid one.
 export function lastCustomValue(entries, customType, pick) {
     if (!Array.isArray(entries))
         return null;
@@ -145,8 +124,7 @@ export function setSharedComboMode(name, value) {
     if (!mode)
         return getSharedComboState();
     const modes = { ...getSharedComboState(), [name]: mode };
-    // Derive the level from the final triplet so a redundant same-value write
-    // cannot strand a matching preset at 'custom' and drop the combo bar.
+    // Derive the level from the final triplet so a redundant same-value write cannot strand a matching preset at 'custom' and drop the combo bar.
     return publish(normalizedState(modes));
 }
 export function reconcileSharedComboEntries(entries) {
@@ -170,8 +148,7 @@ export function reconcileSharedComboEntries(entries) {
                 modes[name] = mode;
         }
     }
-    // The level reflects the final triplet, never the write order, so a preset
-    // entry followed by the same values reconciles back to the preset.
+    // The level reflects the final triplet, never the write order, so a preset entry followed by the same values reconciles back to the preset.
     return publish(normalizedState(modes));
 }
 // One-line session-wide mode summary for change confirmations.

package/extensions/shared/session-state.ts

@@ -1,10 +1,10 @@
 import { readPluginSettings } from './plugin-settings.ts';
-import type { ComboLevel, ComboState, ExtensionCtx, SessionEntry, UiApi } from './types.ts';
+import type { ComboLevel, ComboState, ExtensionCtx, SessionEntry } from './types.ts';
 
 const BRIDGE_KEY = Symbol.for('tersio/combo-session-state');
 
-// A verbatim sentence from OMP's subagent prompt, so it can drift; settings.json overrides it.
-export const OMP_SUBAGENT_MARKER = 'You are operating on a piece of work assigned to you by the main agent.';
+// A verbatim sentence from omp's subagent prompt, so it can drift; read from the installed omp binary on 2026-10-01. pi has no built-in subagent prompt.
+export const OMP_SUBAGENT_MARKER = 'Worker agent: delegated tasks.';
 
 export const COMBO_LEVELS: Record<string, Readonly<ComboState>> = Object.freeze({
   off: Object.freeze({ level: 'off', caveman: 'off', rtk: 'off', ponytail: 'off' }),
@@ -28,6 +28,12 @@ const MODE_ENTRY_TYPES: Record<string, ModeName> = {
   'ponytail-mode': 'ponytail',
 };
 
+/** True when the branch carries Tersio's own mode state; a subagent starts without it. */
+export function hasModeState(entries: SessionEntry[] | null | undefined): boolean {
+  return Array.isArray(entries) && entries.some((entry) => entry?.type === 'custom'
+    && (entry.customType === 'combo-level' || MODE_ENTRY_TYPES[entry.customType ?? '']));
+}
+
 interface Bridge {
   state: Readonly<ComboState>;
   listeners: Map<string, (state: Readonly<ComboState>) => void>;
@@ -108,38 +114,8 @@ export function normalizeComboLevel(value: unknown): ComboLevel | null {
   return COMBO_ALIASES[level] ?? null;
 }
 
-// OMP themes status text through ctx.ui.theme.fg; pi has no ctx.ui.theme, so
-// the same string renders plain there.
-export function themeStatus(ui: UiApi | undefined, indicator: string, label: string, highlight = false): string {
-  const theme = ui?.theme;
-  if (!theme?.fg) return `${indicator} ${label}`;
-  return `${highlight ? theme.fg('accent', indicator) : indicator} ${theme.fg('muted', label)}`;
-}
-
-export function paintStatusBar(ui: UiApi | undefined, key: string, emoji: string, label: string, isActive: boolean): void {
-  ui?.setStatus?.(key, themeStatus(ui, emoji, label, isActive));
-}
-
-// Stale ctx access throws, so never let it abort a mode restore.
-export type StatusUi = UiApi & { setStatus: NonNullable<UiApi['setStatus']> };
-
-export function statusUi(ctx: ExtensionCtx | undefined): StatusUi | undefined {
-  try {
-    const ui = ctx?.ui;
-    return ui?.setStatus ? (ui as StatusUi) : undefined;
-  } catch {
-    return undefined;
-  }
-}
-
-// Which context a status bar paints through. Never remember a UI-less event:
-// that mutes every later bare syncStatus(), freezing the bar on a stale preset.
-export function paintableCtx(remembered: ExtensionCtx | undefined, next: ExtensionCtx | undefined): ExtensionCtx | undefined {
-  return statusUi(next) ? next : remembered;
-}
 
-// Last-wins scan for a custom session entry; skips entries whose value fails
-// to parse so a corrupt write never shadows an older valid one.
+// Last-wins scan for a custom session entry; skips entries whose value fails to parse so a corrupt write never shadows an older valid one.
 export function lastCustomValue<T>(entries: SessionEntry[] | null | undefined, customType: string, pick: (data: SessionEntry['data']) => T | null | undefined): T | null {
   if (!Array.isArray(entries)) return null;
   for (let i = entries.length - 1; i >= 0; i -= 1) {
@@ -173,8 +149,7 @@ export function setSharedComboMode(name: ModeName, value: unknown): Readonly<Com
   const mode = normalizeMode(name, value);
   if (!mode) return getSharedComboState();
   const modes = { ...getSharedComboState(), [name]: mode } as Modes;
-  // Derive the level from the final triplet so a redundant same-value write
-  // cannot strand a matching preset at 'custom' and drop the combo bar.
+  // Derive the level from the final triplet so a redundant same-value write cannot strand a matching preset at 'custom' and drop the combo bar.
   return publish(normalizedState(modes));
 }
 
@@ -195,8 +170,7 @@ export function reconcileSharedComboEntries(entries: SessionEntry[] | null | und
       if (mode) modes[name] = mode;
     }
   }
-  // The level reflects the final triplet, never the write order, so a preset
-  // entry followed by the same values reconciles back to the preset.
+  // The level reflects the final triplet, never the write order, so a preset entry followed by the same values reconciles back to the preset.
   return publish(normalizedState(modes));
 }
 

package/extensions/shared/status.js

@@ -0,0 +1,38 @@
+// One status string every surface renders: host footer bar, CLI menu title, dashboard banner. Nothing else formats mode state.
+import { getSharedComboState } from './session-state.js';
+/** OFF collapses the three modes into one word; a preset or a mix names itself. */
+export function formatStatus(state) {
+    const { level, caveman, rtk, ponytail } = state;
+    if (level === 'off' && caveman === 'off' && rtk === 'off' && ponytail === 'off')
+        return '🧩 combo OFF';
+    const label = level === 'custom' ? 'CUSTOM' : level.toUpperCase();
+    return `🧩 combo ${label}: 🪨caveman=${caveman.toUpperCase()} ⚡rtk=${rtk.toUpperCase()} 🦥ponytail=${ponytail.toUpperCase()}`;
+}
+// Stale ctx access throws, so never let it abort a mode restore.
+function statusUi(ctx) {
+    try {
+        const ui = ctx?.ui;
+        return ui?.setStatus ? ui : undefined;
+    }
+    catch {
+        return undefined;
+    }
+}
+// Subagents and bare restores must not mute the bar on the real session.
+let remembered;
+let lastText;
+let lastUi;
+// Paint the host footer bar; same text on the same UI is skipped, a new ctx repaints it.
+export function announceStatus(ctx) {
+    const text = formatStatus(getSharedComboState());
+    const ui = statusUi(ctx) ?? statusUi(remembered);
+    if (statusUi(ctx))
+        remembered = ctx;
+    if (!ui)
+        return;
+    if (text === lastText && ui === lastUi)
+        return;
+    lastText = text;
+    lastUi = ui;
+    ui.setStatus?.('tersio', text);
+}

package/extensions/shared/status.ts

@@ -0,0 +1,45 @@
+// One status string every surface renders: host footer bar, CLI menu title, dashboard banner. Nothing else formats mode state.
+import { getSharedComboState } from './session-state.ts';
+import type { ExtensionCtx, UiApi } from './types.ts';
+
+export interface StatusState {
+  level: string;
+  caveman: string;
+  rtk: string;
+  ponytail: string;
+}
+
+/** OFF collapses the three modes into one word; a preset or a mix names itself. */
+export function formatStatus(state: StatusState): string {
+  const { level, caveman, rtk, ponytail } = state;
+  if (level === 'off' && caveman === 'off' && rtk === 'off' && ponytail === 'off') return '🧩 combo OFF';
+  const label = level === 'custom' ? 'CUSTOM' : level.toUpperCase();
+  return `🧩 combo ${label}: 🪨caveman=${caveman.toUpperCase()} ⚡rtk=${rtk.toUpperCase()} 🦥ponytail=${ponytail.toUpperCase()}`;
+}
+
+// Stale ctx access throws, so never let it abort a mode restore.
+function statusUi(ctx: ExtensionCtx | undefined): UiApi | undefined {
+  try {
+    const ui = ctx?.ui;
+    return ui?.setStatus ? ui : undefined;
+  } catch {
+    return undefined;
+  }
+}
+
+// Subagents and bare restores must not mute the bar on the real session.
+let remembered: ExtensionCtx | undefined;
+let lastText: string | undefined;
+let lastUi: UiApi | undefined;
+
+// Paint the host footer bar; same text on the same UI is skipped, a new ctx repaints it.
+export function announceStatus(ctx: ExtensionCtx | undefined): void {
+  const text = formatStatus(getSharedComboState());
+  const ui = statusUi(ctx) ?? statusUi(remembered);
+  if (statusUi(ctx)) remembered = ctx;
+  if (!ui) return;
+  if (text === lastText && ui === lastUi) return;
+  lastText = text;
+  lastUi = ui;
+  ui.setStatus?.('tersio', text);
+}

package/extensions/shared/types.js

@@ -1,3 +1,2 @@
-// Shared OMP extension host types. Structural — the real `pi` object comes
-// from the OMP runtime; these describe the surface this package touches.
+// Shared OMP extension host types. Structural — the real `pi` object comes from the OMP runtime; these describe the surface this package touches.
 export {};

package/extensions/shared/types.ts

@@ -1,5 +1,4 @@
-// Shared OMP extension host types. Structural — the real `pi` object comes
-// from the OMP runtime; these describe the surface this package touches.
+// Shared OMP extension host types. Structural — the real `pi` object comes from the OMP runtime; these describe the surface this package touches.
 
 export interface ComboState {
   level: string;
@@ -94,4 +93,5 @@ export interface ExtensionApi {
   }>;
   cwd?: string;
   zod?: { z: unknown };
+  hostId?: 'pi' | 'omp' | 'opencode';
   on<E>(event: string, handler: (event: E, ctx: ExtensionCtx) => unknown): void;}