@krtclcdy/tersio 2.24.0 → 2.24.1

package/extensions/shared/carbon.ts

@@ -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.
 
 export interface ModelCarbon {
   activeB: number;
@@ -39,6 +32,9 @@ const GRIDS: Record<string, number> = {
 // 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';
+
 interface RegistryEntry {
   match?: string;
   exact?: string;

package/extensions/shared/host.js

@@ -1,14 +1,4 @@
-// extensions/shared/host.ts — one extension source, two agent hosts.
-//
-// OMP is a fork of pi, and six surfaces differ: tool schemas (OMP injects
-// `pi.zod`, pi takes any object it forwards as JSON Schema), `setLabel`
-// (pi's takes an entryId, so an extension name must never reach it),
-// `session_branch` (pi reports that switch as `session_tree`), select options
-// (pi takes plain strings), the status-bar theme (pi has no ctx.ui.theme), and
-// prompt injection (pi appends to its sections rather than replacing them).
-//
-// The host is read from the API shape, never a name or an env marker: OMP is
-// the fork that injects zod, and pi does not, including through the SDK.
+// One source for both hosts; OMP differs in six APIs, detected by shape not name.
 import { asPromptArray } from './session-state.js';
 export function isPiHost(pi) {
     return !pi.zod;

package/extensions/shared/host.ts

@@ -1,14 +1,4 @@
-// extensions/shared/host.ts — one extension source, two agent hosts.
-//
-// OMP is a fork of pi, and six surfaces differ: tool schemas (OMP injects
-// `pi.zod`, pi takes any object it forwards as JSON Schema), `setLabel`
-// (pi's takes an entryId, so an extension name must never reach it),
-// `session_branch` (pi reports that switch as `session_tree`), select options
-// (pi takes plain strings), the status-bar theme (pi has no ctx.ui.theme), and
-// prompt injection (pi appends to its sections rather than replacing them).
-//
-// The host is read from the API shape, never a name or an env marker: OMP is
-// the fork that injects zod, and pi does not, including through the SDK.
+// One source for both hosts; OMP differs in six APIs, detected by shape not name.
 
 import { asPromptArray } from './session-state.ts';
 import type { ExtensionApi, ExtensionCtx, PromptInjection, SystemPromptEvent, ToolParams, UiApi } from './types.ts';

package/extensions/shared/plugin-settings.js

@@ -1,25 +1,15 @@
-// Settings reader for the Tersio extensions.
-//
-// One file, under Tersio's own home (~/.tersio/settings.json), serves every
-// host: OMP has no reason to keep its own copy and pi never had a store. The
-// profile CLI writes the same file, so the extensions, `tersio settings`, and
-// both hosts always agree.
-//
-// 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.js';
 export const PLUGIN_NAME = '@krtclcdy/tersio';
-// Session-start defaults, shared by every host: one file under Tersio's own
-// home, so OMP and pi read the same values. This module owns the path.
+// The one store both hosts read; this module owns its path.
 export function tersioSettingsFile() {
     return path.join(tersioHome(), 'settings.json');
 }
-// Older installs stored the same values as OMP plugin settings, and an install
-// that predates ~/.tersio still has them there. Read once and keep them, so
-// switching the store does not reset a user's defaults.
+// Older installs kept these as OMP plugin settings; still read so switching
+// the store does not reset a user's defaults.
 function legacyOmpSettings() {
     const configHome = process.env.XDG_CONFIG_HOME || path.join(os.homedir(), '.config');
     for (const p of [

package/extensions/shared/plugin-settings.ts

@@ -1,12 +1,4 @@
-// Settings reader for the Tersio extensions.
-//
-// One file, under Tersio's own home (~/.tersio/settings.json), serves every
-// host: OMP has no reason to keep its own copy and pi never had a store. The
-// profile CLI writes the same file, so the extensions, `tersio settings`, and
-// both hosts always agree.
-//
-// 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';
@@ -15,15 +7,13 @@ import { tersioHome } from '../lib/utils.ts';
 
 export const PLUGIN_NAME = '@krtclcdy/tersio';
 
-// Session-start defaults, shared by every host: one file under Tersio's own
-// home, so OMP and pi read the same values. This module owns the path.
+// The one store both hosts read; this module owns its path.
 export function tersioSettingsFile(): string {
   return path.join(tersioHome(), 'settings.json');
 }
 
-// Older installs stored the same values as OMP plugin settings, and an install
-// that predates ~/.tersio still has them there. Read once and keep them, so
-// switching the store does not reset a user's defaults.
+// 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');
   for (const p of [

package/extensions/shared/pricing.js

@@ -1,6 +1,5 @@
-// extensions/shared/pricing.ts — dynamic model pricing from LiteLLM.
-// Exact id → provider-prefix strip → default, which reports with known:false so
-// the Dashboard labels an unpriced model honestly. No static table: prices rot.
+// 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';
@@ -70,9 +69,8 @@ export function loadLivePrices() {
 function num(v) {
     return typeof v === 'number' && Number.isFinite(v) && v >= 0 ? v : null;
 }
-// One model, two spellings: transcripts say `space-bunny`, the feed keys it
-// `openrouter/stealth/space-bunny-alpha` at zero. Aliases fold to the first, so
-// a free stealth model never reports 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' },
 ];

package/extensions/shared/pricing.ts

@@ -1,6 +1,5 @@
-// extensions/shared/pricing.ts — dynamic model pricing from LiteLLM.
-// Exact id → provider-prefix strip → default, which reports with known:false so
-// the Dashboard labels an unpriced model honestly. No static table: prices rot.
+// 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';
@@ -88,9 +87,8 @@ function num(v: unknown): number | null {
   return typeof v === 'number' && Number.isFinite(v) && v >= 0 ? v : null;
 }
 
-// One model, two spellings: transcripts say `space-bunny`, the feed keys it
-// `openrouter/stealth/space-bunny-alpha` at zero. Aliases fold to the first, so
-// a free stealth model never reports 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' },
 ];

package/extensions/shared/rtk-gain.js

@@ -1,7 +1,4 @@
-// extensions/shared/rtk-gain.ts — measured RTK savings read from rtk's own
-// history.db with the sqlite3 CLI, so the dashboard shows measured figures and
-// never estimates. Missing DB or CLI returns empty. Caveman and Ponytail are
-// bench-measured in BENCHMARK.md instead: instruction-following is not metered.
+// 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';
@@ -10,9 +7,7 @@ const EMPTY = { commands: 0, saved: 0, input: 0, avgPct: 0, totalMs: 0, byComman
 // 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;
-// RTK stores heredocs and `node -e` scripts verbatim, so one row can arrive as
-// several lines and derail every row after it. 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;

package/extensions/shared/rtk-gain.ts

@@ -1,7 +1,4 @@
-// extensions/shared/rtk-gain.ts — measured RTK savings read from rtk's own
-// history.db with the sqlite3 CLI, so the dashboard shows measured figures and
-// never estimates. Missing DB or CLI returns empty. Caveman and Ponytail are
-// bench-measured in BENCHMARK.md instead: instruction-following is not metered.
+// 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';
@@ -30,9 +27,7 @@ const EMPTY: RtkGain = { commands: 0, saved: 0, input: 0, avgPct: 0, totalMs: 0,
 // sqlite3 CLI and lands in every /data.json poll.
 const MAX_CMD_CHARS = 200;
 
-// RTK stores heredocs and `node -e` scripts verbatim, so one row can arrive as
-// several lines and derail every row after it. 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 {

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,11 +72,19 @@ 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;
 }
 // OMP themes status text through ctx.ui.theme.fg; pi has no ctx.ui.theme, so
 // the same string renders plain there.
@@ -87,13 +97,19 @@ export function themeStatus(ui, indicator, label, highlight = false) {
 export function paintStatusBar(ui, key, emoji, label, isActive) {
     ui?.setStatus?.(key, themeStatus(ui, emoji, label, isActive));
 }
-// Which context a status bar paints through. A UI-less event (a headless child
-// session_start, or a top-level one that fires before the TUI attaches) must
-// never be remembered: doing so mutes every later bare syncStatus(), which is
-// the bridge-listener path a sibling's mode change arrives on. The symptom is a
-// bar frozen on a preset the session no longer has.
+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.
@@ -162,13 +178,9 @@ export function reconcileSharedComboEntries(entries) {
 export function activeModesSummary(state) {
     return `caveman=${state.caveman.toUpperCase()}, rtk=${state.rtk.toUpperCase()}, ponytail=${state.ponytail.toUpperCase()}`;
 }
-export function setSharedComboListener(listener) {
-    // Additive: every sibling syncs its mirror on publish, so a /tersio or
-    // /combo switch lands next turn with no reload. A null listener clears all.
-    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');

package/extensions/shared/session-state.ts

@@ -1,7 +1,9 @@
+import { readPluginSettings } from './plugin-settings.ts';
 import type { ComboLevel, ComboState, ExtensionCtx, SessionEntry, UiApi } 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.';
 
 export const COMBO_LEVELS: Record<string, Readonly<ComboState>> = Object.freeze({
@@ -28,7 +30,7 @@ const MODE_ENTRY_TYPES: Record<string, ModeName> = {
 
 interface Bridge {
   state: Readonly<ComboState>;
-  listeners: Set<(state: Readonly<ComboState>) => void>;
+  listeners: Map<string, (state: Readonly<ComboState>) => void>;
 }
 
 export function normalizeMode(name: ModeName, value: unknown): string | null {
@@ -67,13 +69,13 @@ function bridge(): Bridge {
   const existing = (globalThis as Record<symbol, unknown>)[BRIDGE_KEY] as Bridge | undefined;
   if (existing?.state) return existing;
   const initial = normalizedState((existing || COMBO_LEVELS.off) as Partial<Modes>);
-  return ((globalThis as Record<symbol, unknown>)[BRIDGE_KEY] = { state: initial, listeners: new Set<(state: Readonly<ComboState>) => void>() });
+  return ((globalThis as Record<symbol, unknown>)[BRIDGE_KEY] = { state: initial, listeners: new Map() });
 }
 
 function publish(state: Readonly<ComboState>): Readonly<ComboState> {
   const shared = bridge();
   shared.state = state;
-  for (const listener of shared.listeners) listener(state);
+  for (const listener of shared.listeners.values()) listener(state);
   return state;
 }
 
@@ -90,12 +92,20 @@ export function systemPromptIncludes(systemPrompt: string | string[], marker: st
 }
 
 export function isOmpSubagentPrompt(systemPrompt: string | string[]): boolean {
-  return systemPromptIncludes(systemPrompt, OMP_SUBAGENT_MARKER);
+  const raw = readPluginSettings().subagentMarkers;
+  const configured = Array.isArray(raw) ? raw.filter((m): m is string => 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: Record<string, ComboLevel> = { ultra: 'max', lite: 'medium', full: 'balanced' };
+
 export function normalizeComboLevel(value: unknown): ComboLevel | null {
   const level = String(value || '').trim().toLowerCase();
-  return isPresetLevel(level) ? level : null;
+  if (isPresetLevel(level)) return level;
+  return COMBO_ALIASES[level] ?? null;
 }
 
 // OMP themes status text through ctx.ui.theme.fg; pi has no ctx.ui.theme, so
@@ -110,13 +120,22 @@ export function paintStatusBar(ui: UiApi | undefined, key: string, emoji: string
   ui?.setStatus?.(key, themeStatus(ui, emoji, label, isActive));
 }
 
-// Which context a status bar paints through. A UI-less event (a headless child
-// session_start, or a top-level one that fires before the TUI attaches) must
-// never be remembered: doing so mutes every later bare syncStatus(), which is
-// the bridge-listener path a sibling's mode change arrives on. The symptom is a
-// bar frozen on a preset the session no longer has.
+// 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 next?.ui?.setStatus ? next : remembered;
+  return statusUi(next) ? next : remembered;
 }
 
 // Last-wins scan for a custom session entry; skips entries whose value fails
@@ -186,11 +205,9 @@ export function activeModesSummary(state: { caveman: string; rtk: string; ponyta
   return `caveman=${state.caveman.toUpperCase()}, rtk=${state.rtk.toUpperCase()}, ponytail=${state.ponytail.toUpperCase()}`;
 }
 
-export function setSharedComboListener(listener: ((state: Readonly<ComboState>) => void) | null): void {
-  // Additive: every sibling syncs its mirror on publish, so a /tersio or
-  // /combo switch lands next turn with no reload. A null listener clears all.
-  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: string, listener: (state: Readonly<ComboState>) => void): void {
+  bridge().listeners.set(key, listener);
 }
 
 export function resetSharedComboState(): Readonly<ComboState> {