@krtclcdy/tersio 2.22.1 → 2.24.0

package/extensions/shared/session-state.ts

@@ -12,9 +12,9 @@ export const COMBO_LEVELS: Record<string, Readonly<ComboState>> = Object.freeze(
 });
 
 const MODE_VALUES: Record<string, Set<string>> = {
-  caveman: new Set(['off', 'lite', 'full', 'ultra', 'wenyan']),
+  caveman: new Set(['off', 'lite', 'full', 'ultra', 'wenyan', 'wenyan-lite', 'wenyan-full', 'wenyan-ultra']),
   rtk: new Set(['off', 'on']),
-  ponytail: new Set(['off', 'lite', 'full', 'ultra', 'review']),
+  ponytail: new Set(['off', 'lite', 'full', 'ultra']),
 };
 
 type ModeName = 'caveman' | 'rtk' | 'ponytail';
@@ -34,7 +34,8 @@ interface Bridge {
 export function normalizeMode(name: ModeName, value: unknown): string | null {
   if (name === 'rtk' && typeof value === 'boolean') return value ? 'on' : 'off';
   const mode = String(value ?? '').trim().toLowerCase();
-  return MODE_VALUES[name]?.has(mode) ? mode : null;
+  if (!MODE_VALUES[name]?.has(mode)) return null;
+  return name === 'caveman' && mode === 'wenyan' ? 'wenyan-full' : mode;
 }
 
 export function deriveLevel(modes: Modes | null | undefined): ComboLevel {
@@ -97,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;
 }
@@ -155,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));
 }
 
@@ -177,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

@@ -22,6 +22,11 @@ export type SessionEntry = {
 };
 
 export interface UiApi {
+  select?: (
+    title: string,
+    options: Array<string | { label: string; description?: string }>,
+    dialogOptions?: Record<string, unknown>,
+  ) => Promise<string | undefined>;
   setStatus?: (name: string, value: string | undefined) => void;
   notify?: (message: string, level?: string) => void;
   theme?: {
@@ -42,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;
@@ -63,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<{
@@ -81,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,22 +1,17 @@
-// 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 { 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;
     if (override)
         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)
@@ -54,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')
@@ -95,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;
@@ -132,11 +129,15 @@ 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([
+    'rtk', 'git', 'grep', 'rg', 'find', 'cat', 'ls', 'tree', 'diff', 'log',
+    'npm', 'npx', 'pnpm', 'bun', 'bunx', 'cargo', 'go', 'python', 'pytest',
+    'ruff', 'mypy', 'docker', 'kubectl', 'psql', 'aws', 'gh', 'glab', 'wc',
+]);
 export function newSessionAccum() {
     return { byModel: {}, byDay: {}, byDayModel: {}, byTool: {}, byModelMessages: {}, totals: zeroBreakdown(), messages: 0, costMeasured: 0, recent: [] };
 }
@@ -194,19 +195,23 @@ export function classifySessionLine(row) {
     const computedDur = (typeof msg.completedAt === 'number' && typeof msg.timestamp === 'number') ? msg.completedAt - msg.timestamp : undefined;
     const tools = [];
     for (const part of msg.content ?? []) {
-        if (part?.type === 'toolCall' && typeof part.name === 'string' && part.name) {
-            tools.push(part.name === 'bash' ? `bash:${leadBinary(part.arguments?.command)}` : part.name);
+        if (part?.type !== 'toolCall' || typeof part.name !== 'string' || !part.name)
+            continue;
+        if (part.name !== 'bash') {
+            tools.push(part.name);
+            continue;
         }
+        const command = part.arguments?.command;
+        tools.push(`bash:${leadBinary(command)}`);
     }
     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) => {
@@ -232,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);
     }
@@ -251,6 +256,82 @@ export function importSessionTokens() {
     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) };
 }
+const adoptionFileCache = new Map();
+function parseAdoptionFile(file) {
+    const counts = { bashCalls: 0, eligibleCalls: 0, rtkCalls: 0 };
+    let text;
+    try {
+        text = fs.readFileSync(file, 'utf8');
+    }
+    catch {
+        return { counts, sessions: 0 };
+    }
+    let sawBash = false;
+    for (const line of text.split('\n')) {
+        if (!line.includes('tool_execution_start'))
+            continue;
+        try {
+            const row = JSON.parse(line);
+            if (row.type !== 'custom' || row.customType !== 'tool_execution_start' || row.data?.toolName !== 'bash')
+                continue;
+            const command = row.data.args?.command;
+            if (typeof command !== 'string')
+                continue;
+            sawBash = true;
+            counts.bashCalls += 1;
+            const head = leadBinary(command);
+            if (RTK_ELIGIBLE_HEADS.has(head))
+                counts.eligibleCalls += 1;
+            if (head === 'rtk')
+                counts.rtkCalls += 1;
+        }
+        catch { /* skip corrupt line */ }
+    }
+    return { counts, sessions: sawBash ? 1 : 0 };
+}
+export function clearRtkAdoptionCache() {
+    adoptionFileCache.clear();
+}
+export function readRtkAdoption() {
+    const files = [];
+    walkJsonl(sessionsDir(), files, 2000);
+    if (process.env.TERSIO_SESSIONS_DIR === undefined || process.env.TERSIO_CODEX_DIR !== undefined) {
+        walkJsonl(codexSessionsDir(), files, 2000);
+    }
+    const live = new Set(files);
+    for (const file of adoptionFileCache.keys()) {
+        if (!live.has(file))
+            adoptionFileCache.delete(file);
+    }
+    let bashCalls = 0;
+    let eligibleCalls = 0;
+    let rtkCalls = 0;
+    let sessions = 0;
+    for (const file of files) {
+        let stat;
+        try {
+            stat = fs.statSync(file);
+        }
+        catch {
+            continue;
+        }
+        let entry = adoptionFileCache.get(file);
+        if (!entry || entry.size !== stat.size || entry.mtimeMs !== stat.mtimeMs) {
+            const parsed = parseAdoptionFile(file);
+            entry = { size: stat.size, mtimeMs: stat.mtimeMs, counts: parsed.counts };
+            adoptionFileCache.set(file, entry);
+            sessions += parsed.sessions;
+        }
+        else if (entry.counts.bashCalls > 0) {
+            sessions += 1;
+        }
+        bashCalls += entry.counts.bashCalls;
+        eligibleCalls += entry.counts.eligibleCalls;
+        rtkCalls += entry.counts.rtkCalls;
+    }
+    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) {
     for (const line of text.split('\n')) {
         if (!line.trim())
@@ -275,8 +356,31 @@ export function processSessionText(accum, state, text) {
         catch { /* skip corrupt lines */ }
     }
 }
-// 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`.
+export function readRtkRecallDiagnostics(binary = resolveRtkBinary()) {
+    if (!binary)
+        return { mode: 'unknown', entries: 0, available: false };
+    try {
+        const configPath = process.env.RTK_CONFIG
+            || (process.platform === 'darwin'
+                ? path.join(os.homedir(), 'Library', 'Application Support', 'rtk', 'config.toml')
+                : path.join(process.env.XDG_DATA_HOME || path.join(os.homedir(), '.local', 'share'), 'rtk', 'config.toml'));
+        let config = '';
+        try {
+            config = fs.readFileSync(configPath, 'utf8');
+        }
+        catch { /* use RTK CLI fallback */ }
+        const modeMatch = /^\s*mode\s*=\s*"(sqlite|tee|disabled)"/m.exec(config);
+        const mode = (modeMatch?.[1] ?? 'unknown');
+        const output = execFileSync(binary, ['recall', '--list'], { encoding: 'utf8', timeout: 5000, windowsHide: true });
+        const entries = /\((\d+)\s+(?:entries?|stored)\)/i.exec(output)?.[1] ?? /^\s*(\d+)\s+entries?/im.exec(output)?.[1] ?? '0';
+        return { mode, entries: Number(entries) || 0, available: true };
+    }
+    catch {
+        return { mode: 'unknown', entries: 0, available: false };
+    }
+}
+// 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())
@@ -293,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 };
@@ -312,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);
 }
@@ -342,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 {