@krtclcdy/tersio 2.2.0 → 2.4.0

package/README.md

@@ -11,13 +11,13 @@ 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):
+**Default** (macOS/Linux/WSL) — one line. Installs the CLI via npm, then runs the main installer (scope + Combo preset menus) in the same pass:
 
 ```bash
-curl -fsSL https://raw.githubusercontent.com/KurutoDenzeru/tersio/main/install.sh | sh
+curl -fsSL https://github.com/KurutoDenzeru/tersio/releases/latest/download/install.sh | sh
 ```
 
-OMP plugin (recommended — updates and feature flags handled by OMP):
+Prefer OMP-managed updates and feature flags? Install as an OMP plugin instead:
 
 ```bash
 omp plugin install @krtclcdy/tersio
@@ -30,13 +30,6 @@ omp plugin install '@krtclcdy/tersio[caveman,ponytail]'
 omp plugin features @krtclcdy/tersio --disable rtk
 ```
 
-npm CLI (installs add-ons into your OMP home):
-
-```bash
-npm install -g @krtclcdy/tersio@latest
-tersio install
-```
-
 Then restart OMP and enable a preset:
 
 ```text
@@ -167,7 +160,7 @@ The installer writes `<file>.bak` before replacing an extension source; the upda
 ## Requirements
 
 - [OMP](https://github.com/can1357/oh-my-pi)
-- Node.js 18+ with npm
+- Node.js 20.12+ with npm
 
 Windows/WSL have separate OMP homes — install from the environment where OMP runs. Inside WSL, `command -v npm` must resolve to a Linux path, not `/mnt/c/`.
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@krtclcdy/tersio",
-  "version": "2.2.0",
+  "version": "2.4.0",
   "description": "✂️ Token-saving OMP add-ons: terse Caveman replies, compact RTK shell output, lean Ponytail code calls — one-command combo presets.",
   "keywords": [
     "omp",
@@ -119,11 +119,14 @@
     "test": "tsx --test test/*.test.ts test/*/*.test.ts"
   },
   "engines": {
-    "node": ">=18"
+    "node": ">=20.12.0"
   },
   "devDependencies": {
     "@types/node": "^26.4.1",
     "tsx": "^4.23.13",
     "typescript": "^7.0.2"
+  },
+  "dependencies": {
+    "@clack/prompts": "^1.8.0"
   }
 }

package/tersio.js

@@ -10,6 +10,7 @@ import readline from 'node:readline';
 import { fileURLToPath } from 'node:url';
 import { promisify } from 'node:util';
 import { createRequire } from 'node:module';
+import { cancel as clackCancel, confirm as clackConfirm, select as clackSelect, spinner as clackSpinner, tasks as clackTasks } from '@clack/prompts';
 import { CAVEMAN_REMOTE_RULE, RTK_RELEASE_API, fetchJson, findFile, httpsGet, httpsDownload, sha256File, parseChecksum, readTextIfExists, rtkPlatformSpec, } from './extensions/lib/utils.js';
 const IS_WINDOWS = process.platform === 'win32';
 const RTK_BINARY_NAME = IS_WINDOWS ? 'rtk.exe' : 'rtk';
@@ -112,7 +113,18 @@ function debug(...a) {
 const RL = readline.createInterface({ input: process.stdin, output: process.stdout });
 let rlOpen = true;
 function ask(q) {
-    return new Promise((resolve) => RL.question(q, resolve));
+    return new Promise((resolve) => {
+        if (!rlOpen) {
+            resolve('');
+            return;
+        }
+        try {
+            RL.question(q, resolve);
+        }
+        catch {
+            resolve('');
+        }
+    });
 }
 function closeRL() { if (rlOpen) {
     RL.close();
@@ -139,6 +151,9 @@ async function execP(cmd, args, opts = {}) {
         ...opts,
     });
 }
+async function execNetwork(label, cmd, args, opts = {}) {
+    return withInteractiveSpinner(label, () => execP(cmd, args, opts));
+}
 async function writeIfChanged(dest, content, options = {}) {
     const existing = await readTextIfExists(dest);
     if (existing === content) {
@@ -321,7 +336,7 @@ async function stepPonytail(pluginsDir, userDir, options) {
     else {
         // Try omp plugin install first
         try {
-            await execP(OMP_BIN, ['plugin', 'install', PONYTAIL_GITHUB_SPEC], { cwd: pluginsDir });
+            await execNetwork('Installing Ponytail plugin', OMP_BIN, ['plugin', 'install', PONYTAIL_GITHUB_SPEC], { cwd: pluginsDir });
             console.log('  [ok] omp plugin install ran');
         }
         catch (e) {
@@ -329,7 +344,7 @@ async function stepPonytail(pluginsDir, userDir, options) {
         }
         if (options.reinstall) {
             try {
-                await execP('npm', ['install', PONYTAIL_NPM_SPEC, '--save', '--no-audit', '--no-fund'], { cwd: pluginsDir, timeout: 120000 });
+                await execNetwork('Refreshing Ponytail package', 'npm', ['install', PONYTAIL_NPM_SPEC, '--save', '--no-audit', '--no-fund'], { cwd: pluginsDir, timeout: 120000 });
                 console.log('  [ok] Ponytail refreshed');
             }
             catch (e) {
@@ -343,12 +358,12 @@ async function stepPonytail(pluginsDir, userDir, options) {
         if (!ponytailExtExists) {
             console.log('  [info] pi-extension/index.js not found after omp plugin install — trying npm/bun install...');
             try {
-                await execP('npm', ['install'], { cwd: pluginsDir, timeout: 120000 });
+                await execNetwork('Installing Ponytail dependencies', 'npm', ['install'], { cwd: pluginsDir, timeout: 120000 });
                 console.log('  [ok] npm install completed');
             }
             catch {
                 try {
-                    await execP('bun', ['install'], { cwd: pluginsDir, timeout: 120000 });
+                    await execNetwork('Installing Ponytail dependencies', 'bun', ['install'], { cwd: pluginsDir, timeout: 120000 });
                     console.log('  [ok] bun install completed');
                 }
                 catch (e2) {
@@ -364,7 +379,7 @@ async function stepPonytail(pluginsDir, userDir, options) {
             try {
                 const dest = path.join(pluginsDir, 'node_modules', '@dietrichgebert', 'ponytail');
                 await fs.mkdir(path.dirname(dest), { recursive: true });
-                await execP('git', ['clone', '--depth', '1', 'https://github.com/DietrichGebert/ponytail.git', dest], { timeout: 180000 });
+                await execNetwork('Cloning Ponytail repository', 'git', ['clone', '--depth', '1', 'https://github.com/DietrichGebert/ponytail.git', dest], { timeout: 180000 });
                 console.log('  [ok] git clone completed');
                 ponytailExtExists = await probeExt();
             }
@@ -421,11 +436,11 @@ async function stepSelfPlugin(pluginsDir, options) {
     await fs.mkdir(pluginsDir, { recursive: true });
     await fs.writeFile(pkgPath, JSON.stringify(pkg, null, 2) + '\n', 'utf8');
     try {
-        await execP('npm', ['install', '--no-audit', '--no-fund'], { cwd: pluginsDir, timeout: 180000 });
+        await execNetwork('Installing Tersio plugin dependencies', 'npm', ['install', '--no-audit', '--no-fund'], { cwd: pluginsDir, timeout: 180000 });
     }
     catch {
         try {
-            await execP('bun', ['install'], { cwd: pluginsDir, timeout: 180000 });
+            await execNetwork('Installing Tersio plugin dependencies', 'bun', ['install'], { cwd: pluginsDir, timeout: 180000 });
         }
         catch (e) {
             console.log(`  [fail] Could not install ${PACKAGE_NAME} into plugins dir: ${e.message}`);
@@ -524,7 +539,7 @@ async function extractRtkArchive(archivePath, extractDir) {
 async function stepRtk(binDir, options) {
     console.log('\n[3/7] Installing RTK binary...');
     try {
-        const release = await fetchJson(RTK_RELEASE_API);
+        const release = await withInteractiveSpinner('Finding latest RTK release', () => fetchJson(RTK_RELEASE_API));
         const triple = resolveRtkTriple();
         if (!triple)
             return;
@@ -541,10 +556,14 @@ async function stepRtk(binDir, options) {
         const tmpDir = await fs.mkdtemp(path.join(os.tmpdir(), 'omp-rtk-'));
         try {
             const archivePath = path.join(tmpDir, asset.name);
-            const [checksumsText] = await Promise.all([
-                downloadRtkChecksums(release),
-                httpsDownload(asset.browser_download_url, archivePath),
-            ]);
+            const checksumsText = await withInteractiveSpinner('Downloading RTK binary', async (update) => {
+                const [downloadedChecksums] = await Promise.all([
+                    downloadRtkChecksums(release),
+                    httpsDownload(asset.browser_download_url, archivePath),
+                ]);
+                update('Verifying RTK checksum');
+                return downloadedChecksums;
+            });
             if (!await verifyRtkArchive(archivePath, asset.name, checksumsText))
                 return;
             const extractDir = path.join(tmpDir, 'extracted');
@@ -623,7 +642,7 @@ async function fetchCavemanRule(options) {
     if (options.dryRun)
         return (await readTextIfExists(path.join(path.dirname(CAVEMAN_INDEX), 'rule.md'))) || '';
     try {
-        return await httpsGet(CAVEMAN_REMOTE_RULE);
+        return await withInteractiveSpinner('Fetching Caveman rule', () => httpsGet(CAVEMAN_REMOTE_RULE));
     }
     catch (e) {
         console.log(`  [warn] Could not fetch caveman rule: ${e.message}`);
@@ -679,29 +698,61 @@ async function runDoctor() {
     const comboIndex = path.join(extDir, 'combo-toggle', 'index.js');
     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, 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),
-        readTextIfExists(path.join(extDir, 'shared', 'session-state.js')),
-        readTextIfExists(configPath),
-        readTextIfExists(ponytailPkg),
-        readTextIfExists(ponytailExt),
-        readTextIfExists(path.join(pluginsDir, 'package.json')),
-        readTextIfExists(selfPkg),
-        readTextIfExists(rtkBin),
-        readTextIfExists(cavemanIndex),
-        readTextIfExists(cavemanRule),
-        readTextIfExists(rtkIndex),
-        readTextIfExists(updaterIndex),
-        readTextIfExists(comboIndex),
-        readTextIfExists(modeReinforcement),
-        fs.stat(cavemanRule).catch(() => null),
-        fs.stat(rtkBin).catch(() => null),
-        fs.stat(ponytailPkg).catch(() => null),
-        checkForUpdate(),
-    ]);
+    // Independent probes start concurrently; sections report in fixed order as
+    // their data settles. Every probe resolves instead of rejecting.
+    const probes = {
+        ompVersion: execP(OMP_BIN, ['--version']).then((r) => r.stdout.trim(), () => null),
+        agentEntries: fs.readdir(agentDir).catch(() => null),
+        extEntries: fs.readdir(extDir).catch(() => null),
+        sharedStateText: readTextIfExists(path.join(extDir, 'shared', 'session-state.js')),
+        configText: readTextIfExists(configPath),
+        ponytailPkgText: readTextIfExists(ponytailPkg),
+        ponytailExtText: readTextIfExists(ponytailExt),
+        pluginsPkgRaw: readTextIfExists(path.join(pluginsDir, 'package.json')),
+        selfPkgText: readTextIfExists(selfPkg),
+        rtkBinText: readTextIfExists(rtkBin),
+        cavemanIndexText: readTextIfExists(cavemanIndex),
+        cavemanRuleText: readTextIfExists(cavemanRule),
+        rtkIndexText: readTextIfExists(rtkIndex),
+        updaterIndexText: readTextIfExists(updaterIndex),
+        comboIndexText: readTextIfExists(comboIndex),
+        modeReinforcementText: readTextIfExists(modeReinforcement),
+        ruleMtime: fs.stat(cavemanRule).catch(() => null),
+        rtkMtime: fs.stat(rtkBin).catch(() => null),
+        ponytailMtime: fs.stat(ponytailPkg).catch(() => null),
+        updateVersion: checkForUpdate(),
+    };
+    const rtkVersionProbe = probes.rtkBinText.then((text) => text === null ? null : 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 [ompVersion, agentEntries, extEntries, sharedStateText, configText, updateVersion] = await runInteractivePhase('Checking environment and installation', () => Promise.all([
+        probes.ompVersion,
+        probes.agentEntries,
+        probes.extEntries,
+        probes.sharedStateText,
+        probes.configText,
+        probes.updateVersion,
+    ]));
+    const [cavemanIndexText, rtkIndexText, updaterIndexText, comboIndexText, modeReinforcementText, ponytailPkgText, ponytailExtText, pluginsPkgRaw, selfPkgText] = await runInteractivePhase('Checking extensions and plugins', () => Promise.all([
+        probes.cavemanIndexText,
+        probes.rtkIndexText,
+        probes.updaterIndexText,
+        probes.comboIndexText,
+        probes.modeReinforcementText,
+        probes.ponytailPkgText,
+        probes.ponytailExtText,
+        probes.pluginsPkgRaw,
+        probes.selfPkgText,
+    ]));
+    const [cavemanRuleText, ruleMtime, rtkBinText, rtkMtime, rtkVersion, ponytailMtime] = await runInteractivePhase('Checking add-ons', () => Promise.all([
+        probes.cavemanRuleText,
+        probes.ruleMtime,
+        probes.rtkBinText,
+        probes.rtkMtime,
+        rtkVersionProbe,
+        probes.ponytailMtime,
+    ]));
     // Categorized output with a tally; section headers group related probes.
     const tally = { ok: 0, missing: 0, warn: 0 };
     function check(label, ok, detail = '') {
@@ -750,10 +801,6 @@ async function runDoctor() {
     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);
@@ -855,11 +902,27 @@ async function runUninstall(options = {}) {
         console.log(`  ${rtkBin}`);
     }
     if (!confirmed) {
-        const answer = await ask('\nProceed? [y/N]: ');
-        if (!answer.toLowerCase().startsWith('y')) {
-            console.log('Aborted.');
+        if (tty()) {
             closeRL();
-            return false;
+            const confirmedChoice = await clackConfirm({ message: 'Remove the listed Tersio files?', initialValue: false });
+            if (typeof confirmedChoice !== 'boolean') {
+                clackCancel('Aborted.');
+                closeRL();
+                return false;
+            }
+            if (!confirmedChoice) {
+                console.log('Aborted.');
+                closeRL();
+                return false;
+            }
+        }
+        else {
+            const answer = await ask('\nProceed? [y/N]: ');
+            if (!answer.toLowerCase().startsWith('y')) {
+                console.log('Aborted.');
+                closeRL();
+                return false;
+            }
         }
     }
     // Remove extension directories (independent paths, so concurrently).
@@ -918,7 +981,6 @@ 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) {
@@ -935,7 +997,7 @@ async function latestPublishedVersion() {
         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, {
+        const r = await execNetwork('Checking npm registry for tersio updates', IS_WINDOWS ? process.env.ComSpec || 'cmd.exe' : 'npm', args, {
             timeout: 4000,
             maxBuffer: 1024 * 1024,
             windowsHide: true,
@@ -1013,7 +1075,7 @@ async function runLatestUpdate() {
     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, {
+            const globalResult = await execNetwork('Updating global Tersio CLI', npmCommand, globalArgs, {
                 timeout: 300000,
                 maxBuffer: 10 * 1024 * 1024,
                 windowsHide: true,
@@ -1031,7 +1093,7 @@ async function runLatestUpdate() {
         }
     }
     try {
-        const result = await execP(npmCommand, npmCommandArgs, {
+        const result = await execNetwork('Running latest Tersio installer', npmCommand, npmCommandArgs, {
             timeout: 300000,
             maxBuffer: 10 * 1024 * 1024,
             windowsHide: true,
@@ -1049,7 +1111,6 @@ async function runLatestUpdate() {
             process.stdout.write(err.stdout);
         if (err.stderr)
             process.stderr.write(err.stderr);
-        console.error(`\n[fail] Could not run ${PACKAGE_NAME}@latest: ${err.message}`);
         process.exitCode = 1;
     }
 }
@@ -1065,6 +1126,47 @@ function defaultProfile() {
 function tty() {
     return Boolean(process.stdin.isTTY && process.stdout.isTTY);
 }
+let spinnerDepth = 0;
+// Run async work under a TTY-only timer spinner. The spinner is cleared before
+// the caller prints its normal result line, preserving locked output shapes.
+async function withInteractiveSpinner(message, work) {
+    if (!tty() || spinnerDepth > 0)
+        return work(() => { });
+    // Clack manages stdin itself. Close the legacy question interface before its
+    // first use; non-interactive callers never reach this branch.
+    closeRL();
+    const active = clackSpinner({ indicator: 'timer' });
+    active.start(message);
+    spinnerDepth += 1;
+    try {
+        return await work((next) => { active.message(next); });
+    }
+    finally {
+        active.clear();
+        spinnerDepth -= 1;
+    }
+}
+async function askInteractiveChoice(message, options, initialValue) {
+    if (!tty())
+        return { status: 'unavailable' };
+    closeRL();
+    const choice = await clackSelect({ message, options, initialValue });
+    if (typeof choice !== 'string') {
+        clackCancel('Aborted.');
+        return { status: 'cancelled' };
+    }
+    return { status: 'selected', value: choice };
+}
+// Run collecting work under one TTY-only Clack task. Callers print after the
+// task completes, keeping normal output out of the spinner animation.
+async function runInteractivePhase(title, collect) {
+    if (!tty())
+        return collect();
+    closeRL();
+    let result;
+    await clackTasks([{ title, task: async () => { result = await collect(); } }]);
+    return result;
+}
 // Determine install scope: reinstall > flag > non-interactive default > prompt.
 async function resolveScope() {
     if (reinstall) {
@@ -1085,6 +1187,17 @@ async function resolveScope() {
         console.log(`  Scope: user (${install ? 'install default' : '--scope omitted, defaulting to user with --yes'})`);
         return '1';
     }
+    if (tty()) {
+        const choice = await askInteractiveChoice('Install scope', [
+            { value: '1', label: 'User-level', hint: 'all OMP sessions' },
+            { value: '2', label: 'Project-level', hint: 'this repo only' },
+            { value: '3', label: 'Both' },
+        ], '1');
+        if (choice.status === 'selected')
+            return choice.value;
+        closeRL();
+        process.exit(130);
+    }
     console.log('\nInstall scope:');
     console.log('  1) User-level (all OMP sessions)');
     console.log('  2) Project-level (this repo only)');
@@ -1103,22 +1216,17 @@ async function resolveProfile() {
     // 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)) {
-        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.`);
+        const choice = 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' },
+        ], 'off');
+        if (choice.status === 'selected')
+            profile.comboDefault = choice.value;
+        else {
+            closeRL();
+            process.exit(130);
         }
     }
     // Explicit flags always win over the Combo preset.