@krtclcdy/tersio 2.22.1 → 2.23.0

package/extensions/rtk-session/index.ts

@@ -1,6 +1,4 @@
-import os from 'node:os';
-import path from 'node:path';
-import { activeModesSummary, asPromptArray, getSharedComboState, isComboPresetActive, isOmpSubagentPrompt, lastCustomValue, normalizeInputCommand, normalizeMode, paintStatusBar, paintableCtx, reconcileSharedComboEntries, sessionEntries, setSharedComboListener, setSharedComboMode } from '../shared/session-state.ts';
+import { activeModesSummary, asPromptArray, getSharedComboState, isComboPresetActive, isOmpSubagentPrompt, lastCustomValue, normalizeInputCommand, paintStatusBar, paintableCtx, reconcileSharedComboEntries, sessionEntries, setSharedComboListener, setSharedComboMode } from '../shared/session-state.ts';
 import { readRtkDefault } from '../shared/plugin-settings.ts';
 import type { ExtensionApi, ExtensionCtx, InputEvent, SessionEntry, SystemPromptEvent } from '../shared/types.ts';
 
@@ -17,13 +15,12 @@ function resolveEnabled(entries: SessionEntry[] | null | undefined): boolean | n
   return lastCustomValue(entries, 'rtk-mode', (data) => asBoolean(data?.enabled));
 }
 
-const IS_WINDOWS = process.platform === 'win32';
-const HOME = os.homedir();
-const RTK_BINARY = path.join(HOME, '.bun', 'bin', IS_WINDOWS ? 'rtk.exe' : 'rtk');
+function setRtkProcessEnabled(enabled: boolean): void {
+  if (enabled) delete process.env.RTK_DISABLED;
+  else process.env.RTK_DISABLED = '1';
+}
 
-const RTK_PROMPT = `RTK mode active for this session.
-Use Rust Token Killer for shell output that would otherwise be noisy. Prefer explicit RTK commands in bash: \`rtk git status\`, \`rtk git diff\`, \`rtk read <file>\`, \`rtk grep <pattern> <path>\`, \`rtk find <glob> <path>\`, \`rtk test <cmd...>\`, \`rtk tsc\`, \`rtk lint\`, or \`rtk <tool> ...\` for supported dev commands.
-Do not use RTK when exact raw output is required, when a specialized OMP tool is required by system policy, or when the command changes state and RTK would hide important confirmation text. Specialized OMP tools still win: read/glob/grep/edit/lsp stay preferred over shell equivalents.`;
+const RTK_PROMPT = `RTK guidance active. RTK automatically rewrites eligible Bash calls through the installed rtk hook. Prefer rtk for noisy shell output, but use exact raw output for state changes, checksums, patches, and diagnostics that need full bytes.`;
 
 interface ZodChain {
   min: (n: number) => ZodChain;
@@ -52,7 +49,7 @@ export default function rtkSessionExtension(pi: ExtensionApi): void {
     enabled = Boolean(next);
     pi.appendEntry?.('rtk-mode', { enabled });
     setSharedComboMode('rtk', enabled);
-    syncStatus(ctx);
+    setRtkProcessEnabled(enabled);
     const active = activeModesSummary(getSharedComboState());
     ctx?.ui?.notify?.(enabled ? `RTK on — compact shell output for this session. Active: ${active}.` : `RTK off. Active: ${active}.`, 'info');
   }
@@ -63,6 +60,7 @@ export default function rtkSessionExtension(pi: ExtensionApi): void {
   // it at once so the next turn and the rtk_run gate see it, no reload.
   function syncFromShared(state: { rtk: string }): void {
     enabled = state.rtk === 'on';
+    setRtkProcessEnabled(enabled);
     syncStatus();
   }
   setSharedComboListener(syncFromShared);
@@ -102,7 +100,7 @@ export default function rtkSessionExtension(pi: ExtensionApi): void {
         };
       }
       onUpdate?.({ content: [{ type: 'text', text: `rtk ${params.args.join(' ')}` }], details: { phase: 'start' } });
-      const result = await pi.exec!(RTK_BINARY, params.args, { signal, cwd: ctx?.cwd || pi.cwd });
+      const result = await pi.exec!('rtk', params.args, { signal, cwd: ctx?.cwd || pi.cwd });
       const text = [result.stdout, result.stderr].filter(Boolean).join('\n');
       return {
         isError: result.code !== 0,
@@ -129,6 +127,7 @@ export default function rtkSessionExtension(pi: ExtensionApi): void {
     // installer/user-configured default (off unless configured).
     const persisted = resolveEnabled(entries);
     enabled = typeof persisted === 'boolean' ? persisted : readRtkDefault();
+    setRtkProcessEnabled(enabled);
     syncStatus(ctx);
   }
 

package/extensions/shared/plugin-settings.js

@@ -3,7 +3,7 @@
 // written by `omp plugin config set @krtclcdy/tersio <key> <value>` and by
 // the installer profile step. Tolerant: any parse failure yields {} so every
 // caller falls back to its own default.
-import { existsSync, readFileSync } from 'node:fs';
+import { existsSync, mkdirSync, readFileSync, writeFileSync } from 'node:fs';
 import os from 'node:os';
 import path from 'node:path';
 export const PLUGIN_NAME = '@krtclcdy/tersio';
@@ -30,8 +30,8 @@ export function readPluginSettings() {
     return {};
 }
 const COMBO_LEVELS = new Set(['off', 'medium', 'balanced', 'max']);
-const CAVEMAN_MODES = new Set(['off', 'lite', 'full', 'ultra', 'wenyan']);
-const PONYTAIL_MODES = new Set(['off', 'lite', 'full', 'ultra', 'review']);
+const CAVEMAN_MODES = new Set(['off', 'lite', 'full', 'ultra', 'wenyan', 'wenyan-lite', 'wenyan-full', 'wenyan-ultra']);
+const PONYTAIL_MODES = new Set(['off', 'lite', 'full', 'ultra']);
 function readStringDefault(key, valid) {
     const raw = readPluginSettings()[key];
     return typeof raw === 'string' && valid.has(raw) ? raw : 'off';
@@ -49,3 +49,37 @@ export function readRtkDefault() {
 export function readPonytailDefault() {
     return readStringDefault('ponytailDefault', PONYTAIL_MODES);
 }
+export function isComboSetupComplete() {
+    return readPluginSettings().comboSetupComplete === true;
+}
+const COMBO_MODE_DEFAULTS = {
+    off: { cavemanDefault: 'off', rtkDefault: false, ponytailDefault: 'off' },
+    medium: { cavemanDefault: 'lite', rtkDefault: true, ponytailDefault: 'lite' },
+    balanced: { cavemanDefault: 'full', rtkDefault: true, ponytailDefault: 'full' },
+    max: { cavemanDefault: 'ultra', rtkDefault: true, ponytailDefault: 'ultra' },
+};
+export function saveComboSetup(level) {
+    if (!(level in COMBO_MODE_DEFAULTS))
+        return false;
+    const lockPath = lockPaths()[0];
+    let lock = {};
+    if (existsSync(lockPath)) {
+        try {
+            lock = JSON.parse(readFileSync(lockPath, 'utf8'));
+        }
+        catch {
+            lock = {};
+        }
+    }
+    lock.plugins ||= {};
+    lock.settings ||= {};
+    lock.settings[PLUGIN_NAME] = {
+        ...lock.settings[PLUGIN_NAME],
+        comboDefault: level,
+        ...COMBO_MODE_DEFAULTS[level],
+        comboSetupComplete: true,
+    };
+    mkdirSync(path.dirname(lockPath), { recursive: true });
+    writeFileSync(lockPath, JSON.stringify(lock, null, 2) + '\n', 'utf8');
+    return true;
+}

package/extensions/shared/plugin-settings.ts

@@ -4,7 +4,7 @@
 // the installer profile step. Tolerant: any parse failure yields {} so every
 // caller falls back to its own default.
 
-import { existsSync, readFileSync } from 'node:fs';
+import { existsSync, mkdirSync, readFileSync, writeFileSync } from 'node:fs';
 import os from 'node:os';
 import path from 'node:path';
 export const PLUGIN_NAME = '@krtclcdy/tersio';
@@ -31,8 +31,8 @@ export function readPluginSettings(): Record<string, unknown> {
 }
 
 const COMBO_LEVELS = new Set(['off', 'medium', 'balanced', 'max']);
-const CAVEMAN_MODES = new Set(['off', 'lite', 'full', 'ultra', 'wenyan']);
-const PONYTAIL_MODES = new Set(['off', 'lite', 'full', 'ultra', 'review']);
+const CAVEMAN_MODES = new Set(['off', 'lite', 'full', 'ultra', 'wenyan', 'wenyan-lite', 'wenyan-full', 'wenyan-ultra']);
+const PONYTAIL_MODES = new Set(['off', 'lite', 'full', 'ultra']);
 
 function readStringDefault(key: string, valid: Set<string>): string {
   const raw = readPluginSettings()[key];
@@ -55,3 +55,34 @@ export function readRtkDefault(): boolean {
 export function readPonytailDefault(): string {
   return readStringDefault('ponytailDefault', PONYTAIL_MODES);
 }
+
+export function isComboSetupComplete(): boolean {
+  return readPluginSettings().comboSetupComplete === true;
+}
+
+const COMBO_MODE_DEFAULTS = {
+  off: { cavemanDefault: 'off', rtkDefault: false, ponytailDefault: 'off' },
+  medium: { cavemanDefault: 'lite', rtkDefault: true, ponytailDefault: 'lite' },
+  balanced: { cavemanDefault: 'full', rtkDefault: true, ponytailDefault: 'full' },
+  max: { cavemanDefault: 'ultra', rtkDefault: true, ponytailDefault: 'ultra' },
+} as const;
+
+export function saveComboSetup(level: string): boolean {
+  if (!(level in COMBO_MODE_DEFAULTS)) return false;
+  const lockPath = lockPaths()[0];
+  let lock: { plugins?: Record<string, unknown>; settings?: Record<string, Record<string, unknown>> } = {};
+  if (existsSync(lockPath)) {
+    try { lock = JSON.parse(readFileSync(lockPath, 'utf8')) as typeof lock; } catch { lock = {}; }
+  }
+  lock.plugins ||= {};
+  lock.settings ||= {};
+  lock.settings[PLUGIN_NAME] = {
+    ...lock.settings[PLUGIN_NAME],
+    comboDefault: level,
+    ...COMBO_MODE_DEFAULTS[level as keyof typeof COMBO_MODE_DEFAULTS],
+    comboSetupComplete: true,
+  };
+  mkdirSync(path.dirname(lockPath), { recursive: true });
+  writeFileSync(lockPath, JSON.stringify(lock, null, 2) + '\n', 'utf8');
+  return true;
+}

package/extensions/shared/rtk-gain.js

@@ -55,8 +55,8 @@ export function readRtkGain(limit = 10, cutoffMs) {
         const where = cutoffMs && cutoffMs > 0
             ? `WHERE CAST(strftime('%s', timestamp) AS INTEGER) >= ${Math.floor(cutoffMs / 1000)}`
             : '';
-        const [[commands = '0', saved = '0', input = '0', avgPct = '0', totalMs = '0'] = []] = query(rtkDbPath(), `SELECT COUNT(*), COALESCE(SUM(saved_tokens),0), COALESCE(SUM(input_tokens),0), COALESCE(AVG(savings_pct),0), COALESCE(SUM(exec_time_ms),0) FROM commands ${where};`);
-        const byCommand = query(rtkDbPath(), `SELECT substr(${CMD_ONE_LINE}, 1, ${MAX_CMD_CHARS}), COUNT(*), COALESCE(SUM(saved_tokens),0), COALESCE(AVG(savings_pct),0), COALESCE(AVG(exec_time_ms),0) FROM commands ${where} GROUP BY rtk_cmd ORDER BY SUM(saved_tokens) DESC LIMIT ${Math.max(1, Math.floor(limit))};`).map(([command, count, savedRow, pct, ms]) => ({
+        const [[commands = '0', saved = '0', input = '0', totalMs = '0'] = []] = query(rtkDbPath(), `SELECT COUNT(*), COALESCE(SUM(saved_tokens),0), COALESCE(SUM(input_tokens),0), COALESCE(SUM(exec_time_ms),0) FROM commands ${where};`);
+        const byCommand = query(rtkDbPath(), `SELECT substr(${CMD_ONE_LINE}, 1, ${MAX_CMD_CHARS}), COUNT(*), COALESCE(SUM(saved_tokens),0), COALESCE(100.0 * SUM(saved_tokens) / NULLIF(SUM(input_tokens), 0), 0), COALESCE(AVG(exec_time_ms),0) FROM commands ${where} GROUP BY rtk_cmd ORDER BY SUM(saved_tokens) DESC LIMIT ${Math.max(1, Math.floor(limit))};`).map(([command, count, savedRow, pct, ms]) => ({
             command,
             count: Number(count) || 0,
             saved: Number(savedRow) || 0,

package/extensions/shared/rtk-gain.ts

@@ -76,13 +76,13 @@ export function readRtkGain(limit = 10, cutoffMs?: number): RtkGain {
     const where = cutoffMs && cutoffMs > 0
       ? `WHERE CAST(strftime('%s', timestamp) AS INTEGER) >= ${Math.floor(cutoffMs / 1000)}`
       : '';
-    const [[commands = '0', saved = '0', input = '0', avgPct = '0', totalMs = '0'] = []] = query(
+    const [[commands = '0', saved = '0', input = '0', totalMs = '0'] = []] = query(
       rtkDbPath(),
-      `SELECT COUNT(*), COALESCE(SUM(saved_tokens),0), COALESCE(SUM(input_tokens),0), COALESCE(AVG(savings_pct),0), COALESCE(SUM(exec_time_ms),0) FROM commands ${where};`,
+      `SELECT COUNT(*), COALESCE(SUM(saved_tokens),0), COALESCE(SUM(input_tokens),0), COALESCE(SUM(exec_time_ms),0) FROM commands ${where};`,
     );
     const byCommand = query(
       rtkDbPath(),
-      `SELECT substr(${CMD_ONE_LINE}, 1, ${MAX_CMD_CHARS}), COUNT(*), COALESCE(SUM(saved_tokens),0), COALESCE(AVG(savings_pct),0), COALESCE(AVG(exec_time_ms),0) FROM commands ${where} GROUP BY rtk_cmd ORDER BY SUM(saved_tokens) DESC LIMIT ${Math.max(1, Math.floor(limit))};`,
+      `SELECT substr(${CMD_ONE_LINE}, 1, ${MAX_CMD_CHARS}), COUNT(*), COALESCE(SUM(saved_tokens),0), COALESCE(100.0 * SUM(saved_tokens) / NULLIF(SUM(input_tokens), 0), 0), COALESCE(AVG(exec_time_ms),0) FROM commands ${where} GROUP BY rtk_cmd ORDER BY SUM(saved_tokens) DESC LIMIT ${Math.max(1, Math.floor(limit))};`,
     ).map(([command, count, savedRow, pct, ms]) => ({
       command,
       count: Number(count) || 0,

package/extensions/shared/session-state.js

@@ -7,9 +7,9 @@ export const COMBO_LEVELS = Object.freeze({
     max: Object.freeze({ level: 'max', caveman: 'ultra', rtk: 'on', ponytail: 'ultra' }),
 });
 const MODE_VALUES = {
-    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']),
 };
 const MODE_ENTRY_TYPES = {
     'caveman-mode': 'caveman',
@@ -20,7 +20,9 @@ export function normalizeMode(name, value) {
     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) {
     for (const level of Object.keys(COMBO_LEVELS)) {

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 {

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?: {

package/extensions/shared/usage-ledger.js

@@ -5,7 +5,8 @@
 import fs from 'node:fs';
 import os from 'node:os';
 import path from 'node:path';
-import { tersioDataPath } from '../lib/utils.js';
+import { resolveRtkBinary, tersioDataPath } from '../lib/utils.js';
+import { execFileSync } from 'node:child_process';
 export function ledgerPath() {
     const override = process.env.TERSIO_USAGE_FILE;
     if (override)
@@ -137,6 +138,11 @@ export function walkJsonl(dir, out, cap) {
 // (model, tokens, timing, status), so a few hundred cost little to ship.
 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,9 +200,14 @@ 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 };
 }
@@ -251,6 +262,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,6 +362,29 @@ export function processSessionText(accum, state, text) {
         catch { /* skip corrupt lines */ }
     }
 }
+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 head past `cd` chains and
 // VAR=x assignments (`cd /x && git status` → `git`). Falls back to `bash`.
 const SKIP_HEADS = ['cd', 'echo', 'export', 'true', 'false'];

package/extensions/shared/usage-ledger.ts

@@ -5,7 +5,8 @@
 import fs from 'node:fs';
 import os from 'node:os';
 import path from 'node:path';
-import { tersioDataPath } from '../lib/utils.ts';
+import { resolveRtkBinary, tersioDataPath } from '../lib/utils.ts';
+import { execFileSync } from 'node:child_process';
 
 export type UsageKind = 'command' | 'toggle' | 'install' | 'update' | 'rtk-audit';
 
@@ -104,6 +105,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 };
 }
@@ -187,6 +203,11 @@ export function walkJsonl(dir: string, out: string[], cap: number): void {
 // (model, tokens, timing, status), so a few hundred cost little to ship.
 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',
+]);
 // 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.
 export interface SessionAccum {
@@ -253,9 +274,13 @@ 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 };
 }
@@ -305,6 +330,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,6 +424,25 @@ export function processSessionText(accum: SessionAccum, state: { codexProvider:
     } catch { /* skip corrupt lines */ }
   }
 }
+
+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 head past `cd` chains and
 // VAR=x assignments (`cd /x && git status` → `git`). Falls back to `bash`.
 const SKIP_HEADS = ['cd', 'echo', 'export', 'true', 'false'];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@krtclcdy/tersio",
-  "version": "2.22.1",
+  "version": "2.23.0",
   "description": "✂️ Token-saving OMP add-ons: terse Caveman replies, compact RTK shell output, lean Ponytail code calls — one-command combo presets.",
   "keywords": [
     "omp",
@@ -29,7 +29,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 +55,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 +68,9 @@
           "lite",
           "full",
           "ultra",
-          "wenyan"
+          "wenyan-lite",
+          "wenyan-full",
+          "wenyan-ultra"
         ],
         "default": "off"
       },
@@ -80,8 +86,7 @@
           "off",
           "lite",
           "full",
-          "ultra",
-          "review"
+          "ultra"
         ],
         "default": "off"
       },
@@ -109,7 +114,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

@@ -34,8 +34,8 @@ Options:
   --keep-ponytail (uninstall: keep the bundled Ponytail copy — removed by default)
   --remove-rtk (uninstall: also remove the RTK binary)
   --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