@krtclcdy/tersio 2.9.0 → 2.10.0

package/extensions/shared/rtk-gain.js

@@ -0,0 +1,61 @@
+// extensions/shared/rtk-gain.ts — measured RTK savings from its own store.
+// RTK records every invocation (input/output/saved tokens, savings %, exec
+// time) in history.db; `rtk gain` renders the same rows. We read them with
+// the sqlite3 CLI (present on macOS; best-effort elsewhere) so the dashboard
+// shows measured figures, never estimates. Missing DB/CLI → empty, no throw.
+//
+// Caveman and Ponytail have no per-command counters (instruction-following
+// isn't metered); their gains are bench-measured in BENCHMARK.md and cited
+// as static figures wherever RTK rows appear.
+import { execFileSync } from 'node:child_process';
+import fs from 'node:fs';
+import os from 'node:os';
+import path from 'node:path';
+const EMPTY = { commands: 0, saved: 0, input: 0, avgPct: 0, totalMs: 0, byCommand: [] };
+export function rtkDbPath() {
+    const override = process.env.TERSIO_RTK_DB;
+    if (override)
+        return override;
+    if (process.platform === 'darwin') {
+        return path.join(os.homedir(), 'Library', 'Application Support', 'rtk', 'history.db');
+    }
+    const xdg = process.env.XDG_DATA_HOME || path.join(os.homedir(), '.local', 'share');
+    return path.join(xdg, 'rtk', 'history.db');
+}
+function query(db, sql) {
+    const out = execFileSync('sqlite3', ['-separator', '\t', db, sql], {
+        encoding: 'utf8',
+        timeout: 5000,
+        stdio: ['ignore', 'pipe', 'ignore'],
+    });
+    return out
+        .split('\n')
+        .filter((line) => line.trim())
+        .map((line) => line.split('\t'));
+}
+export function readRtkGain(limit = 10) {
+    try {
+        if (!fs.existsSync(rtkDbPath()))
+            return EMPTY;
+        const [[commands = '0', saved = '0', input = '0', avgPct = '0', totalMs = '0'] = []] = query(rtkDbPath(), 'SELECT COUNT(*), COALESCE(SUM(saved_tokens),0), COALESCE(SUM(input_tokens),0), COALESCE(AVG(savings_pct),0), COALESCE(SUM(exec_time_ms),0) FROM commands;');
+        const byCommand = query(rtkDbPath(), `SELECT rtk_cmd, COUNT(*), SUM(saved_tokens), AVG(savings_pct), AVG(exec_time_ms) FROM commands GROUP BY rtk_cmd ORDER BY SUM(saved_tokens) DESC LIMIT ${Math.max(1, Math.floor(limit))};`).map(([command, count, savedRow, pct, ms]) => ({
+            command,
+            count: Number(count) || 0,
+            saved: Number(savedRow) || 0,
+            avgPct: Number(pct) || 0,
+            avgMs: Number(ms) || 0,
+        }));
+        const totalIn = Number(input) || 0;
+        return {
+            commands: Number(commands) || 0,
+            saved: Number(saved) || 0,
+            input: totalIn,
+            avgPct: totalIn ? ((Number(saved) || 0) / totalIn) * 100 : 0,
+            totalMs: Number(totalMs) || 0,
+            byCommand,
+        };
+    }
+    catch {
+        return EMPTY;
+    }
+}

package/extensions/shared/usage-ledger.js

@@ -35,6 +35,15 @@ export function sessionsDir() {
         return override;
     return path.join(os.homedir(), '.omp', 'agent', 'sessions');
 }
+export function codexSessionsDir() {
+    const override = process.env.TERSIO_CODEX_DIR;
+    if (override)
+        return override;
+    const codexHome = process.env.CODEX_HOME;
+    if (codexHome)
+        return path.join(codexHome, 'sessions');
+    return path.join(os.homedir(), '.codex', 'sessions');
+}
 function dayKey(ts) {
     const ms = typeof ts === 'number' ? ts : Date.parse(ts);
     if (!Number.isFinite(ms))
@@ -66,11 +75,35 @@ export function importSessionTokens() {
     const byDay = {};
     const byDayModel = {};
     const byTool = {};
+    const byModelMessages = {};
     const totals = zeroBreakdown();
     let messages = 0;
     let costMeasured = 0;
     const files = [];
     walkJsonl(sessionsDir(), files, 2000);
+    // A sessions override signals an isolated environment (tests, fixtures):
+    // only walk the real codex dir when it is explicitly set.
+    if (process.env.TERSIO_SESSIONS_DIR === undefined || process.env.TERSIO_CODEX_DIR !== undefined) {
+        walkJsonl(codexSessionsDir(), files, 2000);
+    }
+    let codexProvider = null;
+    function ingest(model, usage, ts) {
+        addInto(totals, usage);
+        byModel[model] ??= zeroBreakdown();
+        addInto(byModel[model], usage);
+        byModelMessages[model] = (byModelMessages[model] ?? 0) + 1;
+        const day = ts !== undefined ? dayKey(ts) : null;
+        if (day) {
+            byDay[day] ??= zeroBreakdown();
+            addInto(byDay[day], usage);
+            const sum = ['input', 'output', 'cacheRead', 'cacheWrite'].reduce((a, k) => a + (typeof usage[k] === 'number' && Number.isFinite(usage[k]) ? Math.floor(usage[k]) : 0), 0);
+            if (sum > 0) {
+                byDayModel[day] ??= {};
+                byDayModel[day][model] = (byDayModel[day][model] ?? 0) + sum;
+            }
+        }
+        messages += 1;
+    }
     for (const file of files) {
         let text;
         try {
@@ -84,24 +117,30 @@ export function importSessionTokens() {
                 continue;
             try {
                 const row = JSON.parse(line);
+                const codexRow = row;
+                const payload = codexRow.payload;
+                if (payload && typeof payload === 'object') {
+                    if (codexRow.type === 'session_meta' && typeof payload.model_provider === 'string') {
+                        codexProvider = payload.model_provider;
+                    }
+                    else if (payload.type === 'token_count') {
+                        const last = payload.info?.last_token_usage;
+                        if (last) {
+                            ingest(codexProvider ? `codex/${codexProvider}` : 'codex', {
+                                input: last['input_tokens'],
+                                output: last['output_tokens'],
+                                cacheRead: last['cached_input_tokens'],
+                                cacheWrite: last['cache_write_input_tokens'],
+                            }, row.timestamp);
+                            continue;
+                        }
+                    }
+                }
                 const msg = row.message;
                 if (!msg || msg.role !== 'assistant' || !msg.usage)
                     continue;
                 const model = typeof msg.model === 'string' && msg.model ? msg.model : 'unknown';
-                addInto(totals, msg.usage);
-                byModel[model] ??= zeroBreakdown();
-                addInto(byModel[model], msg.usage);
-                const day = row.timestamp !== undefined ? dayKey(row.timestamp) : null;
-                if (day) {
-                    byDay[day] ??= zeroBreakdown();
-                    addInto(byDay[day], msg.usage);
-                    const n = msg.usage;
-                    const sum = ['input', 'output', 'cacheRead', 'cacheWrite'].reduce((a, k) => a + (typeof n[k] === 'number' && Number.isFinite(n[k]) ? Math.floor(n[k]) : 0), 0);
-                    if (sum > 0) {
-                        byDayModel[day] ??= {};
-                        byDayModel[day][model] = (byDayModel[day][model] ?? 0) + sum;
-                    }
-                }
+                ingest(model, msg.usage, row.timestamp);
                 if (typeof msg.usage.cost === 'number' && Number.isFinite(msg.usage.cost))
                     costMeasured += msg.usage.cost;
                 for (const part of msg.content ?? []) {
@@ -110,12 +149,11 @@ export function importSessionTokens() {
                         byTool[key] = (byTool[key] ?? 0) + 1;
                     }
                 }
-                messages += 1;
             }
             catch { /* skip corrupt lines */ }
         }
     }
-    return { messages, totals, byModel, byDay, byDayModel, byTool, costMeasured };
+    return { messages, totals, byModel, byDay, byDayModel, byTool, byModelMessages, costMeasured };
 }
 // Lead binary of a shell string: first segment head past `cd` chains and
 // VAR=x assignments (`cd /x && git status` → `git`). Falls back to `bash`.
@@ -134,24 +172,11 @@ function leadBinary(command) {
     }
     return 'bash';
 }
-const PRICE_TABLE = [
-    { match: ':free', price: { input: 0, output: 0, cacheRead: 0, cacheWrite: 0 } },
-    { match: 'opus', price: { input: 15, output: 75, cacheRead: 1.5, cacheWrite: 18.75 } },
-    { match: 'sonnet', price: { input: 3, output: 15, cacheRead: 0.3, cacheWrite: 3.75 } },
-    { match: 'haiku', price: { input: 0.8, output: 4, cacheRead: 0.08, cacheWrite: 1 } },
-    { match: 'gpt', price: { input: 2.5, output: 10, cacheRead: 1.25, cacheWrite: 2.5 } },
-    { match: 'gemini', price: { input: 1.25, output: 10, cacheRead: 0.125, cacheWrite: 1.25 } },
-    { match: 'glm', price: { input: 0.5, output: 1, cacheRead: 0.05, cacheWrite: 0.5 } },
-];
-const DEFAULT_PRICE = { input: 3, output: 15, cacheRead: 0.3, cacheWrite: 3.75 };
-export function priceFor(model) {
-    const name = model.toLowerCase();
-    for (const row of PRICE_TABLE) {
-        if (name.includes(row.match))
-            return { price: row.price, known: true };
-    }
-    return { price: DEFAULT_PRICE, known: false };
-}
+// --- Pricing lives in ./pricing.ts (live LiteLLM cache + fallback table) ---
+import { DEFAULT_PRICE, priceFor } from './pricing.js';
+import { co2GramsFor, energyWhFor } from './carbon.js';
+export { DEFAULT_PRICE, priceFor };
+export { co2GramsFor, energyWhFor };
 export function usdCost(t, model) {
     const { price, known } = model ? priceFor(model) : { price: DEFAULT_PRICE, known: false };
     const m = 1 / 1_000_000;
@@ -160,11 +185,13 @@ export function usdCost(t, model) {
         priced: model ? known : false,
     };
 }
-// ponytail: CO2 is a rough server-energy multiple on output tokens, not metered.
+// CO2 now model-differentiated via ./carbon.ts (EcoLogits 0.8.2 port).
 // Always render with ~est. and never merge with measured figures.
+// The constant below is the served gCO2eq per 1K output tokens for the
+// default (gpt-4o-class) model, kept so single-figure callers stay honest.
 export const CO2_G_PER_1K_OUTPUT = 0.2;
-export function co2Grams(outputTokens) {
-    return (outputTokens / 1000) * CO2_G_PER_1K_OUTPUT;
+export function co2Grams(outputTokens, model) {
+    return co2GramsFor(model ?? 'gpt-4o', outputTokens);
 }
 export function readUsage() {
     let text;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@krtclcdy/tersio",
-  "version": "2.9.0",
+  "version": "2.10.0",
   "description": "✂️ Token-saving OMP add-ons: terse Caveman replies, compact RTK shell output, lean Ponytail code calls — one-command combo presets.",
   "keywords": [
     "omp",
@@ -115,8 +115,7 @@
   "files": [
     "tersio.js",
     "cli/**/*.js",
-    "cli/dashboard.html",
-    "cli/brand.webp",
+    "dashboard/**/*",
     "extensions/**/*.js"
   ],
   "scripts": {