codedeck 0.6.0 → 0.7.0

package/dist/plugin/mods/agents/pane.ts

@@ -47,13 +47,8 @@ function vocab(entries: Record<string, string>): Record<string, string> {
   return Object.assign(Object.create(null) as Record<string, string>, entries);
 }
 
-const STATUS_DOT = vocab({
-  working: "●",
-  starting: "●",
-  needs_input: "◉",
-});
 const STATUS_WORD = vocab({
-  working: "Working now",
+  working: "Working",
   starting: "Starting",
   needs_input: "Waiting for you",
   completed: "Completed",
@@ -111,6 +106,8 @@ function toPaneRow(row: SessionRow): PaneRow {
     id: row.id,
     status: row.status || EMPTY_CELL,
     agent: row.agent || EMPTY_CELL,
+    model: text(row.model) || undefined,
+    effort: text(row.effort) || undefined,
     name: row.name || EMPTY_CELL,
     updatedAt: iso,
   };
@@ -133,7 +130,11 @@ export function selectPane(rows: SessionRow[], runId: string, budget?: number):
     );
     const orchestratorRow = matching.find((row) => row.origin === "open");
     const orchestrator = orchestratorRow
-      ? { agent: text(orchestratorRow.agent) || EMPTY_CELL }
+      ? {
+          agent: text(orchestratorRow.agent) || EMPTY_CELL,
+          model: text(orchestratorRow.model) || undefined,
+          effort: text(orchestratorRow.effort) || undefined,
+        }
       : undefined;
     const workers = matching.filter((row) => row.origin !== "open");
     const ordered = [...workers].sort(compareRows);
@@ -179,16 +180,11 @@ function harnessLabel(agent: unknown): string {
   return HARNESS_LABEL[key] ?? cell(agent);
 }
 
-function dot(status: unknown): string {
-  return STATUS_DOT[text(status)] ?? "○";
-}
-
 function statusWord(status: unknown): string {
   return STATUS_WORD[text(status)] ?? cell(status);
 }
 
-function footerLegend(columns: number): [string, string] {
-  const fullStatus = " ● working  ◉ waiting  ○ finished";
+function footerLegend(columns: number): string {
   const fullHarness =
     " " +
     glyph("claude") +
@@ -199,15 +195,11 @@ function footerLegend(columns: number): [string, string] {
     " Codex  " +
     glyph("omp") +
     " OMP";
-  if (fullStatus.length <= columns - 2 && fullHarness.length <= columns - 2) {
-    return [fullStatus, fullHarness];
-  }
+  if (fullHarness.length <= columns - 2) return fullHarness;
 
-  const compactStatus = " ● wk  ◉ wait  ○ done";
   const iconHarness =
     " " + glyph("claude") + "  " + glyph("opencode") + "  " + glyph("codex") + "  " + glyph("omp");
-  if (compactStatus.length + 4 <= columns - 2) return [compactStatus, iconHarness];
-  return [" ● ◉ ○", iconHarness];
+  return iconHarness;
 }
 
 function age(iso: unknown, now: number): string {
@@ -215,7 +207,7 @@ function age(iso: unknown, now: number): string {
   const then = Date.parse(iso);
   if (Number.isNaN(then)) return "";
   const minutes = Math.floor((now - then) / 60000);
-  if (minutes < 1) return "agora";
+  if (minutes < 1) return "now";
   if (minutes < 60) return `${minutes}m`;
   return `${Math.floor(minutes / 60)}h`;
 }
@@ -224,6 +216,16 @@ function count(value: unknown): number {
   return typeof value === "number" && Number.isFinite(value) ? Math.max(0, Math.trunc(value)) : 0;
 }
 
+function detailLine(model: unknown, effort: unknown, status: string, when: string, width: number): string {
+  const state = status ? `${status}${when ? ` · ${when}` : ""}` : "";
+  const suffix = [text(effort).trim() ? `${cell(effort)} effort` : "", state]
+    .filter(Boolean)
+    .join(" · ");
+  const modelWidth = width - 3 - suffix.length - (suffix ? 3 : 0);
+  const modelText = text(model).trim() && modelWidth > 0 ? fit(cell(model), modelWidth).trimEnd() : "";
+  return `   ${[modelText, suffix].filter(Boolean).join(" · ")}`;
+}
+
 // How old a row looks for eviction: an unparseable timestamp is the oldest
 // possible age, matching how compareRows parks such rows at the end of the
 // display. The orchestrator pins itself to +Infinity so it is the very last
@@ -256,7 +258,7 @@ function draw(snapshot: PaneSnapshot, columns: number, limit: number | undefined
   );
   const orchestrator =
     source.orchestrator && typeof source.orchestrator === "object"
-      ? (source.orchestrator as Partial<{ agent: string }>)
+      ? (source.orchestrator as Partial<{ agent: string; model: string; effort: string }>)
       : undefined;
   const hidden = count(source.hidden);
   const total = count(source.total);
@@ -322,8 +324,11 @@ function draw(snapshot: PaneSnapshot, columns: number, limit: number | undefined
   if (orchestrator !== undefined) {
     blocks.push(
       cardBlock(Number.POSITIVE_INFINITY, "", [
-        ` ${glyph(orchestrator.agent)} ● Orchestrator`,
+        ` ${glyph(orchestrator.agent)} Orchestrator`,
         `   ${harnessLabel(orchestrator.agent)} · ${workerTotal} agents`,
+        ...(text(orchestrator.model).trim() || text(orchestrator.effort).trim()
+          ? [detailLine(orchestrator.model, orchestrator.effort, "", "", INNER)]
+          : []),
       ]),
     );
   }
@@ -337,9 +342,9 @@ function draw(snapshot: PaneSnapshot, columns: number, limit: number | undefined
       const word = statusWord(status);
       blocks.push(
         cardBlock(rowAge(row.updatedAt), cell(row.id), [
-          ` ${glyph(row.agent)} ${dot(row.status)} ${cell(row.id)}  ${harnessLabel(row.agent)}`,
+          ` ${glyph(row.agent)} ${cell(row.id)}  ${harnessLabel(row.agent)}`,
           `   ${cell(row.name)}`,
-          when === "" ? `   ${word}` : `   ${word} · ${when}`,
+          detailLine(row.model, row.effort, word, when, INNER),
         ]),
       );
     }
@@ -373,8 +378,7 @@ function draw(snapshot: PaneSnapshot, columns: number, limit: number | undefined
   const stemAbove = (list: Block[], i: number): boolean =>
     i > 0 && (list[i].kind === "card" || list[i - 1].kind === "card");
 
-  // Rule 3: these ten lines are the frame. Whenever anything is drawn at all
-  // they are drawn, and they are never the lines that the fit cuts.
+  // These frame lines are always drawn when the pane has content.
   const head = [
     frameTop(`Run canvas ${cell(source.runId)}`),
     frameRow(` ${total} sessions · ${working} working`),
@@ -382,11 +386,9 @@ function draw(snapshot: PaneSnapshot, columns: number, limit: number | undefined
     frameSep(),
     frameRow(""),
   ];
-  const [statusLegend, harnessLegend] = footerLegend(W);
+  const harnessLegend = footerLegend(W);
   const tail = [
-    frameRow(""),
     frameSep(),
-    frameRow(statusLegend),
     frameRow(harnessLegend),
     frameBot(),
   ];
@@ -434,6 +436,10 @@ function draw(snapshot: PaneSnapshot, columns: number, limit: number | undefined
     if (kept.length > 0 && kept[kept.length - 1].kind === "card") out.push(stem(), hiddenRow);
     else out.push(hiddenRow);
   }
+  if (limit !== undefined) {
+    const spare = limit - out.length - tail.length;
+    for (let i = 0; i < spare; i += 1) out.push(frameRow(""));
+  }
   out.push(...tail);
   return out;
 }

package/dist/plugin/mods/agents/types.ts

@@ -13,6 +13,8 @@ export interface SessionRow {
   origin?: string | null;
   name?: string;
   agent?: string;
+  model?: string;
+  effort?: string;
   status?: string;
   updatedAt?: string;
 }
@@ -26,6 +28,8 @@ export interface PaneRow {
   id: string;
   status: string;
   agent: string;
+  model?: string;
+  effort?: string;
   name: string;
   updatedAt?: string;
 }
@@ -34,7 +38,7 @@ export interface PaneRow {
 export interface PaneSnapshot {
   runId: string;
   /** The orchestrator's own row, the only one whose origin is "open". */
-  orchestrator: { agent: string } | undefined;
+  orchestrator: { agent: string; model?: string; effort?: string } | undefined;
   rows: PaneRow[];
   /** Rows that matched the run but fell outside the budget. */
   hidden: number;

package/dist/plugin/statusline.sh

@@ -181,8 +181,17 @@ const getRunUsage = () => {
   const runId = text(process.env.CODEDECK_RUN_ID);
   if (!runId) return undefined;
 
+  const args = ["usage", runId, "--json"];
+  const sessionId = payload.session_id;
+  const observeCost = nonNegativeNumber(payload.cost?.total_cost_usd);
+  if (
+    typeof sessionId === "string" &&
+    /^[0-9a-fA-F-]{8,}$/.test(sessionId) &&
+    observeCost !== undefined
+  ) args.push("--observe", `${sessionId}=${observeCost}`);
+
   try {
-    const output = execFileSync("codedeck", ["usage", runId, "--json"], {
+    const output = execFileSync("codedeck", args, {
       encoding: "utf8",
       stdio: ["ignore", "pipe", "ignore"],
       timeout: 1000,
@@ -215,8 +224,30 @@ const getRunUsage = () => {
   }
 };
 
+const isObject = (value) => value !== null && typeof value === "object" && !Array.isArray(value);
+
+const getOrchestratorUsage = (usage) => {
+  const value = usage.orchestrator;
+  if (
+    !isObject(value) ||
+    nonNegativeNumber(value.costUsd) === undefined ||
+    typeof value.costComplete !== "boolean" ||
+    nonNegativeNumber(value.inputTokens) === undefined ||
+    nonNegativeNumber(value.outputTokens) === undefined ||
+    nonNegativeNumber(value.cachedTokens) === undefined ||
+    !Array.isArray(value.sources)
+  ) return undefined;
+  if (!value.sources.every((source) =>
+    isObject(source) &&
+    typeof source.nativeId === "string" &&
+    nonNegativeNumber(source.costUsd) !== undefined
+  )) return undefined;
+  return value;
+};
+
 const local = localCost();
 const runUsage = getRunUsage();
+const orchestratorUsage = runUsage ? getOrchestratorUsage(runUsage) : undefined;
 const workerTokens = runUsage
   ? runUsage.inputTokens + runUsage.outputTokens + runUsage.cachedTokens
   : undefined;
@@ -227,8 +258,14 @@ const tokenField = () => {
 
 const runField = () => {
   if (!runUsage) return undefined;
-  const total = (local ?? 0) + runUsage.costUsd;
-  const incomplete = !runUsage.costComplete;
+  const sourceCost = orchestratorUsage
+    ? orchestratorUsage.sources.reduce(
+      (sum, source) => source.nativeId === payload.session_id ? sum : sum + source.costUsd,
+      0,
+    )
+    : 0;
+  const total = (local ?? 0) + runUsage.costUsd + sourceCost;
+  const incomplete = !runUsage.costComplete || Boolean(orchestratorUsage && !orchestratorUsage.costComplete);
   if (!incomplete && total < COST_DISPLAY_THRESHOLD) return undefined;
   return paint(MUTED, "run ") + costAmount(total, incomplete);
 };

package/dist/store/database.js

@@ -89,9 +89,53 @@ export class Database {
         active INTEGER NOT NULL DEFAULT 1
       );
 
+      CREATE TABLE IF NOT EXISTS usage_sources (
+        source_key TEXT PRIMARY KEY,
+        cost REAL,
+        input_tokens INTEGER,
+        output_tokens INTEGER,
+        cached_tokens INTEGER,
+        updated_at TEXT NOT NULL
+      );
+
+      CREATE TABLE IF NOT EXISTS usage_attributions (
+        session_id TEXT NOT NULL,
+        source_key TEXT NOT NULL,
+        cost REAL,
+        input_tokens INTEGER NOT NULL DEFAULT 0,
+        output_tokens INTEGER NOT NULL DEFAULT 0,
+        cached_tokens INTEGER NOT NULL DEFAULT 0,
+        PRIMARY KEY (session_id, source_key),
+        FOREIGN KEY (session_id) REFERENCES sessions(id) ON DELETE CASCADE,
+        FOREIGN KEY (source_key) REFERENCES usage_sources(source_key) ON DELETE CASCADE
+      );
+
+      CREATE TABLE IF NOT EXISTS session_native_links (
+        session_id TEXT NOT NULL,
+        native_id TEXT NOT NULL,
+        linked_at TEXT NOT NULL,
+        reconciled_at TEXT,
+        state TEXT,
+        PRIMARY KEY (session_id, native_id),
+        FOREIGN KEY (session_id) REFERENCES sessions(id) ON DELETE CASCADE
+      );
+
+      CREATE TABLE IF NOT EXISTS usage_legacy (
+        native_id TEXT PRIMARY KEY,
+        ended_at TEXT NOT NULL,
+        cwd TEXT,
+        repository TEXT,
+        model TEXT,
+        cost REAL,
+        input_tokens INTEGER NOT NULL DEFAULT 0,
+        output_tokens INTEGER NOT NULL DEFAULT 0,
+        cached_tokens INTEGER NOT NULL DEFAULT 0
+      );
+
       CREATE INDEX IF NOT EXISTS idx_events_session_seq ON events(session_id, sequence);
       CREATE INDEX IF NOT EXISTS idx_sessions_status ON sessions(status);
       CREATE INDEX IF NOT EXISTS idx_sessions_created ON sessions(created_at DESC);
+      CREATE INDEX IF NOT EXISTS idx_usage_attributions_source_key ON usage_attributions(source_key);
       CREATE UNIQUE INDEX IF NOT EXISTS idx_claims_active_session_path
         ON claims(session_id, path_glob) WHERE active = 1;
     `);

package/dist/store/database.js.map

@@ -1 +1 @@
-{"version":3,"file":"database.js","sourceRoot":"","sources":["../../src/store/database.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"database.js","sourceRoot":"","sources":["../../src/store/database.ts"],"names":[],"mappings":"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"}

package/dist/store/native-links.js

@@ -0,0 +1,80 @@
+import { SessionStore } from "./sessions.js";
+function toNativeLink(row) {
+    return {
+        sessionId: row.session_id,
+        nativeId: row.native_id,
+        linkedAt: row.linked_at,
+        reconciledAt: row.reconciled_at,
+        state: row.state,
+    };
+}
+export class NativeLinkStore {
+    db;
+    constructor(db) {
+        this.db = db;
+    }
+    link(sessionId, nativeId) {
+        const previous = this.db.prepare(`
+      SELECT native_id FROM session_native_links
+      WHERE session_id = ? AND native_id <> ? AND reconciled_at IS NULL
+      ORDER BY linked_at, native_id
+    `).all(sessionId, nativeId).map((row) => row.native_id);
+        const result = this.db.prepare(`
+      INSERT INTO session_native_links (session_id, native_id, linked_at)
+      VALUES (?, ?, ?)
+      ON CONFLICT(session_id, native_id) DO NOTHING
+    `).run(sessionId, nativeId, new Date().toISOString());
+        return { created: Number(result.changes) > 0, previous };
+    }
+    unreconciled(sessionId) {
+        const rows = this.db.prepare(`
+      SELECT session_id, native_id, linked_at, reconciled_at, state
+      FROM session_native_links
+      WHERE session_id = ? AND reconciled_at IS NULL
+      ORDER BY linked_at, native_id
+    `).all(sessionId);
+        return rows.map(toNativeLink);
+    }
+    linksFor(sessionIds) {
+        if (sessionIds.length === 0)
+            return [];
+        const placeholders = sessionIds.map(() => "?").join(", ");
+        const rows = this.db.prepare(`
+      SELECT session_id, native_id, linked_at, reconciled_at, state
+      FROM session_native_links
+      WHERE session_id IN (${placeholders})
+      ORDER BY session_id, linked_at, native_id
+    `).all(...sessionIds);
+        return rows.map(toNativeLink);
+    }
+    markReconciled(sessionId, nativeId, state) {
+        this.db.prepare(`
+      UPDATE session_native_links SET reconciled_at = ?, state = ?
+      WHERE session_id = ? AND native_id = ?
+    `).run(new Date().toISOString(), state, sessionId, nativeId);
+    }
+    staleOpenRows(isDead) {
+        const candidates = this.db.prepare(`
+      SELECT DISTINCT sessions.id, sessions.status
+      FROM sessions
+      INNER JOIN session_native_links
+        ON session_native_links.session_id = sessions.id
+      WHERE sessions.origin = 'open'
+        AND session_native_links.reconciled_at IS NULL
+        AND sessions.status IN ('interrupted', 'working')
+      ORDER BY sessions.created_at, sessions.id
+    `).all();
+        const sessions = new SessionStore(this.db);
+        const stale = [];
+        for (const candidate of candidates) {
+            const session = sessions.get(candidate.id);
+            if (!session)
+                continue;
+            if (candidate.status === "interrupted" || (candidate.status === "working" && isDead(session))) {
+                stale.push(session);
+            }
+        }
+        return stale;
+    }
+}
+//# sourceMappingURL=native-links.js.map

package/dist/store/native-links.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"native-links.js","sourceRoot":"","sources":["../../src/store/native-links.ts"],"names":[],"mappings":"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"}

package/dist/store/sessions.js

@@ -1,5 +1,5 @@
 import { isActiveStatus } from "../core/session.js";
-import { computeSessionCost } from "../core/pricing.js";
+import { cachedInInputFor, computeSessionCost } from "../core/pricing.js";
 function rowToSession(row) {
     // `failure` is stored as JSON text; tolerate a corrupt blob rather than
     // losing the whole session row over it.
@@ -133,21 +133,29 @@ export class SessionStore {
             worktree: patch.worktree,
             branch: patch.branch,
             base_commit: patch.baseCommit,
-            pid: patch.pid,
-            completed_at: patch.completedAt ? patch.completedAt.toISOString() : undefined,
+            pid: patch.pid === undefined ? undefined : patch.pid ?? null,
+            completed_at: patch.completedAt === undefined
+                ? undefined
+                : patch.completedAt === null
+                    ? null
+                    : patch.completedAt.toISOString(),
             usage_input_tokens: patch.usage?.inputTokens,
             usage_output_tokens: patch.usage?.outputTokens,
             usage_cached_tokens: patch.usage?.cachedTokens,
             usage_cost: patch.usage?.cost,
-            last_event: patch.lastEvent,
+            last_event: patch.lastEvent === undefined ? undefined : patch.lastEvent ?? null,
             effort: patch.effort,
             fast: patch.fast === undefined ? undefined : patch.fast ? 1 : 0,
             sandbox: patch.sandbox,
             dangerously_bypass_approvals_and_sandbox: patch.dangerouslyBypassApprovalsAndSandbox === undefined ? undefined : patch.dangerouslyBypassApprovalsAndSandbox ? 1 : 0,
-            pid_start_time: patch.pidStartTime,
+            pid_start_time: patch.pidStartTime === undefined ? undefined : patch.pidStartTime ?? null,
             log_offset: patch.logOffset,
             stderr_offset: patch.stderrOffset,
-            failure: patch.failure === undefined ? undefined : JSON.stringify(patch.failure),
+            failure: patch.failure === undefined
+                ? undefined
+                : patch.failure === null
+                    ? null
+                    : JSON.stringify(patch.failure),
             origin: patch.origin,
             pending_message: patch.pendingMessage === undefined ? undefined : (patch.pendingMessage ?? null),
             pending_at: patch.pendingAt === undefined ? undefined : (patch.pendingAt ?? null),
@@ -182,6 +190,10 @@ export class SessionStore {
         const row = this.db.prepare(`SELECT * FROM sessions WHERE native_session_id = ? LIMIT 1`).get(nativeId);
         return row ? rowToSession(row) : null;
     }
+    listOpenByNativeId(nativeId) {
+        const rows = this.db.prepare(`SELECT * FROM sessions WHERE origin = 'open' AND native_session_id = ? ORDER BY updated_at DESC, id ASC`).all(nativeId);
+        return rows.map(rowToSession);
+    }
     queryUsage(params = {}) {
         const { since, until } = resolveUsageDateRange(params);
         const rows = this.db.prepare(`
@@ -189,11 +201,28 @@ export class SessionStore {
         id, run_id, name, agent, model, status,
         repository, cwd, worktree,
         created_at, updated_at, completed_at,
-        usage_input_tokens, usage_output_tokens, usage_cached_tokens, usage_cost
+        usage_input_tokens, usage_output_tokens, usage_cached_tokens, usage_cost, origin
       FROM sessions
       WHERE created_at >= ? AND created_at <= ?
       ORDER BY created_at ASC
     `).all(since, until);
+        const hasLegacyTable = this.db.prepare(`SELECT 1 FROM sqlite_master WHERE type = 'table' AND name = 'usage_legacy'`).get() !== undefined;
+        const legacyRows = hasLegacyTable
+            ? this.db.prepare(`
+          SELECT native_id, ended_at, cwd, repository, model, cost,
+            input_tokens, output_tokens, cached_tokens
+          FROM usage_legacy
+          WHERE ended_at >= ? AND ended_at <= ?
+          ORDER BY ended_at ASC
+        `).all(since, until)
+            : [];
+        const unknownOpenCostSessionIds = new Set(this.db.prepare(`
+        SELECT DISTINCT session_native_links.session_id
+        FROM session_native_links
+        INNER JOIN sessions ON sessions.id = session_native_links.session_id
+        WHERE sessions.origin = 'open'
+          AND session_native_links.state IN ('missing', 'no-price')
+      `).all().map((row) => row.session_id));
         const totals = {
             sessionCount: 0,
             activeSessionCount: 0,
@@ -212,10 +241,39 @@ export class SessionStore {
         const byModelMap = new Map();
         const byAgentMap = new Map();
         const byRunMap = new Map();
+        const byOriginMap = new Map();
         const repoFilter = params.repository?.toLowerCase();
         const modelFilter = params.model?.toLowerCase();
         const agentFilter = params.agent;
         const runIdFilter = params.runId;
+        const accumulate = (map, key, inputTokens, outputTokens, cachedTokens, totalTokens, cost, label) => {
+            let bucket = map.get(key);
+            if (!bucket) {
+                bucket = {
+                    key,
+                    label: label ?? key,
+                    sessionCount: 0,
+                    inputTokens: 0,
+                    outputTokens: 0,
+                    cachedTokens: 0,
+                    totalTokens: 0,
+                    costUsd: 0,
+                    costComplete: true,
+                };
+                map.set(key, bucket);
+            }
+            bucket.sessionCount++;
+            bucket.inputTokens += inputTokens;
+            bucket.outputTokens += outputTokens;
+            bucket.cachedTokens += cachedTokens;
+            bucket.totalTokens += totalTokens;
+            if (cost === null) {
+                bucket.costComplete = false;
+            }
+            else {
+                bucket.costUsd += cost;
+            }
+        };
         for (const row of rows) {
             if (runIdFilter && row.run_id !== runIdFilter)
                 continue;
@@ -232,11 +290,13 @@ export class SessionStore {
             const outputTokens = row.usage_output_tokens ?? 0;
             const cachedTokens = row.usage_cached_tokens ?? 0;
             const totalTokens = inputTokens + outputTokens + cachedTokens;
-            const cost = computeSessionCost({
+            const calculatedCost = computeSessionCost({
                 model: row.model,
+                cachedInInput: cachedInInputFor(row.agent),
                 reportedCost: row.usage_cost,
                 usage: { inputTokens, outputTokens, cachedTokens },
             });
+            const cost = unknownOpenCostSessionIds.has(row.id) ? null : calculatedCost;
             totals.sessionCount++;
             if (isActiveStatus(row.status))
                 totals.activeSessionCount++;
@@ -255,49 +315,59 @@ export class SessionStore {
             else {
                 totals.costUsd += cost;
             }
-            const accumulate = (map, key, label) => {
-                let bucket = map.get(key);
-                if (!bucket) {
-                    bucket = {
-                        key,
-                        label: label ?? key,
-                        sessionCount: 0,
-                        inputTokens: 0,
-                        outputTokens: 0,
-                        cachedTokens: 0,
-                        totalTokens: 0,
-                        costUsd: 0,
-                        costComplete: true,
-                    };
-                    map.set(key, bucket);
-                }
-                bucket.sessionCount++;
-                bucket.inputTokens += inputTokens;
-                bucket.outputTokens += outputTokens;
-                bucket.cachedTokens += cachedTokens;
-                bucket.totalTokens += totalTokens;
-                if (cost === null) {
-                    bucket.costComplete = false;
-                }
-                else {
-                    bucket.costUsd += cost;
-                }
-            };
             // Day (local date string YYYY-MM-DD)
             const d = new Date(row.created_at);
             const dayKey = `${d.getFullYear()}-${String(d.getMonth() + 1).padStart(2, "0")}-${String(d.getDate()).padStart(2, "0")}`;
-            accumulate(byDayMap, dayKey);
+            accumulate(byDayMap, dayKey, inputTokens, outputTokens, cachedTokens, totalTokens, cost);
             // Repo (normalized project name across worktrees)
             const repoKey = normalizeProjectName(row);
-            accumulate(byRepoMap, repoKey);
+            accumulate(byRepoMap, repoKey, inputTokens, outputTokens, cachedTokens, totalTokens, cost);
             // Model
-            accumulate(byModelMap, row.model || "unknown");
+            accumulate(byModelMap, row.model || "unknown", inputTokens, outputTokens, cachedTokens, totalTokens, cost);
             // Agent
-            accumulate(byAgentMap, row.agent);
+            accumulate(byAgentMap, row.agent, inputTokens, outputTokens, cachedTokens, totalTokens, cost);
             // Run
             if (row.run_id) {
-                accumulate(byRunMap, row.run_id, row.name ? `${row.name} (${row.run_id.slice(0, 8)})` : row.run_id.slice(0, 8));
+                accumulate(byRunMap, row.run_id, inputTokens, outputTokens, cachedTokens, totalTokens, cost, row.name ? `${row.name} (${row.run_id.slice(0, 8)})` : row.run_id.slice(0, 8));
             }
+            accumulate(byOriginMap, row.origin === "open" ? "orchestrator" : "worker", inputTokens, outputTokens, cachedTokens, totalTokens, cost);
+        }
+        for (const row of legacyRows) {
+            if (runIdFilter)
+                continue;
+            if (agentFilter && agentFilter !== "claude")
+                continue;
+            if (modelFilter && (!row.model || !row.model.toLowerCase().includes(modelFilter)))
+                continue;
+            if (repoFilter) {
+                const repoStr = [row.repository, row.cwd].filter(Boolean).join(" ").toLowerCase();
+                if (!repoStr.includes(repoFilter))
+                    continue;
+            }
+            const inputTokens = row.input_tokens;
+            const outputTokens = row.output_tokens;
+            const cachedTokens = row.cached_tokens;
+            const totalTokens = inputTokens + outputTokens + cachedTokens;
+            const cost = row.cost;
+            totals.sessionCount++;
+            totals.inputTokens += inputTokens;
+            totals.outputTokens += outputTokens;
+            totals.cachedTokens += cachedTokens;
+            totals.totalTokens += totalTokens;
+            if (cost === null) {
+                totals.costComplete = false;
+                totals.sessionsWithoutCost++;
+            }
+            else {
+                totals.costUsd += cost;
+            }
+            const d = new Date(row.ended_at);
+            const dayKey = `${d.getFullYear()}-${String(d.getMonth() + 1).padStart(2, "0")}-${String(d.getDate()).padStart(2, "0")}`;
+            accumulate(byDayMap, dayKey, inputTokens, outputTokens, cachedTokens, totalTokens, cost);
+            accumulate(byRepoMap, normalizeProjectName({ repository: row.repository, cwd: row.cwd }), inputTokens, outputTokens, cachedTokens, totalTokens, cost);
+            accumulate(byModelMap, row.model || "unknown", inputTokens, outputTokens, cachedTokens, totalTokens, cost);
+            accumulate(byAgentMap, "claude", inputTokens, outputTokens, cachedTokens, totalTokens, cost);
+            accumulate(byOriginMap, "orchestrator", inputTokens, outputTokens, cachedTokens, totalTokens, cost);
         }
         const sortDescending = (a, b) => {
             if (b.costUsd !== a.costUsd)
@@ -309,6 +379,7 @@ export class SessionStore {
         const byModel = [...byModelMap.values()].sort(sortDescending);
         const byAgent = [...byAgentMap.values()].sort(sortDescending);
         const byRun = [...byRunMap.values()].sort(sortDescending);
+        const byOrigin = [...byOriginMap.values()].sort(sortDescending);
         return {
             range: {
                 period: params.period,
@@ -321,6 +392,7 @@ export class SessionStore {
             byModel,
             byAgent,
             byRun,
+            byOrigin,
         };
     }
 }