@krtclcdy/tersio 2.23.0 → 2.24.1

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,34 +92,50 @@ 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;
 }
 
-export function paintStatusBar(ui: UiApi | undefined, key: string, emoji: string, label: string, isActive: boolean): void {
+// 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;
-  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: 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 next?.ui?.setStatus ? next : remembered;
+  return statusUi(next) ? next : remembered;
 }
 
 // Last-wins scan for a custom session entry; skips entries whose value fails
@@ -156,8 +174,7 @@ export function setSharedComboMode(name: ModeName, value: unknown): Readonly<Com
   if (!mode) return getSharedComboState();
   const modes = { ...getSharedComboState(), [name]: mode } as Modes;
   // 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));
 }
 
@@ -178,23 +195,19 @@ export function reconcileSharedComboEntries(entries: SessionEntry[] | null | und
       if (mode) 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: { caveman: string; rtk: string; ponytail: string }): string {
   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 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: string, listener: (state: Readonly<ComboState>) => void): void {
+  bridge().listeners.set(key, listener);
 }
 
 export function resetSharedComboState(): Readonly<ComboState> {

package/extensions/shared/types.ts

@@ -47,8 +47,16 @@ export interface ExtensionCtx {
 
 export interface SystemPromptEvent {
   systemPrompt: string | string[];
+  // pi only: the mutable prompt sections. OMP does not provide it.
+  systemPromptOptions?: { appendSystemPrompt?: string };
 }
 
+/** What a `before_agent_start` handler hands back. OMP takes an array, pi a string. */
+export type PromptInjection = { systemPrompt: string[] } | { systemPrompt: string };
+
+/** A tool `parameters` object. OMP wants zod, pi wants JSON Schema. */
+export type ToolParams = Record<string, unknown>;
+
 export interface InputEvent {
   text?: string;
   source?: string;
@@ -68,7 +76,7 @@ export interface ExtensionApi {
     execute: (
       toolCallId: string,
       params: { args: string[] },
-      signal: AbortSignal,
+      signal: AbortSignal | undefined,
       onUpdate: ((data: unknown) => void) | undefined,
       ctx: ExtensionCtx | undefined,
     ) => Promise<{
@@ -86,5 +94,4 @@ export interface ExtensionApi {
   }>;
   cwd?: string;
   zod?: { z: unknown };
-  on<E>(event: string, handler: (event: E, ctx: ExtensionCtx) => unknown): void;
-}
+  on<E>(event: string, handler: (event: E, ctx: ExtensionCtx) => unknown): void;}

package/extensions/shared/usage-ledger.js

@@ -1,11 +1,9 @@
-// Shared usage ledger: append-only JSON-lines file. One source of truth read
-// by `tersio usage`, `/tersio usage`, and the Dashboard.
-// Best-effort by design: a ledger failure never breaks the caller, and
-// corrupt lines are skipped on read (same pattern as the config normalizer).
+// Shared usage ledger: append-only JSON lines, read by the CLI, `/tersio`, and
+// the Dashboard. Best-effort; corrupt lines are skipped on read.
 import fs from 'node:fs';
 import os from 'node:os';
 import path from 'node:path';
-import { resolveRtkBinary, tersioDataPath } from '../lib/utils.js';
+import { isPiProcess, piAgentDir, resolveRtkBinary, tersioDataPath } from '../lib/utils.js';
 import { execFileSync } from 'node:child_process';
 export function ledgerPath() {
     const override = process.env.TERSIO_USAGE_FILE;
@@ -13,11 +11,7 @@ export function ledgerPath() {
         return override;
     return tersioDataPath('usage.jsonl', 'tersio-usage.jsonl');
 }
-// Reset watermark: tersio-owned timestamp marking the last statistics reset.
-// Session transcripts and the RTK database are host/tool-owned and never
-// touched — instead, every derived view (token stats, command tools) filters
-// rows from before the watermark, so "reset" empties what tersio shows
-// without deleting anything it does not own.
+// Reset watermark: views filter rows older than it, so nothing else is deleted.
 export function resetMarkerPath() {
     const override = process.env.TERSIO_RESET_FILE;
     if (override)
@@ -52,13 +46,14 @@ export function appendUsage(kind, detail) {
 function zeroBreakdown() {
     return { input: 0, output: 0, cacheRead: 0, cacheWrite: 0 };
 }
+function stampMs(ts) {
+    return ts === undefined ? NaN : typeof ts === 'number' ? ts : Date.parse(ts);
+}
 export function durOf(v) {
     return typeof v === 'number' && Number.isFinite(v) && v > 0 ? v : undefined;
 }
-// Measured cost for one message. OMP writes usage.cost as
-// { input, output, cacheRead, cacheWrite, total }; a bare number shows up in
-// older fixtures. Anything else means "not recorded" — deliberately not 0, so
-// the dashboard can tell a genuinely free run from an unrecorded one.
+// Measured cost: usage.cost.total, or a bare number in old fixtures. Anything
+// else means unrecorded, which is deliberately not 0.
 export function costOf(usage) {
     const c = usage.cost;
     if (typeof c === 'number')
@@ -92,11 +87,20 @@ function addInto(into, u) {
             into[k] += Math.floor(v);
     }
 }
-export function sessionsDir() {
+export function sessionsDirs() {
     const override = process.env.TERSIO_SESSIONS_DIR;
     if (override)
-        return override;
-    return path.join(os.homedir(), '.omp', 'agent', 'sessions');
+        return [override];
+    // Both hosts, not just the running one: a session on pi is missing from the
+    // dashboard entirely if we stop at the first directory that exists.
+    const dirs = isPiProcess()
+        ? [path.join(piAgentDir(), 'sessions'), path.join(os.homedir(), '.omp', 'agent', 'sessions')]
+        : [path.join(os.homedir(), '.omp', 'agent', 'sessions'), path.join(piAgentDir(), 'sessions')];
+    const found = dirs.filter((dir) => fs.existsSync(dir));
+    return found.length > 0 ? found : [dirs[0]];
+}
+export function sessionsDir() {
+    return sessionsDirs()[0];
 }
 export function codexSessionsDir() {
     const override = process.env.TERSIO_CODEX_DIR;
@@ -107,6 +111,22 @@ export function codexSessionsDir() {
         return path.join(codexHome, 'sessions');
     return path.join(os.homedir(), '.codex', 'sessions');
 }
+// One JSON file per message; probe XDG, then local, then macOS default.
+export function opencodeSessionsDir() {
+    const override = process.env.TERSIO_OPENCODE_DIR;
+    if (override)
+        return override;
+    const xdg = process.env.XDG_DATA_HOME;
+    if (xdg && xdg.trim() !== '')
+        return path.join(xdg, 'opencode', 'storage', 'message');
+    const local = path.join(os.homedir(), '.local', 'share', 'opencode', 'storage', 'message');
+    try {
+        if (fs.existsSync(local))
+            return local;
+    }
+    catch { /* fall through to the platform default */ }
+    return path.join(os.homedir(), 'Library', 'Application Support', 'opencode', 'storage', 'message');
+}
 export function dayKey(ts) {
     const ms = typeof ts === 'number' ? ts : Date.parse(ts);
     if (!Number.isFinite(ms))
@@ -115,7 +135,7 @@ export function dayKey(ts) {
     const p = (n) => String(n).padStart(2, '0');
     return `${d.getFullYear()}-${p(d.getMonth() + 1)}-${p(d.getDate())}`;
 }
-export function walkJsonl(dir, out, cap) {
+export function walkJsonl(dir, out, cap, ext = '.jsonl') {
     let entries;
     try {
         entries = fs.readdirSync(dir, { withFileTypes: true });
@@ -128,14 +148,13 @@ export function walkJsonl(dir, out, cap) {
             return;
         const full = path.join(dir, e.name);
         if (e.isDirectory())
-            walkJsonl(full, out, cap);
-        else if (e.isFile() && e.name.endsWith('.jsonl'))
+            walkJsonl(full, out, cap, ext);
+        else if (e.isFile() && e.name.endsWith(ext))
             out.push(full);
     }
 }
-// Recent requests are their own full-width table in the dashboard, so this is
-// a payload bound rather than a "few highlights" bound. Rows are small
-// (model, tokens, timing, status), so a few hundred cost little to ship.
+// Recent requests get their own full-width table, so this bounds payload
+// rather than highlights; rows are small, so a few hundred cost little.
 export const RECENT_LIMIT = 200;
 const FREE_SUFFIX = /(?::free|-free)$/i;
 const RTK_ELIGIBLE_HEADS = new Set([
@@ -146,7 +165,7 @@ const RTK_ELIGIBLE_HEADS = new Set([
 export function newSessionAccum() {
     return { byModel: {}, byDay: {}, byDayModel: {}, byTool: {}, byModelMessages: {}, totals: zeroBreakdown(), messages: 0, costMeasured: 0, recent: [] };
 }
-export function ingestSessionRow(accum, model, usage, ts, durMs, run, toolNames) {
+export function ingestSessionRow(accum, model, usage, ts, durMs, run, toolNames, host) {
     const watermark = readResetWatermark();
     const ms = ts === undefined ? NaN : typeof ts === 'number' ? ts : Date.parse(ts);
     if (watermark > 0 && (!Number.isFinite(ms) || ms < watermark))
@@ -159,7 +178,7 @@ export function ingestSessionRow(accum, model, usage, ts, durMs, run, toolNames)
     const num = (v) => (typeof v === 'number' && Number.isFinite(v) && v > 0 ? Math.floor(v) : 0);
     if (Number.isFinite(ms)) {
         const outcome = run ?? { st: 'completed' };
-        accum.recent.push({ m: key, i: num(usage.input), o: num(usage.output), t: ms, d: durOf(durMs), cr: num(usage.cacheRead), cw: num(usage.cacheWrite), usd: costOf(usage), st: outcome.st, code: outcome.code, note: outcome.note });
+        accum.recent.push({ m: key, i: num(usage.input), o: num(usage.output), t: ms, d: durOf(durMs), h: host, cr: num(usage.cacheRead), cw: num(usage.cacheWrite), usd: costOf(usage), st: outcome.st, code: outcome.code, note: outcome.note });
     }
     const day = ts !== undefined ? dayKey(ts) : null;
     if (day) {
@@ -184,6 +203,10 @@ export function classifySessionLine(row) {
     if (payload && typeof payload === 'object') {
         if (row.type === 'session_meta' && typeof payload.model_provider === 'string')
             return { kind: 'codex_provider', provider: payload.model_provider };
+        // A Codex transcript states the model once per turn, in turn_context.
+        if (row.type === 'turn_context' && typeof payload.model === 'string' && payload.model) {
+            return { kind: 'codex_model', model: payload.model };
+        }
         if (payload.type === 'token_count') {
             const last = payload.info?.last_token_usage;
             if (last) {
@@ -197,7 +220,10 @@ export function classifySessionLine(row) {
     if (!msg || msg.role !== 'assistant' || !msg.usage)
         return { kind: 'skip' };
     const model = typeof msg.model === 'string' && msg.model ? msg.model : 'unknown';
-    const computedDur = (typeof msg.completedAt === 'number' && typeof msg.timestamp === 'number') ? msg.completedAt - msg.timestamp : undefined;
+    // pi omits duration, so derive Elapsed/Speed from the timestamp pair.
+    const startMs = typeof msg.timestamp === 'number' ? msg.timestamp : undefined;
+    const endMs = typeof msg.completedAt === 'number' ? msg.completedAt : stampMs(row.timestamp);
+    const computedDur = startMs !== undefined && Number.isFinite(endMs) && endMs > startMs ? endMs - startMs : undefined;
     const tools = [];
     for (const part of msg.content ?? []) {
         if (part?.type !== 'toolCall' || typeof part.name !== 'string' || !part.name)
@@ -211,13 +237,63 @@ export function classifySessionLine(row) {
     }
     return { kind: 'assistant_row', model, usage: msg.usage, durMs: typeof msg.duration === 'number' ? msg.duration : computedDur, run: statusOf(msg), tools };
 }
-// Fold `:free`/`-free` suffixes and case variants into one chart key, so the
-// same model from two providers stops splitting into separate rows.
+// True when at least one token bucket holds a positive finite count.
+export function hasPositiveUsage(usage) {
+    for (const k of ['input', 'output', 'cacheRead', 'cacheWrite']) {
+        const v = usage[k];
+        if (typeof v === 'number' && Number.isFinite(v) && v > 0)
+            return true;
+    }
+    return false;
+}
+// One OpenCode message file; assistant rows carry the token buckets.
+export function classifyOpencodeMessage(obj) {
+    if (!obj || typeof obj !== 'object' || obj.role !== 'assistant')
+        return null;
+    const t = obj.tokens;
+    if (!t || typeof t !== 'object')
+        return null;
+    const usage = {
+        input: t.input,
+        output: t.output,
+        cacheRead: t.cache?.read,
+        cacheWrite: t.cache?.write,
+        cost: obj.cost,
+    };
+    if (!hasPositiveUsage(usage))
+        return null;
+    const provider = typeof obj.providerID === 'string' && obj.providerID ? obj.providerID : 'unknown';
+    const model = typeof obj.modelID === 'string' && obj.modelID ? obj.modelID : 'unknown';
+    const num = (v) => (typeof v === 'number' && Number.isFinite(v) && v > 0 ? v : undefined);
+    const created = num(obj.time?.created);
+    const completed = num(obj.time?.completed);
+    return {
+        model: `opencode/${provider}/${model}`,
+        usage,
+        ms: created,
+        durMs: created !== undefined && completed !== undefined && completed > created ? completed - created : undefined,
+    };
+}
+// One OpenCode message file into the shared accum.
+export function processOpencodeFile(accum, text) {
+    let obj;
+    try {
+        obj = JSON.parse(text);
+    }
+    catch {
+        return;
+    }
+    const parsed = classifyOpencodeMessage(obj);
+    if (!parsed)
+        return;
+    ingestSessionRow(accum, parsed.model, parsed.usage, parsed.ms, parsed.durMs, { st: 'completed' }, undefined, 'opencode');
+}
+// Fold `:free`/`-free` suffixes and case variants into one chart key.
 export function canonicalModelId(model) {
-    return model.replace(FREE_SUFFIX, '').toLowerCase();
+    return canonicalPriceId(model.replace(FREE_SUFFIX, ''));
 }
-// LiteLLM-style display: namespace stays lowercase, model segments title-case
-// with version dots kept (`deepseek-v4.1-flash` → `Deepseek-V4.1-Flash`).
+// LiteLLM-style display: lowercase namespace, title-cased model segments with
+// version dots kept.
 export function displayModelId(model) {
     const bare = model.replace(FREE_SUFFIX, '');
     const cap = (s) => {
@@ -242,13 +318,30 @@ export function displayModelId(model) {
 export function importSessionTokens() {
     const accum = newSessionAccum();
     const files = [];
-    walkJsonl(sessionsDir(), files, 2000);
-    // A sessions override signals an isolated environment (tests, fixtures):
-    // only walk the real codex dir when it is explicitly set.
+    for (const dir of sessionsDirs())
+        walkJsonl(dir, files, 2000);
+    // An override means an isolated environment (tests, fixtures): only walk the
+    // real codex dir when one is explicitly set.
     if (process.env.TERSIO_SESSIONS_DIR === undefined || process.env.TERSIO_CODEX_DIR !== undefined) {
         walkJsonl(codexSessionsDir(), files, 2000);
     }
+    // OpenCode message bodies are single JSON documents, not JSONL.
+    const ocFiles = [];
+    if (process.env.TERSIO_SESSIONS_DIR === undefined || process.env.TERSIO_OPENCODE_DIR !== undefined) {
+        walkJsonl(opencodeSessionsDir(), ocFiles, 5000, '.json');
+    }
+    for (const file of ocFiles) {
+        let text;
+        try {
+            text = fs.readFileSync(file, 'utf8');
+        }
+        catch {
+            continue;
+        }
+        processOpencodeFile(accum, text);
+    }
     let codexProvider = null;
+    let codexModel = null;
     for (const file of files) {
         let text;
         try {
@@ -257,11 +350,25 @@ export function importSessionTokens() {
         catch {
             continue;
         }
-        processSessionText(accum, { get codexProvider() { return codexProvider; }, set codexProvider(v) { codexProvider = v; } }, text);
+        processSessionText(accum, {
+            get codexProvider() { return codexProvider; },
+            set codexProvider(v) { codexProvider = v; },
+            get codexModel() { return codexModel; },
+            set codexModel(v) { codexModel = v; },
+        }, text, hostOfSessionFile(file));
     }
     accum.recent.sort((a, b) => b.t - a.t);
     return { messages: accum.messages, totals: accum.totals, byModel: accum.byModel, byDay: accum.byDay, byDayModel: accum.byDayModel, byTool: accum.byTool, byModelMessages: accum.byModelMessages, costMeasured: accum.costMeasured, recent: accum.recent.slice(0, RECENT_LIMIT) };
 }
+// Which agent wrote a session file, from the directory it sits in.
+export function hostOfSessionFile(file) {
+    const norm = file.replace(/\\/g, '/');
+    if (norm.includes('/.omp/'))
+        return 'omp';
+    if (norm.includes('/.codex/'))
+        return 'codex';
+    return 'pi';
+}
 const adoptionFileCache = new Map();
 function parseAdoptionFile(file) {
     const counts = { bashCalls: 0, eligibleCalls: 0, rtkCalls: 0 };
@@ -300,7 +407,8 @@ export function clearRtkAdoptionCache() {
 }
 export function readRtkAdoption() {
     const files = [];
-    walkJsonl(sessionsDir(), files, 2000);
+    for (const dir of sessionsDirs())
+        walkJsonl(dir, files, 2000);
     if (process.env.TERSIO_SESSIONS_DIR === undefined || process.env.TERSIO_CODEX_DIR !== undefined) {
         walkJsonl(codexSessionsDir(), files, 2000);
     }
@@ -338,7 +446,7 @@ export function readRtkAdoption() {
     const missedCalls = Math.max(0, eligibleCalls - rtkCalls);
     return { sessions, bashCalls, eligibleCalls, rtkCalls, missedCalls, adoptionPct: eligibleCalls ? (rtkCalls / eligibleCalls) * 100 : 0 };
 }
-export function processSessionText(accum, state, text) {
+export function processSessionText(accum, state, text, host) {
     for (const line of text.split('\n')) {
         if (!line.trim())
             continue;
@@ -350,14 +458,21 @@ export function processSessionText(accum, state, text) {
                     state.codexProvider = parsed.provider;
                 continue;
             }
+            if (parsed.kind === 'codex_model') {
+                if (parsed.model)
+                    state.codexModel = parsed.model;
+                continue;
+            }
             if (parsed.kind === 'token_row') {
-                const model = parsed.provider ? `codex/${parsed.provider}` : (state.codexProvider ? `codex/${state.codexProvider}` : 'codex');
-                ingestSessionRow(accum, model, parsed.usage ?? {}, row.timestamp, undefined, { st: 'completed' });
+                const base = parsed.provider ? `codex/${parsed.provider}` : (state.codexProvider ? `codex/${state.codexProvider}` : 'codex');
+                // The provider alone told you nothing about which model ran.
+                const model = state.codexModel ? `${base}/${state.codexModel}` : base;
+                ingestSessionRow(accum, model, parsed.usage ?? {}, row.timestamp, parsed.durMs, { st: 'completed' }, undefined, host ?? 'codex');
                 continue;
             }
             if (parsed.kind !== 'assistant_row' || !parsed.model || !parsed.usage)
                 continue;
-            ingestSessionRow(accum, parsed.model, parsed.usage, row.timestamp, parsed.durMs, parsed.run, parsed.tools);
+            ingestSessionRow(accum, parsed.model, parsed.usage, row.timestamp, parsed.durMs, parsed.run, parsed.tools, host);
         }
         catch { /* skip corrupt lines */ }
     }
@@ -385,8 +500,8 @@ export function readRtkRecallDiagnostics(binary = resolveRtkBinary()) {
         return { mode: 'unknown', entries: 0, available: false };
     }
 }
-// Lead binary of a shell string: first segment head past `cd` chains and
-// VAR=x assignments (`cd /x && git status` → `git`). Falls back to `bash`.
+// Lead binary of a shell string: first segment past `cd` chains and VAR=x
+// assignments. Falls back to `bash`.
 const SKIP_HEADS = ['cd', 'echo', 'export', 'true', 'false'];
 export function leadBinary(command) {
     if (typeof command !== 'string' || !command.trim())
@@ -403,7 +518,7 @@ export function leadBinary(command) {
     return 'bash';
 }
 // --- Pricing lives in ./pricing.ts (live LiteLLM cache + fallback table) ---
-import { DEFAULT_PRICE, priceFor, refreshPricesIfStale } from './pricing.js';
+import { DEFAULT_PRICE, canonicalPriceId, priceFor, refreshPricesIfStale } from './pricing.js';
 import { co2GramsFor, energyWhFor } from './carbon.js';
 export { DEFAULT_PRICE, priceFor, refreshPricesIfStale };
 export { co2GramsFor, energyWhFor };
@@ -422,11 +537,6 @@ export function usdCost(t, model) {
         buckets,
     };
 }
-// CO2 now model-differentiated via ./carbon.ts (EcoLogits 0.8.2 port).
-// Always render with ~est. and never merge with measured figures.
-// The constant below is the served gCO2eq per 1K output tokens for the
-// default (gpt-4o-class) model, kept so single-figure callers stay honest.
-export const CO2_G_PER_1K_OUTPUT = 0.2;
 export function co2Grams(outputTokens, model) {
     return co2GramsFor(model ?? 'gpt-4o', outputTokens);
 }
@@ -452,9 +562,8 @@ export function readUsage() {
     }
     return rows;
 }
-// Delete the ledger file. Returns the rows cleared (0 when already absent).
-// Only tersio-owned data lives here; session transcripts and the RTK
-// database are never touched.
+// Delete the ledger file and return the rows cleared. Tersio-owned data only:
+// transcripts and the RTK database are never touched.
 export function clearUsageLedger() {
     const rows = readUsage().length;
     try {