@krtclcdy/tersio 2.23.0 → 2.24.1

package/extensions/shared/plugin-settings.ts

@@ -1,25 +1,25 @@
-// Plugin settings reader for the Tersio extensions.
-// Reads omp's persisted plugin state (~/.omp/plugins/omp-plugins.lock.json),
-// written by `omp plugin config set @krtclcdy/tersio <key> <value>` and by
-// the installer profile step. Tolerant: any parse failure yields {} so every
-// caller falls back to its own default.
+// One settings file for every host; parse failure yields {} with per-caller defaults.
 
 import { existsSync, mkdirSync, readFileSync, writeFileSync } from 'node:fs';
 import os from 'node:os';
 import path from 'node:path';
+import { tersioHome } from '../lib/utils.ts';
+
 export const PLUGIN_NAME = '@krtclcdy/tersio';
 
-function lockPaths(): string[] {
+// The one store both hosts read; this module owns its path.
+export function tersioSettingsFile(): string {
+  return path.join(tersioHome(), 'settings.json');
+}
+
+// Older installs kept these as OMP plugin settings; still read so switching
+// the store does not reset a user's defaults.
+function legacyOmpSettings(): Record<string, unknown> | null {
   const configHome = process.env.XDG_CONFIG_HOME || path.join(os.homedir(), '.config');
-  return [
+  for (const p of [
     path.join(os.homedir(), '.omp', 'plugins', 'omp-plugins.lock.json'),
     path.join(configHome, 'omp', 'plugins', 'omp-plugins.lock.json'),
-  ];
-}
-
-// `settings[PLUGIN_NAME]` in the lock file; empty object when missing.
-export function readPluginSettings(): Record<string, unknown> {
-  for (const p of lockPaths()) {
+  ]) {
     if (!existsSync(p)) continue;
     try {
       const config = JSON.parse(readFileSync(p, 'utf8')) as { settings?: Record<string, Record<string, unknown>> };
@@ -27,7 +27,23 @@ export function readPluginSettings(): Record<string, unknown> {
       if (values && typeof values === 'object' && !Array.isArray(values)) return values;
     } catch { /* tolerate corrupt file */ }
   }
-  return {};
+  return null;
+}
+
+function readSettingsFile(): Record<string, unknown> | null {
+  const p = tersioSettingsFile();
+  if (!existsSync(p)) return null;
+  try {
+    const parsed = JSON.parse(readFileSync(p, 'utf8')) as Record<string, unknown>;
+    return parsed && typeof parsed === 'object' && !Array.isArray(parsed) ? parsed : null;
+  } catch {
+    return null;
+  }
+}
+
+// The stored settings; empty when the file is missing, corrupt, or empty.
+export function readPluginSettings(): Record<string, unknown> {
+  return readSettingsFile() ?? legacyOmpSettings() ?? {};
 }
 
 const COMBO_LEVELS = new Set(['off', 'medium', 'balanced', 'max']);
@@ -69,20 +85,13 @@ const COMBO_MODE_DEFAULTS = {
 
 export function saveComboSetup(level: string): boolean {
   if (!(level in COMBO_MODE_DEFAULTS)) return false;
-  const lockPath = lockPaths()[0];
-  let lock: { plugins?: Record<string, unknown>; settings?: Record<string, Record<string, unknown>> } = {};
-  if (existsSync(lockPath)) {
-    try { lock = JSON.parse(readFileSync(lockPath, 'utf8')) as typeof lock; } catch { lock = {}; }
-  }
-  lock.plugins ||= {};
-  lock.settings ||= {};
-  lock.settings[PLUGIN_NAME] = {
-    ...lock.settings[PLUGIN_NAME],
+  const file = tersioSettingsFile();
+  mkdirSync(path.dirname(file), { recursive: true });
+  writeFileSync(file, `${JSON.stringify({
+    ...readPluginSettings(),
     comboDefault: level,
     ...COMBO_MODE_DEFAULTS[level as keyof typeof COMBO_MODE_DEFAULTS],
     comboSetupComplete: true,
-  };
-  mkdirSync(path.dirname(lockPath), { recursive: true });
-  writeFileSync(lockPath, JSON.stringify(lock, null, 2) + '\n', 'utf8');
+  }, null, 2)}\n`, 'utf8');
   return true;
 }

package/extensions/shared/pricing.js

@@ -1,17 +1,13 @@
-// extensions/shared/pricing.ts — dynamic model pricing from LiteLLM.
-// Lookup order: exact id in the live cache → provider-prefix strip → default.
-// The cache is the full LiteLLM feed (3k+ ids), refreshed lazily in background
-// and on `tersio update`; every reader is sync and offline-safe. No static
-// per-model table — list prices rot, the feed does not. Unknown models report
-// the default with known:false so the dashboard labels them honestly.
+// 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';
-// Live cache refreshes lazily: 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() {
@@ -26,8 +22,8 @@ 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 (new) and ModelPrice objects
-// (written by older refreshes) — 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);
@@ -35,6 +31,8 @@ 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.
             return o;
         }
     }
@@ -71,15 +69,27 @@ 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.
+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;
+}
 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.
+    const id = MODEL_ALIASES.find((a) => a.id === model.toLowerCase())?.feed ?? model;
     if (table) {
-        const hit = asPrice(table.exact[model] ?? table.exact[model.toLowerCase()]);
+        const hit = asPrice(table.exact[id] ?? table.exact[id.toLowerCase()]);
         if (hit)
             return { price: hit, 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 = model.toLowerCase();
+        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)
@@ -87,8 +97,7 @@ export function priceFor(model, live) {
     }
     return { price: DEFAULT_PRICE, known: false, live: false };
 }
-// Fetch LiteLLM pricing, keep every id with valid input/output rates, write
-// the cache. False on any failure (offline, timeout, shape change) — callers
+// Fetch LiteLLM pricing and write the cache. False on any failure — callers
 // fall back silently.
 export async function refreshPrices() {
     if (refreshInflight)
@@ -153,8 +162,8 @@ export async function refreshPrices() {
         refreshInflight = null;
     }
 }
-// Fire-and-forget refresh when the cache is stale or missing. Readers keep
-// using the stale file (or the built-in table) — 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,11 +1,6 @@
-// extensions/shared/pricing.ts — dynamic model pricing from LiteLLM.
-// Lookup order: exact id in the live cache → provider-prefix strip → default.
-// The cache is the full LiteLLM feed (3k+ ids), refreshed lazily in background
-// and on `tersio update`; every reader is sync and offline-safe. No static
-// per-model table — list prices rot, the feed does not. Unknown models report
-// the default with known:false so the dashboard labels them honestly.
+// 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 os from 'node:os';
 import path from 'node:path';
 import { tersioDataPath } from '../lib/utils.ts';
 
@@ -20,8 +15,8 @@ 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';
-// Live cache refreshes lazily: 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;
 
@@ -47,8 +42,8 @@ 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 (new) and ModelPrice objects
-// (written by older refreshes) — 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]);
@@ -56,6 +51,8 @@ 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.
       return o as unknown as ModelPrice;
     }
   }
@@ -90,22 +87,35 @@ 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.
+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;
+}
+
 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.
+  const id = MODEL_ALIASES.find((a) => a.id === model.toLowerCase())?.feed ?? model;
   if (table) {
-    const hit = asPrice(table.exact[model] ?? table.exact[model.toLowerCase()]);
+    const hit = asPrice(table.exact[id] ?? table.exact[id.toLowerCase()]);
     if (hit) return { price: hit, 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 = model.toLowerCase();
+    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 };
   }
   return { price: DEFAULT_PRICE, known: false, live: false };
 }
-// Fetch LiteLLM pricing, keep every id with valid input/output rates, write
-// the cache. False on any failure (offline, timeout, shape change) — callers
+// 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;
@@ -160,8 +170,8 @@ export async function refreshPrices(): Promise<boolean> {
   }
 }
 
-// Fire-and-forget refresh when the cache is stale or missing. Readers keep
-// using the stale file (or the built-in table) — 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,28 +1,13 @@
-// extensions/shared/rtk-gain.ts — measured RTK savings from its own store.
-// RTK records every invocation (input/output/saved tokens, savings %, exec
-// time) in history.db; `rtk gain` renders the same rows. We read them with
-// the sqlite3 CLI (present on macOS; best-effort elsewhere) so the dashboard
-// shows measured figures, never estimates. Missing DB/CLI → empty, no throw.
-//
-// Caveman and Ponytail have no per-command counters (instruction-following
-// isn't metered); their gains are bench-measured in BENCHMARK.md and cited
-// as static figures wherever RTK rows appear.
-//
-// Rows group by command alone, machine-wide: one row per command no matter
-// which repo ran it. Project filtering stays out — wasted column, same logic.
+// Savings read from rtk history, never estimated; modes bench in 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: [] };
-// RTK stores the whole command line, and `rtk ls -d` with a long path list
-// runs to tens of KB. The table shows one clipped cell, so bound the string
-// 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;
-// The query() reader is line- and tab-delimited, and RTK stores heredocs and
-// `node -e` scripts verbatim (~67 rows here), so one logical row can arrive as
-// several lines and derail every row after it. Fold whitespace into spaces
-// first: the stored command keeps its newlines, only the read view flattens.
+// 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), ' ')`;
 export function rtkDbPath() {
     const override = process.env.TERSIO_RTK_DB;
@@ -49,9 +34,8 @@ export function readRtkGain(limit = 10, cutoffMs) {
     try {
         if (!fs.existsSync(rtkDbPath()))
             return EMPTY;
-        // View-level cutoff only: rows stay in rtk's own database untouched.
-        // strftime('%s') normalizes ISO-8601 timestamps to epoch seconds; rows
-        // with unparseable timestamps (0) 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,15 +1,4 @@
-// extensions/shared/rtk-gain.ts — measured RTK savings from its own store.
-// RTK records every invocation (input/output/saved tokens, savings %, exec
-// time) in history.db; `rtk gain` renders the same rows. We read them with
-// the sqlite3 CLI (present on macOS; best-effort elsewhere) so the dashboard
-// shows measured figures, never estimates. Missing DB/CLI → empty, no throw.
-//
-// Caveman and Ponytail have no per-command counters (instruction-following
-// isn't metered); their gains are bench-measured in BENCHMARK.md and cited
-// as static figures wherever RTK rows appear.
-//
-// Rows group by command alone, machine-wide: one row per command no matter
-// which repo ran it. Project filtering stays out — wasted column, same logic.
+// Savings read from rtk history, never estimated; modes bench in BENCHMARK.md.
 import { execFileSync } from 'node:child_process';
 import fs from 'node:fs';
 import os from 'node:os';
@@ -34,15 +23,11 @@ export interface RtkGain {
 
 const EMPTY: RtkGain = { commands: 0, saved: 0, input: 0, avgPct: 0, totalMs: 0, byCommand: [] };
 
-// RTK stores the whole command line, and `rtk ls -d` with a long path list
-// runs to tens of KB. The table shows one clipped cell, so bound the string
-// 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;
 
-// The query() reader is line- and tab-delimited, and RTK stores heredocs and
-// `node -e` scripts verbatim (~67 rows here), so one logical row can arrive as
-// several lines and derail every row after it. Fold whitespace into spaces
-// first: the stored command keeps its newlines, only the read view flattens.
+// 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), ' ')`;
 
 export function rtkDbPath(): string {
@@ -70,9 +55,8 @@ 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: rows stay in rtk's own database untouched.
-    // strftime('%s') normalizes ISO-8601 timestamps to epoch seconds; rows
-    // with unparseable timestamps (0) 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,4 +1,6 @@
+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.';
 export const COMBO_LEVELS = Object.freeze({
     off: Object.freeze({ level: 'off', caveman: 'off', rtk: 'off', ponytail: 'off' }),
@@ -51,12 +53,12 @@ function bridge() {
     if (existing?.state)
         return existing;
     const initial = normalizedState((existing || COMBO_LEVELS.off));
-    return (globalThis[BRIDGE_KEY] = { state: initial, listeners: new Set() });
+    return (globalThis[BRIDGE_KEY] = { state: initial, listeners: new Map() });
 }
 function publish(state) {
     const shared = bridge();
     shared.state = state;
-    for (const listener of shared.listeners)
+    for (const listener of shared.listeners.values())
         listener(state);
     return state;
 }
@@ -70,31 +72,44 @@ export function systemPromptIncludes(systemPrompt, marker) {
     return asPromptArray(systemPrompt).some((prompt) => typeof prompt === 'string' && prompt.includes(marker));
 }
 export function isOmpSubagentPrompt(systemPrompt) {
-    return systemPromptIncludes(systemPrompt, OMP_SUBAGENT_MARKER);
-}
+    const raw = readPluginSettings().subagentMarkers;
+    const configured = Array.isArray(raw) ? raw.filter((m) => typeof m === 'string' && m.trim() !== '') : [];
+    // A malformed setting falls back rather than matching every turn.
+    const markers = configured.length ? configured : [OMP_SUBAGENT_MARKER];
+    return markers.some((marker) => systemPromptIncludes(systemPrompt, marker));
+}
+// ultra maps to max, lite/full to nearest, rather than erroring.
+const COMBO_ALIASES = { ultra: 'max', lite: 'medium', full: 'balanced' };
 export function normalizeComboLevel(value) {
     const level = String(value || '').trim().toLowerCase();
-    return isPresetLevel(level) ? level : null;
+    if (isPresetLevel(level))
+        return level;
+    return COMBO_ALIASES[level] ?? null;
 }
-export function paintStatusBar(ui, key, emoji, label, isActive) {
+// 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;
-    const indicator = isActive && theme?.fg ? theme.fg('accent', emoji) : emoji;
-    ui?.setStatus?.(key, theme?.fg ? `${indicator} ${theme.fg('muted', label)}` : `${indicator} ${label}`);
-}
-// Which context a status bar should remember to paint through.
-//
-// A UI-less event — a headless child session_start, or a top-level
-// session_start that fires before the TUI attaches — must never become the
-// remembered context. Two things went wrong when it did: the old
-// `ctx || lastCtx` fallback only triggered for a *falsy* ctx, so a truthy
-// ctx without `ui` returned early anyway, and remembering it destroyed the one
-// paintable context we had. Every later bare syncStatus() then went mute —
-// and the bare call is the bridge-listener path, which is how a mode change
-// made by a sibling extension reaches this bar. The symptom is a bar frozen on
-// a preset the session no longer has: it shows "combo BALANCED" while caveman
-// and rtk are already off.
+    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 next?.ui?.setStatus ? next : remembered;
+    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.
@@ -131,8 +146,7 @@ export function setSharedComboMode(name, value) {
         return getSharedComboState();
     const modes = { ...getSharedComboState(), [name]: mode };
     // Derive the level from the final triplet so a redundant same-value write
-    // (entry replay on resume, upstream ponytail re-affirming its mode) cannot
-    // strand a matching preset at 'custom' and drop the combo bar.
+    // cannot strand a matching preset at 'custom' and drop the combo bar.
     return publish(normalizedState(modes));
 }
 export function reconcileSharedComboEntries(entries) {
@@ -156,23 +170,17 @@ export function reconcileSharedComboEntries(entries) {
                 modes[name] = mode;
         }
     }
-    // The level always reflects the final mode triplet, never the write order:
-    // 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, e.g.
-// `caveman=ULTRA, rtk=ON, ponytail=ULTRA`.
+// One-line session-wide mode summary for change confirmations.
 export function activeModesSummary(state) {
     return `caveman=${state.caveman.toUpperCase()}, rtk=${state.rtk.toUpperCase()}, ponytail=${state.ponytail.toUpperCase()}`;
 }
-export function setSharedComboListener(listener) {
-    // Additive: every sibling extension syncs its local mirror on publish, so
-    // a /tersio or /combo switch takes effect next turn with no session reload.
-    // A null listener clears all (no current callers; reserved for teardown).
-    if (typeof listener === 'function')
-        bridge().listeners.add(listener);
-    else
-        bridge().listeners.clear();
+// Keyed registration drops stale closures; hosts offer no teardown hook.
+export function setSharedComboListener(key, listener) {
+    bridge().listeners.set(key, listener);
 }
 export function resetSharedComboState() {
     return setSharedComboLevel('off');