@krtclcdy/tersio 2.20.1 → 2.22.0

package/cli/settings.js

@@ -4,11 +4,12 @@
 // override flags and --currency). Interactive: clack selects seeded from the
 // stored profile.
 import path from 'node:path';
-import { CAVEMAN_DEFAULTS, COMBO_DEFAULTS, COMBO_PRESET_MODES, OMP_PLUGINS_DIR, PACKAGE_NAME, PONYTAIL_DEFAULTS, cavemanDefaultFlag, comboDefaultFlag, currency, currencyGiven, dryRun, ponytailDefaultFlag, profileFlagsGiven, rtkDefaultFlag, } from './common.js';
+import { CAVEMAN_DEFAULTS, COMBO_DEFAULTS, COMBO_PRESET_MODES, OMP_PLUGINS_DIR, PACKAGE_NAME, PONYTAIL_DEFAULTS, cavemanDefaultFlag, comboDefaultFlag, currency, currencyGiven, diagScheduleFlag, dryRun, ponytailDefaultFlag, profileFlagsGiven, rtkDefaultFlag, settingArg, } from './common.js';
 import { CURRENCY_CODES } from './currency.js';
 import { textTable } from './usage.js';
 import { askInteractiveChoice, closeRL, tty } from './interactive.js';
 import { formatProfile, storedProfile, writePluginSettings } from './profile.js';
+import { readDiagSchedule, setDiagSchedule } from './dashboard.js';
 function applyFlags(base) {
     const next = { ...base };
     if (comboDefaultFlag !== undefined)
@@ -71,6 +72,94 @@ async function askProfile(current) {
     next.currency = cur.value;
     return next;
 }
+async function askDiagSchedule(current) {
+    const picked = await askInteractiveChoice('Diagnosis auto-check', [
+        { value: 'manual', label: 'manual', hint: 'check on open' },
+        { value: 'daily', label: 'daily' },
+        { value: 'weekly', label: 'weekly' },
+        { value: 'monthly', label: 'monthly' },
+    ], current);
+    if (picked.status !== 'selected')
+        return null;
+    return picked.value;
+}
+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]');
+}
+// Single-setting jump: `tersio settings diagnosis` prompts only that value
+// instead of walking the whole chain. Returns false when aborted.
+async function runSingleSetting(name, current, nextDiag) {
+    const next = { ...current };
+    let diag = nextDiag;
+    switch (name) {
+        case 'combo': {
+            const combo = await askInteractiveChoice('Session-start defaults — Combo preset', [
+                { value: 'off', label: 'off' },
+                { value: 'medium', label: 'medium', hint: 'caveman=lite, rtk=on, ponytail=lite' },
+                { value: 'balanced', label: 'balanced', hint: 'caveman=full, rtk=on, ponytail=full' },
+                { value: 'max', label: 'max', hint: 'caveman=ultra, rtk=on, ponytail=ultra' },
+            ], current.comboDefault);
+            if (combo.status !== 'selected')
+                return null;
+            const preset = COMBO_PRESET_MODES[combo.value] ?? COMBO_PRESET_MODES.off;
+            next.comboDefault = combo.value;
+            next.cavemanDefault = preset.caveman;
+            next.rtkDefault = preset.rtk;
+            next.ponytailDefault = preset.ponytail;
+            break;
+        }
+        case 'caveman': {
+            const picked = await askInteractiveChoice('Caveman default', [...CAVEMAN_DEFAULTS].map((v) => ({
+                value: v, label: v,
+            })), next.cavemanDefault);
+            if (picked.status !== 'selected')
+                return null;
+            next.cavemanDefault = picked.value;
+            break;
+        }
+        case 'rtk': {
+            const picked = await askInteractiveChoice('RTK default', [
+                { value: 'on', label: 'on' },
+                { value: 'off', label: 'off' },
+            ], next.rtkDefault ? 'on' : 'off');
+            if (picked.status !== 'selected')
+                return null;
+            next.rtkDefault = picked.value === 'on';
+            break;
+        }
+        case 'ponytail': {
+            const picked = await askInteractiveChoice('Ponytail default', [...PONYTAIL_DEFAULTS].map((v) => ({
+                value: v, label: v,
+            })), next.ponytailDefault);
+            if (picked.status !== 'selected')
+                return null;
+            next.ponytailDefault = picked.value;
+            break;
+        }
+        case 'currency': {
+            const picked = await askInteractiveChoice('Display currency (usage/gain reports)', CURRENCY_CODES.map((v) => ({
+                value: v, label: v,
+            })), next.currency);
+            if (picked.status !== 'selected')
+                return null;
+            next.currency = picked.value;
+            break;
+        }
+        case 'diagnosis': {
+            const picked = await askDiagSchedule(diag);
+            if (picked === null)
+                return null;
+            diag = picked;
+            break;
+        }
+        default: {
+            console.error(`[fail] Invalid setting: ${name}. Valid: ${SETTING_NAMES.join(', ')}`);
+            process.exit(1);
+        }
+    }
+    return { profile: next, diag };
+}
 function printSettingsTable(current) {
     console.log('\n=== Tersio Settings ===');
     // Currency lives here no longer: the gain dashboard owns displaying and
@@ -81,6 +170,7 @@ function printSettingsTable(current) {
         ['caveman', current.cavemanDefault, [...CAVEMAN_DEFAULTS].join(' | ')],
         ['rtk', current.rtkDefault ? 'on' : 'off', 'on | off'],
         ['ponytail', current.ponytailDefault, [...PONYTAIL_DEFAULTS].join(' | ')],
+        ['diagnosis', readDiagSchedule(), 'manual | daily | weekly | monthly'],
     ];
     for (const l of textTable(['Setting', 'Current', 'Valid values'], rows, [false, false, false], 64)) {
         console.log(l);
@@ -91,7 +181,32 @@ async function runSettings() {
     const current = await storedProfile();
     printSettingsTable(current);
     let next;
-    if (profileFlagsGiven || currencyGiven) {
+    let nextDiag = readDiagSchedule();
+    if (diagScheduleFlag !== undefined)
+        nextDiag = diagScheduleFlag;
+    if (settingArg !== null) {
+        if (!SETTING_NAMES.includes(settingArg)) {
+            console.error(`[fail] Invalid setting: ${settingArg}. Valid: ${SETTING_NAMES.join(', ')}`);
+            closeRL();
+            process.exit(1);
+            return;
+        }
+        if (!tty()) {
+            console.log('\n  Single-setting jump needs a terminal.');
+            settingsUsage();
+            closeRL();
+            return;
+        }
+        const single = await runSingleSetting(settingArg, current, nextDiag);
+        if (single === null) {
+            closeRL();
+            process.exit(130);
+            return;
+        }
+        next = single.profile;
+        nextDiag = single.diag;
+    }
+    else if (profileFlagsGiven || currencyGiven || diagScheduleFlag !== undefined) {
         next = applyFlags(current);
     }
     else if (tty()) {
@@ -101,20 +216,28 @@ async function runSettings() {
             process.exit(130);
             return;
         }
+        const picked = await askDiagSchedule(nextDiag);
+        if (picked === null) {
+            closeRL();
+            process.exit(130);
+            return;
+        }
+        nextDiag = picked;
     }
     else {
         console.log('\n  No flags given and no TTY — nothing to change.');
-        console.log('  Usage: tersio settings [--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] [--dry-run]');
+        settingsUsage();
         closeRL();
         return;
     }
     if (dryRun) {
-        console.log(`\n  [dry-run] would set defaults: ${formatProfile(next)}`);
+        console.log(`\n  [dry-run] would set defaults: ${formatProfile(next)} · diagnosis=${nextDiag}`);
         closeRL();
         return;
     }
     await writePluginSettings(next, {});
-    console.log(`  Defaults: ${formatProfile(next)}`);
+    setDiagSchedule(nextDiag);
+    console.log(`  Defaults: ${formatProfile(next)} · diagnosis=${nextDiag}`);
     console.log('  Applies to fresh sessions only — anything persisted with /combo, /caveman, or /rtk wins.');
     console.log('  Currency applies to usage/gain reports; --currency overrides it per run.');
     closeRL();

package/cli/uninstall.js

@@ -56,8 +56,8 @@ async function removeUninstallTarget(target, shouldDryRun, recursive = true) {
 async function runUninstall(options = {}) {
     const shouldDryRun = options.dryRun ?? dryRun;
     const confirmed = (options.yes ?? yes) || shouldDryRun;
-    // Ponytail ships with Tersio's presets, so a full uninstall removes it too;
-    // --keep-ponytail opts out and reinstall always preserves it.
+    // Ponytail is bundled with Tersio's presets, so a full uninstall removes
+    // its copy too; --keep-ponytail opts out and reinstall always preserves it.
     const shouldRemovePonytail = options.removePonytail ?? (removePonytail || !keepPonytail);
     const shouldRemoveRtk = options.removeRtk ?? removeRtk;
     console.log('\n=== Tersio Uninstall ===\n');
@@ -135,8 +135,8 @@ async function runUninstall(options = {}) {
                 await writeConfigLines(configPath, lines, `  [write] Updated config.yml (removed ${before - lines.length} entries)`);
         }
     }
-    // Remove the Ponytail plugin package the installer added (dep, files,
-    // lock entry); the config.yml entry was filtered above.
+    // Remove the bundled Ponytail copy (dep entry exists only on
+    // pre-bundle installs); the config.yml entry was filtered above.
     if (shouldRemovePonytail) {
         const pluginsPkgPath = path.join(pluginsDir, 'package.json');
         await updateJsonFile(pluginsPkgPath, (data) => dropKey(data.dependencies, '@dietrichgebert/ponytail'), `would remove @dietrichgebert/ponytail from ${pluginsPkgPath}`, 'Removed @dietrichgebert/ponytail from plugins/package.json', shouldDryRun);

package/cli/update.js

@@ -4,7 +4,7 @@ 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 { execNetwork } from './interactive.js';
-import { readTextIfExists } from '../extensions/lib/utils.js';
+import { readTextIfExists, 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';
 const UPDATE_CHECK_TTL_MS = 6 * 60 * 60 * 1000;
@@ -39,7 +39,7 @@ async function latestPublishedVersion() {
 // (cached under OMP_PLUGINS_DIR) unless force skips the cache — an explicit
 // "check for updates" must never trust a stale cache.
 async function checkForUpdate(force = false) {
-    const cachePath = path.join(OMP_PLUGINS_DIR, 'tersio-update-check.json');
+    const cachePath = tersioDataPath('update-check.json', 'tersio-update-check.json');
     const cached = parseJsonObject(await readTextIfExists(cachePath));
     const cacheFresh = typeof cached?.lastCheck === 'number' && Date.now() - cached.lastCheck < UPDATE_CHECK_TTL_MS;
     if (!force && cacheFresh && cached?.latest)
@@ -68,20 +68,6 @@ async function settle(work, ms) {
         clearTimeout(timer);
     }
 }
-// Plain `npm view <spec> version` with no spinner, for background probes.
-async function npmViewVersion(spec, timeoutMs) {
-    try {
-        const exe = IS_WINDOWS ? process.env.ComSpec || 'cmd.exe' : 'npm';
-        const args = IS_WINDOWS
-            ? ['/d', '/s', '/c', 'npm', 'view', spec, 'version', '--prefer-online']
-            : ['view', spec, 'version', '--prefer-online'];
-        const r = await execP(exe, args, { timeout: timeoutMs, maxBuffer: 1024 * 1024, windowsHide: true, shell: false });
-        return r.stdout.trim() || null;
-    }
-    catch {
-        return null;
-    }
-}
 // Run a child with inherited stdio for live output. Used when the child
 // renders its own interactive UI (the delegated installer runs Clack
 // spinners), which a concurrent outer spinner would corrupt into stray bars.
@@ -100,20 +86,19 @@ async function probeUpdatePlan(cliLatest) {
     const rtkBin = path.join(BUN_BIN_DIR, RTK_BINARY_NAME);
     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 [rtkLocal, rtkRelease, ruleLocalText, ruleRemoteText, ponytailLocalText, ponytailLatest] = await Promise.all([
+    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),
         readTextIfExists(ponytailPkg),
-        settle(npmViewVersion('@dietrichgebert/ponytail', 4000), 5000),
     ]);
     const shortHash = (text) => text === null ? null : sha256Hex(text).slice(0, 8);
     return {
         cli: cliLatest,
         rtk: [rtkLocal, rtkRelease],
         rule: [shortHash(ruleLocalText), shortHash(ruleRemoteText)],
-        ponytail: [ponytailLocalText ? parseJsonObject(ponytailLocalText)?.version ?? null : null, ponytailLatest],
+        ponytail: ponytailLocalText ? parseJsonObject(ponytailLocalText)?.version ?? null : null,
     };
 }
 // Every add-on prints its status: version jump when stale, "up to date"
@@ -136,7 +121,12 @@ function planLines(plan) {
     push('Tersio', PACKAGE_VERSION, plan.cli);
     push('RTK', plan.rtk[0], plan.rtk[1]);
     push('Caveman rule', plan.rule[0], plan.rule[1]);
-    push('Ponytail', plan.ponytail[0], plan.ponytail[1]);
+    if (plan.ponytail)
+        status.push(`Ponytail: ${plan.ponytail} (bundled with tersio)`);
+    else {
+        status.push('Ponytail: missing → bundled reinstall');
+        stale.push('Ponytail: missing → bundled reinstall');
+    }
     return { stale, status };
 }
 async function runLatestUpdate() {
@@ -166,6 +156,25 @@ async function runLatestUpdate() {
         return;
     }
     console.log(`Updating ${stale.join(', ')}`);
+    // Broken payloads (v2.20.0) crash on boot — smoke-check the target before touching anything installed.
+    const smokeArgs = IS_WINDOWS
+        ? ['/d', '/s', '/c', 'npm', 'exec', '--yes', '--prefer-online', `--package=${PACKAGE_NAME}${target}`, '--', PACKAGE_BIN, '--version']
+        : ['exec', '--yes', '--prefer-online', `--package=${PACKAGE_NAME}${target}`, '--', PACKAGE_BIN, '--version'];
+    try {
+        await execP(npmCommand, smokeArgs, {
+            timeout: 120000,
+            maxBuffer: 1024 * 1024,
+            windowsHide: true,
+            shell: false,
+        });
+    }
+    catch (e) {
+        console.error(`[fail] Update payload ${PACKAGE_NAME}${target} failed its smoke check — staying on ${PACKAGE_VERSION}.`);
+        console.error(`[fail] ${e.message.split('\n')[0]}`);
+        console.error(`[hint] Retry once released fixed; manual: npm install -g ${PACKAGE_NAME}@latest --no-audit --no-fund --prefer-online`);
+        process.exitCode = 1;
+        return;
+    }
     // The npx delegation below only refreshes the OMP-side files; the globally
     // installed CLI keeps its old version until npm -g runs. Refresh both.
     const globalArgs = IS_WINDOWS

package/cli/usage.js

@@ -132,7 +132,7 @@ function printReport(report) {
         return;
     }
     const t = report.tokens;
-    console.log(`  TOKENS  ${fmt(t.input)} in · ${fmt(t.output)} out · ${fmt(t.cacheRead)} cache read${t.cacheWrite > 0 ? ` · ${fmt(t.cacheWrite)} written` : ''}`);
+    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.)`);
     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) {