@krtclcdy/tersio 2.25.4 → 2.25.5

package/dist/cli/usage.js

@@ -1,6 +1,6 @@
 // cli/usage.ts — ledger + session-token usage report, tokscale-style.
-import { co2GramsFor, displayModelId, energyWhFor, foldModelsByLabel, importSessionTokens, ledgerPath, priceFor, readResetWatermark, readRtkAdoption, readRtkRecallDiagnostics, readUsage, refreshPricesIfStale, sessionsDir, usdCost, } from '../extensions/shared/usage-ledger.js';
-import { resolveRtkBinary } from '../extensions/lib/utils.js';
+import { PRICE_TIERS_FIRM, co2GramsFor, displayModelId, energyWhFor, foldModelsByLabel, importSessionTokens, ledgerPath, priceFor, pricesOverridePath, readResetWatermark, readRtkAdoption, readRtkRecallDiagnostics, readUsage, refreshPricesIfStale, sessionsDir, usdCost, } from '../extensions/shared/usage-ledger.js';
+import { resolveRtkBinary } from '../extensions/shared/utils.js';
 import { readRtkGain } from '../extensions/shared/rtk-gain.js';
 import { readUsageDb, reparseGuardReport, syncUsageDb, usageDbPath } from '../extensions/shared/usage-store.js';
 import { withInteractiveSpinner } from './interactive.js';
@@ -39,11 +39,13 @@ export function summarizeUsage(rows) {
     const source = stored ? (synced ? 'stored' : 'stored-stale') : 'live';
     const watermark = readResetWatermark();
     let usd = 0;
+    let estimatedUsd = 0;
     let priced = true;
     let savedUsd = 0;
     const byModelUsd = {};
     const byModelBucketUsd = {};
     const byHost = {};
+    const byAgent = {};
     const byDayModel = {};
     let co2g = 0;
     let energyWh = 0;
@@ -55,9 +57,26 @@ export function summarizeUsage(rows) {
     };
     // Price by exact key first (gateways can differ), then fold every map under the display label.
     const folded = foldModelsByLabel(session.byModel, session.byModelMessages);
+    const priceTiers = {};
+    // Named in the loop so the list is built in one pass, then sorted by token volume below.
+    const weakModels = [];
+    const measuredModels = [];
     for (const [model, t] of Object.entries(session.byModel)) {
-        const c = usdCost(t, model);
+        // A model is measured only when the host priced every one of its messages; a partly measured
+        // model would read its unpriced messages as zero, which is the one error worse than a guess.
+        const covered = (session.byModelCostMessages[model] ?? 0) >= (session.byModelMessages[model] ?? 0);
+        const measured = covered ? session.byModelMeasured[model] : undefined;
+        const c = usdCost(t, model, measured);
         usd += c.usd;
+        priceTiers[c.tier] = (priceTiers[c.tier] ?? 0) + 1;
+        if (c.tier === 'measured')
+            measuredModels.push(model);
+        // A tier that is not firm is an estimate, so it is kept out of the firm total rather than
+        // summed beside a measured cost that would make the whole figure read as a bill.
+        if (!PRICE_TIERS_FIRM.includes(c.tier)) {
+            estimatedUsd += c.usd;
+            weakModels.push(model);
+        }
         const label = displayModelId(model);
         byModelUsd[label] = (byModelUsd[label] ?? 0) + c.usd;
         byModelBucketUsd[label] ??= { input: 0, output: 0, cacheRead: 0, cacheWrite: 0 };
@@ -67,6 +86,11 @@ export function summarizeUsage(rows) {
             byHost[label][host] ??= { input: 0, output: 0, cacheRead: 0, cacheWrite: 0 };
             addTok(byHost[label][host], hb);
         }
+        for (const [agent, ab] of Object.entries(session.byAgent[model] ?? {})) {
+            byAgent[agent] ??= { tokens: { input: 0, output: 0, cacheRead: 0, cacheWrite: 0 }, msgs: 0 };
+            addTok(byAgent[agent].tokens, ab);
+            byAgent[agent].msgs += session.byAgentMessages[model]?.[agent] ?? 0;
+        }
         co2g += co2GramsFor(model, t.output);
         energyWh += energyWhFor(model, t.output);
         if (!c.priced)
@@ -81,6 +105,10 @@ export function summarizeUsage(rows) {
         }
     }
     const byTool = Object.entries(session.byTool).sort((a, b) => b[1] - a[1]).slice(0, 10);
+    // Heaviest first, then capped to five: the line is guidance, not a dump of the model table.
+    const weakKeys = weakModels
+        .toSorted((a, b) => tokenTotal(session.byModel[b]) - tokenTotal(session.byModel[a]))
+        .slice(0, 5);
     return {
         total: rows.length,
         byKind,
@@ -94,6 +122,7 @@ export function summarizeUsage(rows) {
         byModelBucketUsd,
         byModelMessages: folded.byModelMessages,
         byHost,
+        byAgent,
         byDay: session.byDay,
         byDayModel,
         byTool,
@@ -106,6 +135,10 @@ export function summarizeUsage(rows) {
         rtkRecall: readRtkRecallDiagnostics(resolveRtkBinary()),
         usd,
         priced,
+        estimatedUsd,
+        priceTiers,
+        weakModels: weakKeys,
+        measuredModels,
         savedUsd,
         costMeasured: session.costMeasured,
         co2g,
@@ -119,6 +152,10 @@ export function summarizeUsage(rows) {
 function fmt(n) {
     return n.toLocaleString('en-US');
 }
+/** Every billed bucket, so a model sorts by how much of the estimate it carries. */
+function tokenTotal(t) {
+    return t.input + t.output + t.cacheRead + t.cacheWrite;
+}
 function fmtShort(n) {
     if (n >= 1e12)
         return (n / 1e12).toFixed(1) + 'T';
@@ -163,12 +200,34 @@ function printReport(report) {
     }
     const t = report.tokens;
     const a = report.rtkAdoption;
+    // A tier that is not firm is named, so a figure that is partly a guess never reads as a bill.
+    const weak = ['tail', 'default'].reduce((sum, tier) => sum + (report.priceTiers[tier] ?? 0), 0);
+    const overridden = report.priceTiers.override ?? 0;
+    // The count stays in the cell; the names go on their own line below, because the cell is a
+    // fixed 118 columns and a list of model ids would be truncated to nothing.
+    const listed = report.weakModels.map((m) => displayModelId(m));
+    const measuredCount = report.measuredModels.length;
+    const costNote = weak > 0
+        ? ` · ${weak} model${weak === 1 ? '' : 's'} priced from another provider or the default table — add them to ${pricesOverridePath()}`
+        : overridden > 0
+            ? ` · ${overridden} model${overridden === 1 ? '' : 's'} priced from your override file`
+            : measuredCount > 0
+                ? ` · ${measuredCount} model${measuredCount === 1 ? '' : 's'} priced by the host`
+                : '';
     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.)`],
+        ['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.)${costNote}`],
         ['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);
+    if (measuredCount > 0) {
+        // Named, because a measured figure is only worth trusting when a reader sees whose it is.
+        console.log(`  Priced by the host: ${measuredCount} model${measuredCount === 1 ? '' : 's'}`);
+    }
+    if (weak > 0) {
+        // Heaviest first, one per host spelling, so the operator sees exactly what to write.
+        console.log(`  Unpriced (heaviest first): ${listed.join(', ')}`);
+    }
     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) {
@@ -186,6 +245,18 @@ function printReport(report) {
         if (allModels.length > ROW_CAP)
             console.log(`  showing top ${ROW_CAP} of ${fmt(allModels.length)} models — full set in the dashboard`);
     }
+    const agentKinds = Object.entries(report.byAgent).filter(([, per]) => per.msgs > 0).toSorted((x, y) => y[1].msgs - x[1].msgs);
+    if (agentKinds.length > 1) {
+        console.log('  BY AGENT');
+        const top = agentKinds.reduce((m, [, per]) => Math.max(m, per.tokens.input + per.tokens.output + per.tokens.cacheRead + per.tokens.cacheWrite), 1);
+        const arows = agentKinds.map(([kind, per]) => {
+            const total = per.tokens.input + per.tokens.output + per.tokens.cacheRead + per.tokens.cacheWrite;
+            return [kind === 'subagent' ? 'Subagents' : 'Main agent', fmt(per.msgs), fmt(per.tokens.input), fmt(per.tokens.output), fmt(per.tokens.cacheRead), `${bar(total / top, 8)} ${fmtShort(total)}`];
+        });
+        for (const line of textTable(['Agent', 'Msgs', 'Input', 'Output', 'Cache read', 'Share'], arows, [false, true, true, true, true, false])) {
+            console.log(line);
+        }
+    }
     const cmdRows = report.byTool.map(([tool, n]) => ({ name: tool, count: n, saved: null, avgPct: null, avgMs: null }));
     for (const r of report.rtkGain.byCommand) {
         cmdRows.push({ name: r.command, count: r.count, saved: r.saved, avgPct: r.avgPct, avgMs: r.avgMs });

package/dist/extensions/{combo-toggle → combo}/index.js

@@ -14,7 +14,7 @@ import { activeModesSummary, COMBO_LEVELS, getSharedComboState, hasModeState, no
 import { hostSelect, injectPromptText, onHostEvent, setExtensionLabel } from '../shared/host.js';
 import { announceStatus } from '../shared/status.js';
 import { isComboSetupComplete, readCavemanDefault, readComboDefault, readPluginSettings, readPonytailDefault, readRtkDefault, saveComboSetup, } from '../shared/plugin-settings.js';
-import { findHoistedPackage, isPiProcess } from '../lib/utils.js';
+import { findHoistedPackage, isPiProcess } from '../shared/utils.js';
 const EXTENSION_DIR = path.dirname(fileURLToPath(import.meta.url));
 const PONYTAIL_FALLBACK_INTENSITY = {
     lite: 'Prefer the simplest correct solution.',

package/dist/extensions/{tersio-commands → commands}/index.js

@@ -5,7 +5,7 @@ import { setExtensionLabel } from '../shared/host.js';
 import os from 'node:os';
 import path from 'node:path';
 import { appendUsage, readUsage } from '../shared/usage-ledger.js';
-import { checkAddonsSummary, runAddonUpdate } from '../ai-addons-updater/index.js';
+import { checkAddonsSummary, runAddonUpdate } from '../updater/index.js';
 const HELP = [
     '/tersio status — active modes + combo level',
     '/tersio check — add-on version check',

package/dist/extensions/{rtk-filter/index.js → rtk/filter.js}

@@ -2,7 +2,7 @@
 import { mkdtempSync, rmSync, writeFileSync } from 'node:fs';
 import { tmpdir } from 'node:os';
 import { join } from 'node:path';
-import { resolveRtkBinary } from '../lib/utils.js';
+import { resolveRtkBinary } from '../shared/utils.js';
 import { readRtkDefault } from '../shared/plugin-settings.js';
 import { getSharedComboState, lastCustomValue, sessionEntries } from '../shared/session-state.js';
 /** Tool name to `rtk pipe --filter` name. Exported so the OpenCode host reuses one map. */

package/dist/extensions/{rtk-session/index.js → rtk/session.js}

@@ -1,7 +1,7 @@
 import { getSharedComboState, hasModeState, isOmpSubagentPrompt, lastCustomValue, reconcileSharedComboEntries, sessionEntries, setSharedComboListener, setSharedComboMode, systemPromptIncludes } from '../shared/session-state.js';
 import { injectPromptText, onHostEvent, setExtensionLabel, stringArrayToolParams } from '../shared/host.js';
 import { readRtkDefault } from '../shared/plugin-settings.js';
-import { resolveRtkBinary } from '../lib/utils.js';
+import { resolveRtkBinary } from '../shared/utils.js';
 import { announceStatus } from '../shared/status.js';
 const DEFAULT_ENABLED = false;
 function asBoolean(value) {

package/dist/extensions/{opencode/server.js → server.js}

@@ -1,13 +1,13 @@
 // OpenCode plugin entry: maps its plugin API onto the shared ExtensionApi the mode extensions consume.
 import { execFile } from 'node:child_process';
-import cavemanSessionExtension from '../caveman-session/index.js';
-import rtkSessionExtension from '../rtk-session/index.js';
-import rtkFilterExtension, { FILTER_BY_TOOL, MIN_FILTER_BYTES, filterThroughRtk, filterableText, rtkActive } from '../rtk-filter/index.js';
-import comboToggleExtension from '../combo-toggle/index.js';
-import tersioCommandsExtension from '../tersio-commands/index.js';
-import { getSharedComboState } from '../shared/session-state.js';
-import { formatStatus } from '../shared/status.js';
-import { resolveRtkBinary } from '../lib/utils.js';
+import cavemanSessionExtension from './caveman/index.js';
+import rtkSessionExtension from './rtk/session.js';
+import rtkFilterExtension, { FILTER_BY_TOOL, MIN_FILTER_BYTES, filterThroughRtk, filterableText, rtkActive } from './rtk/filter.js';
+import comboToggleExtension from './combo/index.js';
+import tersioCommandsExtension from './commands/index.js';
+import { getSharedComboState } from './shared/session-state.js';
+import { formatStatus } from './shared/status.js';
+import { resolveRtkBinary } from './shared/utils.js';
 // The npm name, so the plugin list reads the same as the OMP and pi installs.
 const plugin = {
     id: '@krtclcdy/tersio',