@krtclcdy/tersio 2.0.1 → 2.2.0

package/README.md

@@ -11,6 +11,12 @@ Terse replies, compact shell output, and minimal code decisions for [Oh My Pi (O
 
 ## Install
 
+Quick install (macOS/Linux/WSL — checks npm, then bootstraps the CLI):
+
+```bash
+curl -fsSL https://raw.githubusercontent.com/KurutoDenzeru/tersio/main/install.sh | sh
+```
+
 OMP plugin (recommended — updates and feature flags handled by OMP):
 
 ```bash
@@ -79,7 +85,7 @@ Break-even math, balanced preset (caveman full + rtk + ponytail): `⌈overhead
 | Command | Purpose |
 |---|---|
 | `tersio install` | Install (user scope by default; `--scope project\|both` for more) |
-| `tersio update` | Refresh from the latest release |
+| `tersio update` | Refresh the CLI, extensions, and add-ons (RTK binary, Caveman rule, Ponytail) |
 | `tersio reinstall` | Fresh install, preserving the Ponytail package |
 | `tersio doctor` | Check OMP, extension, Ponytail, and RTK health |
 | `tersio uninstall` | Remove extensions, registration, and the Ponytail plugin (`--keep-ponytail` keeps Ponytail; `--remove-rtk` also removes the RTK binary) |

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@krtclcdy/tersio",
-  "version": "2.0.1",
+  "version": "2.2.0",
   "description": "✂️ Token-saving OMP add-ons: terse Caveman replies, compact RTK shell output, lean Ponytail code calls — one-command combo presets.",
   "keywords": [
     "omp",

package/tersio.js

@@ -84,7 +84,7 @@ function printHelp() {
 
 Commands:
   install      Install the add-ons (user scope by default)
-  update       Run the latest published installer
+  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
   uninstall    Remove the managed extensions
@@ -661,17 +661,8 @@ async function stepCombo(extDir, options) {
     await ensureExtensionInConfig(configPath, dest, 'combo', options);
 }
 // --- Doctor ---
-function presence(label, text) {
-    console.log(`  ${label}: ${text !== null ? 'installed' : 'MISSING'}`);
-}
-function locationLine(label, ok, loc) {
-    console.log(`  ${label}: ${ok ? 'ok' : 'MISSING'} ${loc}`);
-}
 async function runDoctor() {
-    console.log('\n=== Tersio Doctor ===\n');
-    // Node
-    console.log(`  Node: ok ${process.version}`);
-    // OMP CLI version joins FS probes below; logs keep fixed order.
+    console.log('\n=== Tersio Doctor ===');
     // Directories
     const agentDir = OMP_AGENT_DIR;
     const extDir = path.join(agentDir, 'extensions');
@@ -689,7 +680,7 @@ async function runDoctor() {
     const modeReinforcement = path.join(extDir, 'shared', 'mode-reinforcement.js');
     const selfPkg = path.join(pluginsDir, 'node_modules', PACKAGE_NAME, 'package.json');
     // Independent probes run concurrently; logs below keep fixed order.
-    const [ompVersion, agentEntries, extEntries, sharedStateText, configText, ponytailPkgText, ponytailExtText, pluginsPkgRaw, selfPkgText, rtkBinText, cavemanIndexText, cavemanRuleText, rtkIndexText, updaterIndexText, comboIndexText, modeReinforcementText,] = await Promise.all([
+    const [ompVersion, agentEntries, extEntries, sharedStateText, configText, ponytailPkgText, ponytailExtText, pluginsPkgRaw, selfPkgText, rtkBinText, cavemanIndexText, cavemanRuleText, rtkIndexText, updaterIndexText, comboIndexText, modeReinforcementText, ruleMtime, rtkMtime, ponytailMtime, updateVersion,] = await Promise.all([
         execP(OMP_BIN, ['--version']).then((r) => r.stdout.trim(), () => null),
         fs.readdir(agentDir).catch(() => null),
         fs.readdir(extDir).catch(() => null),
@@ -706,49 +697,79 @@ async function runDoctor() {
         readTextIfExists(updaterIndex),
         readTextIfExists(comboIndex),
         readTextIfExists(modeReinforcement),
+        fs.stat(cavemanRule).catch(() => null),
+        fs.stat(rtkBin).catch(() => null),
+        fs.stat(ponytailPkg).catch(() => null),
+        checkForUpdate(),
     ]);
-    console.log(ompVersion !== null ? `  OMP CLI: ok ${ompVersion}` : '  OMP CLI: MISSING');
-    console.log(`  Home: ${HOME}`);
-    locationLine('OMP agent dir', agentEntries !== null, agentDir);
-    locationLine('OMP extensions dir', extEntries !== null, extDir);
-    console.log(`  Shared session bridge: ${sharedStateText !== null ? 'installed' : 'MISSING'}`);
-    locationLine('OMP config.yml', configText !== null, configPath);
-    presence('Ponytail package', ponytailPkgText);
-    presence('Ponytail extension', ponytailExtText);
-    if (configText) {
-        const hasPonytailPath = configText.includes('ponytail') && configText.includes('pi-extension');
-        console.log(`  Ponytail in config.yml: ${hasPonytailPath ? 'registered' : 'MISSING'}`);
-    }
-    // Self plugin registration (Settings → Plugins listing)
-    const selfDep = PACKAGE_NAME in (parseJsonObject(pluginsPkgRaw)?.dependencies || {});
-    console.log(`  Self plugin in plugins/package.json: ${selfDep ? 'registered' : 'MISSING'}`);
-    console.log(`  Self plugin package: ${selfPkgText !== null ? 'installed' : 'MISSING'}`);
-    // RTK
-    const rtkExists = rtkBinText !== null;
-    console.log(`  RTK binary: ${rtkExists ? 'installed' : 'MISSING'} ${rtkBin}`);
-    if (rtkExists) {
-        try {
-            const v = (await execP(rtkBin, ['--version'], { timeout: 5000 })).stdout.trim();
-            console.log(`  RTK version: ${v}`);
+    // Categorized output with a tally; section headers group related probes.
+    const tally = { ok: 0, missing: 0, warn: 0 };
+    function check(label, ok, detail = '') {
+        if (ok) {
+            tally.ok++;
+            console.log(`  ${label}: ok${detail ? ` ${detail}` : ''}`);
         }
-        catch {
-            console.log('  RTK version: unavailable (may not be executable)');
+        else {
+            tally.missing++;
+            console.log(`  ${label}: MISSING${detail ? ` ${detail}` : ''}`);
         }
     }
-    // Caveman
-    presence('Caveman extension', cavemanIndexText);
-    presence('Caveman rule.md', cavemanRuleText);
-    // RTK extension
-    presence('RTK extension', rtkIndexText);
-    // Updater
-    presence('Updater extension', updaterIndexText);
-    // Combo
-    presence('Combo extension', comboIndexText);
-    presence('Mode reinforcement extension', modeReinforcementText);
+    function warnLine(label, detail) {
+        tally.warn++;
+        console.log(`  ${label}: warn ${detail}`);
+    }
+    section('Environment');
+    check('Node', true, process.version);
+    check('OMP CLI', ompVersion !== null, ompVersion ?? '');
+    if (updateVersion)
+        warnLine('Tersio CLI', `${updateVersion} available — run tersio update`);
+    else
+        check('Tersio CLI', true, PACKAGE_VERSION);
+    console.log(`  Home: ${HOME}`);
+    section('Installation');
+    check('OMP agent dir', agentEntries !== null, agentDir);
+    check('OMP extensions dir', extEntries !== null, extDir);
+    check('OMP config.yml', configText !== null, configPath);
+    check('Shared session bridge', sharedStateText !== null);
+    section('Extensions');
+    check('Caveman extension', cavemanIndexText !== null);
+    check('RTK extension', rtkIndexText !== null);
+    check('Updater extension', updaterIndexText !== null);
+    check('Combo extension', comboIndexText !== null);
+    check('Mode reinforcement extension', modeReinforcementText !== null);
+    section('Plugins');
+    check('Ponytail package', ponytailPkgText !== null);
+    check('Ponytail extension', ponytailExtText !== null);
     if (configText) {
-        const hasComboPath = configText.includes('combo-toggle');
-        console.log(`  Combo in config.yml: ${hasComboPath ? 'registered' : 'MISSING'}`);
+        check('Ponytail in config.yml', configText.includes('ponytail') && configText.includes('pi-extension'));
+        check('Combo in config.yml', configText.includes('combo-toggle'));
     }
+    check('Self plugin package', selfPkgText !== null, parseJsonObject(selfPkgText)?.version ?? '');
+    const selfDep = PACKAGE_NAME in (parseJsonObject(pluginsPkgRaw)?.dependencies || {});
+    check('Self plugin in plugins/package.json', selfDep);
+    section('Add-ons');
+    const ruleAge = ruleMtime ? `updated ${relTime(Date.now() - ruleMtime.mtimeMs)}` : '';
+    check('Caveman rule', cavemanRuleText !== null, ruleAge);
+    const rtkVersion = rtkBinText === null ? null : await execP(rtkBin, ['--version'], { timeout: 5000 }).then((r) => r.stdout.trim() || r.stderr.trim() || null, (e) => {
+        const err = e;
+        return err.stdout?.trim() || err.stderr?.trim() || null;
+    });
+    const rtkAge = rtkMtime ? `updated ${relTime(Date.now() - rtkMtime.mtimeMs)}` : '';
+    if (rtkBinText === null)
+        check('RTK binary', false, rtkBin);
+    else {
+        const bits = [rtkVersion, rtkAge].filter(Boolean).join(', ');
+        check('RTK binary', true, bits);
+        if (!rtkVersion)
+            warnLine('RTK version', 'unavailable — binary may not be executable');
+    }
+    const ponytailAge = ponytailMtime ? `updated ${relTime(Date.now() - ponytailMtime.mtimeMs)}` : '';
+    check('Ponytail', ponytailPkgText !== null, [parseJsonObject(ponytailPkgText)?.version ?? '', ponytailAge].filter(Boolean).join(', '));
+    const total = tally.ok + tally.missing + tally.warn;
+    console.log(`\n  Summary: ${total} checks — ${tally.ok} ok, ${tally.warn} warn, ${tally.missing} missing`);
+}
+function section(name) {
+    console.log(`\n${name}`);
 }
 // Read-modify-write a JSON file. mutate returns true when it changed
 // something; no change (or unreadable file) means no output at all.
@@ -897,6 +918,67 @@ async function runUninstall(options = {}) {
     return true;
 }
 const SCOPE_MAP = { user: '1', project: '2', both: '3' };
+const COMBO_MENU = { '1': 'off', '2': 'medium', '3': 'balanced', '4': 'max' };
+// --- Update check (cached; used by the bare-invocation banner and doctor) ---
+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);
+    const pb = b.replace(/^v/, '').split('.').map((n) => parseInt(n, 10) || 0);
+    for (let i = 0; i < 3; i++) {
+        if ((pa[i] || 0) !== (pb[i] || 0))
+            return (pa[i] || 0) > (pb[i] || 0);
+    }
+    return false;
+}
+async function latestPublishedVersion() {
+    try {
+        const args = IS_WINDOWS
+            ? ['/d', '/s', '/c', 'npm', 'view', PACKAGE_NAME, 'version', '--prefer-online']
+            : ['view', PACKAGE_NAME, 'version', '--prefer-online'];
+        const r = await execP(IS_WINDOWS ? process.env.ComSpec || 'cmd.exe' : 'npm', args, {
+            timeout: 4000,
+            maxBuffer: 1024 * 1024,
+            windowsHide: true,
+            shell: false,
+        });
+        return r.stdout.trim() || null;
+    }
+    catch {
+        return null;
+    }
+}
+// Returns a newer published version, or null. Reads the registry at most once
+// per TTL (cached under OMP_PLUGINS_DIR) and stays silent on failure.
+async function checkForUpdate() {
+    const cachePath = path.join(OMP_PLUGINS_DIR, '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 (cacheFresh && cached?.latest)
+        return newerThan(cached.latest, PACKAGE_VERSION) ? cached.latest : null;
+    const latest = await latestPublishedVersion();
+    if (latest) {
+        await fs.mkdir(OMP_PLUGINS_DIR, { recursive: true }).catch(() => { });
+        await fs.writeFile(cachePath, JSON.stringify({ latest, lastCheck: Date.now() }) + '\n', 'utf8').catch(() => { });
+        return newerThan(latest, PACKAGE_VERSION) ? latest : null;
+    }
+    // Registry unreachable: fall back to a stale cache rather than staying silent.
+    return cached?.latest && newerThan(cached.latest, PACKAGE_VERSION) ? cached.latest : null;
+}
+function relTime(ageMs) {
+    const mins = Math.floor(ageMs / 60000);
+    if (mins < 1)
+        return 'just now';
+    if (mins < 60)
+        return `${mins} min${mins === 1 ? '' : 's'} ago`;
+    const hours = Math.floor(mins / 60);
+    if (hours < 24)
+        return `${hours} hour${hours === 1 ? '' : 's'} ago`;
+    const days = Math.floor(hours / 24);
+    if (days < 14)
+        return `${days} day${days === 1 ? '' : 's'} ago`;
+    const weeks = Math.floor(days / 7);
+    return `${weeks} week${weeks === 1 ? '' : 's'} ago`;
+}
 async function runLatestUpdate() {
     const updateScope = scopeFlag || 'user';
     if (!Object.hasOwn(SCOPE_MAP, updateScope)) {
@@ -923,6 +1005,31 @@ async function runLatestUpdate() {
     const npmCommandArgs = IS_WINDOWS ? ['/d', '/s', '/c', 'npm', ...npmArgs] : npmArgs;
     console.log('=== Updating Tersio ===');
     console.log(`  Running the latest ${PACKAGE_NAME} installer...\n`);
+    // The npx delegation below only refreshes the OMP-side files; the globally
+    // installed CLI keeps its old version until npm -g runs. Refresh both.
+    if (dryRun) {
+        console.log(`  [dry-run] would run: npm install -g ${PACKAGE_NAME}@latest --no-audit --no-fund`);
+    }
+    else {
+        try {
+            const globalArgs = IS_WINDOWS ? ['/d', '/s', '/c', 'npm', 'install', '-g', `${PACKAGE_NAME}@latest`, '--no-audit', '--no-fund'] : ['install', '-g', `${PACKAGE_NAME}@latest`, '--no-audit', '--no-fund'];
+            const globalResult = await execP(npmCommand, globalArgs, {
+                timeout: 300000,
+                maxBuffer: 10 * 1024 * 1024,
+                windowsHide: true,
+                shell: false,
+            });
+            if (globalResult.stdout)
+                process.stdout.write(globalResult.stdout);
+            if (globalResult.stderr)
+                process.stderr.write(globalResult.stderr);
+            console.log(`  [ok] CLI updated to ${PACKAGE_NAME}@latest`);
+        }
+        catch (e) {
+            console.log(`  [warn] Global CLI update skipped: ${e.message}`);
+            console.log(`  [hint] Manual: npm install -g ${PACKAGE_NAME}@latest`);
+        }
+    }
     try {
         const result = await execP(npmCommand, npmCommandArgs, {
             timeout: 300000,
@@ -992,12 +1099,27 @@ async function resolveScope() {
 async function resolveProfile() {
     const profile = defaultProfile();
     // Single interactive prompt: the Combo preset implies all three modes.
+    // Numbered menu, same pattern as the scope prompt — no typing preset names.
     // Only for a real user at a terminal, only when no default flags were
     // given, and never for --apply-update runs.
     if (tty() && !profileFlagsGiven && !applyUpdate && (install || reinstall)) {
-        const comboAnswer = (await ask('  Default Combo preset on session start? [off/medium/balanced/max] (off): ')).trim().toLowerCase();
-        if (comboAnswer && COMBO_DEFAULTS.has(comboAnswer))
-            profile.comboDefault = comboAnswer;
+        console.log('  Session-start defaults — Combo preset:');
+        console.log('    1) off');
+        console.log('    2) medium   (caveman=lite, rtk=on, ponytail=lite)');
+        console.log('    3) balanced (caveman=full, rtk=on, ponytail=full)');
+        console.log('    4) max      (caveman=ultra, rtk=on, ponytail=ultra)');
+        for (;;) {
+            const answer = (await ask('  Choose [1-4] (default 1): ')).trim();
+            if (!answer) {
+                profile.comboDefault = 'off';
+                break;
+            }
+            if (COMBO_MENU[answer]) {
+                profile.comboDefault = COMBO_MENU[answer];
+                break;
+            }
+            console.log(`  [fail] Invalid choice: ${answer}. Choose 1, 2, 3, or 4.`);
+        }
     }
     // Explicit flags always win over the Combo preset.
     if (comboDefaultFlag !== undefined)
@@ -1113,13 +1235,23 @@ async function main() {
     console.log(`  Platform: ${process.platform}`);
     console.log(`  Arch: ${process.arch}`);
     console.log(`  Home: ${HOME}`);
+    // Remind humans a newer release exists; silent for scripts (no TTY) and for
+    // the apply-update payload, which is itself an update run.
+    if (tty() && !applyUpdate && command !== 'uninstall') {
+        const newer = await checkForUpdate();
+        if (newer)
+            console.log(`\n  [update] tersio ${newer} available (installed ${PACKAGE_VERSION}) — run \`tersio update\``);
+    }
     const scope = await resolveScope();
     // Resolve session defaults: flags > interactive prompt > defaults.
     const profile = await resolveProfile();
     const userDir = OMP_AGENT_DIR;
     const userExtDir = path.join(userDir, 'extensions');
     const projectExtDir = path.join(process.cwd(), '.omp', 'extensions');
-    const options = { dryRun, verbose, yes, scope, reinstall };
+    // apply-update is `tersio update`'s payload run: treat it like reinstall so
+    // the add-ons refresh too — Ponytail package via npm, self plugin, RTK
+    // binary (always re-downloaded), and the Caveman rule (always re-fetched).
+    const options = { dryRun, verbose, yes, scope, reinstall: reinstall || applyUpdate };
     // Check prerequisites
     console.log('\nPrerequisites:');
     try {