@krtclcdy/tersio 2.15.0 → 2.17.0

package/cli/rtk-wiring.js

@@ -1,12 +1,20 @@
 // cli/rtk-wiring.ts — wire the installed rtk binary into OMP.
 // `rtk init -g --agent omp` writes rtk's tool_call extension to
-// ~/.omp/agent/extensions/rtk.ts; OMP auto-loads it and rewrites bash
-// commands to rtk before execution, so every rewritten call lands in
-// rtk's history.db and shows metered savings in the gain dashboard.
+// ~/.omp/agent/extensions/rtk.ts, and we register that path in config.yml
+// (OMP only loads listed extensions — rtk init does not register it).
+// Once loaded, OMP rewrites bash commands to rtk before execution, so every
+// rewritten call lands in rtk's history.db and shows metered savings.
 // Fail-open: a failed wire only downgrades to manual `rtk` prefixing.
 // Deliberately free of cli/common.ts imports (argv side effects) so tests
 // can load it directly.
+import { promises as fs } from 'node:fs';
+import os from 'node:os';
+import path from 'node:path';
 import { execFile } from 'node:child_process';
+function debugWire(options, msg) {
+    if (!options.quiet)
+        console.log(`  ${msg}`);
+}
 function shortWiringError(e) {
     const err = e;
     const why = [err.code !== undefined ? `code ${err.code}` : '', err.signal ?? '', err.stderr?.trim(), err.message]
@@ -29,14 +37,64 @@ function execFileP(cmd, args, timeout) {
 // Idempotent: rtk rewrites its extension file on every init run, so
 // reinstalling tersio refreshes the wiring for free.
 export async function wireRtkOmp(rtkBin, options = {}) {
-    console.log('  Wiring rtk → OMP (bash tool_call rewrite)...');
-    if (options.dryRun) {
-        console.log('  [dry-run] would run: rtk init -g --agent omp');
+    if (!options.dryRun)
+        debugWire(options, 'Wiring rtk → OMP (bash tool_call rewrite)…');
+    if (options.dryRun)
         return true;
+    const wired = await runRtkInit(rtkBin, options);
+    if (!wired)
+        return false;
+    await ensureRtkInConfig(options);
+    return true;
+}
+// The rtk.ts path rtk init writes (mirrors OMP_AGENT_DIR in cli/common.ts
+// without importing it — see header note on argv side effects).
+function rtkExtensionPath() {
+    const home = process.env.HOME || process.env.USERPROFILE || os.homedir();
+    return path.join(home, '.omp', 'agent', 'extensions', 'rtk.ts');
+}
+// OMP loads only listed extensions: append rtk.ts after the existing entries
+// (or create the key) so a fresh wire takes effect on next OMP start.
+async function ensureRtkInConfig(options) {
+    const home = process.env.HOME || process.env.USERPROFILE || os.homedir();
+    const configPath = path.join(home, '.omp', 'agent', 'config.yml');
+    const extPath = rtkExtensionPath().replace(/\\/g, '/');
+    let raw = null;
+    try {
+        raw = await fs.readFile(configPath, 'utf8');
+    }
+    catch {
+        return;
+    }
+    if (raw.includes(extPath)) {
+        debugWire(options, 'rtk already in config.yml');
+        return;
     }
+    const lines = raw.split('\n');
+    const keyIdx = lines.findIndex((l) => /^\s*extensions\s*:/i.test(l));
+    const line = `  - ${extPath}`;
+    if (keyIdx === -1) {
+        lines.push('extensions:', line, '');
+    }
+    else {
+        if (/^\s*extensions\s*:\s*(?:\[\s*\]|null|~)?\s*$/i.test(lines[keyIdx]))
+            lines[keyIdx] = 'extensions:';
+        lines.splice(keyIdx + 1, 0, line);
+    }
+    try {
+        await fs.mkdir(path.dirname(configPath), { recursive: true });
+        await fs.copyFile(configPath, `${configPath}.bak`).catch(() => { });
+        await fs.writeFile(configPath, lines.join('\n'), 'utf8');
+        debugWire(options, 'rtk registered in config.yml');
+    }
+    catch (e) {
+        console.log(`  [warn] could not register rtk in config.yml: ${e.message}`);
+    }
+}
+async function runRtkInit(rtkBin, options) {
     try {
         await execFileP(rtkBin, ['init', '-g', '--agent', 'omp'], 30000);
-        console.log('  [ok] rtk OMP extension wired (~/.omp/agent/extensions/rtk.ts)');
+        debugWire(options, 'rtk OMP extension wired');
         return true;
     }
     catch (first) {
@@ -45,7 +103,7 @@ export async function wireRtkOmp(rtkBin, options = {}) {
         await new Promise((resolve) => setTimeout(resolve, 2000));
         try {
             await execFileP(rtkBin, ['init', '-g', '--agent', 'omp'], 30000);
-            console.log('  [ok] rtk OMP extension wired (~/.omp/agent/extensions/rtk.ts)');
+            debugWire(options, 'rtk OMP extension wired');
             return true;
         }
         catch (e) {

package/cli/update.js

@@ -116,15 +116,28 @@ async function probeUpdatePlan(cliLatest) {
         ponytail: [ponytailLocalText ? parseJsonObject(ponytailLocalText)?.version ?? null : null, ponytailLatest],
     };
 }
-function planLine(name, current, latest) {
-    if (!current && !latest)
-        console.log(`  ${name}: unknown`);
-    else if (!latest)
-        console.log(`  ${name}: ${current} (latest unknown)`);
-    else if (current === latest)
-        console.log(`  ${name}: ${current} (up to date)`);
-    else
-        console.log(`  ${name}: ${current ?? 'missing'} → ${latest}`);
+// Every add-on prints its status: version jump when stale, "up to date"
+// otherwise, honest "unknown" when the probe cannot reach its source.
+function planLines(plan) {
+    const stale = [];
+    const status = [];
+    const push = (name, current, latest) => {
+        if (!current && !latest)
+            status.push(`${name}: unknown`);
+        else if (!latest)
+            status.push(`${name}: ${current} (latest unknown)`);
+        else if (current === latest)
+            status.push(`${name}: ${current} (up to date)`);
+        else {
+            status.push(`${name}: ${current ?? 'missing'} → ${latest}`);
+            stale.push(`${name}: ${current ?? 'missing'} → ${latest}`);
+        }
+    };
+    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]);
+    return { stale, status };
 }
 async function runLatestUpdate() {
     const forwardedArgs = ['--yes'];
@@ -133,7 +146,6 @@ async function runLatestUpdate() {
     if (verbose)
         forwardedArgs.push('--verbose');
     const npmCommand = IS_WINDOWS ? process.env.ComSpec || 'cmd.exe' : 'npm';
-    console.log('=== Updating Tersio ===');
     // Resolve the target explicitly: `npm view --prefer-online` beats the local
     // metadata cache, so a stale `@latest` can never pin an older release.
     const cliLatest = await latestPublishedVersion();
@@ -141,37 +153,38 @@ async function runLatestUpdate() {
     // Current → latest per add-on. Best-effort; unreachable probes print as
     // unknown and never block the update.
     const plan = await probeUpdatePlan(cliLatest);
-    planLine('Tersio', PACKAGE_VERSION, plan.cli);
-    planLine('RTK', plan.rtk[0], plan.rtk[1]);
-    planLine('Caveman rule', plan.rule[0], plan.rule[1]);
-    planLine('Ponytail', plan.ponytail[0], plan.ponytail[1]);
-    console.log('');
+    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(' ')}`);
+        return;
+    }
+    console.log(`Checking for updates:\n  ${status.join('\n  ')}`);
+    if (stale.length === 0) {
+        console.log(`tersio ${PACKAGE_VERSION} — up to date`);
+        return;
+    }
+    console.log(`Updating ${stale.join(', ')}`);
     // 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
         ? ['/d', '/s', '/c', 'npm', 'install', '-g', `${PACKAGE_NAME}${target}`, '--no-audit', '--no-fund', '--prefer-online']
         : ['install', '-g', `${PACKAGE_NAME}${target}`, '--no-audit', '--no-fund', '--prefer-online'];
-    if (dryRun) {
-        console.log(`  [dry-run] would run: npm install -g ${PACKAGE_NAME}${target} --no-audit --no-fund --prefer-online`);
+    try {
+        const globalResult = await execNetwork(`Updating global Tersio CLI to ${PACKAGE_NAME}${target}`, npmCommand, globalArgs, {
+            timeout: 300000,
+            maxBuffer: 10 * 1024 * 1024,
+            windowsHide: true,
+            shell: false,
+        });
+        // npm -g echoes its own added/changed summary; only failures surface here.
+        if (globalResult.stderr)
+            process.stderr.write(globalResult.stderr);
     }
-    else {
-        try {
-            const globalResult = await execNetwork(`Updating global Tersio CLI to ${PACKAGE_NAME}${target}`, 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}${target}`);
-        }
-        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`);
-        }
+    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`);
     }
     const npmArgs = [
         'exec',
@@ -184,23 +197,22 @@ async function runLatestUpdate() {
         ...forwardedArgs,
     ];
     const npmCommandArgs = IS_WINDOWS ? ['/d', '/s', '/c', 'npm', ...npmArgs] : npmArgs;
-    // Inherited stdio, no outer spinner: the delegated installer renders its
-    // own Clack UI live, which capture-then-dump would corrupt into stray bars.
-    console.log(`  Running ${PACKAGE_NAME}${target} installer...`);
+    // 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.
     try {
         await execInherit(npmCommand, npmCommandArgs);
-        console.log('\n=== Update complete ===');
+        console.log(`Done — tersio ${plan.cli ?? PACKAGE_VERSION}. Restart OMP.`);
         if (!dryRun) {
             try {
-                if (await refreshPrices())
-                    console.log('  [ok] model price table refreshed');
+                await refreshPrices();
             }
             catch { /* pricing is best-effort; update already succeeded */ }
         }
     }
     catch (e) {
         const err = e;
-        console.error(`\n[fail] Could not run ${PACKAGE_NAME}${target}: ${err.message}`);
+        console.error(`[fail] Could not run ${PACKAGE_NAME}${target}: ${err.message}`);
         process.exitCode = 1;
     }
 }

package/cli/usage.js

@@ -18,12 +18,14 @@ export function summarizeUsage(rows) {
     let priced = true;
     let savedUsd = 0;
     const byModelUsd = {};
+    const byModelBucketUsd = {};
     let co2g = 0;
     let energyWh = 0;
     for (const [model, t] of Object.entries(session.byModel)) {
         const c = usdCost(t, model);
         usd += c.usd;
         byModelUsd[model] = c.usd;
+        byModelBucketUsd[model] = c.buckets;
         co2g += co2GramsFor(model, t.output);
         energyWh += energyWhFor(model, t.output);
         if (!c.priced)
@@ -41,6 +43,7 @@ export function summarizeUsage(rows) {
         tokens: session.totals,
         byModel: session.byModel,
         byModelUsd,
+        byModelBucketUsd,
         byModelMessages: session.byModelMessages,
         byDay: session.byDay,
         byDayModel: session.byDayModel,