@krtclcdy/tersio 2.25.5 → 2.25.7

package/dist/extensions/shared/status.js

@@ -1,16 +1,16 @@
-// One status string every surface renders: host footer bar, CLI menu title, dashboard banner. Nothing else formats mode state.
+// One status string every surface renders: host footer, CLI title, dashboard banner. Nothing else formats mode state.
 import { getSharedComboState } from './session-state.js';
-/** OFF collapses the three modes into one word; a preset or a mix names itself. */
+/** OFF collapses every mode into one word; a preset or a mix names itself. */
 export function formatStatus(state) {
-    const { level, caveman, rtk, ponytail } = state;
-    if (level === 'off' && caveman === 'off' && rtk === 'off' && ponytail === 'off')
+    const { level, caveman, rtk, ponytail, pstack } = state;
+    if (level === 'off' && caveman === 'off' && rtk === 'off' && ponytail === 'off' && pstack === 'off')
         return '🧩 combo OFF';
     const label = level === 'custom' ? 'CUSTOM' : level.toUpperCase();
-    return `🧩 combo ${label}: 🪨caveman=${caveman.toUpperCase()} ⚡rtk=${rtk.toUpperCase()} 🦥ponytail=${ponytail.toUpperCase()}`;
+    return `🧩 combo ${label}: 🪨caveman=${caveman.toUpperCase()} ⚡rtk=${rtk.toUpperCase()} 🦥ponytail=${ponytail.toUpperCase()} 🥔pstack=${pstack.toUpperCase()}`;
 }
-// The string upstream's skill tells the model to relay for `/caveman status`.
+// The string upstream's skill tells the model to relay for `/caveman status`; `off` is a mode, so it reads as one.
 export function formatCavemanStatus(mode) {
-    return `Caveman mode: ${mode && mode !== 'off' ? mode : 'unknown'}`;
+    return `Caveman mode: ${mode || 'unknown'}`;
 }
 // Stale ctx access throws, so never let it abort a mode restore.
 function statusUi(ctx) {
@@ -26,7 +26,7 @@ function statusUi(ctx) {
 let remembered;
 let lastText;
 let lastUi;
-// Paint the host footer bar; same text on the same UI is skipped, a new ctx repaints it.
+// Paint the host footer bar; same text on the same UI is skipped. One key only: the combo line already names the caveman mode, and a second key renders as a second footer line.
 export function announceStatus(ctx) {
     const state = getSharedComboState();
     const text = formatStatus(state);
@@ -40,5 +40,4 @@ export function announceStatus(ctx) {
     lastText = text;
     lastUi = ui;
     ui.setStatus?.('tersio', text);
-    ui.setStatus?.('caveman', formatCavemanStatus(state.caveman));
 }

package/dist/extensions/shared/types.js

@@ -1,2 +1,2 @@
-// Shared OMP extension host types. Structural — the real `pi` object comes from the OMP runtime; these describe the surface this package touches.
+// Shared OMP extension host types. Structural — the real `pi` object comes from the OMP runtime.
 export {};

package/dist/extensions/shared/usage-ledger.js

@@ -1,8 +1,10 @@
-// Shared usage ledger: append-only JSON lines, read by the CLI, `/tersio`, and the Dashboard. Best-effort; corrupt lines are skipped on read.
+// Usage ledger: append-only JSON lines, read by the CLI, `/tersio`, and the Dashboard. Corrupt lines are skipped.
 import fs from 'node:fs';
 import path from 'node:path';
-import { homeDir, isPiProcess, piAgentDir, resolveRtkBinary, tersioDataPath } from './utils.js';
 import { execFileSync } from 'node:child_process';
+import { homeDir, isPiProcess, piAgentDir, resolveRtkBinary, tersioDataPath } from './utils.js';
+import { eligibleHeads } from './rtk-eligible.js';
+import { sqliteRead } from './sqlite.js';
 export function ledgerPath() {
     const override = process.env.TERSIO_USAGE_FILE;
     if (override)
@@ -50,7 +52,7 @@ function stampMs(ts) {
 export function durOf(v) {
     return typeof v === 'number' && Number.isFinite(v) && v > 0 ? v : undefined;
 }
-// Measured cost: usage.cost.total, or a bare number in old fixtures. Anything else means unrecorded, which is deliberately not 0.
+// Measured cost: usage.cost.total, or a bare number in old fixtures. Anything else means unrecorded, not 0.
 export function costOf(usage) {
     const c = usage.cost;
     if (typeof c === 'number')
@@ -87,7 +89,7 @@ export function sessionsDirs() {
     const override = process.env.TERSIO_SESSIONS_DIR;
     if (override)
         return [override];
-    // Both hosts, not just the running one: a session on pi is missing from the dashboard entirely if we stop at the first directory that exists.
+    // Both hosts, not just the running one: a pi session is missing if we stop at the first existing directory.
     const dirs = isPiProcess()
         ? [path.join(piAgentDir(), 'sessions'), path.join(homeDir(), '.omp', 'agent', 'sessions')]
         : [path.join(homeDir(), '.omp', 'agent', 'sessions'), path.join(piAgentDir(), 'sessions')];
@@ -129,22 +131,20 @@ export function opencodeDbPath() {
     catch { /* fall through to the platform default */ }
     return path.join(homeDir(), 'Library', 'Application Support', 'opencode', 'opencode.db');
 }
-// Two on-disk shapes: legacy `message` (role/modelID/providerID live inside `data`),
-// current `session_message` (role in the `type` column, model under data.model).
-// Scalars only: the `data` blob holds newlines and tabs, which the sqlite3 CLI would split.
+// `message` vs `session_message`: read scalars only, since the blob's newlines break the row-per-line output.
 const OC_DB_ORDER = ' ORDER BY time_created;';
-const OC_DB_COLUMNS = 'json_extract(data,\'$.time.created\'), json_extract(data,\'$.time.completed\'),' +
+const OC_DB_COLUMNS = 'json_extract(data,\'$.time.created\'), json_extract(data,\'$.time.streamed\'), json_extract(data,\'$.time.completed\'),' +
     ' json_extract(data,\'$.tokens.input\'), json_extract(data,\'$.tokens.output\'),' +
     ' json_extract(data,\'$.tokens.cache.read\'), json_extract(data,\'$.tokens.cache.write\'), json_extract(data,\'$.cost\')';
-const ocDbLegacy = (since) => `SELECT id, time_created, json_extract(data,'$.role'), json_extract(data,'$.providerID'), json_extract(data,'$.modelID'), ${OC_DB_COLUMNS}` +
+const OC_DB_TOOLS = '(SELECT group_concat(json_extract(j.value,\'$.name\')) FROM json_each(data,\'$.content\') j' +
+    ' WHERE json_extract(j.value,\'$.type\')=\'tool\')';
+const ocDbLegacy = (since) => `SELECT id, time_created, json_extract(data,'$.role'), json_extract(data,'$.providerID'), json_extract(data,'$.modelID'), ${OC_DB_COLUMNS}, ${OC_DB_TOOLS}` +
     ` FROM message WHERE json_extract(data,'$.role')='assistant' AND time_created > ${since}${OC_DB_ORDER}`;
-const ocDbCurrent = (since) => `SELECT id, time_created, 'assistant', json_extract(data,'$.model.providerID'), json_extract(data,'$.model.id'), ${OC_DB_COLUMNS}` +
+const ocDbCurrent = (since) => `SELECT id, time_created, 'assistant', json_extract(data,'$.model.providerID'), json_extract(data,'$.model.id'), ${OC_DB_COLUMNS}, ${OC_DB_TOOLS}` +
     ` FROM session_message WHERE type='assistant' AND time_created > ${since}${OC_DB_ORDER}`;
 // A re-scan window covers tokens that land after the row was created, so a late fill is not lost.
 export const OPENCODE_DB_OVERLAP_MS = 3_600_000;
-// execFileSync caps output at 1MB; a busy table clears it in one SELECT.
-export const SQLITE_READ_BUFFER = 50 * 1024 * 1024;
-// Empty when sqlite3 is absent or the db is unreadable; that is a sync skip, not a failure.
+// Empty when no SQLite is available or the db is unreadable; that is a sync skip, not a failure.
 export function readOpencodeDbRows(db, sinceMs) {
     if (!Number.isFinite(sinceMs))
         return [];
@@ -153,7 +153,7 @@ export function readOpencodeDbRows(db, sinceMs) {
             return [];
         const since = Math.max(0, Math.floor(sinceMs));
         // Separate calls: a db holding only one table must not cancel the other.
-        const run = (sql) => execFileSync('sqlite3', ['-separator', '\t', '-readonly', db, sql], { encoding: 'utf8', timeout: 30000, stdio: ['ignore', 'pipe', 'ignore'], maxBuffer: SQLITE_READ_BUFFER });
+        const run = (sql) => sqliteRead(db, sql);
         let out = '';
         try {
             out += run(ocDbLegacy(since));
@@ -167,17 +167,18 @@ export function readOpencodeDbRows(db, sinceMs) {
         for (const line of out.split('\n')) {
             if (!line.trim())
                 continue;
-            const [id, created, role, providerID, modelID, tCreated, tCompleted, input, output, cacheRead, cacheWrite, cost] = line.split('\t');
+            const [id, created, role, providerID, modelID, tCreated, tStreamed, tCompleted, input, output, cacheRead, cacheWrite, cost, tools] = line.split('\t');
             const n = (v) => (v !== undefined && v !== '' && Number.isFinite(Number(v)) ? Number(v) : undefined);
             rows.push({
                 id,
                 created: Number(created),
+                tools: tools ?? '',
                 row: {
                     role,
                     modelID,
                     providerID,
                     tokens: { input: n(input), output: n(output), cache: { read: n(cacheRead), write: n(cacheWrite) } },
-                    time: { created: n(tCreated), completed: n(tCompleted) },
+                    time: { created: n(tCreated), streamed: n(tStreamed), completed: n(tCompleted) },
                     cost: n(cost),
                 },
             });
@@ -196,6 +197,60 @@ export function dayKey(ts) {
     const p = (n) => String(n).padStart(2, '0');
     return `${d.getFullYear()}-${p(d.getMonth() + 1)}-${p(d.getDate())}`;
 }
+// OpenCode tool parts carry the command in the message blob; sqliteRead is line-based, so newlines are flattened in SQL.
+const OC_BASH_CMD = "replace(replace(json_extract(j.value,'$.state.input.command'), char(10), ' '), char(13), ' ')";
+const OC_BASH_TOOL = "json_extract(j.value,'$.type')='tool' AND (json_extract(j.value,'$.name')='bash' OR json_extract(j.value,'$.name')='shell')";
+const ocBashLegacy = `SELECT message.id, json_extract(message.data,'$.sessionID'), ${OC_BASH_CMD} FROM message, json_each(message.data,'$.content') j WHERE json_extract(message.data,'$.role')='assistant' AND ${OC_BASH_TOOL}`;
+const ocBashCurrent = `SELECT session_message.id, session_message.session_id, ${OC_BASH_CMD} FROM session_message, json_each(session_message.data,'$.content') j WHERE session_message.type='assistant' AND ${OC_BASH_TOOL}`;
+/** Every executed bash command in an OpenCode db, v2 first and the legacy table second. */
+export function readOpencodeBashRows(db) {
+    const rows = [];
+    try {
+        if (!fs.existsSync(db))
+            return rows;
+        let out = '';
+        try {
+            out += sqliteRead(db, ocBashCurrent);
+        }
+        catch { /* no v2 table */ }
+        try {
+            out += sqliteRead(db, ocBashLegacy);
+        }
+        catch { /* no legacy table */ }
+        for (const line of out.split('\n')) {
+            if (!line.trim())
+                continue;
+            const [id, sessionId, command] = line.split('\t');
+            if (typeof command !== 'string' || !command.trim())
+                continue;
+            rows.push({ id: id ?? '', sessionId: sessionId ?? '', command });
+        }
+    }
+    catch { /* an unreadable db is a skip, not a failure */ }
+    return rows;
+}
+// Pre-v2 OpenCode stores one message per JSON file; the same tool-part shape holds the command.
+function opencodeFileBash(file) {
+    try {
+        const message = JSON.parse(fs.readFileSync(file, 'utf8'));
+        const parts = Array.isArray(message.content) ? message.content : [];
+        const commands = [];
+        for (const part of parts) {
+            const p = part;
+            if (p?.type !== 'tool')
+                continue;
+            if (p.name !== 'bash' && p.name !== 'shell')
+                continue;
+            const command = p.state?.input?.command;
+            if (typeof command === 'string' && command)
+                commands.push(command);
+        }
+        return { commands, sessionId: typeof message.sessionID === 'string' ? message.sessionID : '' };
+    }
+    catch {
+        return { commands: [], sessionId: '' };
+    }
+}
 export function walkJsonl(dir, out, cap, ext = '.jsonl') {
     let entries;
     try {
@@ -217,15 +272,10 @@ export function walkJsonl(dir, out, cap, ext = '.jsonl') {
 // Recent rows are a newest-first window over lifetime history; aggregates keep everything.
 export const RECENT_LIMIT = 2000;
 const FREE_SUFFIX = /(?::free|-free)$/i;
-const RTK_ELIGIBLE_HEADS = new Set([
-    'rtk', 'git', 'grep', 'rg', 'find', 'cat', 'ls', 'tree', 'diff', 'log',
-    'npm', 'npx', 'pnpm', 'bun', 'bunx', 'cargo', 'go', 'python', 'pytest',
-    'ruff', 'mypy', 'docker', 'kubectl', 'psql', 'aws', 'gh', 'glab', 'wc',
-]);
 export function newSessionAccum() {
     return { byModel: {}, byDay: {}, byDayModel: {}, byTool: {}, byModelMessages: {}, byHost: {}, byAgent: {}, byAgentMessages: {}, byModelMeasured: {}, byModelCostMessages: {}, totals: zeroBreakdown(), messages: 0, costMeasured: 0, recent: [], recentFloor: Number.POSITIVE_INFINITY };
 }
-export function ingestSessionRow(accum, model, usage, ts, durMs, run, toolNames, host, id, agent) {
+export function ingestSessionRow(accum, model, usage, ts, durMs, run, toolNames, host, id, agent, ttftMs) {
     const watermark = readResetWatermark();
     const ms = ts === undefined ? NaN : typeof ts === 'number' ? ts : Date.parse(ts);
     if (watermark > 0 && (!Number.isFinite(ms) || ms < watermark))
@@ -250,11 +300,9 @@ export function ingestSessionRow(accum, model, usage, ts, durMs, run, toolNames,
     const num = (v) => (typeof v === 'number' && Number.isFinite(v) && v > 0 ? Math.floor(v) : 0);
     if (Number.isFinite(ms)) {
         const outcome = run ?? { st: 'completed' };
-        // The store holds every message ever recorded, but only the newest few are ever read. Skip
-        // anything older than the floor, and re-read the floor when the list is full, so a 50k-row
-        // store costs 2000 rows of memory instead of 50k.
+        // Only the newest rows are read: skip below the floor, and a 50k-row store costs 2000 rows of memory.
         if (accum.recent.length < RECENT_LIMIT || ms >= accum.recentFloor) {
-            accum.recent.push({ m: key, i: num(usage.input), o: num(usage.output), t: ms, d: durOf(durMs), h: host, cr: num(usage.cacheRead), cw: num(usage.cacheWrite), usd: costOf(usage), st: outcome.st, code: outcome.code, note: outcome.note, id });
+            accum.recent.push({ m: key, i: num(usage.input), o: num(usage.output), t: ms, d: durOf(durMs), tf: durOf(ttftMs), h: host, cr: num(usage.cacheRead), cw: num(usage.cacheWrite), usd: costOf(usage), st: outcome.st, code: outcome.code, note: outcome.note, id });
             if (accum.recent.length > RECENT_LIMIT) {
                 let drop = 0;
                 for (let k = 1; k < accum.recent.length; k += 1)
@@ -326,7 +374,7 @@ export function classifySessionLine(row) {
         const command = part.arguments?.command;
         tools.push(`bash:${leadBinary(command)}`);
     }
-    return { kind: 'assistant_row', model, usage: msg.usage, durMs: typeof msg.duration === 'number' ? msg.duration : computedDur, run: statusOf(msg), tools };
+    return { kind: 'assistant_row', model, usage: msg.usage, durMs: typeof msg.duration === 'number' ? msg.duration : computedDur, ttftMs: typeof msg.ttft === 'number' ? msg.ttft : undefined, run: statusOf(msg), tools };
 }
 // True when at least one token bucket holds a positive finite count.
 export function hasPositiveUsage(usage) {
@@ -337,6 +385,25 @@ export function hasPositiveUsage(usage) {
     }
     return false;
 }
+/** Tool names an OpenCode message called; v2 passes SQL's comma-joined string as the blob holds newlines. */
+export function opencodeToolNames(message, joined) {
+    if (joined !== undefined)
+        return joined === '' ? [] : joined.split(',');
+    const parts = message?.content;
+    if (!Array.isArray(parts))
+        return [];
+    const names = [];
+    for (const part of parts) {
+        if (!part || typeof part !== 'object')
+            continue;
+        if (part.type !== 'tool')
+            continue;
+        const name = part.name;
+        if (typeof name === 'string' && name)
+            names.push(name);
+    }
+    return names;
+}
 // One OpenCode message file; assistant rows carry the token buckets.
 export function classifyOpencodeMessage(obj) {
     if (!obj || typeof obj !== 'object' || obj.role !== 'assistant')
@@ -358,14 +425,16 @@ export function classifyOpencodeMessage(obj) {
     const num = (v) => (typeof v === 'number' && Number.isFinite(v) && v > 0 ? v : undefined);
     const created = num(obj.time?.created);
     const completed = num(obj.time?.completed);
+    // `streamed` is when the first token arrived, so it is the host's own first-token latency.
+    const streamed = num(obj.time?.streamed);
     return {
         model: `opencode/${provider}/${model}`,
         usage,
         ms: created,
         durMs: created !== undefined && completed !== undefined && completed > created ? completed - created : undefined,
+        ttftMs: created !== undefined && streamed !== undefined && streamed > created ? streamed - created : undefined,
     };
 }
-// One OpenCode message file into the shared accum. The msg id is the file name.
 export function processOpencodeFile(accum, text, file) {
     let obj;
     try {
@@ -374,18 +443,19 @@ export function processOpencodeFile(accum, text, file) {
     catch {
         return;
     }
-    const parsed = classifyOpencodeMessage(obj);
+    const message = obj;
+    const parsed = classifyOpencodeMessage(message);
     if (!parsed)
         return;
     const id = file ? path.basename(file).replace(/\.[^.]+$/, '') || undefined : undefined;
-    ingestSessionRow(accum, parsed.model, parsed.usage, parsed.ms, parsed.durMs, { st: 'completed' }, undefined, 'opencode', id, 'main');
+    ingestSessionRow(accum, parsed.model, parsed.usage, parsed.ms, parsed.durMs, { st: 'completed' }, opencodeToolNames(message), 'opencode', id, 'main', parsed.ttftMs);
 }
 // One v2 message row into the shared accum. The msg id is the row primary key.
 export function ingestOpencodeDbRow(accum, row) {
     const parsed = classifyOpencodeMessage(row.row);
     if (!parsed)
         return;
-    ingestSessionRow(accum, parsed.model, parsed.usage, parsed.ms, parsed.durMs, { st: 'completed' }, undefined, 'opencode', row.id, 'main');
+    ingestSessionRow(accum, parsed.model, parsed.usage, parsed.ms, parsed.durMs, { st: 'completed' }, opencodeToolNames(row.row, row.tools), 'opencode', row.id, 'main', parsed.ttftMs);
 }
 // Fold `:free`/`-free` suffixes and case variants into one chart key.
 export function canonicalModelId(model) {
@@ -396,8 +466,7 @@ export function messageRowId(row) {
     const id = row.id;
     return typeof id === 'string' && id ? id : undefined;
 }
-// Vendor names mirror the dashboard map; CLI needs names only. Family first:
-// gateway segments shadow it (minimaxai holds xai, gemma rides nvidia).
+// Vendor names mirror the dashboard map; family first, so gateway segments shadow it (minimaxai holds xai).
 const VENDOR_RES = [
     [/inclusionai|ling-/i, 'InclusionAI'],
     [/minimax/i, 'MiniMax'],
@@ -533,9 +602,7 @@ export function hostOfSessionFile(file) {
         return 'opencode';
     return 'pi';
 }
-// Which agent ran a session file, from its own `session` row: a transcript with a parent
-// session is a subagent's, and everything else is the main agent. The row is the host's own
-// record, so a mirrored transcript carries the same answer as the stats database.
+// A transcript with a parent session ran as a subagent; the host's own row, so a mirror answers the same.
 export function agentOfSessionText(text) {
     if (!text.includes('parentSession'))
         return 'main';
@@ -552,7 +619,17 @@ export function agentOfSessionText(text) {
     return 'main';
 }
 const adoptionFileCache = new Map();
-function parseAdoptionFile(file) {
+function countBashCommands(commands, eligible, counts) {
+    for (const command of commands) {
+        counts.bashCalls += 1;
+        const head = leadBinary(command);
+        if (eligible.has(head))
+            counts.eligibleCalls += 1;
+        if (head === 'rtk')
+            counts.rtkCalls += 1;
+    }
+}
+function parseAdoptionFile(file, eligible) {
     const counts = { bashCalls: 0, eligibleCalls: 0, rtkCalls: 0 };
     let text;
     try {
@@ -561,7 +638,7 @@ function parseAdoptionFile(file) {
     catch {
         return { counts, sessions: 0 };
     }
-    let sawBash = false;
+    const commands = [];
     for (const line of text.split('\n')) {
         if (!line.includes('tool_execution_start'))
             continue;
@@ -570,24 +647,22 @@ function parseAdoptionFile(file) {
             if (row.type !== 'custom' || row.customType !== 'tool_execution_start' || row.data?.toolName !== 'bash')
                 continue;
             const command = row.data.args?.command;
-            if (typeof command !== 'string')
-                continue;
-            sawBash = true;
-            counts.bashCalls += 1;
-            const head = leadBinary(command);
-            if (RTK_ELIGIBLE_HEADS.has(head))
-                counts.eligibleCalls += 1;
-            if (head === 'rtk')
-                counts.rtkCalls += 1;
+            if (typeof command === 'string')
+                commands.push(command);
         }
         catch { /* skip corrupt line */ }
     }
-    return { counts, sessions: sawBash ? 1 : 0 };
+    countBashCommands(commands, eligible, counts);
+    return { counts, sessions: commands.length > 0 ? 1 : 0 };
 }
 export function clearRtkAdoptionCache() {
     adoptionFileCache.clear();
 }
 export function readRtkAdoption() {
+    // The eligible set comes from rtk's rewrite contract, cached per binary version.
+    const eligible = eligibleHeads(resolveRtkBinary());
+    // A cached count is only valid for the head set that produced it.
+    const headsKey = [...eligible].sort().join(',');
     const files = [];
     for (const dir of sessionsDirs())
         walkJsonl(dir, files, 2000);
@@ -609,9 +684,9 @@ export function readRtkAdoption() {
             continue;
         }
         let entry = adoptionFileCache.get(file);
-        if (!entry || entry.size !== stat.size || entry.mtimeMs !== stat.mtimeMs) {
-            const parsed = parseAdoptionFile(file);
-            entry = { size: stat.size, mtimeMs: stat.mtimeMs, counts: parsed.counts };
+        if (!entry || entry.size !== stat.size || entry.mtimeMs !== stat.mtimeMs || entry.heads !== headsKey) {
+            const parsed = parseAdoptionFile(file, eligible);
+            entry = { size: stat.size, mtimeMs: stat.mtimeMs, heads: headsKey, counts: parsed.counts };
             adoptionFileCache.set(file, entry);
             sessions += parsed.sessions;
         }
@@ -622,6 +697,30 @@ export function readRtkAdoption() {
         eligibleCalls += entry.counts.eligibleCalls;
         rtkCalls += entry.counts.rtkCalls;
     }
+    // OpenCode keeps its own store: a v2 sqlite db, or one JSON file per message before v2.
+    const opencode = { bashCalls: 0, eligibleCalls: 0, rtkCalls: 0 };
+    const opencodeSessions = new Set();
+    if (process.env.TERSIO_SESSIONS_DIR === undefined || process.env.TERSIO_OPENCODE_DB !== undefined) {
+        for (const row of readOpencodeBashRows(opencodeDbPath())) {
+            countBashCommands([row.command], eligible, opencode);
+            if (row.sessionId)
+                opencodeSessions.add(row.sessionId);
+        }
+    }
+    const ocFiles = [];
+    if (process.env.TERSIO_SESSIONS_DIR === undefined || process.env.TERSIO_OPENCODE_DIR !== undefined) {
+        walkJsonl(opencodeSessionsDir(), ocFiles, 5000, '.json');
+        for (const file of ocFiles) {
+            const parsed = opencodeFileBash(file);
+            countBashCommands(parsed.commands, eligible, opencode);
+            if (parsed.sessionId)
+                opencodeSessions.add(parsed.sessionId);
+        }
+    }
+    bashCalls += opencode.bashCalls;
+    eligibleCalls += opencode.eligibleCalls;
+    rtkCalls += opencode.rtkCalls;
+    sessions += opencodeSessions.size;
     const missedCalls = Math.max(0, eligibleCalls - rtkCalls);
     return { sessions, bashCalls, eligibleCalls, rtkCalls, missedCalls, adoptionPct: eligibleCalls ? (rtkCalls / eligibleCalls) * 100 : 0 };
 }
@@ -652,7 +751,7 @@ export function processSessionText(accum, state, text, host, agent) {
             }
             if (parsed.kind !== 'assistant_row' || !parsed.model || !parsed.usage)
                 continue;
-            ingestSessionRow(accum, parsed.model, parsed.usage, row.timestamp, parsed.durMs, parsed.run, parsed.tools, host, rid, agent);
+            ingestSessionRow(accum, parsed.model, parsed.usage, row.timestamp, parsed.durMs, parsed.run, parsed.tools, host, rid, agent, parsed.ttftMs);
         }
         catch { /* skip corrupt lines */ }
     }
@@ -696,16 +795,12 @@ export function leadBinary(command) {
     }
     return 'bash';
 }
-// --- Pricing lives in ./pricing.ts (live LiteLLM cache + fallback table) ---
+// Pricing lives in ./pricing.ts (live LiteLLM cache + fallback table).
 import { DEFAULT_PRICE, PRICE_TIERS_FIRM, canonicalPriceId, priceFor, pricesOverridePath, refreshPricesIfStale } from './pricing.js';
 import { co2GramsFor, energyWhFor } from './carbon.js';
 export { DEFAULT_PRICE, PRICE_TIERS_FIRM, priceFor, pricesOverridePath, refreshPricesIfStale };
 export { co2GramsFor, energyWhFor };
-/**
- * Price one model's tokens. `measured` is the cost the host reported for those tokens; it outranks
- * every rate card, because it is the only figure from the party that billed. Pass undefined rather
- * than 0 for a cost nobody reported: `costOf` keeps the two apart.
- */
+/** Price one model's tokens; `measured` outranks every rate card, so pass undefined when unreported. */
 export function usdCost(t, model, measured) {
     const m = 1 / 1_000_000;
     if (measured !== undefined) {
@@ -727,8 +822,7 @@ export function usdCost(t, model, measured) {
     };
     return {
         usd: buckets.input + buckets.output + buckets.cacheRead + buckets.cacheWrite,
-        // A tier the caller cannot stand behind is not a price. `tail` and `default` are estimates,
-        // and a report that sums them beside measured cost reads as a bill it is not.
+        // `tail`/`default` are estimates; summing them beside measured cost reads as a bill it is not.
         priced: PRICE_TIERS_FIRM.includes(hit.tier),
         tier: hit.tier,
         buckets,
@@ -759,7 +853,7 @@ export function readUsage() {
     }
     return rows;
 }
-// Delete the ledger file and return the rows cleared. Tersio-owned data only: transcripts and the RTK database are never touched.
+// Delete the ledger file and return the rows cleared. Tersio-owned data only: transcripts and the RTK database stay.
 export function clearUsageLedger() {
     const rows = readUsage().length;
     try {