@krtclcdy/tersio 2.22.1 → 2.24.0

package/extensions/shared/usage-ledger.ts

@@ -1,11 +1,10 @@
-// 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.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';
 
@@ -21,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;
@@ -58,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;
@@ -69,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 {
@@ -83,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;
@@ -104,6 +91,21 @@ export interface SessionTokens {
   recent: RecentRequest[];
 }
 
+export interface RtkAdoption {
+  sessions: number;
+  bashCalls: number;
+  eligibleCalls: number;
+  rtkCalls: number;
+  missedCalls: number;
+  adoptionPct: number;
+}
+
+export interface RtkRecallDiagnostics {
+  mode: 'sqlite' | 'tee' | 'disabled' | 'unknown';
+  entries: number;
+  available: boolean;
+}
+
 function zeroBreakdown(): TokenBreakdown {
   return { input: 0, output: 0, cacheRead: 0, cacheWrite: 0 };
 }
@@ -111,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;
@@ -150,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 {
@@ -182,13 +186,17 @@ 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;
-// 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.
+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',
+]);
+// 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>;
@@ -253,19 +261,22 @@ export function classifySessionLine(row: { timestamp?: string | number; type?: u
   const computedDur = (typeof msg.completedAt === 'number' && typeof msg.timestamp === 'number') ? msg.completedAt - msg.timestamp : undefined;
   const tools: string[] = [];
   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 as { command?: unknown } | null)?.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 as { command?: unknown } | null)?.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: 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 => {
@@ -287,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);
   }
@@ -305,6 +316,80 @@ export function importSessionTokens(): SessionTokens {
   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<string, { size: number; mtimeMs: number; counts: { bashCalls: number; eligibleCalls: number; rtkCalls: number } }>();
+
+function parseAdoptionFile(file: string): { counts: { bashCalls: number; eligibleCalls: number; rtkCalls: number }; sessions: number } {
+  const counts = { bashCalls: 0, eligibleCalls: 0, rtkCalls: 0 };
+  let text: string;
+  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) as {
+        type?: string;
+        customType?: string;
+        data?: { toolName?: unknown; args?: { command?: unknown } };
+      };
+      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(): void {
+  adoptionFileCache.clear();
+}
+
+export function readRtkAdoption(): RtkAdoption {
+  const files: string[] = [];
+  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: fs.Stats;
+    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: SessionAccum, state: { codexProvider: string | null }, text: string): void {
   for (const line of text.split('\n')) {
     if (!line.trim()) continue;
@@ -325,8 +410,27 @@ export function processSessionText(accum: SessionAccum, state: { codexProvider:
     } 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: string | null = resolveRtkBinary()): RtkRecallDiagnostics {
+  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') as RtkRecallDiagnostics['mode'];
+    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: unknown): string {
   if (typeof command !== 'string' || !command.trim()) return 'bash';
@@ -341,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';
 
@@ -365,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);
 }
@@ -395,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 {

package/extensions/shared/usage-store.ts

@@ -1,11 +1,9 @@
 // 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 os from 'node:os';
@@ -23,6 +21,7 @@ import {
   walkJsonl,
 } from './usage-ledger.ts';
 import { tersioDataPath } from '../lib/utils.ts';
+import { MODEL_ALIASES } from './pricing.ts';
 import type { RunStatus, SessionTokens } from './usage-ledger.ts';
 
 export function usageDbPath(): string {
@@ -70,6 +69,10 @@ function query(db: string, sql: string): string[][] {
 
 function ensureSchema(db: string): void {
   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);` +
@@ -77,7 +80,7 @@ function ensureSchema(db: string): void {
       `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,
   );
 }
 
@@ -91,8 +94,8 @@ function readFiles(db: string): Record<string, { mtime: number; size: number }>
   return known;
 }
 
-// One parsed assistant message, as stored. `t` is epoch ms or null when the
-// source row carries no usable timestamp (live counts it, skips its recent).
+// One parsed assistant message, as stored. `t` is null when the source row has
+// no usable timestamp: counted, but skipped in the recent list.
 interface StoredRow {
   t: number | null;
   model: string;
@@ -173,10 +176,9 @@ function insertSql(file: string, r: StoredRow): string {
     `${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(): boolean {
   let db: string;
   try {

package/extensions/tersio-commands/index.js

@@ -4,6 +4,7 @@
 // publishes sync sibling mirrors live, so switches notify and take effect
 // next turn — no reload.
 import { getSharedComboState, reconcileSharedComboEntries, sessionEntries, } from '../shared/session-state.js';
+import { setExtensionLabel } from '../shared/host.js';
 import os from 'node:os';
 import path from 'node:path';
 import { appendUsage, readUsage } from '../shared/usage-ledger.js';
@@ -48,7 +49,7 @@ async function openDashboard(pi, ctx) {
     }
 }
 export default function tersioCommandsExtension(pi) {
-    pi.setLabel?.('Tersio unified root command');
+    setExtensionLabel(pi, 'Tersio unified root command');
     pi.registerCommand?.('tersio', {
         description: 'Tersio root: status|check|update|dashboard|usage|help',
         handler: async (args, ctx) => {

package/extensions/tersio-commands/index.ts

@@ -8,6 +8,7 @@ import {
   reconcileSharedComboEntries,
   sessionEntries,
 } from '../shared/session-state.ts';
+import { setExtensionLabel } from '../shared/host.ts';
 import os from 'node:os';
 import path from 'node:path';
 import { appendUsage, readUsage } from '../shared/usage-ledger.ts';
@@ -54,7 +55,7 @@ async function openDashboard(pi: ExtensionApi, ctx?: ExtensionCtx): Promise<void
 }
 
 export default function tersioCommandsExtension(pi: ExtensionApi): void {
-  pi.setLabel?.('Tersio unified root command');
+  setExtensionLabel(pi, 'Tersio unified root command');
 
 
   pi.registerCommand?.('tersio', {

package/package.json

@@ -1,9 +1,11 @@
 {
   "name": "@krtclcdy/tersio",
-  "version": "2.22.1",
-  "description": "✂️ Token-saving OMP add-ons: terse Caveman replies, compact RTK shell output, lean Ponytail code calls — one-command combo presets.",
+  "version": "2.24.0",
+  "description": "\u2702\ufe0f Token-saving OMP add-ons: terse Caveman replies, compact RTK shell output, lean Ponytail code calls \u2014 one-command combo presets.",
   "keywords": [
     "omp",
+    "pi",
+    "pi-package",
     "token-saving",
     "ai-tools",
     "developer-tools",
@@ -29,7 +31,6 @@
       "./extensions/caveman-session/index.ts",
       "./extensions/rtk-session/index.ts",
       "./extensions/combo-toggle/index.ts",
-      "./extensions/shared/mode-reinforcement.ts",
       "./extensions/tersio-commands/index.ts"
     ],
     "skills": [
@@ -56,6 +57,11 @@
         ],
         "default": "off"
       },
+      "comboSetupComplete": {
+        "type": "boolean",
+        "description": "Whether the first interactive OMP launch has completed the Combo preset prompt",
+        "default": false
+      },
       "cavemanDefault": {
         "type": "enum",
         "description": "Session-start default (no saved state)",
@@ -64,7 +70,9 @@
           "lite",
           "full",
           "ultra",
-          "wenyan"
+          "wenyan-lite",
+          "wenyan-full",
+          "wenyan-ultra"
         ],
         "default": "off"
       },
@@ -80,8 +88,7 @@
           "off",
           "lite",
           "full",
-          "ultra",
-          "review"
+          "ultra"
         ],
         "default": "off"
       },
@@ -109,7 +116,8 @@
     "cli/**/*.js",
     "dashboard/dist/**/*",
     "extensions/**/*.js",
-    "extensions/**/*.ts"
+    "extensions/**/*.ts",
+    "extensions/caveman-session/rule.md"
   ],
   "scripts": {
     "clean": "rm -f tersio.js cli/*.js extensions/**/*.js && rm -rf dashboard/dist",

package/tersio.js

@@ -1,6 +1,6 @@
 #!/usr/bin/env node
 // tersio.ts — Install Tersio (caveman/rtk/ponytail) add-ons on any OMP device.
-// Usage: node tersio.js [install|update|reinstall|doctor|dashboard|uninstall|version|help] [options]
+// Usage: node tersio.js [install|update|doctor|dashboard|uninstall|version|help] [options]
 // Requires: node/npm and omp CLI
 import { PACKAGE_BIN, PACKAGE_VERSION, applyUpdate, commandArg, dashboard, dashboardExport, dashboardOpen, dashboardPort, doctor, reset, settings, showHelp, showVersion, uninstall, unknownCommand, update, usage, } from './cli/common.js';
 import { closeRL } from './cli/interactive.js';
@@ -16,9 +16,8 @@ function printHelp() {
     console.log(`Usage: ${PACKAGE_BIN} [command] [options]
 
 Commands:
-  install      Install the add-ons (user scope: all OMP sessions)
+  install      Install the add-ons for one agent (--host omp|pi, or ask at a terminal)
   update       Refresh the CLI and add-ons (RTK binary, Caveman rule, Ponytail)
-  reinstall    Clean and reinstall the user-scope add-ons
   doctor       Check the current installation (--fix repairs, --dry-run previews)
   usage        Ledger-backed usage + savings report
   dashboard     Open the Dashboard (localhost only)
@@ -31,11 +30,12 @@ Commands:
 Options:
   --fix (doctor: repairs all; --fix=<scope> repairs one of extensions, registrations, rtk, ponytail, cli)
   --scope user (legacy; accepted and ignored — user scope is the only scope)
+  --host omp|pi (install|uninstall: target agent; a terminal asks instead)
   --keep-ponytail (uninstall: keep the bundled Ponytail copy — removed by default)
-  --remove-rtk (uninstall: also remove the RTK binary)
+  --remove-rtk (uninstall: also remove the RTK binary; its OMP wiring always goes)
   --combo-default off|medium|balanced|max (implies caveman, rtk, ponytail)
-  --caveman-default off|lite|full|ultra|wenyan (override; default follows combo)
-  --ponytail-default off|lite|full|ultra|review (override; default follows combo)
+  --caveman-default off|lite|full|ultra|wenyan-lite|wenyan-full|wenyan-ultra (override; default follows combo)
+  --ponytail-default off|lite|full|ultra (override; default follows combo)
   --rtk-default on|off (override; default follows combo)
   --yes, -y
   --dry-run

package/extensions/shared/mode-reinforcement.js

@@ -1,26 +0,0 @@
-import { asPromptArray, reconcileSharedComboEntries, sessionEntries, systemPromptIncludes } from './session-state.js';
-const MARKER = 'SUPREME TOKEN SAVER MODES ACTIVE';
-function instruction(state) {
-    const modes = [
-        state.caveman !== 'off' && `caveman=${state.caveman}`,
-        state.rtk === 'on' && 'rtk=on',
-        state.ponytail !== 'off' && `ponytail=${state.ponytail}`,
-    ].filter(Boolean);
-    if (!modes.length)
-        return null;
-    return `${MARKER}: ${modes.join(' · ')}. Keep these active for the entire response: concise Caveman prose, RTK for eligible noisy shell output, and the smallest correct Ponytail solution. Do not weaken or disable a mode unless the user explicitly asks.`;
-}
-export default function modeReinforcementExtension(pi) {
-    pi.setLabel?.('Tersio mode reinforcement');
-    pi.on('before_agent_start', async (event, ctx) => {
-        if (!ctx?.hasUI)
-            return;
-        const text = instruction(reconcileSharedComboEntries(sessionEntries(ctx)));
-        if (!text)
-            return;
-        const base = asPromptArray(event.systemPrompt);
-        if (systemPromptIncludes(base, MARKER))
-            return;
-        return { systemPrompt: [...base, text] };
-    });
-}

package/extensions/shared/mode-reinforcement.ts

@@ -1,29 +0,0 @@
-import { asPromptArray, reconcileSharedComboEntries, sessionEntries, systemPromptIncludes } from './session-state.ts';
-import type { ExtensionApi, SystemPromptEvent } from './types.ts';
-
-const MARKER = 'SUPREME TOKEN SAVER MODES ACTIVE';
-
-function instruction(state: { caveman: string; rtk: string; ponytail: string }): string | null {
-  const modes = [
-    state.caveman !== 'off' && `caveman=${state.caveman}`,
-    state.rtk === 'on' && 'rtk=on',
-    state.ponytail !== 'off' && `ponytail=${state.ponytail}`,
-  ].filter(Boolean);
-  if (!modes.length) return null;
-
-  return `${MARKER}: ${modes.join(' · ')}. Keep these active for the entire response: concise Caveman prose, RTK for eligible noisy shell output, and the smallest correct Ponytail solution. Do not weaken or disable a mode unless the user explicitly asks.`;
-}
-
-export default function modeReinforcementExtension(pi: ExtensionApi): void {
-  pi.setLabel?.('Tersio mode reinforcement');
-
-  pi.on('before_agent_start', async (event: SystemPromptEvent, ctx) => {
-    if (!ctx?.hasUI) return;
-    const text = instruction(reconcileSharedComboEntries(sessionEntries(ctx)));
-    if (!text) return;
-
-    const base = asPromptArray(event.systemPrompt);
-    if (systemPromptIncludes(base, MARKER)) return;
-    return { systemPrompt: [...base, text] };
-  });
-}