@krtclcdy/tersio 2.23.0 → 2.24.0

package/extensions/shared/session-state.js

@@ -76,23 +76,22 @@ export function normalizeComboLevel(value) {
     const level = String(value || '').trim().toLowerCase();
     return isPresetLevel(level) ? 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));
+}
+// 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 paintableCtx(remembered, next) {
     return next?.ui?.setStatus ? next : remembered;
 }
@@ -131,8 +130,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,19 +154,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).
+    // 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

package/extensions/shared/session-state.ts

@@ -98,24 +98,23 @@ export function normalizeComboLevel(value: unknown): ComboLevel | null {
   return isPresetLevel(level) ? 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));
+}
+
+// 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 paintableCtx(remembered: ExtensionCtx | undefined, next: ExtensionCtx | undefined): ExtensionCtx | undefined {
   return next?.ui?.setStatus ? next : remembered;
 }
@@ -156,8 +155,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,21 +176,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).
+  // 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();
 }

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)
@@ -55,10 +49,8 @@ function zeroBreakdown() {
 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')
@@ -96,7 +88,11 @@ export function sessionsDir() {
     const override = process.env.TERSIO_SESSIONS_DIR;
     if (override)
         return override;
-    return path.join(os.homedir(), '.omp', 'agent', 'sessions');
+    // The running host wins; the other host's directory is the fallback.
+    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')];
+    return dirs.find((dir) => fs.existsSync(dir)) ?? dirs[0];
 }
 export function codexSessionsDir() {
     const override = process.env.TERSIO_CODEX_DIR;
@@ -133,9 +129,8 @@ export function walkJsonl(dir, out, cap) {
             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([
@@ -211,13 +206,12 @@ 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.
+// 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) => {
@@ -243,8 +237,8 @@ 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.
+    // 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);
     }
@@ -385,8 +379,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 +397,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 +416,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 +441,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 {

package/extensions/shared/usage-ledger.ts

@@ -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.ts';
+import { isPiProcess, piAgentDir, resolveRtkBinary, tersioDataPath } from '../lib/utils.ts';
 import { execFileSync } from 'node:child_process';
 
 export type UsageKind = 'command' | 'toggle' | 'install' | 'update' | 'rtk-audit';
@@ -22,11 +20,7 @@ export function ledgerPath(): string {
   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(): string {
   const override = process.env.TERSIO_RESET_FILE;
   if (override) return override;
@@ -59,10 +53,7 @@ export function appendUsage(kind: UsageKind, detail: string): void {
 }
 
 // --- Session tokens, tokscale-style ------------------------------------------
-// OMP writes per-assistant-message usage into ~/.omp/agent/sessions/**/*.jsonl:
-// message.role === 'assistant', message.usage = { input, output, cacheRead,
-// cacheWrite }, message.model, plus a per-line timestamp. Same source tokscale
-// parses for its oh-my-pi client. Best-effort: unreadable files are skipped.
+// Assistant messages in the host transcripts carry usage, model, and a timestamp.
 export interface TokenBreakdown {
   input: number;
   output: number;
@@ -70,10 +61,7 @@ export interface TokenBreakdown {
   cacheWrite: number;
 }
 
-// Run outcome for one assistant message. OMP writes stopReason on every turn
-// (toolUse | stop | aborted | error) and, when the request failed, an HTTP
-// errorStatus plus errorMessage. `toolUse` is an ordinary turn that handed off
-// to tools, so it reads as completed rather than as a distinct state.
+// `toolUse` is an ordinary turn that handed off to tools, so it reads completed.
 export type RunStatus = 'completed' | 'aborted' | 'error';
 
 export interface RecentRequest {
@@ -84,9 +72,7 @@ export interface RecentRequest {
   d?: number;
   cr?: number;
   cw?: number;
-  // Measured spend for this message, from the transcript's usage.cost.total.
-  // Left undefined when the host recorded no cost — never backfilled with an
-  // estimate, so a measured figure is never mistaken for a modeled one.
+  // Undefined when the host recorded no cost; never backfilled.
   usd?: number;
   st: RunStatus;
   code?: number;
@@ -127,10 +113,8 @@ export function durOf(v: unknown): number | undefined {
   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: Record<string, unknown>): number | undefined {
   const c = usage.cost;
   if (typeof c === 'number') return Number.isFinite(c) ? c : undefined;
@@ -166,7 +150,11 @@ function addInto(into: TokenBreakdown, u: { input?: unknown; output?: unknown; c
 export function sessionsDir(): string {
   const override = process.env.TERSIO_SESSIONS_DIR;
   if (override) return override;
-  return path.join(os.homedir(), '.omp', 'agent', 'sessions');
+  // The running host wins; the other host's directory is the fallback.
+  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')];
+  return dirs.find((dir) => fs.existsSync(dir)) ?? dirs[0];
 }
 
 export function codexSessionsDir(): string {
@@ -198,9 +186,8 @@ export function walkJsonl(dir: string, out: string[], cap: number): void {
     else if (e.isFile() && e.name.endsWith('.jsonl')) 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([
@@ -208,8 +195,8 @@ const RTK_ELIGIBLE_HEADS = new Set([
   'npm', 'npx', 'pnpm', 'bun', 'bunx', 'cargo', 'go', 'python', 'pytest',
   'ruff', 'mypy', 'docker', 'kubectl', 'psql', 'aws', 'gh', 'glab', 'wc',
 ]);
-// Session-parse buffer shared by live reads and usage.db syncs: identical
-// inputs produce identical aggregates, so the store is a cache, never a fork.
+// Parse buffer shared by live reads and usage.db syncs, so the store is a
+// cache and never a fork.
 export interface SessionAccum {
   byModel: Record<string, TokenBreakdown>;
   byDay: Record<string, TokenBreakdown>;
@@ -284,13 +271,12 @@ export function classifySessionLine(row: { timestamp?: string | number; type?: u
   }
   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.
+// Fold `:free`/`-free` suffixes and case variants into one chart key.
 export function canonicalModelId(model: string): string {
-  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: string): string {
   const bare = model.replace(FREE_SUFFIX, '');
   const cap = (s: string): string => {
@@ -312,8 +298,8 @@ export function importSessionTokens(): SessionTokens {
   const accum = newSessionAccum();
   const files: string[] = [];
   walkJsonl(sessionsDir(), files, 2000);
-  // A sessions override signals an isolated environment (tests, fixtures):
-  // only walk the real codex dir when it is explicitly set.
+  // 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);
   }
@@ -443,8 +429,8 @@ export function readRtkRecallDiagnostics(binary: string | null = resolveRtkBinar
     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: unknown): string {
   if (typeof command !== 'string' || !command.trim()) return 'bash';
@@ -459,7 +445,7 @@ export function leadBinary(command: unknown): string {
 }
 
 // --- Pricing lives in ./pricing.ts (live LiteLLM cache + fallback table) ---
-import { DEFAULT_PRICE, priceFor, refreshPricesIfStale } from './pricing.ts';
+import { DEFAULT_PRICE, canonicalPriceId, priceFor, refreshPricesIfStale } from './pricing.ts';
 import { co2GramsFor, energyWhFor } from './carbon.ts';
 import type { ModelPrice } from './pricing.ts';
 
@@ -483,12 +469,6 @@ export function usdCost(t: TokenBreakdown, model?: string): { usd: number; price
   };
 }
 
-// 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: number, model?: string): number {
   return co2GramsFor(model ?? 'gpt-4o', outputTokens);
 }
@@ -513,9 +493,8 @@ export function readUsage(): UsageRow[] {
   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(): number {
   const rows = readUsage().length;
   try {

package/extensions/shared/usage-store.js

@@ -1,16 +1,15 @@
 // extensions/shared/usage-store.ts — tersio-owned usage.db.
-// Persists the same per-message rows importSessionTokens derives live (model,
-// tokens, cache, cost input, timing, status, tools), so top models, costing,
-// cache, CO2 inputs, and activity survive session-file rotation. Sync is
-// incremental: a files ledger (mtime+size) skips unchanged transcripts, and
-// every read applies the current reset watermark — the store is a cache,
-// never a fork. Missing sqlite3 CLI → sync false / read null, callers fall
-// back to the live path. Never touches RTK's history.db or host transcripts.
+// Persists the rows importSessionTokens derives live, so reports survive
+// session-file rotation. Sync is incremental (a files ledger skips unchanged
+// transcripts) and every read applies the reset watermark, so the store is a
+// cache, never a fork. Missing sqlite3 → sync false / read null. Never touches
+// RTK's history.db or host transcripts.
 import { execFileSync } from 'node:child_process';
 import fs from 'node:fs';
 import path from 'node:path';
 import { RECENT_LIMIT, canonicalModelId, classifySessionLine, codexSessionsDir, costOf, durOf, ingestSessionRow, newSessionAccum, sessionsDir, walkJsonl, } from './usage-ledger.js';
 import { tersioDataPath } from '../lib/utils.js';
+import { MODEL_ALIASES } from './pricing.js';
 export function usageDbPath() {
     const override = process.env.TERSIO_USAGE_DB;
     if (override)
@@ -45,12 +44,16 @@ function query(db, sql) {
 }
 function ensureSchema(db) {
     fs.mkdirSync(path.dirname(db), { recursive: true });
+    // Rows imported before an alias existed keep the spelling they were stored
+    // with, and the mtime ledger will not re-read those transcripts. Fold them in
+    // once, so the merge shows up without a reset.
+    const rekeys = MODEL_ALIASES.map((a) => `UPDATE messages SET model='${a.id}' WHERE model='${a.feed}';`).join('');
     run(db, `CREATE TABLE IF NOT EXISTS meta (k TEXT PRIMARY KEY, v TEXT NOT NULL);` +
         `CREATE TABLE IF NOT EXISTS files (path TEXT PRIMARY KEY, mtime REAL NOT NULL, size INTEGER NOT NULL);` +
         `CREATE TABLE IF NOT EXISTS messages (file TEXT NOT NULL, t REAL, model TEXT NOT NULL,` +
         ` i INTEGER NOT NULL, o INTEGER NOT NULL, d REAL, cr INTEGER NOT NULL, cw INTEGER NOT NULL,` +
         ` usd REAL, st TEXT NOT NULL, code REAL, note TEXT, tools TEXT NOT NULL DEFAULT '[]');` +
-        `CREATE INDEX IF NOT EXISTS idx_messages_file ON messages(file);`);
+        `CREATE INDEX IF NOT EXISTS idx_messages_file ON messages(file);` + rekeys);
 }
 function readFiles(db) {
     const known = {};
@@ -129,10 +132,9 @@ function insertSql(file, r) {
         `${nullNum(r.d)},${r.cr},${r.cw},${nullNum(r.usd)},${esc(r.st)},` +
         `${nullNum(r.code)},${nullStr(r.note)},${esc(JSON.stringify(r.tools))});`;
 }
-// Incremental sync: unchanged transcripts are skipped via mtime+size,
-// changed ones are deleted and re-inserted. Rows for deleted transcripts
-// are kept, so OMP session rotation never erases history. True on success
-// (including nothing-to-do), false when sqlite3 or disk is unavailable.
+// Incremental sync: unchanged transcripts are skipped via mtime+size, changed
+// ones re-inserted. Rows for deleted transcripts are kept, so rotation never
+// erases history. False when sqlite3 or disk is unavailable.
 export function syncUsageDb() {
     let db;
     try {