@krtclcdy/tersio 2.24.0 → 2.24.1

package/cli/uninstall.js

@@ -2,7 +2,7 @@
 import { promises as fs } from 'node:fs';
 import path from 'node:path';
 import { BUN_BIN_DIR, OMP_AGENT_DIR, OMP_PLUGINS_DIR, PACKAGE_NAME, RTK_BINARY_NAME, args, dryRun, keepPonytail, removePonytail, removeRtk, yes, debug, writeConfigLines, } from './common.js';
-import { askInteractiveChoice, closeRL, confirmDestructive, tty } from './interactive.js';
+import { askInteractiveChoice, closeRL, confirmDestructive, tty, sayTagged } from './interactive.js';
 import { detectHosts, hostHint, hostLabel, parseHostArg } from './hosts.js';
 import { findHoistedPackage, piAgentDir, readTextIfExists } from '../extensions/lib/utils.js';
 import { fileURLToPath } from 'node:url';
@@ -22,7 +22,7 @@ const PI_TREE_DIRS = [
 // One `pi remove`, for both packages the installer adds there.
 async function piRemove(spec, shouldDryRun) {
     if (shouldDryRun) {
-        console.log(`  [dry-run] would run: pi remove ${spec}`);
+        sayTagged(`  [dry-run] would run: pi remove ${spec}`);
         return;
     }
     try {
@@ -35,11 +35,11 @@ async function piRemove(spec, shouldDryRun) {
                     resolve();
             });
         });
-        console.log(`  [ok] removed the pi package ${spec}`);
+        sayTagged(`  [ok] removed the pi package ${spec}`);
     }
     catch (e) {
-        console.log(`  [fail] pi remove: ${e.message}`);
-        console.log(`  [hint] Manual: pi remove ${spec}`);
+        sayTagged(`  [fail] pi remove: ${e.message}`);
+        sayTagged(`  [hint] Manual: pi remove ${spec}`);
     }
 }
 // Only the skill directories the installer copied, never pi's own skills dir.
@@ -52,13 +52,24 @@ async function removeCopiedPonytailSkills(shouldDryRun) {
             await removeUninstallTarget(path.join(piAgentDir(), 'skills', entry.name), shouldDryRun);
     }
 }
-// pi owns its package dir, so removal is `pi remove`; the tree and the defaults
-// file are ours. Ponytail goes too unless --keep-ponytail, matching the OMP
-// route, so neither host keeps a package we installed on its behalf.
-async function removePiLayer(host, shouldDryRun, shouldRemovePonytail) {
+// pi removal delegates to pi remove; always list and confirm first.
+async function removePiLayer(host, shouldDryRun, shouldRemovePonytail, shouldRemoveRtk, confirmed) {
     const targets = PI_TREE_DIRS.map((dir) => path.join(piAgentDir(), 'extensions', dir));
+    const rtkWiring = path.join(piAgentDir(), 'extensions', 'rtk.ts');
     if (!host.installed && !host.declared) {
-        console.log(`  [skip] ${host.label} — nothing installed (${host.installCmd})`);
+        sayTagged(`  [skip] ${host.label} — nothing installed (${host.installCmd})`);
+        return false;
+    }
+    console.log('Will remove:');
+    for (const t of targets)
+        console.log(`  ${t}`);
+    if (shouldRemovePonytail)
+        console.log(`  npm:${PONYTAIL_PKG} (pi package)`);
+    if (shouldRemoveRtk)
+        console.log(`  ${rtkWiring} (rtk wiring)`);
+    console.log(`  ${tersioSettingsFile()} (session defaults)`);
+    if (!confirmed && !(await confirmDestructive(`Remove Tersio from ${host.label}?`))) {
+        closeRL();
         return false;
     }
     if (host.declared)
@@ -68,6 +79,12 @@ async function removePiLayer(host, shouldDryRun, shouldRemovePonytail) {
         await removeCopiedPonytailSkills(shouldDryRun);
     }
     await Promise.all(targets.map((t) => removeUninstallTarget(t, shouldDryRun)));
+    // rtk's wiring is a loose file, not one of the tree dirs, so it survived
+    // --remove-rtk on pi while OMP removed its copy.
+    if (shouldRemoveRtk) {
+        await removeUninstallTarget(rtkWiring, shouldDryRun, false);
+        await removeUninstallTarget(path.join(BUN_BIN_DIR, RTK_BINARY_NAME), shouldDryRun, false);
+    }
     await clearSessionDefaults(shouldDryRun);
     return true;
 }
@@ -91,11 +108,11 @@ async function updateJsonFile(filePath, mutate, dryRunNote, writeNote, dryRun) {
     if (!mutate(data))
         return;
     if (dryRun) {
-        console.log(`  [dry-run] ${dryRunNote}`);
+        sayTagged(`  [dry-run] ${dryRunNote}`);
         return;
     }
     await fs.writeFile(filePath, JSON.stringify(data, null, 2) + '\n', 'utf8');
-    console.log(`  [write] ${writeNote}`);
+    sayTagged(`  [write] ${writeNote}`);
 }
 function dropKey(section, key) {
     if (!section || typeof section !== 'object')
@@ -109,14 +126,14 @@ function dropKey(section, key) {
 async function removeUninstallTarget(target, shouldDryRun, recursive = true) {
     try {
         if (shouldDryRun) {
-            console.log(`  [dry-run] would remove ${target}`);
+            sayTagged(`  [dry-run] would remove ${target}`);
             return;
         }
         if (recursive)
             await fs.rm(target, { recursive: true, force: true });
         else
             await fs.unlink(target);
-        console.log(`  [rm] ${target}`);
+        sayTagged(`  [rm] ${target}`);
     }
     catch {
         debug(`Could not remove ${target}`);
@@ -163,14 +180,14 @@ async function runUninstall(options = {}) {
     }
     const selected = detectHosts().find((h) => h.id === host);
     if (host === 'pi') {
-        const removed = await removePiLayer(selected, shouldDryRun, shouldRemovePonytail);
+        const removed = await removePiLayer(selected, shouldDryRun, shouldRemovePonytail, shouldRemoveRtk, confirmed);
         if (removed)
-            console.log('\nDone. Restart pi for changes to take effect.');
+            console.log('\nDone. Restart pi, then /combo medium.');
         closeRL();
         return removed;
     }
     if (!selected.installed)
-        console.log(`  [note] ${selected.label} has no tersio install; removing what is left behind.`);
+        sayTagged(`  [note] ${selected.label} has no tersio install; removing what is left behind.`);
     const extDir = path.join(OMP_AGENT_DIR, 'extensions');
     const configPath = path.join(OMP_AGENT_DIR, 'config.yml');
     const rtkBin = path.join(BUN_BIN_DIR, RTK_BINARY_NAME);
@@ -222,23 +239,27 @@ async function runUninstall(options = {}) {
         });
         if (lines.length !== before) {
             if (shouldDryRun)
-                console.log(`  [dry-run] would remove ${before - lines.length} config.yml entries`);
+                sayTagged(`  [dry-run] would remove ${before - lines.length} config.yml entries`);
             else
                 await writeConfigLines(configPath, lines, `  [write] Updated config.yml (removed ${before - lines.length} entries)`);
         }
     }
+    // Cleared last: writeConfigLines above would just make a fresh one.
+    for (const backup of [`${configPath}.bak`, path.join(pluginsDir, 'node_modules', PACKAGE_NAME, 'extensions', 'caveman-session', 'rule.md.bak')]) {
+        await removeUninstallTarget(backup, shouldDryRun, false);
+    }
     // Remove the bundled Ponytail copy; its config.yml entry is already filtered.
     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);
         try {
             if (shouldDryRun)
-                console.log(`  [dry-run] would remove ${ponytailPkgDir}`);
+                sayTagged(`  [dry-run] would remove ${ponytailPkgDir}`);
             else {
                 await fs.rm(ponytailPkgDir, { recursive: true, force: true });
-                console.log(`  [rm] ${ponytailPkgDir}`);
+                sayTagged(`  [rm] ${ponytailPkgDir}`);
                 await fs.rm(path.dirname(ponytailPkgDir));
-                console.log(`  [rm] ${path.dirname(ponytailPkgDir)} (empty scope)`);
+                sayTagged(`  [rm] ${path.dirname(ponytailPkgDir)} (empty scope)`);
             }
         }
         catch {
@@ -254,9 +275,7 @@ async function runUninstall(options = {}) {
     if ((await readTextIfExists(path.join(selfPluginDir, 'package.json'))) !== null) {
         await removeUninstallTarget(selfPluginDir, shouldDryRun);
     }
-    // Our rtk wiring goes with the rest: leaving the file would keep OMP
-    // rewriting bash calls to a package this uninstall just removed. The binary
-    // stays unless --remove-rtk, since it is a shared tool on PATH.
+    // Our rtk wiring goes too, or OMP keeps rewriting for a removed package.
     await removeUninstallTarget(path.join(extDir, 'rtk.ts'), shouldDryRun);
     if (shouldRemoveRtk)
         await removeUninstallTarget(rtkBin, shouldDryRun, false);

package/cli/update.js

@@ -3,7 +3,7 @@ import { promises as fs } from 'node:fs';
 import path from 'node:path';
 import { spawn } from 'node:child_process';
 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 { execNetwork, sayTagged } from './interactive.js';
 import { readTextIfExists, resolveRtkBinary, tersioDataPath } from '../extensions/lib/utils.js';
 import { refreshPrices } from '../extensions/shared/pricing.js';
 import { CAVEMAN_REMOTE_RULE, RTK_RELEASE_API, httpsGet, normalizeRtkVersion, sha256Hex, } from '../extensions/lib/utils.js';
@@ -140,8 +140,8 @@ async function runLatestUpdate() {
     const { stale, status } = planLines(plan);
     if (dryRun) {
         console.log(`tersio update (dry-run):\n  ${status.join('\n  ')}`);
-        console.log(`  [dry-run] would run: npm install -g ${PACKAGE_NAME}${target} --no-audit --no-fund --prefer-online`);
-        console.log(`  [dry-run] would delegate: npm exec --yes --prefer-online --package=${PACKAGE_NAME}${target} -- tersio --apply-update ${forwardedArgs.join(' ')}`);
+        sayTagged(`  [dry-run] would run: npm install -g ${PACKAGE_NAME}${target} --no-audit --no-fund --prefer-online`);
+        sayTagged(`  [dry-run] would delegate: npm exec --yes --prefer-online --package=${PACKAGE_NAME}${target} -- tersio --apply-update ${forwardedArgs.join(' ')}`);
         return;
     }
     console.log(`Checking for updates:\n  ${status.join('\n  ')}`);
@@ -186,8 +186,8 @@ async function runLatestUpdate() {
             process.stderr.write(globalResult.stderr);
     }
     catch (e) {
-        console.log(`  [warn] Global CLI update skipped: ${e.message}`);
-        console.log(`  [hint] Manual: npm install -g ${PACKAGE_NAME}${target} --no-audit --no-fund --prefer-online`);
+        sayTagged(`  [warn] Global CLI update skipped: ${e.message}`);
+        sayTagged(`  [hint] Manual: npm install -g ${PACKAGE_NAME}${target} --no-audit --no-fund --prefer-online`);
     }
     const npmArgs = [
         'exec',
@@ -200,9 +200,8 @@ async function runLatestUpdate() {
         ...forwardedArgs,
     ];
     const npmCommandArgs = IS_WINDOWS ? ['/d', '/s', '/c', 'npm', ...npmArgs] : npmArgs;
-    // Inherited stdio, no outer spinner. The delegated installer runs quiet
-    // (banner and per-file writes suppressed); this parent owns both the plan
-    // line above and the closing summary below — one voice, no repeats.
+    // Inherited stdio, no outer spinner; the delegated installer runs quiet and
+    // this parent owns both the plan line and the closing summary.
     try {
         await execInherit(npmCommand, npmCommandArgs);
         console.log(`Done — tersio ${plan.cli ?? PACKAGE_VERSION}. Restart OMP.`);

package/cli/usage.js

@@ -113,6 +113,7 @@ function bar(frac, width = 12) {
     const filled = Math.max(0, Math.min(width, Math.round(frac * width)));
     return '█'.repeat(filled) + '░'.repeat(width - filled);
 }
+const ROW_CAP = 15;
 function pad(s, n) {
     return s.length >= n ? s : s + ' '.repeat(n - s.length);
 }
@@ -136,10 +137,15 @@ function printReport(report) {
         return;
     }
     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);
+    const a = report.rtkAdoption;
+    for (const l of textTable(['Metric', 'Value'], [
+        ['Tokens', `${fmt(t.input)} in · ${fmt(t.output)} out · ${fmt(t.cacheRead)} cache read · ${fmt(t.cacheWrite)} cache write`],
+        ['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.)`],
+        ['RTK adoption', `${fmt(a.rtkCalls)}/${fmt(a.eligibleCalls)} eligible Bash calls use RTK (${a.adoptionPct.toFixed(1)}%) · ${fmt(a.missedCalls)} missed · recall ${report.rtkRecall.available ? `${report.rtkRecall.mode} (${report.rtkRecall.entries})` : 'unavailable'}`],
+    ], [false, false], 118))
+        console.log(l);
+    const allModels = 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));
+    const models = allModels.slice(0, ROW_CAP);
     if (models.length) {
         console.log('  BY MODEL');
         const top = models.reduce((m, [, b]) => Math.max(m, b.input + b.output + b.cacheRead + b.cacheWrite), 1);
@@ -152,6 +158,8 @@ function printReport(report) {
         for (const l of textTable(['Model', 'Input', 'Output', 'Cache r/w', report.currency, 'Hit', 'Share'], mrows, [false, true, true, true, true, true, false])) {
             console.log(l);
         }
+        if (allModels.length > ROW_CAP)
+            console.log(`  showing top ${ROW_CAP} of ${fmt(allModels.length)} models — full set in the dashboard`);
     }
     const cmdRows = report.byTool.map(([tool, n]) => ({ name: tool, count: n, saved: null, avgPct: null, avgMs: null }));
     for (const r of report.rtkGain.byCommand) {
@@ -165,7 +173,7 @@ function printReport(report) {
             : '  COMMAND TOOLS';
         console.log(scope);
         const top = cmdRows.reduce((m, r) => Math.max(m, r.count), 1);
-        const crows = cmdRows.slice(0, 15).map((r, idx) => [
+        const crows = cmdRows.slice(0, ROW_CAP).map((r, idx) => [
             String(idx + 1),
             r.name,
             fmt(r.count),
@@ -177,6 +185,8 @@ function printReport(report) {
         for (const l of textTable(['#', 'Tool/Command', 'Count', 'Saved', 'Avg%', 'Time', 'Impact'], crows, [true, false, true, true, true, true, false], 30)) {
             console.log(l);
         }
+        if (cmdRows.length > ROW_CAP)
+            console.log(`  showing top ${ROW_CAP} of ${fmt(cmdRows.length)} commands — full set in the dashboard`);
     }
 }
 async function runUsage() {