@krtclcdy/tersio 2.22.1 → 2.23.0

package/cli/install.js

@@ -3,14 +3,13 @@ import { promises as fs } from 'node:fs';
 import os from 'node:os';
 import path from 'node:path';
 import { fileURLToPath } from 'node:url';
-import { BUN_BIN_DIR, COMBO_PRESET_MODES, IS_WINDOWS, OMP_AGENT_DIR, OMP_PLUGINS_DIR, OMP_BIN, PACKAGE_NAME, PACKAGE_VERSION, RTK_BINARY_NAME, applyUpdate, cavemanDefaultFlag, comboDefaultFlag, command, dryRun, install, ponytailDefaultFlag, profileFlagsGiven, reinstall, rtkDefaultFlag, verbose, yes, dashboardExport, dashboardPort, debug, ensureExtensionAfterConfigEntry, ensureExtensionInConfig, ensurePonytailConfigValue, execP, parseJsonObject, readPluginsPackage, writeIfChanged, } from './common.js';
+import { BUN_BIN_DIR, COMBO_PRESET_MODES, IS_WINDOWS, OMP_AGENT_DIR, OMP_PLUGINS_DIR, OMP_BIN, PACKAGE_NAME, PACKAGE_VERSION, RTK_BINARY_NAME, applyUpdate, cavemanDefaultFlag, comboDefaultFlag, command, dryRun, install, ponytailDefaultFlag, profileFlagsGiven, reinstall, rtkDefaultFlag, verbose, yes, dashboardExport, dashboardPort, debug, ensurePonytailConfigValue, execP, parseJsonObject, readPluginsPackage, writeIfChanged, } from './common.js';
 import { askInteractiveChoice, askInteractiveConfirm, closeRL, execNetwork, tty, withInteractiveSpinner, } from './interactive.js';
 import { printWelcome } from './banner.js';
 import { checkForUpdate, runLatestUpdate } from './update.js';
 import { runUninstall } from './uninstall.js';
 import { runDoctor } from './doctor.js';
 import { runReset } from './reset.js';
-import { runSettings } from './settings.js';
 import { runUsage } from './usage.js';
 import { runDashboard } from './dashboard.js';
 import { wireRtkOmp } from './rtk-wiring.js';
@@ -20,18 +19,18 @@ import { storedProfile, writePluginSettings } from './profile.js';
 const EXT_DIR = path.join(path.dirname(fileURLToPath(import.meta.url)), '..', 'extensions');
 const SHARED_SESSION_STATE = path.join(EXT_DIR, 'shared', 'session-state.ts');
 const CAVEMAN_INDEX = path.join(EXT_DIR, 'caveman-session', 'index.ts');
+const CAVEMAN_RULE = path.join(EXT_DIR, 'caveman-session', 'rule.md');
 const RTK_SESSION_INDEX = path.join(EXT_DIR, 'rtk-session', 'index.ts');
 const UPDATER_INDEX = path.join(EXT_DIR, 'ai-addons-updater', 'index.ts');
 const COMBO_TOGGLE_INDEX = path.join(EXT_DIR, 'combo-toggle', 'index.ts');
 const TERSIO_COMMANDS_INDEX = path.join(EXT_DIR, 'tersio-commands', 'index.ts');
-const MODE_REINFORCEMENT_INDEX = path.join(EXT_DIR, 'shared', 'mode-reinforcement.ts');
 const SHARED_TYPES = path.join(EXT_DIR, 'shared', 'types.ts');
 const LIB_UTILS = path.join(EXT_DIR, 'lib', 'utils.ts');
 const SHARED_PLUGIN_SETTINGS = path.join(EXT_DIR, 'shared', 'plugin-settings.ts');
 const SHARED_USAGE_LEDGER = path.join(EXT_DIR, 'shared', 'usage-ledger.ts');
 const SHARED_PRICING = path.join(EXT_DIR, 'shared', 'pricing.ts');
 const SHARED_CARBON = path.join(EXT_DIR, 'shared', 'carbon.ts');
-async function stepPonytail(pluginsDir, userDir, options) {
+async function stepPonytail(pluginsDir, options) {
     if (!options.quiet)
         console.log('  Ponytail — ensure bundled plugin');
     await fs.mkdir(pluginsDir, { recursive: true });
@@ -92,12 +91,8 @@ async function stepPonytail(pluginsDir, userDir, options) {
         console.log('  [hint] The /ponytail command won\'t work, but ponytail skills will still load');
     }
     else if (!options.dryRun && !options.quiet) {
-        // Wire extension into config.yml so /ponytail command loads
-        debug('Bundled Ponytail pi-extension found');
+        debug('Bundled Ponytail pi-extension found; OMP loads it from the plugin manifest');
     }
-    // Still set Ponytail config defaults even without the extension command
-    const configPath = path.join(userDir, 'config.yml');
-    await ensureExtensionInConfig(configPath, ponytailExtPath, 'ponytail', options);
     await ensurePonytailConfigValue('defaultMode', 'off', options);
     // hideStatus=true keeps the upstream ponytail bar hidden; combo owns the bar.
     await ensurePonytailConfigValue('hideStatus', true, options);
@@ -355,14 +350,6 @@ async function stepSharedSessionState(extDir, options) {
         [SHARED_CARBON, path.join('shared', 'carbon.ts')],
     ], 'shared/session-state.js', options);
 }
-async function stepModeReinforcement(extDir, ponytailExtPath, options) {
-    if (!options.quiet)
-        console.log('  Session helpers — sync shared files');
-    const dest = path.join(extDir, 'shared', 'mode-reinforcement.ts');
-    if (!await copySources(extDir, [[MODE_REINFORCEMENT_INDEX, path.join('shared', 'mode-reinforcement.ts')]], 'shared/mode-reinforcement.ts', options))
-        return;
-    await ensureExtensionAfterConfigEntry(path.join(path.dirname(extDir), 'config.yml'), dest, ponytailExtPath, 'mode reinforcement', options);
-}
 async function stepRtkSession(extDir, options) {
     if (!options.quiet)
         console.log('  RTK session — install session mode');
@@ -371,12 +358,17 @@ async function stepRtkSession(extDir, options) {
 // One rule fetch serves the install; dry runs stay offline
 // and fall back to the bundled rule to preview its destination.
 async function fetchCavemanRule(options) {
+    const bundled = await readTextIfExists(CAVEMAN_RULE);
     if (options.dryRun)
-        return (await readTextIfExists(path.join(path.dirname(CAVEMAN_INDEX), 'rule.md'))) || '';
+        return bundled;
     try {
         return await withInteractiveSpinner('Fetching Caveman rule', () => httpsGet(CAVEMAN_REMOTE_RULE));
     }
     catch (e) {
+        if (bundled !== null) {
+            debug(`Using bundled Caveman rule: ${e.message}`);
+            return bundled;
+        }
         console.log(`  [warn] Could not fetch caveman rule: ${e.message}`);
         return null;
     }
@@ -411,12 +403,7 @@ async function stepUpdater(extDir, options) {
 async function stepCombo(extDir, options) {
     if (!options.quiet)
         console.log('  Combo — install preset switch');
-    const dest = path.join(extDir, 'combo-toggle', 'index.ts');
-    if (!await copySources(extDir, [[COMBO_TOGGLE_INDEX, path.join('combo-toggle', 'index.ts')]], 'combo-toggle/index.ts', options))
-        return;
-    // Auto-register combo in config.yml
-    const configPath = path.join(path.dirname(extDir), 'config.yml');
-    await ensureExtensionInConfig(configPath, dest, 'combo', options);
+    await copySources(extDir, [[COMBO_TOGGLE_INDEX, path.join('combo-toggle', 'index.ts')]], 'combo-toggle/index.ts', options);
 }
 async function resolveProfile(forceReinstall = false, opts = {}) {
     // Seed from the lock file so flag-less update/reinstall runs keep the
@@ -486,7 +473,6 @@ async function runCommandMenu() {
         { value: 'usage', label: 'Usage', hint: 'token usage and savings report' },
         { value: 'dashboard', label: 'Dashboard', hint: 'open the report in your browser' },
         { value: 'reset', label: 'Reset statistics', hint: 'clear statistics; transcripts and RTK history stay' },
-        { value: 'settings', label: 'Settings', hint: 'defaults: combo, caveman, rtk, ponytail, currency' },
         { value: 'uninstall', label: 'Uninstall', hint: 'remove tersio' },
     ], 'install');
     if (choice.status !== 'selected') {
@@ -553,9 +539,6 @@ async function runCommandMenu() {
             await runReset();
             closeRL();
             break;
-        case 'settings':
-            await runSettings();
-            break;
         case 'uninstall':
             await runUninstall();
             closeRL();
@@ -644,14 +627,12 @@ async function runInstall(overrides = {}) {
     await capture('shared', () => stepSharedSessionState(userExtDir, options));
     let selfPlugin = false;
     await capture('self-plugin', async () => { selfPlugin = await stepSelfPlugin(OMP_PLUGINS_DIR, options); });
-    await capture('ponytail', () => stepPonytail(OMP_PLUGINS_DIR, userDir, options));
-    const ponytailExtPath = path.join(OMP_PLUGINS_DIR, 'node_modules', '@dietrichgebert', 'ponytail', 'pi-extension', 'index.js');
+    await capture('ponytail', () => stepPonytail(OMP_PLUGINS_DIR, options));
     await capture('rtk', () => stepRtk(BUN_BIN_DIR, options));
     await capture('rtk session', () => stepRtkSession(userExtDir, options));
-    await capture('caveman', () => stepCaveman(userExtDir, cavemanRule, options));
+    await capture('caveman', () => stepCaveman(path.join(OMP_PLUGINS_DIR, 'node_modules', '@krtclcdy', 'tersio', 'extensions'), cavemanRule, options));
     await capture('combo', () => stepCombo(userExtDir, options));
     await capture('commands', () => stepTersioCommands(userExtDir, options));
-    await capture('reinforcement', () => stepModeReinforcement(userExtDir, ponytailExtPath, options));
     await capture('updater', () => stepUpdater(userExtDir, options));
     if (selfPlugin)
         await capture('settings', () => writePluginSettings(profile, options));

package/cli/profile.js

@@ -72,6 +72,7 @@ async function writePluginSettings(profile, options) {
     config.settings[PACKAGE_NAME] = {
         ...(config.settings[PACKAGE_NAME] || {}),
         comboDefault: profile.comboDefault,
+        comboSetupComplete: true,
         cavemanDefault: profile.cavemanDefault,
         rtkDefault: profile.rtkDefault,
         ponytailDefault: profile.ponytailDefault,

package/cli/settings.js

@@ -85,7 +85,7 @@ async function askDiagSchedule(current) {
 }
 const SETTING_NAMES = ['combo', 'caveman', 'rtk', 'ponytail', 'currency', 'diagnosis'];
 function settingsUsage() {
-    console.log('  Usage: tersio settings [combo|caveman|rtk|ponytail|currency|diagnosis] [--combo-default off|medium|balanced|max] [--caveman-default off|lite|full|ultra|wenyan] [--rtk-default on|off] [--ponytail-default off|lite|full|ultra|review] [--currency USD|PHP|EUR|GBP|JPY|KRW|SGD|AUD|CAD|INR] [--diag-schedule manual|daily|weekly|monthly] [--dry-run]');
+    console.log('  Usage: tersio settings [combo|caveman|rtk|ponytail|currency|diagnosis] [--combo-default off|medium|balanced|max] [--caveman-default off|lite|full|ultra|wenyan-lite|wenyan-full|wenyan-ultra] [--rtk-default on|off] [--ponytail-default off|lite|full|ultra] [--currency USD|PHP|EUR|GBP|JPY|KRW|SGD|AUD|CAD|INR] [--diag-schedule manual|daily|weekly|monthly] [--dry-run]');
 }
 // Single-setting jump: `tersio settings diagnosis` prompts only that value
 // instead of walking the whole chain. Returns false when aborted.

package/cli/update.js

@@ -2,11 +2,11 @@
 import { promises as fs } from 'node:fs';
 import path from 'node:path';
 import { spawn } from 'node:child_process';
-import { BUN_BIN_DIR, IS_WINDOWS, OMP_AGENT_DIR, OMP_PLUGINS_DIR, PACKAGE_BIN, PACKAGE_NAME, PACKAGE_VERSION, RTK_BINARY_NAME, dryRun, execP, parseJsonObject, verbose, } from './common.js';
+import { IS_WINDOWS, OMP_PLUGINS_DIR, PACKAGE_BIN, PACKAGE_NAME, PACKAGE_VERSION, dryRun, execP, parseJsonObject, verbose, } from './common.js';
 import { execNetwork } from './interactive.js';
-import { readTextIfExists, tersioDataPath } from '../extensions/lib/utils.js';
+import { readTextIfExists, resolveRtkBinary, tersioDataPath } from '../extensions/lib/utils.js';
 import { refreshPrices } from '../extensions/shared/pricing.js';
-import { CAVEMAN_REMOTE_RULE, RTK_RELEASE_API, fetchJson, httpsGet, normalizeRtkVersion, sha256Hex, } from '../extensions/lib/utils.js';
+import { CAVEMAN_REMOTE_RULE, RTK_RELEASE_API, httpsGet, normalizeRtkVersion, sha256Hex, } from '../extensions/lib/utils.js';
 const UPDATE_CHECK_TTL_MS = 6 * 60 * 60 * 1000;
 function newerThan(a, b) {
     const pa = a.replace(/^v/, '').split('.').map((n) => parseInt(n, 10) || 0);
@@ -83,21 +83,22 @@ async function execInherit(cmd, args) {
 // Current → latest per add-on. Every probe is capped and nullable; the plan
 // prints `unknown` for anything unreachable and the update proceeds anyway.
 async function probeUpdatePlan(cliLatest) {
-    const rtkBin = path.join(BUN_BIN_DIR, RTK_BINARY_NAME);
+    const rtkBin = resolveRtkBinary();
     const ponytailPkg = path.join(OMP_PLUGINS_DIR, 'node_modules', '@dietrichgebert', 'ponytail', 'package.json');
-    const ruleDest = path.join(OMP_AGENT_DIR, 'extensions', 'caveman-session', 'rule.md');
+    const tersioRule = path.join(OMP_PLUGINS_DIR, 'node_modules', '@krtclcdy', 'tersio', 'extensions', 'caveman-session', 'rule.md');
+    const controller = new AbortController();
     const [rtkLocal, rtkRelease, ruleLocalText, ruleRemoteText, ponytailLocalText] = await Promise.all([
-        settle(execP(rtkBin, ['--version'], { timeout: 5000 }).then((r) => normalizeRtkVersion(r.stdout.trim() || r.stderr.trim()) || null), 6000),
-        settle(fetchJson(RTK_RELEASE_API).then((r) => normalizeRtkVersion(r.tag_name) || null), 4000),
-        readTextIfExists(ruleDest),
-        settle(httpsGet(CAVEMAN_REMOTE_RULE), 4000),
+        settle(rtkBin ? execP(rtkBin, ['--version'], { timeout: 5000 }).then((r) => normalizeRtkVersion(r.stdout.trim() || r.stderr.trim()) || null) : Promise.resolve(null), 6000),
+        settle(httpsGet(RTK_RELEASE_API, { signal: controller.signal }).then((text) => normalizeRtkVersion(JSON.parse(text).tag_name) || null), 1500),
+        readTextIfExists(tersioRule),
+        settle(httpsGet(CAVEMAN_REMOTE_RULE, { signal: controller.signal }).then((text) => sha256Hex(text).slice(0, 8)), 1500),
         readTextIfExists(ponytailPkg),
     ]);
-    const shortHash = (text) => text === null ? null : sha256Hex(text).slice(0, 8);
+    controller.abort();
     return {
         cli: cliLatest,
         rtk: [rtkLocal, rtkRelease],
-        rule: [shortHash(ruleLocalText), shortHash(ruleRemoteText)],
+        rule: [ruleLocalText ? sha256Hex(ruleLocalText).slice(0, 8) : null, ruleRemoteText],
         ponytail: ponytailLocalText ? parseJsonObject(ponytailLocalText)?.version ?? null : null,
     };
 }

package/cli/usage.js

@@ -1,4 +1,6 @@
-import { co2GramsFor, displayModelId, energyWhFor, importSessionTokens, ledgerPath, priceFor, readResetWatermark, readUsage, refreshPricesIfStale, sessionsDir, usdCost, } from '../extensions/shared/usage-ledger.js';
+// cli/usage.ts — ledger + session-token usage report, tokscale-style.
+import { co2GramsFor, displayModelId, energyWhFor, importSessionTokens, ledgerPath, priceFor, readResetWatermark, readRtkAdoption, readRtkRecallDiagnostics, readUsage, refreshPricesIfStale, sessionsDir, usdCost, } from '../extensions/shared/usage-ledger.js';
+import { resolveRtkBinary } from '../extensions/lib/utils.js';
 import { readRtkGain } from '../extensions/shared/rtk-gain.js';
 import { readUsageDb, syncUsageDb, usageDbPath } from '../extensions/shared/usage-store.js';
 import { withInteractiveSpinner } from './interactive.js';
@@ -74,6 +76,8 @@ export function summarizeUsage(rows) {
             est: usdCost({ input: r.i, output: r.o, cacheRead: r.cr ?? 0, cacheWrite: r.cw ?? 0 }, r.m).usd,
         })),
         rtkGain: readRtkGain(RTK_COMMAND_ROWS, watermark || undefined),
+        rtkAdoption: readRtkAdoption(),
+        rtkRecall: readRtkRecallDiagnostics(resolveRtkBinary()),
         usd,
         priced,
         savedUsd,
@@ -134,6 +138,7 @@ function printReport(report) {
     const t = report.tokens;
     console.log(`  TOKENS  ${fmt(t.input)} in · ${fmt(t.output)} out · ${fmt(t.cacheRead)} cache read · ${fmt(t.cacheWrite)} cache write`);
     console.log(`  COST    ${formatCurrency(report.usd, report.currency)}${report.priced ? '' : ' (includes default pricing)'} · ~${formatCurrency(report.savedUsd, report.currency)} cache-saved (est.) · ~${report.co2g.toFixed(1)}g CO2 (est.)`);
+    console.log(`  RTK      ${fmt(report.rtkAdoption.rtkCalls)}/${fmt(report.rtkAdoption.eligibleCalls)} eligible OMP Bash calls use RTK (${report.rtkAdoption.adoptionPct.toFixed(1)}%) · ${fmt(report.rtkAdoption.missedCalls)} missed · recall ${report.rtkRecall.available ? `${report.rtkRecall.mode} (${report.rtkRecall.entries})` : 'unavailable'}`);
     const models = Object.entries(report.byModel).filter(([, b]) => b.input + b.output + b.cacheRead + b.cacheWrite > 0).sort((a, b) => (b[1].input + b[1].output) - (a[1].input + a[1].output)).slice(0, 8);
     if (models.length) {
         console.log('  BY MODEL');