@krtclcdy/tersio 2.24.0 → 2.24.1

package/extensions/shared/usage-ledger.js

@@ -46,6 +46,9 @@ export function appendUsage(kind, detail) {
 function zeroBreakdown() {
     return { input: 0, output: 0, cacheRead: 0, cacheWrite: 0 };
 }
+function stampMs(ts) {
+    return ts === undefined ? NaN : typeof ts === 'number' ? ts : Date.parse(ts);
+}
 export function durOf(v) {
     return typeof v === 'number' && Number.isFinite(v) && v > 0 ? v : undefined;
 }
@@ -84,15 +87,20 @@ function addInto(into, u) {
             into[k] += Math.floor(v);
     }
 }
-export function sessionsDir() {
+export function sessionsDirs() {
     const override = process.env.TERSIO_SESSIONS_DIR;
     if (override)
-        return override;
-    // The running host wins; the other host's directory is the fallback.
+        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.
     const dirs = isPiProcess()
         ? [path.join(piAgentDir(), 'sessions'), path.join(os.homedir(), '.omp', 'agent', 'sessions')]
         : [path.join(os.homedir(), '.omp', 'agent', 'sessions'), path.join(piAgentDir(), 'sessions')];
-    return dirs.find((dir) => fs.existsSync(dir)) ?? dirs[0];
+    const found = dirs.filter((dir) => fs.existsSync(dir));
+    return found.length > 0 ? found : [dirs[0]];
+}
+export function sessionsDir() {
+    return sessionsDirs()[0];
 }
 export function codexSessionsDir() {
     const override = process.env.TERSIO_CODEX_DIR;
@@ -103,6 +111,22 @@ export function codexSessionsDir() {
         return path.join(codexHome, 'sessions');
     return path.join(os.homedir(), '.codex', 'sessions');
 }
+// One JSON file per message; probe XDG, then local, then macOS default.
+export function opencodeSessionsDir() {
+    const override = process.env.TERSIO_OPENCODE_DIR;
+    if (override)
+        return override;
+    const xdg = process.env.XDG_DATA_HOME;
+    if (xdg && xdg.trim() !== '')
+        return path.join(xdg, 'opencode', 'storage', 'message');
+    const local = path.join(os.homedir(), '.local', 'share', 'opencode', 'storage', 'message');
+    try {
+        if (fs.existsSync(local))
+            return local;
+    }
+    catch { /* fall through to the platform default */ }
+    return path.join(os.homedir(), 'Library', 'Application Support', 'opencode', 'storage', 'message');
+}
 export function dayKey(ts) {
     const ms = typeof ts === 'number' ? ts : Date.parse(ts);
     if (!Number.isFinite(ms))
@@ -111,7 +135,7 @@ export function dayKey(ts) {
     const p = (n) => String(n).padStart(2, '0');
     return `${d.getFullYear()}-${p(d.getMonth() + 1)}-${p(d.getDate())}`;
 }
-export function walkJsonl(dir, out, cap) {
+export function walkJsonl(dir, out, cap, ext = '.jsonl') {
     let entries;
     try {
         entries = fs.readdirSync(dir, { withFileTypes: true });
@@ -124,8 +148,8 @@ export function walkJsonl(dir, out, cap) {
             return;
         const full = path.join(dir, e.name);
         if (e.isDirectory())
-            walkJsonl(full, out, cap);
-        else if (e.isFile() && e.name.endsWith('.jsonl'))
+            walkJsonl(full, out, cap, ext);
+        else if (e.isFile() && e.name.endsWith(ext))
             out.push(full);
     }
 }
@@ -141,7 +165,7 @@ const RTK_ELIGIBLE_HEADS = new Set([
 export function newSessionAccum() {
     return { byModel: {}, byDay: {}, byDayModel: {}, byTool: {}, byModelMessages: {}, totals: zeroBreakdown(), messages: 0, costMeasured: 0, recent: [] };
 }
-export function ingestSessionRow(accum, model, usage, ts, durMs, run, toolNames) {
+export function ingestSessionRow(accum, model, usage, ts, durMs, run, toolNames, host) {
     const watermark = readResetWatermark();
     const ms = ts === undefined ? NaN : typeof ts === 'number' ? ts : Date.parse(ts);
     if (watermark > 0 && (!Number.isFinite(ms) || ms < watermark))
@@ -154,7 +178,7 @@ 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' };
-        accum.recent.push({ m: key, i: num(usage.input), o: num(usage.output), t: ms, d: durOf(durMs), cr: num(usage.cacheRead), cw: num(usage.cacheWrite), usd: costOf(usage), st: outcome.st, code: outcome.code, note: outcome.note });
+        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 });
     }
     const day = ts !== undefined ? dayKey(ts) : null;
     if (day) {
@@ -179,6 +203,10 @@ export function classifySessionLine(row) {
     if (payload && typeof payload === 'object') {
         if (row.type === 'session_meta' && typeof payload.model_provider === 'string')
             return { kind: 'codex_provider', provider: payload.model_provider };
+        // A Codex transcript states the model once per turn, in turn_context.
+        if (row.type === 'turn_context' && typeof payload.model === 'string' && payload.model) {
+            return { kind: 'codex_model', model: payload.model };
+        }
         if (payload.type === 'token_count') {
             const last = payload.info?.last_token_usage;
             if (last) {
@@ -192,7 +220,10 @@ export function classifySessionLine(row) {
     if (!msg || msg.role !== 'assistant' || !msg.usage)
         return { kind: 'skip' };
     const model = typeof msg.model === 'string' && msg.model ? msg.model : 'unknown';
-    const computedDur = (typeof msg.completedAt === 'number' && typeof msg.timestamp === 'number') ? msg.completedAt - msg.timestamp : undefined;
+    // pi omits duration, so derive Elapsed/Speed from the timestamp pair.
+    const startMs = typeof msg.timestamp === 'number' ? msg.timestamp : undefined;
+    const endMs = typeof msg.completedAt === 'number' ? msg.completedAt : stampMs(row.timestamp);
+    const computedDur = startMs !== undefined && Number.isFinite(endMs) && endMs > startMs ? endMs - startMs : undefined;
     const tools = [];
     for (const part of msg.content ?? []) {
         if (part?.type !== 'toolCall' || typeof part.name !== 'string' || !part.name)
@@ -206,6 +237,57 @@ export function classifySessionLine(row) {
     }
     return { kind: 'assistant_row', model, usage: msg.usage, durMs: typeof msg.duration === 'number' ? msg.duration : computedDur, run: statusOf(msg), tools };
 }
+// True when at least one token bucket holds a positive finite count.
+export function hasPositiveUsage(usage) {
+    for (const k of ['input', 'output', 'cacheRead', 'cacheWrite']) {
+        const v = usage[k];
+        if (typeof v === 'number' && Number.isFinite(v) && v > 0)
+            return true;
+    }
+    return false;
+}
+// One OpenCode message file; assistant rows carry the token buckets.
+export function classifyOpencodeMessage(obj) {
+    if (!obj || typeof obj !== 'object' || obj.role !== 'assistant')
+        return null;
+    const t = obj.tokens;
+    if (!t || typeof t !== 'object')
+        return null;
+    const usage = {
+        input: t.input,
+        output: t.output,
+        cacheRead: t.cache?.read,
+        cacheWrite: t.cache?.write,
+        cost: obj.cost,
+    };
+    if (!hasPositiveUsage(usage))
+        return null;
+    const provider = typeof obj.providerID === 'string' && obj.providerID ? obj.providerID : 'unknown';
+    const model = typeof obj.modelID === 'string' && obj.modelID ? obj.modelID : 'unknown';
+    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);
+    return {
+        model: `opencode/${provider}/${model}`,
+        usage,
+        ms: created,
+        durMs: created !== undefined && completed !== undefined && completed > created ? completed - created : undefined,
+    };
+}
+// One OpenCode message file into the shared accum.
+export function processOpencodeFile(accum, text) {
+    let obj;
+    try {
+        obj = JSON.parse(text);
+    }
+    catch {
+        return;
+    }
+    const parsed = classifyOpencodeMessage(obj);
+    if (!parsed)
+        return;
+    ingestSessionRow(accum, parsed.model, parsed.usage, parsed.ms, parsed.durMs, { st: 'completed' }, undefined, 'opencode');
+}
 // Fold `:free`/`-free` suffixes and case variants into one chart key.
 export function canonicalModelId(model) {
     return canonicalPriceId(model.replace(FREE_SUFFIX, ''));
@@ -236,13 +318,30 @@ export function displayModelId(model) {
 export function importSessionTokens() {
     const accum = newSessionAccum();
     const files = [];
-    walkJsonl(sessionsDir(), files, 2000);
+    for (const dir of sessionsDirs())
+        walkJsonl(dir, files, 2000);
     // An override means an isolated environment (tests, fixtures): only walk the
     // real codex dir when one is explicitly set.
     if (process.env.TERSIO_SESSIONS_DIR === undefined || process.env.TERSIO_CODEX_DIR !== undefined) {
         walkJsonl(codexSessionsDir(), files, 2000);
     }
+    // OpenCode message bodies are single JSON documents, not JSONL.
+    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) {
+        let text;
+        try {
+            text = fs.readFileSync(file, 'utf8');
+        }
+        catch {
+            continue;
+        }
+        processOpencodeFile(accum, text);
+    }
     let codexProvider = null;
+    let codexModel = null;
     for (const file of files) {
         let text;
         try {
@@ -251,11 +350,25 @@ export function importSessionTokens() {
         catch {
             continue;
         }
-        processSessionText(accum, { get codexProvider() { return codexProvider; }, set codexProvider(v) { codexProvider = v; } }, text);
+        processSessionText(accum, {
+            get codexProvider() { return codexProvider; },
+            set codexProvider(v) { codexProvider = v; },
+            get codexModel() { return codexModel; },
+            set codexModel(v) { codexModel = v; },
+        }, text, hostOfSessionFile(file));
     }
     accum.recent.sort((a, b) => b.t - a.t);
     return { messages: accum.messages, totals: accum.totals, byModel: accum.byModel, byDay: accum.byDay, byDayModel: accum.byDayModel, byTool: accum.byTool, byModelMessages: accum.byModelMessages, costMeasured: accum.costMeasured, recent: accum.recent.slice(0, RECENT_LIMIT) };
 }
+// Which agent wrote a session file, from the directory it sits in.
+export function hostOfSessionFile(file) {
+    const norm = file.replace(/\\/g, '/');
+    if (norm.includes('/.omp/'))
+        return 'omp';
+    if (norm.includes('/.codex/'))
+        return 'codex';
+    return 'pi';
+}
 const adoptionFileCache = new Map();
 function parseAdoptionFile(file) {
     const counts = { bashCalls: 0, eligibleCalls: 0, rtkCalls: 0 };
@@ -294,7 +407,8 @@ export function clearRtkAdoptionCache() {
 }
 export function readRtkAdoption() {
     const files = [];
-    walkJsonl(sessionsDir(), files, 2000);
+    for (const dir of sessionsDirs())
+        walkJsonl(dir, files, 2000);
     if (process.env.TERSIO_SESSIONS_DIR === undefined || process.env.TERSIO_CODEX_DIR !== undefined) {
         walkJsonl(codexSessionsDir(), files, 2000);
     }
@@ -332,7 +446,7 @@ export function readRtkAdoption() {
     const missedCalls = Math.max(0, eligibleCalls - rtkCalls);
     return { sessions, bashCalls, eligibleCalls, rtkCalls, missedCalls, adoptionPct: eligibleCalls ? (rtkCalls / eligibleCalls) * 100 : 0 };
 }
-export function processSessionText(accum, state, text) {
+export function processSessionText(accum, state, text, host) {
     for (const line of text.split('\n')) {
         if (!line.trim())
             continue;
@@ -344,14 +458,21 @@ export function processSessionText(accum, state, text) {
                     state.codexProvider = parsed.provider;
                 continue;
             }
+            if (parsed.kind === 'codex_model') {
+                if (parsed.model)
+                    state.codexModel = parsed.model;
+                continue;
+            }
             if (parsed.kind === 'token_row') {
-                const model = parsed.provider ? `codex/${parsed.provider}` : (state.codexProvider ? `codex/${state.codexProvider}` : 'codex');
-                ingestSessionRow(accum, model, parsed.usage ?? {}, row.timestamp, undefined, { st: 'completed' });
+                const base = parsed.provider ? `codex/${parsed.provider}` : (state.codexProvider ? `codex/${state.codexProvider}` : 'codex');
+                // The provider alone told you nothing about which model ran.
+                const model = state.codexModel ? `${base}/${state.codexModel}` : base;
+                ingestSessionRow(accum, model, parsed.usage ?? {}, row.timestamp, parsed.durMs, { st: 'completed' }, undefined, host ?? 'codex');
                 continue;
             }
             if (parsed.kind !== 'assistant_row' || !parsed.model || !parsed.usage)
                 continue;
-            ingestSessionRow(accum, parsed.model, parsed.usage, row.timestamp, parsed.durMs, parsed.run, parsed.tools);
+            ingestSessionRow(accum, parsed.model, parsed.usage, row.timestamp, parsed.durMs, parsed.run, parsed.tools, host);
         }
         catch { /* skip corrupt lines */ }
     }

package/extensions/shared/usage-ledger.ts

@@ -70,6 +70,8 @@ export interface RecentRequest {
   o: number;
   t: number;
   d?: number;
+  /** Which agent wrote the session: pi, omp, or codex. */
+  h?: string;
   cr?: number;
   cw?: number;
   // Undefined when the host recorded no cost; never backfilled.
@@ -109,6 +111,10 @@ export interface RtkRecallDiagnostics {
 function zeroBreakdown(): TokenBreakdown {
   return { input: 0, output: 0, cacheRead: 0, cacheWrite: 0 };
 }
+function stampMs(ts: string | number | undefined): number {
+  return ts === undefined ? NaN : typeof ts === 'number' ? ts : Date.parse(ts);
+}
+
 export function durOf(v: unknown): number | undefined {
   return typeof v === 'number' && Number.isFinite(v) && v > 0 ? v : undefined;
 }
@@ -147,14 +153,20 @@ function addInto(into: TokenBreakdown, u: { input?: unknown; output?: unknown; c
   }
 }
 
-export function sessionsDir(): string {
+export function sessionsDirs(): string[] {
   const override = process.env.TERSIO_SESSIONS_DIR;
-  if (override) return override;
-  // The running host wins; the other host's directory is the fallback.
+  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.
   const dirs = isPiProcess()
     ? [path.join(piAgentDir(), 'sessions'), path.join(os.homedir(), '.omp', 'agent', 'sessions')]
     : [path.join(os.homedir(), '.omp', 'agent', 'sessions'), path.join(piAgentDir(), 'sessions')];
-  return dirs.find((dir) => fs.existsSync(dir)) ?? dirs[0];
+  const found = dirs.filter((dir) => fs.existsSync(dir));
+  return found.length > 0 ? found : [dirs[0]];
+}
+
+export function sessionsDir(): string {
+  return sessionsDirs()[0];
 }
 
 export function codexSessionsDir(): string {
@@ -165,6 +177,19 @@ export function codexSessionsDir(): string {
   return path.join(os.homedir(), '.codex', 'sessions');
 }
 
+// One JSON file per message; probe XDG, then local, then macOS default.
+export function opencodeSessionsDir(): string {
+  const override = process.env.TERSIO_OPENCODE_DIR;
+  if (override) return override;
+  const xdg = process.env.XDG_DATA_HOME;
+  if (xdg && xdg.trim() !== '') return path.join(xdg, 'opencode', 'storage', 'message');
+  const local = path.join(os.homedir(), '.local', 'share', 'opencode', 'storage', 'message');
+  try {
+    if (fs.existsSync(local)) return local;
+  } catch { /* fall through to the platform default */ }
+  return path.join(os.homedir(), 'Library', 'Application Support', 'opencode', 'storage', 'message');
+}
+
 export function dayKey(ts: string | number): string | null {
   const ms = typeof ts === 'number' ? ts : Date.parse(ts);
   if (!Number.isFinite(ms)) return null;
@@ -172,7 +197,7 @@ export function dayKey(ts: string | number): string | null {
   const p = (n: number): string => String(n).padStart(2, '0');
   return `${d.getFullYear()}-${p(d.getMonth() + 1)}-${p(d.getDate())}`;
 }
-export function walkJsonl(dir: string, out: string[], cap: number): void {
+export function walkJsonl(dir: string, out: string[], cap: number, ext = '.jsonl'): void {
   let entries: fs.Dirent[];
   try {
     entries = fs.readdirSync(dir, { withFileTypes: true });
@@ -182,8 +207,8 @@ export function walkJsonl(dir: string, out: string[], cap: number): void {
   for (const e of entries) {
     if (out.length >= cap) return;
     const full = path.join(dir, e.name);
-    if (e.isDirectory()) walkJsonl(full, out, cap);
-    else if (e.isFile() && e.name.endsWith('.jsonl')) out.push(full);
+    if (e.isDirectory()) walkJsonl(full, out, cap, ext);
+    else if (e.isFile() && e.name.endsWith(ext)) out.push(full);
   }
 }
 // Recent requests get their own full-width table, so this bounds payload
@@ -211,7 +236,7 @@ export interface SessionAccum {
 export function newSessionAccum(): SessionAccum {
   return { byModel: {}, byDay: {}, byDayModel: {}, byTool: {}, byModelMessages: {}, totals: zeroBreakdown(), messages: 0, costMeasured: 0, recent: [] };
 }
-export function ingestSessionRow(accum: SessionAccum, model: string, usage: Record<string, unknown>, ts: string | number | undefined, durMs?: unknown, run?: { st: RunStatus; code?: number; note?: string }, toolNames?: string[]): boolean {
+export function ingestSessionRow(accum: SessionAccum, model: string, usage: Record<string, unknown>, ts: string | number | undefined, durMs?: unknown, run?: { st: RunStatus; code?: number; note?: string }, toolNames?: string[], host?: string): boolean {
   const watermark = readResetWatermark();
   const ms = ts === undefined ? NaN : typeof ts === 'number' ? ts : Date.parse(ts);
   if (watermark > 0 && (!Number.isFinite(ms) || ms < watermark)) return false;
@@ -223,7 +248,7 @@ export function ingestSessionRow(accum: SessionAccum, model: string, usage: Reco
   const num = (v: unknown): number => (typeof v === 'number' && Number.isFinite(v) && v > 0 ? Math.floor(v) : 0);
   if (Number.isFinite(ms)) {
     const outcome = run ?? { st: 'completed' as RunStatus };
-    accum.recent.push({ m: key, i: num(usage.input), o: num(usage.output), t: ms, d: durOf(durMs), cr: num(usage.cacheRead), cw: num(usage.cacheWrite), usd: costOf(usage), st: outcome.st, code: outcome.code, note: outcome.note });
+    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 });
   }
   const day = ts !== undefined ? dayKey(ts) : null;
   if (day) {
@@ -241,11 +266,15 @@ export function ingestSessionRow(accum: SessionAccum, model: string, usage: Reco
   for (const name of toolNames ?? []) accum.byTool[name] = (accum.byTool[name] ?? 0) + 1;
   return true;
 }
-export type SessionLineKind = 'codex_provider' | 'token_row' | 'assistant_row' | 'skip';
-export function classifySessionLine(row: { timestamp?: string | number; type?: unknown; message?: { role?: unknown; model?: unknown; usage?: Record<string, unknown>; duration?: unknown; completedAt?: unknown; timestamp?: unknown; stopReason?: unknown; errorStatus?: unknown; errorMessage?: unknown; isError?: unknown; content?: Array<{ type?: unknown; name?: unknown; arguments?: unknown }> }; payload?: { type?: unknown; model_provider?: unknown; info?: { last_token_usage?: Record<string, unknown> } } }): { kind: SessionLineKind; provider?: string; model?: string; usage?: Record<string, unknown>; durMs?: number; run?: { st: RunStatus; code?: number; note?: string }; tools?: string[]; ms?: number } {
+export type SessionLineKind = 'codex_provider' | 'codex_model' | 'token_row' | 'assistant_row' | 'skip';
+export function classifySessionLine(row: { timestamp?: string | number; type?: unknown; message?: { role?: unknown; model?: unknown; usage?: Record<string, unknown>; duration?: unknown; completedAt?: unknown; timestamp?: unknown; stopReason?: unknown; errorStatus?: unknown; errorMessage?: unknown; isError?: unknown; content?: Array<{ type?: unknown; name?: unknown; arguments?: unknown }> }; payload?: { type?: unknown; model?: unknown; model_provider?: unknown; info?: { last_token_usage?: Record<string, unknown> } } }): { kind: SessionLineKind; provider?: string; model?: string; usage?: Record<string, unknown>; durMs?: number; run?: { st: RunStatus; code?: number; note?: string }; tools?: string[]; ms?: number } {
   const payload = row.payload;
   if (payload && typeof payload === 'object') {
     if (row.type === 'session_meta' && typeof payload.model_provider === 'string') return { kind: 'codex_provider', provider: payload.model_provider };
+    // A Codex transcript states the model once per turn, in turn_context.
+    if (row.type === 'turn_context' && typeof payload.model === 'string' && payload.model) {
+      return { kind: 'codex_model', model: payload.model };
+    }
     if (payload.type === 'token_count') {
       const last = payload.info?.last_token_usage;
       if (last) {
@@ -258,7 +287,10 @@ export function classifySessionLine(row: { timestamp?: string | number; type?: u
   const msg = row.message;
   if (!msg || msg.role !== 'assistant' || !msg.usage) return { kind: 'skip' };
   const model = typeof msg.model === 'string' && msg.model ? msg.model : 'unknown';
-  const computedDur = (typeof msg.completedAt === 'number' && typeof msg.timestamp === 'number') ? msg.completedAt - msg.timestamp : undefined;
+  // pi omits duration, so derive Elapsed/Speed from the timestamp pair.
+  const startMs = typeof msg.timestamp === 'number' ? msg.timestamp : undefined;
+  const endMs = typeof msg.completedAt === 'number' ? msg.completedAt : stampMs(row.timestamp);
+  const computedDur = startMs !== undefined && Number.isFinite(endMs) && endMs > startMs ? endMs - startMs : undefined;
   const tools: string[] = [];
   for (const part of msg.content ?? []) {
     if (part?.type !== 'toolCall' || typeof part.name !== 'string' || !part.name) continue;
@@ -271,6 +303,64 @@ export function classifySessionLine(row: { timestamp?: string | number; type?: u
   }
   return { kind: 'assistant_row', model, usage: msg.usage, durMs: typeof msg.duration === 'number' ? msg.duration : computedDur, run: statusOf(msg), tools };
 }
+// True when at least one token bucket holds a positive finite count.
+export function hasPositiveUsage(usage: Record<string, unknown>): boolean {
+  for (const k of ['input', 'output', 'cacheRead', 'cacheWrite']) {
+    const v = usage[k];
+    if (typeof v === 'number' && Number.isFinite(v) && v > 0) return true;
+  }
+  return false;
+}
+
+export interface OpencodeMessage {
+  role?: unknown;
+  tokens?: { input?: unknown; output?: unknown; reasoning?: unknown; cache?: { read?: unknown; write?: unknown } } | null;
+  modelID?: unknown;
+  providerID?: unknown;
+  time?: { created?: unknown; completed?: unknown } | null;
+  cost?: unknown;
+  finish?: unknown;
+}
+
+// One OpenCode message file; assistant rows carry the token buckets.
+export function classifyOpencodeMessage(obj: OpencodeMessage | null | undefined): { model: string; usage: Record<string, unknown>; ms: number | undefined; durMs: number | undefined } | null {
+  if (!obj || typeof obj !== 'object' || obj.role !== 'assistant') return null;
+  const t = obj.tokens;
+  if (!t || typeof t !== 'object') return null;
+  const usage: Record<string, unknown> = {
+    input: t.input,
+    output: t.output,
+    cacheRead: t.cache?.read,
+    cacheWrite: t.cache?.write,
+    cost: (obj as Record<string, unknown>).cost,
+  };
+  if (!hasPositiveUsage(usage)) return null;
+  const provider = typeof obj.providerID === 'string' && obj.providerID ? obj.providerID : 'unknown';
+  const model = typeof obj.modelID === 'string' && obj.modelID ? obj.modelID : 'unknown';
+  const num = (v: unknown): number | undefined => (typeof v === 'number' && Number.isFinite(v) && v > 0 ? v : undefined);
+  const created = num(obj.time?.created);
+  const completed = num(obj.time?.completed);
+  return {
+    model: `opencode/${provider}/${model}`,
+    usage,
+    ms: created,
+    durMs: created !== undefined && completed !== undefined && completed > created ? completed - created : undefined,
+  };
+}
+
+// One OpenCode message file into the shared accum.
+export function processOpencodeFile(accum: SessionAccum, text: string): void {
+  let obj: unknown;
+  try {
+    obj = JSON.parse(text);
+  } catch {
+    return;
+  }
+  const parsed = classifyOpencodeMessage(obj as OpencodeMessage);
+  if (!parsed) return;
+  ingestSessionRow(accum, parsed.model, parsed.usage, parsed.ms, parsed.durMs, { st: 'completed' as RunStatus }, undefined, 'opencode');
+}
+
 // Fold `:free`/`-free` suffixes and case variants into one chart key.
 export function canonicalModelId(model: string): string {
   return canonicalPriceId(model.replace(FREE_SUFFIX, ''));
@@ -297,13 +387,28 @@ export function displayModelId(model: string): string {
 export function importSessionTokens(): SessionTokens {
   const accum = newSessionAccum();
   const files: string[] = [];
-  walkJsonl(sessionsDir(), files, 2000);
+  for (const dir of sessionsDirs()) walkJsonl(dir, files, 2000);
   // An override means an isolated environment (tests, fixtures): only walk the
   // real codex dir when one is explicitly set.
   if (process.env.TERSIO_SESSIONS_DIR === undefined || process.env.TERSIO_CODEX_DIR !== undefined) {
     walkJsonl(codexSessionsDir(), files, 2000);
   }
+  // OpenCode message bodies are single JSON documents, not JSONL.
+  const ocFiles: string[] = [];
+  if (process.env.TERSIO_SESSIONS_DIR === undefined || process.env.TERSIO_OPENCODE_DIR !== undefined) {
+    walkJsonl(opencodeSessionsDir(), ocFiles, 5000, '.json');
+  }
+  for (const file of ocFiles) {
+    let text: string;
+    try {
+      text = fs.readFileSync(file, 'utf8');
+    } catch {
+      continue;
+    }
+    processOpencodeFile(accum, text);
+  }
   let codexProvider: string | null = null;
+  let codexModel: string | null = null;
   for (const file of files) {
     let text: string;
     try {
@@ -311,12 +416,25 @@ export function importSessionTokens(): SessionTokens {
     } catch {
       continue;
     }
-    processSessionText(accum, { get codexProvider() { return codexProvider; }, set codexProvider(v: string | null) { codexProvider = v; } }, text);
+    processSessionText(accum, {
+      get codexProvider() { return codexProvider; },
+      set codexProvider(v: string | null) { codexProvider = v; },
+      get codexModel() { return codexModel; },
+      set codexModel(v: string | null) { codexModel = v; },
+    }, text, hostOfSessionFile(file));
   }
   accum.recent.sort((a, b) => b.t - a.t);
   return { messages: accum.messages, totals: accum.totals, byModel: accum.byModel, byDay: accum.byDay, byDayModel: accum.byDayModel, byTool: accum.byTool, byModelMessages: accum.byModelMessages, costMeasured: accum.costMeasured, recent: accum.recent.slice(0, RECENT_LIMIT) };
 }
 
+// Which agent wrote a session file, from the directory it sits in.
+export function hostOfSessionFile(file: string): string {
+  const norm = file.replace(/\\/g, '/');
+  if (norm.includes('/.omp/')) return 'omp';
+  if (norm.includes('/.codex/')) return 'codex';
+  return 'pi';
+}
+
 const adoptionFileCache = new Map<string, { size: number; mtimeMs: number; counts: { bashCalls: number; eligibleCalls: number; rtkCalls: number } }>();
 
 function parseAdoptionFile(file: string): { counts: { bashCalls: number; eligibleCalls: number; rtkCalls: number }; sessions: number } {
@@ -355,7 +473,7 @@ export function clearRtkAdoptionCache(): void {
 
 export function readRtkAdoption(): RtkAdoption {
   const files: string[] = [];
-  walkJsonl(sessionsDir(), files, 2000);
+  for (const dir of sessionsDirs()) walkJsonl(dir, files, 2000);
   if (process.env.TERSIO_SESSIONS_DIR === undefined || process.env.TERSIO_CODEX_DIR !== undefined) {
     walkJsonl(codexSessionsDir(), files, 2000);
   }
@@ -390,7 +508,7 @@ export function readRtkAdoption(): RtkAdoption {
   const missedCalls = Math.max(0, eligibleCalls - rtkCalls);
   return { sessions, bashCalls, eligibleCalls, rtkCalls, missedCalls, adoptionPct: eligibleCalls ? (rtkCalls / eligibleCalls) * 100 : 0 };
 }
-export function processSessionText(accum: SessionAccum, state: { codexProvider: string | null }, text: string): void {
+export function processSessionText(accum: SessionAccum, state: { codexProvider: string | null; codexModel?: string | null }, text: string, host?: string): void {
   for (const line of text.split('\n')) {
     if (!line.trim()) continue;
     try {
@@ -400,13 +518,19 @@ export function processSessionText(accum: SessionAccum, state: { codexProvider:
         if (parsed.provider) state.codexProvider = parsed.provider;
         continue;
       }
+      if (parsed.kind === 'codex_model') {
+        if (parsed.model) state.codexModel = parsed.model;
+        continue;
+      }
       if (parsed.kind === 'token_row') {
-        const model = parsed.provider ? `codex/${parsed.provider}` : (state.codexProvider ? `codex/${state.codexProvider}` : 'codex');
-        ingestSessionRow(accum, model, parsed.usage ?? {}, row.timestamp, undefined, { st: 'completed' as RunStatus });
+        const base = parsed.provider ? `codex/${parsed.provider}` : (state.codexProvider ? `codex/${state.codexProvider}` : 'codex');
+        // The provider alone told you nothing about which model ran.
+        const model = state.codexModel ? `${base}/${state.codexModel}` : base;
+        ingestSessionRow(accum, model, parsed.usage ?? {}, row.timestamp, parsed.durMs, { st: 'completed' as RunStatus }, undefined, host ?? 'codex');
         continue;
       }
       if (parsed.kind !== 'assistant_row' || !parsed.model || !parsed.usage) continue;
-      ingestSessionRow(accum, parsed.model, parsed.usage, row.timestamp, parsed.durMs, parsed.run, parsed.tools);
+      ingestSessionRow(accum, parsed.model, parsed.usage, row.timestamp, parsed.durMs, parsed.run, parsed.tools, host);
     } catch { /* skip corrupt lines */ }
   }
 }