codesesh 1.0.2 → 1.0.3

package/dist/{chunk-VAUC2W7I.js → chunk-PSHZZITB.js}

@@ -1,6 +1,37 @@
 #!/usr/bin/env node
 
-// ../core/dist/chunk-PIUQAREY.mjs
+// ../core/dist/chunk-46YWSMES.mjs
+var UNKNOWN_AGENT_NAME = "unknown";
+function normalizeSessionReference(reference) {
+  return {
+    agentName: reference.agentName.trim().toLowerCase(),
+    sessionId: reference.sessionId
+  };
+}
+function parseSessionReference(value) {
+  const separatorIndex = value.indexOf("/");
+  if (separatorIndex <= 0 || separatorIndex === value.length - 1) return null;
+  const agentName = value.slice(0, separatorIndex).trim().toLowerCase();
+  if (!agentName) return null;
+  return {
+    agentName,
+    sessionId: value.slice(separatorIndex + 1)
+  };
+}
+function formatSessionReference(reference) {
+  const normalized = normalizeSessionReference(reference);
+  return `${normalized.agentName}/${normalized.sessionId}`;
+}
+function getSessionAgentKey(session) {
+  return parseSessionReference(session.slug ?? "")?.agentName ?? UNKNOWN_AGENT_NAME;
+}
+function agentRoutePath(agentName) {
+  return `/${encodeURIComponent(agentName.trim().toLowerCase())}`;
+}
+function sessionRoutePath(reference) {
+  const normalized = normalizeSessionReference(reference);
+  return `${agentRoutePath(normalized.agentName)}/${encodeURIComponent(normalized.sessionId)}`;
+}
 function toRecord(value) {
   return value !== null && typeof value === "object" && !Array.isArray(value) ? value : null;
 }
@@ -121,7 +152,7 @@ function normalizeMessageParts(value) {
   });
 }
 
-// ../core/dist/chunk-LE5L4UBM.mjs
+// ../core/dist/chunk-TBIXUIQV.mjs
 import { chmodSync, existsSync, mkdirSync, readdirSync, statSync } from "fs";
 import { basename, dirname, join } from "path";
 import { createHash } from "crypto";
@@ -135,7 +166,7 @@ import { existsSync as existsSync4, readFileSync as readFileSync2, statSync as s
 import { join as join5, basename as basename3, dirname as dirname2 } from "path";
 import { existsSync as existsSync3 } from "fs";
 import { homedir as homedir2, platform } from "os";
-import { join as join4 } from "path";
+import { isAbsolute, join as join4, resolve } from "path";
 import { closeSync, openSync, readSync } from "fs";
 import { StringDecoder } from "string_decoder";
 import { basename as basename2 } from "path";
@@ -147,7 +178,7 @@ import { createHash as createHash2 } from "crypto";
 import { existsSync as existsSync6, readFileSync as readFileSync3, statSync as statSync5 } from "fs";
 import { join as join8, basename as basename5, dirname as dirname4 } from "path";
 import { existsSync as existsSync7, readFileSync as readFileSync4, statSync as statSync6 } from "fs";
-import { basename as basename6, dirname as dirname5, join as join9, resolve } from "path";
+import { basename as basename6, dirname as dirname5, join as join9, resolve as resolve2 } from "path";
 import { existsSync as existsSync8, readFileSync as readFileSync5, statSync as statSync7 } from "fs";
 import { join as join10, basename as basename7 } from "path";
 import { existsSync as existsSync9, lstatSync, readdirSync as readdirSync3, readFileSync as readFileSync6 } from "fs";
@@ -162,8 +193,7 @@ import { dirname as dirname6, join as join14 } from "path";
 import { existsSync as existsSync12, readdirSync as readdirSync4, realpathSync, statSync as statSync10 } from "fs";
 import { basename as basename9, join as join17 } from "path";
 import { closeSync as closeSync2, openSync as openSync2, readFileSync as readFileSync8, readSync as readSync2, statSync as statSync9 } from "fs";
-import { homedir as homedir5 } from "os";
-import { join as join15, resolve as resolve2 } from "path";
+import { join as join15 } from "path";
 import * as zlib from "zlib";
 import { createHash as createHash3 } from "crypto";
 import { readFileSync as readFileSync9 } from "fs";
@@ -968,12 +998,32 @@ function reportAgentScanFailure(failure, baselineRetained) {
   });
 }
 var BaseAgent = class {
+  /**
+   * Commit the observation made by the latest checkForChanges. Called by the
+   * scan orchestrator only after the scan consuming that check succeeded, so
+   * a failed scan leaves the baseline behind and the next check re-detects
+   * the same change instead of silently skipping it.
+   */
+  commitChangeCheck() {
+  }
+  /** Wrap an enumeration/database read so failures follow the error taxonomy. */
+  scanStep(stage, sourcePath, read) {
+    try {
+      return read();
+    } catch (error) {
+      if (error instanceof SessionScanError) throw error;
+      throw new SessionScanError(this.name, stage, { cause: error, sourcePath });
+    }
+  }
   filterCachedSessions(sessions) {
     return sessions;
   }
   getUri(sessionId) {
     return `${this.name}://${sessionId}`;
   }
+  sessionSlug(sessionId) {
+    return formatSessionReference({ agentName: this.name, sessionId });
+  }
 };
 var FileSystemSessionSource = class extends BaseAgent {
   sessionMetaMap = /* @__PURE__ */ new Map();
@@ -1215,6 +1265,7 @@ function latestSqliteSourceMtime(dbPath) {
 var DatabaseSessionSource = class extends BaseAgent {
   sessionMetaMap = /* @__PURE__ */ new Map();
   lastSourceFingerprint = null;
+  pendingSourceFingerprint = null;
   /** 记录单个会话的缓存 meta（sourcePath = dbPath）。 */
   rememberSession(sessionId, additionalMeta = {}) {
     const dbPath = this.getDatabasePath();
@@ -1239,6 +1290,11 @@ var DatabaseSessionSource = class extends BaseAgent {
   setSessionMetaMap(meta) {
     this.sessionMetaMap = meta;
   }
+  commitChangeCheck() {
+    if (this.pendingSourceFingerprint == null) return;
+    this.lastSourceFingerprint = this.pendingSourceFingerprint;
+    this.pendingSourceFingerprint = null;
+  }
   /**
    * 变更检测：数据库内部变更难以按行定位，按库文件集合的指纹判定。
    *
@@ -1263,7 +1319,7 @@ var DatabaseSessionSource = class extends BaseAgent {
       if (pricingChanged) return { hasChanges: true, timestamp: Date.now() };
       const fingerprint = sqliteSourceFingerprint(dbPath);
       const previous = this.lastSourceFingerprint;
-      this.lastSourceFingerprint = fingerprint;
+      this.pendingSourceFingerprint = fingerprint;
       const hasChanges = previous == null ? latestSqliteSourceMtime(dbPath) > sinceTimestamp : fingerprint !== previous;
       return {
         hasChanges,
@@ -1369,10 +1425,16 @@ var PerfTracer = class {
   }
 };
 var perf = new PerfTracer();
+function expandHomePath(path2) {
+  if (path2 === "~") return homedir2();
+  if (path2.startsWith("~/") || path2.startsWith("~\\")) return join4(homedir2(), path2.slice(2));
+  return path2;
+}
 function readEnvPath(name) {
   const value = process.env[name];
-  if (!value) return null;
-  return value;
+  if (!value || !value.trim()) return null;
+  const expanded = expandHomePath(value.trim());
+  return isAbsolute(expanded) ? expanded : resolve(expanded);
 }
 function firstExisting(...paths) {
   for (const p of paths) {
@@ -1605,18 +1667,35 @@ function estimateTokenCost(model, tokens) {
   return estimateCostForTokens(model, tokens)?.cost ?? null;
 }
 var TIMEZONE_SUFFIX_PATTERN = /(?:Z|[+-]\d{2}:?\d{2})$/i;
-function parseAgentTimestampMs(value, agentName) {
+function parseAgentTimestamp(value, agentName, options = {}) {
+  if (value == null) return null;
+  if (typeof value === "number") {
+    if (Number.isFinite(value)) return value;
+    reportTimestampParseFailure(agentName, value);
+    return null;
+  }
+  if (typeof value !== "string") {
+    reportTimestampParseFailure(agentName, value);
+    return null;
+  }
   const timestamp = value.trim().replace(" ", "T");
-  if (!timestamp) return 0;
+  if (!timestamp) return null;
+  if (options.numericStrings) {
+    const numeric = Number(timestamp);
+    if (Number.isFinite(numeric)) return numeric;
+  }
   const normalized = TIMEZONE_SUFFIX_PATTERN.test(timestamp) ? timestamp : `${timestamp}Z`;
   const timestampMs = Date.parse(normalized);
   if (Number.isFinite(timestampMs)) return timestampMs;
+  reportTimestampParseFailure(agentName, value, normalized);
+  return null;
+}
+function reportTimestampParseFailure(agentName, value, normalized) {
   getCoreDiagnostics()?.warn("agent.timestamp_parse_failed", {
     agentName,
-    value,
+    value: typeof value === "string" || typeof value === "number" ? value : typeof value,
     normalized
   });
-  return 0;
 }
 function asRecord(value) {
   if (value && typeof value === "object" && !Array.isArray(value)) {
@@ -1672,6 +1751,9 @@ var TranscriptBuilder = class {
   options;
   messages = [];
   pendingToolCalls = /* @__PURE__ */ new Map();
+  // Tracks per-message part kinds so grouping checks are O(1) instead of
+  // rescanning the growing parts array on every append (CS-283).
+  partFlags = /* @__PURE__ */ new WeakMap();
   currentAssistant = null;
   latestTextAssistant = null;
   beginTurn() {
@@ -1681,10 +1763,13 @@ var TranscriptBuilder = class {
   appendMessage(input) {
     const message = this.createMessage(input);
     this.messages.push(message);
-    this.registerToolCalls(message.parts);
+    for (const part of message.parts) {
+      this.registerToolCall(part);
+      this.notePart(message, part);
+    }
     if (message.role === "assistant") {
       this.currentAssistant = message;
-      if (message.parts.some((part) => part.type === "text")) {
+      if (this.flagsFor(message).hasText) {
         this.latestTextAssistant = message;
       }
     } else if (message.role === "user") {
@@ -1694,11 +1779,12 @@ var TranscriptBuilder = class {
   }
   appendAssistantPart(part, input, options = {}) {
     const current = this.currentAssistant;
-    const canReuse = current !== null && (options.grouping === "current" || (part.type === "text" ? !current.parts.some((item) => item.type === "tool") : part.type === "reasoning" ? !current.parts.some((item) => item.type === "text" || item.type === "tool") : false));
+    const currentFlags = current === null ? null : this.flagsFor(current);
+    const canReuse = current !== null && (options.grouping === "current" || (part.type === "text" ? !currentFlags.hasTool : part.type === "reasoning" ? !currentFlags.hasText && !currentFlags.hasTool : false));
     const message = canReuse ? current : this.appendMessage({ ...input, role: "assistant", parts: [part] });
     if (canReuse) {
       if (options.deduplicateTail) this.appendPartIfNew(message, part);
-      else message.parts.push(part);
+      else this.pushPart(message, part);
       this.applyMissingMetadata(message, input);
     }
     if (part.type === "text") {
@@ -1717,7 +1803,7 @@ var TranscriptBuilder = class {
       parts: [part]
     });
     if (target) {
-      message.parts.push(part);
+      this.pushPart(message, part);
       this.applyMissingMetadata(message, input);
       if (options.markModeAsTool) message.mode = "tool";
       this.registerToolCall(part);
@@ -1727,7 +1813,7 @@ var TranscriptBuilder = class {
   }
   appendToCurrentAssistant(part) {
     if (!this.currentAssistant) return false;
-    this.currentAssistant.parts.push(part);
+    this.pushPart(this.currentAssistant, part);
     return true;
   }
   updateToolCall(callId, update) {
@@ -1804,9 +1890,6 @@ var TranscriptBuilder = class {
       nickname: input.nickname
     };
   }
-  registerToolCalls(parts) {
-    for (const part of parts) this.registerToolCall(part);
-  }
   registerToolCall(part) {
     if (part.type === "tool" && part.callID) {
       this.pendingToolCalls.set(part.callID, part);
@@ -1817,7 +1900,24 @@ var TranscriptBuilder = class {
     if ("text" in part && tail?.type === part.type && "text" in tail && tail.text === part.text) {
       return;
     }
+    this.pushPart(message, part);
+  }
+  pushPart(message, part) {
     message.parts.push(part);
+    this.notePart(message, part);
+  }
+  notePart(message, part) {
+    const flags = this.flagsFor(message);
+    if (part.type === "text") flags.hasText = true;
+    else if (part.type === "tool") flags.hasTool = true;
+  }
+  flagsFor(message) {
+    let flags = this.partFlags.get(message);
+    if (!flags) {
+      flags = { hasText: false, hasTool: false };
+      this.partFlags.set(message, flags);
+    }
+    return flags;
   }
   applyMissingMetadata(message, input) {
     if (!message.id && input.id) message.id = input.id;
@@ -1855,18 +1955,12 @@ var TranscriptBuilder = class {
     };
   }
 };
-var HEAD_INDEX_VERSION = "claudecode-head-v6";
+var HEAD_INDEX_VERSION = "claudecode-head-v7";
 function resolveClaudeCodeDataRoot() {
   return resolveHomePath("CLAUDE_CONFIG_DIR", ".claude");
 }
 function parseTimestampMs(data) {
-  const raw = data["timestamp"];
-  const value = asString(raw);
-  if (value === void 0) {
-    if (raw !== void 0 && raw !== null) reportFieldMismatch("claudecode", "timestamp");
-    return 0;
-  }
-  return parseAgentTimestampMs(value, "claudecode");
+  return parseAgentTimestamp(data["timestamp"], "claudecode") ?? 0;
 }
 function readUsageNumber(usage, field) {
   const raw = usage[field];
@@ -2067,7 +2161,7 @@ var ClaudeCodeAgent = class extends SingleFileSessionSource {
       reference: { agentName: this.name, sessionId: meta.id },
       id: meta.id,
       title: meta.title,
-      slug: `claudecode/${meta.id}`,
+      slug: this.sessionSlug(meta.id),
       directory: meta.directory,
       parent_reference: meta.parentSessionId == null ? void 0 : { agentName: this.name, sessionId: meta.parentSessionId },
       version: void 0,
@@ -2347,7 +2441,7 @@ var ClaudeCodeAgent = class extends SingleFileSessionSource {
     if (messageCount === 0) return filteredSession("no visible messages");
     return parsedSession({
       id: sessionId,
-      slug: `claudecode/${sessionId}`,
+      slug: this.sessionSlug(sessionId),
       title,
       directory,
       parent_reference: child?.parentSessionId == null ? void 0 : { agentName: this.name, sessionId: child.parentSessionId },
@@ -2997,7 +3091,7 @@ var OpenCodeSqliteAgent = class extends DatabaseSessionSource {
     const messageTitle = context?.messageTitle ?? null;
     return parsedSession({
       id,
-      slug: `${this.name}/${id}`,
+      slug: this.sessionSlug(id),
       title: resolveSessionTitle(String(row.title ?? ""), messageTitle, null),
       directory: String(row.directory ?? ""),
       parent_reference: row.parent_id == null || String(row.parent_id) === "" ? void 0 : { agentName: this.name, sessionId: String(row.parent_id) },
@@ -3379,6 +3473,14 @@ var OpenCodeAgent = class extends OpenCodeSqliteAgent {
     });
   }
 };
+function normalizeToolArguments(raw) {
+  if (typeof raw !== "string") return raw;
+  try {
+    return JSON.parse(raw);
+  } catch {
+    return raw;
+  }
+}
 var KIMI_TOOL_TITLE_MAP = {
   ReadFile: "read",
   Glob: "glob",
@@ -3388,7 +3490,7 @@ var KIMI_TOOL_TITLE_MAP = {
   Shell: "bash"
 };
 var KIMI_IGNORED_TOOLS = /* @__PURE__ */ new Set(["SetTodoList"]);
-var KIMI_PARSER_REVISION = "kimi-parser-v1";
+var KIMI_PARSER_REVISION = "kimi-parser-v2";
 function resolveKimiDataRoot() {
   return resolveHomePath("KIMI_SHARE_DIR", ".kimi");
 }
@@ -3402,26 +3504,53 @@ function readWireTimestamp(record) {
   return narrowField("kimi", "wire.timestamp", record.timestamp, asNumber) ?? 0;
 }
 function parseTimestamp(raw) {
-  if (typeof raw === "number") return Number.isFinite(raw) ? raw : null;
-  if (typeof raw !== "string" || raw.trim() === "") return null;
-  const numeric = Number(raw);
-  if (Number.isFinite(numeric)) return numeric;
-  const parsed = Date.parse(raw);
-  return Number.isFinite(parsed) ? parsed : null;
+  return parseAgentTimestamp(raw, "kimi", { numericStrings: true });
 }
 function extractTokenField(usage, field) {
   return narrowField("kimi", `usage.${field}`, usage[field], asNumber) ?? 0;
 }
-function normalizeToolArguments(raw) {
-  if (typeof raw === "string") {
-    try {
-      return JSON.parse(raw);
-    } catch {
-      return raw;
+var KimiUsageAccumulator = class {
+  constructor(model, usesWireTotalFallback) {
+    this.model = model;
+    this.usesWireTotalFallback = usesWireTotalFallback;
+  }
+  model;
+  usesWireTotalFallback;
+  stats = {
+    total_cost: 0,
+    total_input_tokens: 0,
+    total_output_tokens: 0,
+    total_tokens: 0,
+    message_count: 0
+  };
+  totalCost = 0;
+  applyContextRecord(record) {
+    if (record.role !== "_usage") return;
+    const tokenCount = asNumber(record.token_count);
+    if (tokenCount === void 0) {
+      reportFieldMismatch("kimi", "usage.token_count");
+      return;
     }
+    this.stats.total_tokens = tokenCount;
+  }
+  applyWireRecord(record) {
+    if (this.usesWireTotalFallback) this.applyContextRecord(record);
+    const tokenUsage = asRecord(asRecord(record.message)?.usage);
+    if (!tokenUsage) return null;
+    const inputTokens = extractTokenField(tokenUsage, "input_tokens");
+    const outputTokens = extractTokenField(tokenUsage, "output_tokens");
+    const cost = estimateTokenCost(this.model, { input: inputTokens, output: outputTokens });
+    this.stats.total_input_tokens += inputTokens;
+    this.stats.total_output_tokens += outputTokens;
+    if (cost !== null) this.totalCost += cost;
+    return { inputTokens, outputTokens, cost };
+  }
+  finish() {
+    const stats = { ...this.stats, total_cost: Number(this.totalCost.toFixed(8)) };
+    if (stats.total_cost > 0) stats.cost_source = "estimated";
+    return stats;
   }
-  return raw;
-}
+};
 function normalizeToolOutputParts(content, timestampMs) {
   if (typeof content === "string") {
     const text2 = cleanInternalText(content);
@@ -3647,7 +3776,7 @@ var KimiAgent = class extends FileSystemSessionSource {
     const stats = this.extractStats(meta.sourcePath);
     return parsedSession({
       id: meta.id,
-      slug: `kimi/${meta.id}`,
+      slug: this.sessionSlug(meta.id),
       title: meta.title,
       directory: meta.cwd,
       time_created: meta.createdAt,
@@ -3667,10 +3796,12 @@ var KimiAgent = class extends FileSystemSessionSource {
     if (!meta.contextFile) throw new Error("context.jsonl is missing");
     const builder = new TranscriptBuilder();
     const ignoredToolCallIds = /* @__PURE__ */ new Set();
+    const accumulator = new KimiUsageAccumulator(this.defaultModel, false);
     let seq = 0;
     const fallbackTs = meta.createdAt;
     for (const record of readJsonlFile(meta.contextFile)) {
       seq++;
+      accumulator.applyContextRecord(record);
       try {
         const role = String(record.role ?? "");
         if (role === "_checkpoint" || role === "_usage" || isInternalEventType(role)) continue;
@@ -3716,8 +3847,8 @@ var KimiAgent = class extends FileSystemSessionSource {
       } catch {
       }
     }
-    const stats = this.extractStats(meta.sourcePath);
-    return this.buildSessionData(meta, builder, stats);
+    this.collectWireUsage(meta.sourcePath, accumulator);
+    return this.buildSessionData(meta, builder, accumulator.finish());
   }
   getSessionDataFromWire(meta) {
     const wirePath = meta.wireFile ?? join8(meta.sourcePath, "wire.jsonl");
@@ -3725,29 +3856,25 @@ var KimiAgent = class extends FileSystemSessionSource {
     const builder = new TranscriptBuilder();
     const ignoredToolCallIds = /* @__PURE__ */ new Set();
     const openToolArgumentBuffer = /* @__PURE__ */ new Map();
+    const accumulator = new KimiUsageAccumulator(this.defaultModel, true);
     let openToolCallId = null;
     let seq = 0;
     for (const record of readJsonlFile(wirePath)) {
       seq++;
       try {
+        const tokenUsage = accumulator.applyWireRecord(record);
         const message = asRecord(record.message) ?? {};
         const msgType = asString(message.type) ?? "";
         if (isInternalEventType(msgType)) continue;
         const payload = asRecord(message.payload) ?? {};
         const timestampMs = Math.floor(readWireTimestamp(record) * 1e3);
-        const usage = asRecord(message["usage"]);
-        if (usage) {
-          const inputTokens = extractTokenField(usage, "input_tokens");
-          const outputTokens = extractTokenField(usage, "output_tokens");
-          if (inputTokens || outputTokens) {
-            const tokens = { input: inputTokens, output: outputTokens };
-            const cost = estimateTokenCost(this.defaultModel, tokens);
-            builder.attachUsageToLatestAssistant(tokens, {
-              model: this.defaultModel,
-              cost: cost ?? void 0,
-              costSource: cost === null ? void 0 : "estimated"
-            });
-          }
+        if (tokenUsage && (tokenUsage.inputTokens || tokenUsage.outputTokens)) {
+          const tokens = { input: tokenUsage.inputTokens, output: tokenUsage.outputTokens };
+          builder.attachUsageToLatestAssistant(tokens, {
+            model: this.defaultModel,
+            cost: tokenUsage.cost ?? void 0,
+            costSource: tokenUsage.cost === null ? void 0 : "estimated"
+          });
         }
         if (msgType === "TurnBegin") {
           const userInput = payload.user_input;
@@ -3852,8 +3979,7 @@ var KimiAgent = class extends FileSystemSessionSource {
       } catch {
       }
     }
-    const stats = this.extractStats(meta.sourcePath);
-    return this.buildSessionData(meta, builder, stats);
+    return this.buildSessionData(meta, builder, accumulator.finish());
   }
   // --- Helpers ---
   sourceFingerprint(meta) {
@@ -3950,59 +4076,27 @@ var KimiAgent = class extends FileSystemSessionSource {
     if (!outputParts.length || !callId) return false;
     return builder.resolveToolCall(callId, { output: [...outputParts] });
   }
-  /** Applies a `_usage` record's running total; other records are ignored. */
-  applyUsageTotal(record, stats) {
-    if (record.role !== "_usage") return;
-    const tokenCount = asNumber(record.token_count);
-    if (tokenCount === void 0) {
-      reportFieldMismatch("kimi", "usage.token_count");
-      return;
-    }
-    stats.total_tokens = tokenCount;
-  }
   extractStats(sessionDir) {
-    let totalCost = 0;
-    const stats = {
-      total_cost: 0,
-      total_input_tokens: 0,
-      total_output_tokens: 0,
-      total_tokens: 0,
-      message_count: 0
-    };
     const contextPath = join8(sessionDir, "context.jsonl");
     const hasContext = existsSync6(contextPath);
+    const accumulator = new KimiUsageAccumulator(this.defaultModel, !hasContext);
     if (hasContext) {
       try {
-        for (const record of readJsonlFile(contextPath)) this.applyUsageTotal(record, stats);
+        for (const record of readJsonlFile(contextPath)) accumulator.applyContextRecord(record);
       } catch {
       }
     }
+    this.collectWireUsage(sessionDir, accumulator);
+    return accumulator.finish();
+  }
+  collectWireUsage(sessionDir, accumulator) {
     const wirePath = join8(sessionDir, "wire.jsonl");
     if (existsSync6(wirePath)) {
       try {
-        for (const record of readJsonlFile(wirePath)) {
-          const tokenUsage = asRecord(asRecord(record.message)?.usage);
-          if (tokenUsage) {
-            const inputTokens = extractTokenField(tokenUsage, "input_tokens");
-            const outputTokens = extractTokenField(tokenUsage, "output_tokens");
-            stats.total_input_tokens += inputTokens;
-            stats.total_output_tokens += outputTokens;
-            const cost = estimateTokenCost(this.defaultModel, {
-              input: inputTokens,
-              output: outputTokens
-            });
-            if (cost !== null) totalCost += cost;
-          }
-          if (!hasContext) this.applyUsageTotal(record, stats);
-        }
+        for (const record of readJsonlFile(wirePath)) accumulator.applyWireRecord(record);
       } catch {
       }
     }
-    stats.total_cost = Number(totalCost.toFixed(8));
-    if (stats.total_cost > 0) {
-      stats.cost_source = "estimated";
-    }
-    return stats;
   }
   buildSessionData(meta, builder, stats) {
     const transcript = builder.finish(stats);
@@ -4010,7 +4104,7 @@ var KimiAgent = class extends FileSystemSessionSource {
       reference: { agentName: this.name, sessionId: meta.id },
       id: meta.id,
       title: meta.title,
-      slug: `kimi/${meta.id}`,
+      slug: this.sessionSlug(meta.id),
       directory: meta.cwd,
       time_created: meta.createdAt,
       time_updated: meta.activityAt,
@@ -4036,28 +4130,15 @@ var KIMI_CODE_TOOL_TITLE_MAP = {
   Shell: "bash"
 };
 var KIMI_CODE_IGNORED_TOOLS = /* @__PURE__ */ new Set(["SetTodoList"]);
-var KIMI_CODE_PARSER_REVISION = "kimi-code-parser-v1";
+var KIMI_CODE_PARSER_REVISION = "kimi-code-parser-v2";
 function resolveKimiCodeDataRoot() {
   return resolveHomePath("KIMI_CODE_HOME", ".kimi-code");
 }
 function mapToolTitle2(toolName) {
   return KIMI_CODE_TOOL_TITLE_MAP[toolName] ?? toolName;
 }
-function normalizeToolArguments2(raw) {
-  if (typeof raw !== "string") return raw;
-  try {
-    return JSON.parse(raw);
-  } catch {
-    return raw;
-  }
-}
 function parseTimestamp2(raw) {
-  if (typeof raw === "number") return Number.isFinite(raw) ? raw : null;
-  if (typeof raw !== "string" || raw.trim() === "") return null;
-  const numeric = Number(raw);
-  if (Number.isFinite(numeric)) return numeric;
-  const parsed = Date.parse(raw);
-  return Number.isFinite(parsed) ? parsed : null;
+  return parseAgentTimestamp(raw, "kimi-code", { numericStrings: true });
 }
 function timestampFromRecord(record) {
   return parseTimestamp2(record.time) ?? 0;
@@ -4173,7 +4254,7 @@ function toolCallParts(message, timestampMs, ignoredToolCallIds) {
       continue;
     }
     const rawArguments = functionRecord?.arguments ?? callRecord?.arguments;
-    parts.push(toolPart(toolName, callId, normalizeToolArguments2(rawArguments), timestampMs));
+    parts.push(toolPart(toolName, callId, normalizeToolArguments(rawArguments), timestampMs));
   }
   return parts;
 }
@@ -4274,7 +4355,7 @@ var KimiCodeAgent = class extends FileSystemSessionSource {
       const sessionPath = asString(record.sessionDir);
       const workDir = asString(record.workDir);
       if (!sessionPath || !workDir) continue;
-      this.workDirBySessionPath.set(resolve(sessionPath), workDir);
+      this.workDirBySessionPath.set(resolve2(sessionPath), workDir);
     }
   }
   listSessionDirs() {
@@ -4308,7 +4389,7 @@ var KimiCodeAgent = class extends FileSystemSessionSource {
         wireStat.mtimeMs
       );
       const custom = asRecord(state.custom);
-      const workDir = asString(state.workDir) ?? asString(custom?.cwd) ?? this.workDirBySessionPath.get(resolve(sessionDir)) ?? "";
+      const workDir = asString(state.workDir) ?? asString(custom?.cwd) ?? this.workDirBySessionPath.get(resolve2(sessionDir)) ?? "";
       const explicitTitle = asString(state.title) ?? asString(state.customTitle) ?? "";
       return parsedSession({
         id: basename6(sessionDir),
@@ -4416,7 +4497,7 @@ var KimiCodeAgent = class extends FileSystemSessionSource {
     this.sessionMetaMap.set(meta.id, meta);
     return parsedSession({
       id: meta.id,
-      slug: `${this.name}/${meta.id}`,
+      slug: this.sessionSlug(meta.id),
       title: meta.title,
       directory: meta.workDir,
       time_created: meta.createdAt,
@@ -4434,7 +4515,7 @@ var KimiCodeAgent = class extends FileSystemSessionSource {
       reference: { agentName: this.name, sessionId: meta.id },
       id: meta.id,
       title: meta.title,
-      slug: `${this.name}/${meta.id}`,
+      slug: this.sessionSlug(meta.id),
       directory: meta.workDir,
       time_created: meta.createdAt,
       time_updated: meta.activityAt,
@@ -4865,7 +4946,7 @@ var JsValueReader = class {
 var PROPOSED_PLAN_PATTERN = /<proposed_plan>\s*([\s\S]*?)\s*<\/proposed_plan>/;
 var PLAN_APPROVAL_PREFIX = "PLEASE IMPLEMENT THIS PLAN";
 var SUBAGENT_NOTIFICATION_PATTERN = /<subagent_notification>\s*([\s\S]*?)\s*<\/subagent_notification>/;
-var HEAD_INDEX_VERSION2 = "codex-head-v1";
+var HEAD_INDEX_VERSION2 = "codex-head-v2";
 var PARSER_VERSION = "codex-parser-v8";
 function resolveCodexDataRoot() {
   return resolveHomePath("CODEX_HOME", ".codex");
@@ -4897,7 +4978,7 @@ function extractSessionId(filename) {
   return stem;
 }
 function parseTimestampMs2(data) {
-  return parseAgentTimestampMs(String(data["timestamp"] ?? ""), "codex");
+  return parseAgentTimestamp(data["timestamp"], "codex") ?? 0;
 }
 function extractModelName(raw) {
   return typeof raw === "string" && raw.trim() ? raw.trim() : null;
@@ -4920,9 +5001,10 @@ function extractThreadMeta(firstRecord) {
   const agentNickname = asString(payload["agent_nickname"]) ?? null;
   return { threadSource, parentThreadId, agentNickname };
 }
+var LEADING_READ_CHUNK_BYTES = 64 * 1024;
 function readLeadingJsonlLines(filePath, limit) {
   const lines = [];
-  for (const line of readJsonlFileLines(filePath)) {
+  for (const line of readJsonlFileLines(filePath, LEADING_READ_CHUNK_BYTES)) {
     if (!line.trim()) continue;
     lines.push(line);
     if (lines.length === limit) break;
@@ -4954,16 +5036,6 @@ function resolveToolIdentity(name, namespace) {
     metadata: { name, namespace: namespaceText }
   };
 }
-function normalizeToolArguments3(raw) {
-  if (typeof raw === "string") {
-    try {
-      return JSON.parse(raw);
-    } catch {
-      return raw;
-    }
-  }
-  return raw;
-}
 function normalizeCustomToolArguments(toolName, input) {
   if (toolName === "apply_patch") {
     return parseApplyPatchInput(input);
@@ -5073,6 +5145,36 @@ function extractPatchContent(lines, startIndex) {
   }
   return { text: contentLines.join("\n"), nextLineIndex: i };
 }
+var ChildMessageVisibilityIndex = class {
+  visibleSubagentIds = /* @__PURE__ */ new Set();
+  visibleNicknameTexts = /* @__PURE__ */ new Map();
+  constructor(messages) {
+    for (const message of messages) this.add(message);
+  }
+  hasEquivalent(message) {
+    if (message.subagent_id !== void 0 && this.visibleSubagentIds.has(message.subagent_id)) {
+      return true;
+    }
+    const nickname = message.nickname;
+    const text = message.parts.find((part) => part.type === "text")?.text;
+    return nickname !== void 0 && text !== void 0 && this.visibleNicknameTexts.get(nickname)?.has(text) === true;
+  }
+  add(message) {
+    if (message.subagent_id !== void 0) {
+      this.visibleSubagentIds.add(message.subagent_id);
+      return;
+    }
+    if (message.nickname === void 0) return;
+    let texts = this.visibleNicknameTexts.get(message.nickname);
+    if (!texts) {
+      texts = /* @__PURE__ */ new Set();
+      this.visibleNicknameTexts.set(message.nickname, texts);
+    }
+    for (const part of message.parts) {
+      if (part.type === "text") texts.add(part.text);
+    }
+  }
+};
 function compareSourceActivityDesc(left, right) {
   const leftTimestamp = sourceTimestamp(left.file, left.stat.mtimeMs);
   const rightTimestamp = sourceTimestamp(right.file, right.stat.mtimeMs);
@@ -5093,7 +5195,11 @@ var CodexAgent = class extends SingleFileSessionSource {
   sessionIndexMtime;
   sessionIndexPath;
   subagentIndex = null;
+  // Thread meta lives in a rollout's immutable first line; fingerprinting by
+  // (mtime, size) lets index rebuilds stat files instead of re-reading them.
+  threadMetaByPath = /* @__PURE__ */ new Map();
   subagentStatsByParent = /* @__PURE__ */ new Map();
+  childFinalMessagesByParent = /* @__PURE__ */ new Map();
   // ---- BaseAgent implementation ----
   findBasePath() {
     return firstExisting(join10(resolveCodexDataRoot(), "sessions"));
@@ -5126,6 +5232,7 @@ var CodexAgent = class extends SingleFileSessionSource {
     super.setSessionMetaMap(meta);
     this.subagentIndex = null;
     this.subagentStatsByParent.clear();
+    this.childFinalMessagesByParent.clear();
   }
   /**
    * A changed subagent file leaves its parent's aggregated token stats stale,
@@ -5143,14 +5250,20 @@ var CodexAgent = class extends SingleFileSessionSource {
       expanded.add(parentId);
       this.subagentIndex = null;
       this.subagentStatsByParent.delete(parentId);
+      this.childFinalMessagesByParent.delete(parentId);
     }
     return [...expanded];
   }
   readThreadMeta(filePath) {
     try {
+      const { mtimeMs, size } = statSync7(filePath);
+      const fingerprint = `${mtimeMs}:${size}`;
+      const cached = this.threadMetaByPath.get(filePath);
+      if (cached && cached.fingerprint === fingerprint) return cached.meta;
       const firstLine = readLeadingJsonlLines(filePath, 1)[0];
-      if (!firstLine) return null;
-      return extractThreadMeta(JSON.parse(firstLine));
+      const meta = firstLine ? extractThreadMeta(JSON.parse(firstLine)) : null;
+      this.threadMetaByPath.set(filePath, { fingerprint, meta });
+      return meta;
     } catch (error) {
       getCoreDiagnostics()?.warn("codex.thread_meta_read_failed", {
         filePath,
@@ -5317,19 +5430,13 @@ var CodexAgent = class extends SingleFileSessionSource {
     });
     this.applyChildStats(result.stats, meta.id);
     const childMessages = this.collectChildMessages(meta.id);
-    for (const message of childMessages) {
-      const messageText = message.parts.find((part) => part.type === "text")?.text;
-      const alreadyVisible = result.messages.some(
-        (existing) => message.subagent_id !== void 0 && existing.subagent_id === message.subagent_id || existing.subagent_id === void 0 && message.nickname !== void 0 && messageText !== void 0 && existing.nickname === message.nickname && existing.parts.some((part) => part.type === "text" && part.text === messageText)
-      );
-      if (!alreadyVisible) result.messages.push(message);
-    }
+    this.mergeChildMessages(result.messages, childMessages);
     result.stats.message_count = result.messages.length;
     return {
       reference: { agentName: this.name, sessionId: meta.id },
       id: meta.id,
       title: meta.title,
-      slug: `codex/${meta.id}`,
+      slug: this.sessionSlug(meta.id),
       directory: meta.directory,
       parent_reference: meta.parentThreadId == null ? void 0 : { agentName: this.name, sessionId: meta.parentThreadId },
       time_created: meta.createdAt,
@@ -5347,7 +5454,8 @@ var CodexAgent = class extends SingleFileSessionSource {
     if (this.subagentIndex) return this.subagentIndex;
     this.basePath ??= this.findBasePath();
     const index = { childFilesByParent: /* @__PURE__ */ new Map(), subagentFiles: /* @__PURE__ */ new Set() };
-    for (const file of this.listRolloutFilePaths()) {
+    const paths = this.listRolloutFilePaths();
+    for (const file of paths) {
       const threadMeta = this.readThreadMeta(file);
       if (threadMeta?.threadSource !== "subagent") continue;
       index.subagentFiles.add(file);
@@ -5356,6 +5464,12 @@ var CodexAgent = class extends SingleFileSessionSource {
       if (files) files.push(file);
       else index.childFilesByParent.set(threadMeta.parentThreadId, [file]);
     }
+    if (this.threadMetaByPath.size > paths.length) {
+      const active = new Set(paths);
+      for (const path2 of this.threadMetaByPath.keys()) {
+        if (!active.has(path2)) this.threadMetaByPath.delete(path2);
+      }
+    }
     this.subagentIndex = index;
     return index;
   }
@@ -5381,17 +5495,56 @@ var CodexAgent = class extends SingleFileSessionSource {
   collectChildFiles(parentSessionId) {
     return this.ensureSubagentIndex().childFilesByParent.get(parentSessionId) ?? [];
   }
+  mergeChildMessages(visibleMessages, childMessages) {
+    const visible = new ChildMessageVisibilityIndex(visibleMessages);
+    for (const message of childMessages) {
+      if (visible.hasEquivalent(message)) continue;
+      visibleMessages.push(message);
+      visible.add(message);
+    }
+  }
   collectChildMessages(parentSessionId) {
-    return this.collectChildFiles(parentSessionId).flatMap((file) => {
-      const message = this.parseChildFinalMessage(file);
+    const childFiles = this.collectChildFiles(parentSessionId);
+    this.reconcileChildFinalMessageCache(parentSessionId, childFiles);
+    return childFiles.flatMap((file) => {
+      const message = this.getChildFinalMessage(parentSessionId, file);
       return message ? [message] : [];
     }).sort((left, right) => left.time_created - right.time_created);
   }
-  parseChildFinalMessage(filePath) {
+  getChildFinalMessage(parentSessionId, filePath) {
+    const sourceFingerprint = this.childFinalMessageFingerprint(filePath);
+    let cache = this.childFinalMessagesByParent.get(parentSessionId);
+    if (!cache) {
+      cache = /* @__PURE__ */ new Map();
+      this.childFinalMessagesByParent.set(parentSessionId, cache);
+    }
+    const cached = cache.get(filePath);
+    if (cached?.sourceFingerprint === sourceFingerprint && cached.parserVersion === PARSER_VERSION) {
+      return cached.message;
+    }
+    const message = this.readChildFinalMessage(filePath);
+    cache.set(filePath, { sourceFingerprint, parserVersion: PARSER_VERSION, message });
+    return message;
+  }
+  reconcileChildFinalMessageCache(parentSessionId, childFiles) {
+    const cache = this.childFinalMessagesByParent.get(parentSessionId);
+    if (!cache) return;
+    const activeFiles = new Set(childFiles);
+    for (const filePath of cache.keys()) {
+      if (!activeFiles.has(filePath)) cache.delete(filePath);
+    }
+    if (cache.size === 0) this.childFinalMessagesByParent.delete(parentSessionId);
+  }
+  childFinalMessageFingerprint(filePath) {
+    const { mtimeMs, size } = statSync7(filePath);
+    return JSON.stringify([mtimeMs, size]);
+  }
+  readChildFinalMessage(filePath) {
     const sessionId = extractSessionId(filePath);
     const threadMeta = this.readThreadMeta(filePath);
     let latestOutput = null;
     let finalOutput = null;
+    let fallbackMtimeMs = null;
     for (const record of readJsonlFile(filePath)) {
       try {
         const recordType = String(record["type"] ?? "");
@@ -5404,7 +5557,7 @@ var CodexAgent = class extends SingleFileSessionSource {
         const candidate = {
           id: asString(payload["id"]) ?? `codex-subagent-${sessionId}`,
           text,
-          timestampMs: parseTimestampMs2(record) || parseTimestampMs2(payload) || statSync7(filePath).mtimeMs,
+          timestampMs: parseTimestampMs2(record) || parseTimestampMs2(payload) || (fallbackMtimeMs ??= statSync7(filePath).mtimeMs),
           isFinal: String(record["phase"] ?? "") === "final_answer" || String(payload["phase"] ?? "") === "final_answer"
         };
         latestOutput = candidate;
@@ -5533,7 +5686,11 @@ var CodexAgent = class extends SingleFileSessionSource {
       }
       this.sessionIndexCache = cache;
       this.sessionIndexMtime = mtime;
-    } catch {
+    } catch (error) {
+      getCoreDiagnostics()?.warn("codex.session_index_read_failed", {
+        path: indexPath,
+        message: error instanceof Error ? error.message : String(error)
+      });
       this.sessionIndexCache.clear();
       this.sessionIndexMtime = void 0;
     }
@@ -5675,7 +5832,7 @@ var CodexAgent = class extends SingleFileSessionSource {
     const title = resolveSessionTitle(indexTitle, messageTitle, basenameTitle(directory || null));
     return parsedSession({
       id: sessionId,
-      slug: `codex/${sessionId}`,
+      slug: this.sessionSlug(sessionId),
       title,
       directory,
       parent_reference: parentThreadId == null ? void 0 : { agentName: this.name, sessionId: parentThreadId },
@@ -5719,7 +5876,7 @@ var CodexAgent = class extends SingleFileSessionSource {
     const title = resolveSessionTitle(indexTitle, messageTitle, directoryTitle);
     return parsedSession({
       id: sessionId,
-      slug: `codex/${sessionId}`,
+      slug: this.sessionSlug(sessionId),
       title,
       directory,
       parent_reference: parentThreadId == null ? void 0 : { agentName: this.name, sessionId: parentThreadId },
@@ -5934,7 +6091,7 @@ var CodexAgent = class extends SingleFileSessionSource {
     const name = String(payload["name"] ?? "").trim();
     if (!name) return;
     const toolIdentity = resolveToolIdentity(name, payload["namespace"]);
-    const arguments_ = normalizeToolArguments3(payload["arguments"]);
+    const arguments_ = normalizeToolArguments(payload["arguments"]);
     const toolPart2 = {
       type: "tool",
       tool: toolIdentity.tool,
@@ -6407,7 +6564,7 @@ var CursorAgent = class extends DatabaseSessionSource {
               return getParsedSession(
                 hasFastMessages && fastMessageCount === 0 && !hasSubagents ? filteredSession("no visible messages") : parsedSession({
                   id: composerId,
-                  slug: `cursor/${composerId}`,
+                  slug: this.sessionSlug(composerId),
                   title: fastTitle,
                   directory,
                   time_created: createdAt,
@@ -6526,7 +6683,7 @@ var CursorAgent = class extends DatabaseSessionSource {
         reference: { agentName: this.name, sessionId: composerId },
         id: composerId,
         title,
-        slug: `cursor/${composerId}`,
+        slug: this.sessionSlug(composerId),
         directory,
         time_created: createdAt,
         time_updated: updatedAt || void 0,
@@ -6604,7 +6761,7 @@ var CursorAgent = class extends DatabaseSessionSource {
     if (directory) this.directoryCache.set(composerId, directory);
     return {
       id: composerId,
-      slug: `cursor/${composerId}`,
+      slug: this.sessionSlug(composerId),
       title,
       directory,
       time_created: createdAt,
@@ -6665,33 +6822,18 @@ var CursorAgent = class extends DatabaseSessionSource {
     const messageTitle = firstUserMessageTitle(messages) ?? composer.text;
     return resolveSessionTitle(explicit, messageTitle, null);
   }
-  /** Count messages from bubbles */
-  countMessagesFromBubbles(db, composerId) {
-    try {
-      const rows = db.prepare("SELECT value FROM cursorDiskKV WHERE key LIKE ?").all(`bubbleId:${composerId}:%`);
-      let count = 0;
-      for (const row of rows) {
-        try {
-          const bubble = parseBubbleRow(row.value);
-          if (bubble?.type === 1 || bubble?.type === 2) {
-            count++;
-          }
-        } catch {
-        }
-      }
-      return count;
-    } catch {
-      return 0;
-    }
-  }
-  /** Load one composer's bubbles, for the detail path that only needs a single session. */
+  /**
+   * Load one composer's bubbles, for the detail path that only needs a
+   * single session. A failing bubble query throws instead of returning [] —
+   * a broken database must not read as an empty session.
+   */
   loadMessagesFromBubbles(db, composerId, initialModelName) {
-    try {
-      const rows = db.prepare("SELECT rowid AS row_id, key, value FROM cursorDiskKV WHERE key LIKE ?").all(`bubbleId:${composerId}:%`);
-      return this.messagesFromBubbles(groupBubbleRows(rows), initialModelName);
-    } catch {
-      return [];
-    }
+    const rows = this.scanStep(
+      "reading composer bubbles",
+      this.getDatabasePath() ?? "",
+      () => db.prepare("SELECT rowid AS row_id, key, value FROM cursorDiskKV WHERE key LIKE ?").all(`bubbleId:${composerId}:%`)
+    );
+    return this.messagesFromBubbles(groupBubbleRows(rows), initialModelName);
   }
   /** Build messages from bubbles already parsed once, in insertion order. */
   messagesFromBubbles(bubbles, initialModelName) {
@@ -6859,18 +7001,11 @@ var CursorAgent = class extends DatabaseSessionSource {
     }
   }
 };
-var HEAD_INDEX_VERSION3 = "pi-head-v1";
+var HEAD_INDEX_VERSION3 = "pi-head-v2";
 var PARSER_VERSION2 = "pi-parser-v3";
 function resolvePiDataRoot() {
   return resolveHomePath("PI_HOME", ".pi");
 }
-function parseTimestampMs3(value) {
-  if (typeof value === "number") return Number.isFinite(value) ? value : 0;
-  const text = String(value ?? "").trim();
-  if (!text) return 0;
-  const ts = Date.parse(text);
-  return Number.isNaN(ts) ? 0 : ts;
-}
 function narrowPiField(field, value, narrow) {
   return narrowField("pi", field, value, narrow);
 }
@@ -6880,7 +7015,7 @@ function narrowTimestampMs(field, value) {
     value,
     (v) => typeof v === "number" || typeof v === "string" ? v : void 0
   );
-  return shaped === void 0 ? 0 : parseTimestampMs3(shaped);
+  return shaped === void 0 ? 0 : parseAgentTimestamp(shaped, "pi", { numericStrings: true }) ?? 0;
 }
 function extractSessionIdFromFilename(filePath) {
   const stem = basename8(filePath, ".jsonl");
@@ -6974,7 +7109,7 @@ var PiAgent = class extends SingleFileSessionSource {
       reference: { agentName: this.name, sessionId: meta.id },
       id: meta.id,
       title: meta.title,
-      slug: `pi/${meta.id}`,
+      slug: this.sessionSlug(meta.id),
       directory: meta.directory,
       time_created: meta.createdAt,
       time_updated: meta.updatedAt,
@@ -7024,7 +7159,7 @@ var PiAgent = class extends SingleFileSessionSource {
     const modelUsage = Object.keys(state.modelUsage).length > 0 ? state.modelUsage : void 0;
     return parsedSession({
       id: parsed.sessionId,
-      slug: `pi/${parsed.sessionId}`,
+      slug: this.sessionSlug(parsed.sessionId),
       title: parsed.title,
       directory: parsed.directory,
       time_created: parsed.createdAt,
@@ -7144,7 +7279,7 @@ var PiAgent = class extends SingleFileSessionSource {
       const model = typeof message["model"] === "string" ? message["model"].trim() : null;
       const estimatedCost = usage.cost === null ? estimateTokenCost(model, usage.tokens) : null;
       const cost = usage.cost ?? estimatedCost ?? 0;
-      const costSource = cost > 0 ? usage.cost === null ? "estimated" : "recorded" : void 0;
+      const costSource2 = cost > 0 ? usage.cost === null ? "estimated" : "recorded" : void 0;
       return {
         message: {
           id,
@@ -7156,7 +7291,7 @@ var PiAgent = class extends SingleFileSessionSource {
           model,
           tokens: usage.tokens,
           cost: cost || void 0,
-          costSource
+          costSource: costSource2
         },
         totalTokens: usage.totalTokens,
         model
@@ -8008,7 +8143,7 @@ var GrokAgent = class extends FileSystemSessionSource {
     const fingerprint = this.sourceFingerprint(source);
     const head = {
       id: summary.id,
-      slug: `grok/${summary.id}`,
+      slug: this.sessionSlug(summary.id),
       title,
       directory: summary.cwd,
       parent_reference: summary.parentSessionId ? { agentName: this.name, sessionId: summary.parentSessionId } : void 0,
@@ -8042,7 +8177,7 @@ var GrokAgent = class extends FileSystemSessionSource {
       reference: { agentName: this.name, sessionId: meta.id },
       id: meta.id,
       title: meta.title,
-      slug: `grok/${meta.id}`,
+      slug: this.sessionSlug(meta.id),
       directory: meta.directory,
       parent_reference: meta.parentSessionId ? { agentName: this.name, sessionId: meta.parentSessionId } : void 0,
       version: void 0,
@@ -8122,15 +8257,8 @@ var DshSessionLogError = class extends Error {
     this.name = "DshSessionLogError";
   }
 };
-function expandHomePath(path2) {
-  if (path2 === "~") return homedir5();
-  if (path2.startsWith("~/") || path2.startsWith("~\\")) return join15(homedir5(), path2.slice(2));
-  return path2;
-}
 function resolveDshDataRoot() {
-  const fromEnv = process.env["DSH_HOME"];
-  const selected = fromEnv !== void 0 && fromEnv.trim().length > 0 ? fromEnv : join15(homedir5(), ".dsh");
-  return resolve2(expandHomePath(selected));
+  return resolveHomePath("DSH_HOME", ".dsh");
 }
 function dshSessionsRoot(dataRoot) {
   return join15(dataRoot, "sessions");
@@ -9115,7 +9243,7 @@ var DshAgent = class extends FileSystemSessionSource {
       const stats = this.statArtifact(artifact.sourcePath);
       if (!stats) continue;
       if (!matchesScanWindow(Number(stats.mtimeMs), options)) continue;
-      const header = this.enumerationStep(
+      const header = this.scanStep(
         "reading session headers",
         artifact.sourcePath,
         () => readDshSessionHeader(artifact.sourcePath, artifact.encoding)
@@ -9157,7 +9285,7 @@ var DshAgent = class extends FileSystemSessionSource {
     }
     const head = {
       id: header.id,
-      slug: `${this.name}/${header.id}`,
+      slug: this.sessionSlug(header.id),
       title: this.resolveTitle(header, projection),
       directory: header.cwd ?? "",
       ...header.parentSession ? { parent_reference: { agentName: this.name, sessionId: header.parentSession } } : {},
@@ -9193,7 +9321,7 @@ var DshAgent = class extends FileSystemSessionSource {
       reference: { agentName: this.name, sessionId: header.id },
       id: header.id,
       title: this.resolveTitle(header, projection),
-      slug: `${this.name}/${header.id}`,
+      slug: this.sessionSlug(header.id),
       directory: header.cwd ?? "",
       ...header.parentSession ? { parent_reference: { agentName: this.name, sessionId: header.parentSession } } : {},
       version: "0",
@@ -9301,13 +9429,6 @@ var DshAgent = class extends FileSystemSessionSource {
       );
     }
   }
-  enumerationStep(stage, sourcePath, read) {
-    try {
-      return read();
-    } catch (error) {
-      throw new SessionScanError(this.name, stage, { cause: error, sourcePath });
-    }
-  }
   statArtifact(sourcePath) {
     try {
       return statSync10(sourcePath, { bigint: true });
@@ -9405,39 +9526,39 @@ registerAgent({
   toolStrategy: "custom",
   create: () => new CursorAgent()
 });
-var CACHE_SCHEMA_VERSION = 24;
+var CACHE_SCHEMA_VERSION = 29;
 
-// ../core/dist/chunk-4L5UAZIZ.mjs
+// ../core/dist/chunk-BORKFBHP.mjs
 function mergeSessionsUpdatedEvents(previous, next) {
   const changedSessionHeads = /* @__PURE__ */ new Map();
   const projectionRelatedSessionHeads = /* @__PURE__ */ new Map();
   const projectionSessionOrder = /* @__PURE__ */ new Map();
   const newSessionRefs = /* @__PURE__ */ new Map();
   const removedSessionRefs = /* @__PURE__ */ new Map();
-  const sessionKey2 = (agentName, sessionId) => `${agentName}\0${sessionId}`;
+  const sessionKey22 = (agentName, sessionId) => `${agentName}\0${sessionId}`;
   const addChanged = (item) => {
-    const key = sessionKey2(item.reference.agentName, item.reference.sessionId);
+    const key = sessionKey22(item.reference.agentName, item.reference.sessionId);
     removedSessionRefs.delete(key);
     projectionRelatedSessionHeads.delete(key);
     changedSessionHeads.set(key, item);
   };
   const addProjectionRelated = (item) => {
-    const key = sessionKey2(item.reference.agentName, item.reference.sessionId);
+    const key = sessionKey22(item.reference.agentName, item.reference.sessionId);
     if (changedSessionHeads.has(key) || removedSessionRefs.has(key)) return;
     projectionRelatedSessionHeads.set(key, item);
   };
   const addNew = (item) => {
-    const key = sessionKey2(item.agentName, item.sessionId);
+    const key = sessionKey22(item.agentName, item.sessionId);
     removedSessionRefs.delete(key);
     newSessionRefs.set(key, item);
   };
   const addProjectionOrder = (item) => {
-    const key = sessionKey2(item.agentName, item.sessionId);
+    const key = sessionKey22(item.agentName, item.sessionId);
     projectionSessionOrder.delete(key);
     projectionSessionOrder.set(key, item);
   };
   const addRemoved = (item) => {
-    const key = sessionKey2(item.agentName, item.sessionId);
+    const key = sessionKey22(item.agentName, item.sessionId);
     changedSessionHeads.delete(key);
     projectionRelatedSessionHeads.delete(key);
     projectionSessionOrder.delete(key);
@@ -9512,37 +9633,6 @@ function matchesProjectIdentity(identity, expected) {
 function getProjectAgentKey(projectIdentityKey, agentName) {
   return `${projectIdentityKey}\0${agentName.toLowerCase()}`;
 }
-var UNKNOWN_AGENT_NAME = "unknown";
-function normalizeSessionReference(reference) {
-  return {
-    agentName: reference.agentName.trim().toLowerCase(),
-    sessionId: reference.sessionId
-  };
-}
-function parseSessionReference(value) {
-  const separatorIndex = value.indexOf("/");
-  if (separatorIndex <= 0 || separatorIndex === value.length - 1) return null;
-  const agentName = value.slice(0, separatorIndex).trim().toLowerCase();
-  if (!agentName) return null;
-  return {
-    agentName,
-    sessionId: value.slice(separatorIndex + 1)
-  };
-}
-function formatSessionReference(reference) {
-  const normalized = normalizeSessionReference(reference);
-  return `${normalized.agentName}/${normalized.sessionId}`;
-}
-function getSessionAgentKey(session) {
-  return parseSessionReference(session.slug)?.agentName ?? UNKNOWN_AGENT_NAME;
-}
-function agentRoutePath(agentName) {
-  return `/${encodeURIComponent(agentName.trim().toLowerCase())}`;
-}
-function sessionRoutePath(reference) {
-  const normalized = normalizeSessionReference(reference);
-  return `${agentRoutePath(normalized.agentName)}/${encodeURIComponent(normalized.sessionId)}`;
-}
 function compareSessionActivityDesc(a, b) {
   return (b.time_updated ?? b.time_created) - (a.time_updated ?? a.time_created);
 }
@@ -9628,12 +9718,6 @@ function hasActivityInWindow(session, from, to) {
   const activity = activityTime(session);
   return (from == null || activity >= from) && (to == null || activity <= to);
 }
-function isChildSession(session) {
-  return session.parent_reference != null;
-}
-function getRootSessions(sessions) {
-  return sessions.filter((session) => !session.parent_reference);
-}
 function ownStats(session) {
   const stats = session.stats;
   const cost = stats.total_cost ?? 0;
@@ -9833,115 +9917,6 @@ function createSessionProjectionContext(previousSessions, nextSessions, changedS
   );
   return { relatedSessionHeads, sessionOrder };
 }
-var SAMPLE_SESSION_HEAD = {
-  id: "session-1",
-  slug: "claudecode/session-1",
-  title: "Fix flaky search index test",
-  directory: "/Users/dev/project",
-  project_identity: {
-    kind: "git_remote",
-    key: "github.com/example/project",
-    displayName: "example/project"
-  },
-  time_created: 17e11,
-  time_updated: 17000036e5,
-  stats: {
-    message_count: 12,
-    total_input_tokens: 4200,
-    total_output_tokens: 1800,
-    total_cost: 0.042,
-    cost_source: "recorded",
-    total_tokens: 6e3,
-    total_cache_read_tokens: 3e3,
-    total_cache_create_tokens: 500
-  },
-  model_usage: { "claude-5-sonnet": 6e3 },
-  smart_tags: ["bugfix"],
-  smart_tags_source_updated_at: 17000036e5
-};
-var SAMPLE_SESSIONS_UPDATED_EVENT = {
-  type: "sessions-updated",
-  changedAgents: ["claudecode"],
-  newSessions: 1,
-  newSessionRefs: [{ agentName: "claudecode", sessionId: SAMPLE_SESSION_HEAD.id }],
-  updatedSessions: 0,
-  removedSessions: 0,
-  totalSessions: 43,
-  timestamp: 170000002e4,
-  changedSessionHeads: [
-    {
-      reference: { agentName: "claudecode", sessionId: SAMPLE_SESSION_HEAD.id },
-      session: SAMPLE_SESSION_HEAD
-    }
-  ],
-  projectionRelatedSessionHeads: [],
-  projectionSessionOrder: [{ agentName: "claudecode", sessionId: SAMPLE_SESSION_HEAD.id }],
-  removedSessionRefs: []
-};
-var SAMPLE_DASHBOARD_DATA = {
-  totals: {
-    sessions: 1,
-    messages: 12,
-    tokens: 6e3,
-    cost: 0.042,
-    costRecorded: 0.042,
-    costEstimated: 0,
-    cacheReadTokens: 3e3,
-    cost_source: "recorded",
-    latestActivity: 17000036e5,
-    latestActivityProject: "example/project",
-    latestActivityAgent: "claudecode"
-  },
-  scopeCounts: { projects: 1, agents: 1 },
-  perAgent: [
-    {
-      name: "claudecode",
-      displayName: "Claude Code",
-      icon: "claude",
-      sessions: 1,
-      messages: 12,
-      tokens: 6e3,
-      cost: 0.042
-    }
-  ],
-  dailyActivity: [
-    {
-      date: "2023-11-14",
-      sessions: 1,
-      messages: 12,
-      cost: 0.042,
-      input: 700,
-      output: 1800,
-      cache_read: 3e3,
-      cache_create: 500
-    }
-  ],
-  modelDistribution: [{ model: "claude-5-sonnet", tokens: 6e3, sessions: 1 }],
-  perProject: [
-    {
-      identityKind: "git_remote",
-      identityKey: "github.com/example/project",
-      displayName: "example/project",
-      sessions: 1,
-      messages: 12,
-      tokens: 6e3,
-      cost: 0.042,
-      cost_source: "recorded",
-      agents: ["claudecode"],
-      sparkline: [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0.042]
-    }
-  ],
-  projectRollup: { projects: 0, sessions: 0, tokens: 0, cost: 0 },
-  recentSessions: [
-    {
-      reference: { agentName: "claudecode", sessionId: SAMPLE_SESSION_HEAD.id },
-      session: SAMPLE_SESSION_HEAD
-    }
-  ],
-  recentFileActivities: [],
-  modelCost: null,
-  window: { from: 16999e8, to: 17000036e5, days: 1 }
-};
 
 // ../core/dist/index.mjs
 import { availableParallelism } from "os";
@@ -9951,7 +9926,6 @@ import { spawnSync } from "child_process";
 import * as os from "os";
 import * as path from "path";
 import { createHash as createHash4 } from "crypto";
-import { resolve as resolve3, sep } from "path";
 import { existsSync as existsSync32, rmSync as rmSync2, unlinkSync } from "fs";
 import { existsSync as existsSync22 } from "fs";
 import { join as join18 } from "path";
@@ -10017,6 +9991,7 @@ function normalizeGitRemote(url) {
   return value.toLowerCase();
 }
 var IDENTITY_CACHE_TTL_MS = 10 * 60 * 1e3;
+var IDENTITY_CACHE_MAX_ENTRIES = 512;
 var identityCache = /* @__PURE__ */ new Map();
 function computeIdentity(cwd, fs) {
   return computeIdentityProjection(cwd, fs).identity;
@@ -10025,15 +10000,25 @@ function normalizeProjectDirectory(cwd) {
   if (!cwd) return "";
   return getPathOps(cwd).resolve(cwd);
 }
-function computeIdentityProjection(cwd, fs, resolverRevision = PROJECT_IDENTITY_RESOLVER_REVISION) {
+function computeIdentityProjection(cwd, fs = realFs, resolverRevision = PROJECT_IDENTITY_RESOLVER_REVISION) {
   if (fs !== realFs) return resolveIdentityProjection(cwd, fs, resolverRevision);
   const key = normalizeProjectDirectory(cwd);
   const cached = identityCache.get(key);
-  if (cached && cached.projection.resolverRevision === resolverRevision && Date.now() - cached.resolvedAt < IDENTITY_CACHE_TTL_MS) {
-    return cached.projection;
+  if (cached) {
+    if (cached.projection.resolverRevision === resolverRevision && Date.now() - cached.resolvedAt < IDENTITY_CACHE_TTL_MS) {
+      identityCache.delete(key);
+      identityCache.set(key, cached);
+      return cached.projection;
+    }
+    identityCache.delete(key);
   }
   const projection = resolveIdentityProjection(cwd, fs, resolverRevision);
   identityCache.set(key, { projection, resolvedAt: Date.now() });
+  while (identityCache.size > IDENTITY_CACHE_MAX_ENTRIES) {
+    const oldestKey = identityCache.keys().next().value;
+    if (oldestKey == null) break;
+    identityCache.delete(oldestKey);
+  }
   return projection;
 }
 function resolveIdentityProjection(cwd, fs, resolverRevision) {
@@ -10224,9 +10209,12 @@ function buildProjectGroups(sessions) {
 }
 function createProjectScopeMatcher(queryPath, fs = realFs) {
   const identity = computeIdentity(queryPath, fs);
+  return createProjectScopeMatcherFromIdentity(queryPath, identity);
+}
+function createProjectScopeMatcherFromIdentity(queryPath, identity) {
   return {
     identity: { kind: identity.kind, key: identity.key },
-    path: normalizeScopePath(queryPath)
+    path: normalizeProjectScopePath(queryPath)
   };
 }
 function matchesProjectScope(session, scope) {
@@ -10238,11 +10226,11 @@ function filterSessionsByProjectScope(sessions, queryPath, fs) {
   return sessions.filter((session) => matchesProjectScope(session, scope));
 }
 function isPathScopeMatch(queryPath, sessionPath) {
-  const session = normalizeScopePath(sessionPath);
+  const session = normalizeProjectScopePath(sessionPath);
   return session === queryPath || session.startsWith(queryPath + "/") || queryPath.startsWith(session + "/");
 }
-function normalizeScopePath(path2) {
-  return resolve3(path2).replaceAll(sep, "/");
+function normalizeProjectScopePath(path2) {
+  return normalizeProjectDirectory(path2).replaceAll("\\", "/");
 }
 var SMART_TAG_CLASSIFIER_REVISION = "smart-tags-v1";
 var TAG_ORDER = [
@@ -10596,6 +10584,44 @@ function normalizeFilePathSearch(value) {
   return value.trim().replace(/^"|"$/g, "");
 }
 var MESSAGE_PARTS_FORMAT_VERSION = 1;
+function messageCursorContentFromCachedRow(row) {
+  return {
+    messageId: String(row.message_id),
+    role: String(row.role),
+    timeCreated: Number(row.time_created),
+    timeCompleted: row.time_completed,
+    agent: row.agent,
+    mode: row.mode,
+    model: row.model,
+    provider: row.provider,
+    tokensJson: row.tokens_json,
+    cost: row.cost,
+    costSource: row.cost_source,
+    partsJson: String(row.parts_json),
+    partsFormatVersion: row.parts_format_version,
+    subagentId: row.subagent_id,
+    nickname: row.nickname
+  };
+}
+function messageCursorContentFromStructuredRecord(record) {
+  return {
+    messageId: record.id,
+    role: record.role,
+    timeCreated: record.timeCreated,
+    timeCompleted: record.timeCompleted,
+    agent: record.agent,
+    mode: record.mode,
+    model: record.model,
+    provider: record.provider,
+    tokensJson: record.tokensJson,
+    cost: record.cost,
+    costSource: record.costSource,
+    partsJson: record.partsJson,
+    partsFormatVersion: MESSAGE_PARTS_FORMAT_VERSION,
+    subagentId: record.subagentId,
+    nickname: record.nickname
+  };
+}
 function stringifyOptionalJson(value) {
   return value == null ? null : JSON.stringify(value);
 }
@@ -10610,6 +10636,13 @@ function sourcePathFromMetaJson(metaJson) {
   const meta = JSON.parse(metaJson);
   return sourcePathFromMeta(meta);
 }
+function requireSessionProjectIdentity(agentName, session) {
+  if (session.project_identity) return session.project_identity;
+  throw new Error(`Session ${agentName}/${session.id} is missing project_identity`);
+}
+function assertSessionProjectIdentities(agentName, sessions) {
+  for (const session of sessions) requireSessionProjectIdentity(agentName, session);
+}
 function prepareUpsertSession(db) {
   return db.prepare(`
     INSERT INTO sessions(
@@ -10749,7 +10782,7 @@ function prepareUpsertIndexedSession(db) {
   return prepareIndexedSession(db);
 }
 function upsertSessionRow(statement, agentName, session, metaJson, sortIndex, sourcePath) {
-  const identity = session.project_identity ?? computeIdentity(session.directory, realFs);
+  const identity = requireSessionProjectIdentity(agentName, session);
   const activityTime2 = session.time_updated ?? session.time_created;
   statement.run(
     agentName,
@@ -11174,16 +11207,62 @@ function discardPublicationStaging(db, publicationId) {
     db.prepare("DELETE FROM search_index_publication_entries").run();
   }
 }
-function withCacheConnection(fn) {
-  const cachePath = getCachePath2();
-  const connection = getCacheConnection(cachePath);
-  if (!connection) return null;
-  try {
-    if (getSchemaEnsuredPath() !== cachePath) {
-      ensureSchema(connection.db, cachePath);
-      setSchemaEnsuredPath(cachePath);
-    }
-    return fn(connection);
+function prepareLegacyProjectIdentityResolver(db, currentVersion) {
+  const directories = /* @__PURE__ */ new Set();
+  if (currentVersion < 7 && tableExists(db, "cached_sessions")) {
+    const rows = db.prepare("SELECT agent_name, session_id, session_json FROM cached_sessions").all();
+    for (const row of rows) {
+      if (!row.session_json) continue;
+      try {
+        const session = JSON.parse(row.session_json);
+        if (session.directory != null) {
+          directories.add(String(session.directory));
+        } else {
+          getCoreDiagnostics()?.warn("sqlite.migration.identity_precompute.missing_directory", {
+            agent_name: row.agent_name,
+            session_id: row.session_id
+          });
+        }
+      } catch {
+        continue;
+      }
+    }
+  }
+  if (currentVersion < 12) {
+    for (const table of ["session_documents", "sessions", "project_sessions"]) {
+      if (!tableExists(db, table) || !columnExists(db, table, "directory")) continue;
+      const rows = db.prepare(`SELECT directory FROM ${table}`).all();
+      for (const row of rows) directories.add(String(row.directory ?? ""));
+    }
+  }
+  const identities = /* @__PURE__ */ new Map();
+  for (const directory of directories) {
+    try {
+      identities.set(directory, computeIdentity(directory, realFs));
+    } catch (error) {
+      identities.set(directory, error instanceof Error ? error : new Error(String(error)));
+    }
+  }
+  return (directory) => {
+    const identity = identities.get(directory);
+    if (identity instanceof Error) throw identity;
+    if (identity) return identity;
+    throw new Error(`Missing precomputed project identity for legacy directory: ${directory}`);
+  };
+}
+function getLegacySessionDirectory(session) {
+  return typeof session.directory === "string" ? session.directory : null;
+}
+function withCacheConnection(fn) {
+  const cachePath = getCachePath2();
+  const connection = getCacheConnection(cachePath);
+  if (!connection) return null;
+  try {
+    if (getSchemaEnsuredPath() !== cachePath) {
+      ensureSchema(connection.db, cachePath);
+      setSchemaEnsuredPath(cachePath);
+    }
+    return fn(connection);
   } catch (error) {
     getCoreDiagnostics()?.warn("cache.write_failed", {
       message: error instanceof Error ? error.message : String(error),
@@ -11211,6 +11290,13 @@ function cleanPublicationStaging(connection) {
 function withCacheDb(fn) {
   return withCacheConnection(({ db }) => fn(db));
 }
+function withCacheDbOutcome(fn) {
+  let result = { status: "failed" };
+  withCacheConnection(({ db }) => {
+    result = { status: "success", value: fn(db) };
+  });
+  return result;
+}
 function withCacheDbReadOnly(fn) {
   const cachePath = getCachePath2();
   if (!hasCacheStorage()) return { status: "failed" };
@@ -11328,6 +11414,9 @@ function createSessionTables(db) {
     CREATE INDEX IF NOT EXISTS idx_sessions_agent_activity_order
       ON sessions(agent_name, activity_time DESC, session_id);
 
+    CREATE INDEX IF NOT EXISTS idx_sessions_activity
+      ON sessions(activity_time DESC, agent_name, session_id);
+
     CREATE INDEX IF NOT EXISTS idx_sessions_project
       ON sessions(project_identity_kind, project_identity_key, activity_time);
 
@@ -11351,6 +11440,7 @@ function createSessionTables(db) {
       cost_source TEXT,
       parts_json TEXT NOT NULL,
       parts_format_version INTEGER NOT NULL DEFAULT 0,
+      content_chain_digest TEXT,
       subagent_id TEXT,
       nickname TEXT,
       content_text TEXT NOT NULL,
@@ -11363,9 +11453,62 @@ function createSessionTables(db) {
 
     CREATE INDEX IF NOT EXISTS idx_messages_session
       ON messages(agent_name, session_id, message_index);
+
+    CREATE INDEX IF NOT EXISTS idx_messages_usage_time
+      ON messages(
+        CASE
+          WHEN time_completed > 0 THEN time_completed
+          WHEN time_created > 0 THEN time_created
+        END,
+        agent_name,
+        session_id
+      );
   `);
+  createSessionModelCostTable(db);
+  createSessionCostSummaryTable(db);
   createMessageToolTables(db);
 }
+function createSessionModelCostTable(db) {
+  db.exec(`
+    CREATE TABLE IF NOT EXISTS session_model_cost (
+      agent_name TEXT NOT NULL,
+      session_id TEXT NOT NULL,
+      model TEXT NOT NULL,
+      cost REAL NOT NULL,
+      cost_recorded REAL NOT NULL,
+      PRIMARY KEY (agent_name, session_id, model),
+      FOREIGN KEY (agent_name, session_id)
+        REFERENCES sessions(agent_name, session_id)
+        ON DELETE CASCADE
+    );
+  `);
+}
+function createSessionCostSummaryTable(db) {
+  db.exec(`
+    CREATE TABLE IF NOT EXISTS session_cost_summary (
+      agent_name TEXT NOT NULL,
+      session_id TEXT NOT NULL,
+      message_count INTEGER NOT NULL DEFAULT 0,
+      untimed_message_count INTEGER NOT NULL DEFAULT 0,
+      input_tokens INTEGER NOT NULL DEFAULT 0,
+      output_tokens INTEGER NOT NULL DEFAULT 0,
+      reasoning_tokens INTEGER NOT NULL DEFAULT 0,
+      cache_read_tokens INTEGER NOT NULL DEFAULT 0,
+      cache_create_tokens INTEGER NOT NULL DEFAULT 0,
+      untimed_input_tokens INTEGER NOT NULL DEFAULT 0,
+      untimed_output_tokens INTEGER NOT NULL DEFAULT 0,
+      untimed_reasoning_tokens INTEGER NOT NULL DEFAULT 0,
+      untimed_cache_read_tokens INTEGER NOT NULL DEFAULT 0,
+      untimed_cache_create_tokens INTEGER NOT NULL DEFAULT 0,
+      message_cost REAL NOT NULL,
+      untimed_message_cost REAL NOT NULL,
+      PRIMARY KEY (agent_name, session_id),
+      FOREIGN KEY (agent_name, session_id)
+        REFERENCES sessions(agent_name, session_id)
+        ON DELETE CASCADE
+    );
+  `);
+}
 function createMessageToolTables(db) {
   db.exec(`
     CREATE TABLE IF NOT EXISTS message_tools (
@@ -11725,7 +11868,7 @@ function hasAnyCacheSchema(db) {
     "project_sessions"
   ].some((table) => tableExists(db, table));
 }
-function backfillProjectSessions(db) {
+function backfillProjectSessions(db, resolveIdentity) {
   if (!tableExists(db, "cached_sessions") || !tableExists(db, "project_sessions")) {
     return;
   }
@@ -11753,14 +11896,16 @@ function backfillProjectSessions(db) {
     }
     try {
       const session = JSON.parse(row.session_json);
-      const identity = session.project_identity ?? computeIdentity(session.directory, realFs);
+      const directory = getLegacySessionDirectory(session);
+      if (directory == null) continue;
+      const identity = session.project_identity ?? resolveIdentity(directory);
       upsert.run(
         row.agent_name,
         row.session_id,
         identity.kind,
         identity.key,
         identity.displayName,
-        session.directory,
+        directory,
         session.time_updated ?? session.time_created
       );
     } catch {
@@ -11768,7 +11913,7 @@ function backfillProjectSessions(db) {
     }
   }
 }
-function backfillSessionDocumentProjects(db) {
+function backfillSessionDocumentProjects(db, resolveIdentity) {
   if (!tableExists(db, "session_documents") || !columnExists(db, "session_documents", "project_identity_key")) {
     return;
   }
@@ -11782,17 +11927,17 @@ function backfillSessionDocumentProjects(db) {
     WHERE id = ?
   `);
   for (const row of rows) {
-    const identity = computeIdentity(String(row.directory ?? ""), realFs);
+    const identity = resolveIdentity(String(row.directory ?? ""));
     update.run(identity.kind, identity.key, identity.displayName, Number(row.id));
   }
 }
-function migrateProjectIdentity(db) {
+function migrateProjectIdentity(db, resolveIdentity) {
   ensureLegacySessionDocumentColumns(db);
   createProjectTables(db);
-  backfillProjectSessions(db);
-  backfillSessionDocumentProjects(db);
+  backfillProjectSessions(db, resolveIdentity);
+  backfillSessionDocumentProjects(db, resolveIdentity);
 }
-function refreshProjectIdentities(db) {
+function refreshProjectIdentities(db, resolveIdentity) {
   if (tableExists(db, "sessions") && columnExists(db, "sessions", "project_identity_key") && columnExists(db, "sessions", "directory")) {
     const rows = db.prepare("SELECT agent_name, session_id, directory FROM sessions").all();
     const update = db.prepare(`
@@ -11809,7 +11954,7 @@ function refreshProjectIdentities(db) {
             WHERE agent_name = ? AND session_id = ?
           `) : null;
     for (const row of rows) {
-      const identity = computeIdentity(String(row.directory ?? ""), realFs);
+      const identity = resolveIdentity(String(row.directory ?? ""));
       update.run(identity.kind, identity.key, identity.displayName, row.agent_name, row.session_id);
       updateFileActivity?.run(identity.key, row.agent_name, row.session_id);
     }
@@ -11825,14 +11970,14 @@ function refreshProjectIdentities(db) {
       WHERE agent_name = ? AND session_id = ?
     `);
     for (const row of rows) {
-      const identity = computeIdentity(String(row.directory ?? ""), realFs);
+      const identity = resolveIdentity(String(row.directory ?? ""));
       update.run(identity.kind, identity.key, identity.displayName, row.agent_name, row.session_id);
     }
   }
-  backfillSessionDocumentProjects(db);
+  backfillSessionDocumentProjects(db, resolveIdentity);
   recreateProjectGroupsView(db);
 }
-function backfillStructuredSessions(db) {
+function backfillStructuredSessions(db, resolveIdentity) {
   createSessionTables(db);
   recreateProjectGroupsView(db);
   const upsertSession = prepareUpsertSession(db);
@@ -11845,7 +11990,10 @@ function backfillStructuredSessions(db) {
         continue;
       }
       try {
-        const session = JSON.parse(row.session_json);
+        const parsed = JSON.parse(row.session_json);
+        const directory = getLegacySessionDirectory(parsed);
+        if (directory == null) continue;
+        const session = parsed.project_identity == null ? { ...parsed, project_identity: resolveIdentity(directory) } : parsed;
         upsertSessionRow(
           upsertSession,
           String(row.agent_name),
@@ -11889,7 +12037,7 @@ function backfillStructuredSessions(db) {
       kind: row.project_identity_kind,
       key: String(row.project_identity_key),
       displayName: String(row.project_display_name)
-    } : computeIdentity(directory, realFs);
+    } : resolveIdentity(directory);
     upsertSessionRow(
       upsertSession,
       String(row.agent_name),
@@ -12015,6 +12163,174 @@ function replaceSessionActivityIndex(db) {
       ON sessions(agent_name, activity_time DESC, session_id);
   `);
 }
+function addSessionActivityIndex(db) {
+  if (!tableExists(db, "sessions")) return;
+  db.exec(`
+    CREATE INDEX IF NOT EXISTS idx_sessions_activity
+      ON sessions(activity_time DESC, agent_name, session_id)
+  `);
+}
+function addSessionModelCostRollup(db) {
+  createSessionModelCostTable(db);
+  if (!tableExists(db, "messages")) return;
+  db.exec(`
+    INSERT OR REPLACE INTO session_model_cost(agent_name, session_id, model, cost, cost_recorded)
+    SELECT
+      agent_name,
+      session_id,
+      model,
+      SUM(COALESCE(cost, 0)),
+      SUM(CASE WHEN cost_source = 'recorded' THEN COALESCE(cost, 0) ELSE 0 END)
+    FROM messages
+    WHERE model IS NOT NULL AND model <> ''
+    GROUP BY agent_name, session_id, model
+  `);
+}
+function addSessionCostSummary(db) {
+  db.exec(`
+    CREATE TABLE IF NOT EXISTS session_cost_summary (
+      agent_name TEXT NOT NULL,
+      session_id TEXT NOT NULL,
+      message_cost REAL NOT NULL,
+      untimed_message_cost REAL NOT NULL,
+      PRIMARY KEY (agent_name, session_id),
+      FOREIGN KEY (agent_name, session_id)
+        REFERENCES sessions(agent_name, session_id)
+        ON DELETE CASCADE
+    );
+  `);
+  if (!tableExists(db, "messages")) return;
+  db.exec(`
+    CREATE INDEX IF NOT EXISTS idx_messages_cost_time
+      ON messages(
+        CASE
+          WHEN time_completed > 0 THEN time_completed
+          WHEN time_created > 0 THEN time_created
+        END,
+        agent_name,
+        session_id
+      )
+      WHERE cost > 0;
+  `);
+  if (columnExists(db, "session_cost_summary", "message_count")) return;
+  db.exec(`
+
+    INSERT OR REPLACE INTO session_cost_summary(
+      agent_name,
+      session_id,
+      message_cost,
+      untimed_message_cost
+    )
+    SELECT
+      m.agent_name,
+      m.session_id,
+      SUM(CASE WHEN m.cost > 0 THEN m.cost ELSE 0 END),
+      SUM(
+        CASE
+          WHEN m.cost > 0
+            AND COALESCE(m.time_completed, 0) <= 0
+            AND COALESCE(m.time_created, 0) <= 0
+          THEN m.cost
+          ELSE 0
+        END
+      )
+    FROM messages m
+    JOIN sessions s
+      ON s.agent_name = m.agent_name
+      AND s.session_id = m.session_id
+    GROUP BY m.agent_name, m.session_id
+  `);
+}
+function addSessionUsageSummary(db) {
+  if (!tableExists(db, "session_cost_summary")) addSessionCostSummary(db);
+  const columns = {
+    message_count: "INTEGER NOT NULL DEFAULT 0",
+    untimed_message_count: "INTEGER NOT NULL DEFAULT 0",
+    input_tokens: "INTEGER NOT NULL DEFAULT 0",
+    output_tokens: "INTEGER NOT NULL DEFAULT 0",
+    reasoning_tokens: "INTEGER NOT NULL DEFAULT 0",
+    cache_read_tokens: "INTEGER NOT NULL DEFAULT 0",
+    cache_create_tokens: "INTEGER NOT NULL DEFAULT 0",
+    untimed_input_tokens: "INTEGER NOT NULL DEFAULT 0",
+    untimed_output_tokens: "INTEGER NOT NULL DEFAULT 0",
+    untimed_reasoning_tokens: "INTEGER NOT NULL DEFAULT 0",
+    untimed_cache_read_tokens: "INTEGER NOT NULL DEFAULT 0",
+    untimed_cache_create_tokens: "INTEGER NOT NULL DEFAULT 0"
+  };
+  for (const [name, definition] of Object.entries(columns)) {
+    if (!columnExists(db, "session_cost_summary", name)) {
+      db.exec(`ALTER TABLE session_cost_summary ADD COLUMN ${name} ${definition}`);
+    }
+  }
+  if (!tableExists(db, "messages")) return;
+  db.exec(`
+    DROP INDEX IF EXISTS idx_messages_cost_time;
+    CREATE INDEX IF NOT EXISTS idx_messages_usage_time
+      ON messages(
+        CASE
+          WHEN time_completed > 0 THEN time_completed
+          WHEN time_created > 0 THEN time_created
+        END,
+        agent_name,
+        session_id
+      );
+
+    DELETE FROM session_cost_summary;
+    WITH normalized AS (
+      SELECT
+        m.agent_name,
+        m.session_id,
+        COALESCE(m.time_completed, 0) <= 0 AND COALESCE(m.time_created, 0) <= 0 AS untimed,
+        MAX(CAST(COALESCE(json_extract(m.tokens_json, '$.input'), 0) AS INTEGER), 0) AS input_tokens,
+        MAX(CAST(COALESCE(json_extract(m.tokens_json, '$.output'), 0) AS INTEGER), 0) AS output_tokens,
+        MAX(CAST(COALESCE(json_extract(m.tokens_json, '$.reasoning'), 0) AS INTEGER), 0) AS reasoning_tokens,
+        MAX(CAST(COALESCE(json_extract(m.tokens_json, '$.cache_read'), 0) AS INTEGER), 0) AS cache_read_tokens,
+        MAX(CAST(COALESCE(json_extract(m.tokens_json, '$.cache_create'), 0) AS INTEGER), 0) AS cache_create_tokens,
+        CASE WHEN m.cost > 0 THEN m.cost ELSE 0 END AS cost
+      FROM messages m
+      JOIN sessions s
+        ON s.agent_name = m.agent_name
+        AND s.session_id = m.session_id
+    )
+    INSERT INTO session_cost_summary(
+      agent_name,
+      session_id,
+      message_count,
+      untimed_message_count,
+      input_tokens,
+      output_tokens,
+      reasoning_tokens,
+      cache_read_tokens,
+      cache_create_tokens,
+      untimed_input_tokens,
+      untimed_output_tokens,
+      untimed_reasoning_tokens,
+      untimed_cache_read_tokens,
+      untimed_cache_create_tokens,
+      message_cost,
+      untimed_message_cost
+    )
+    SELECT
+      agent_name,
+      session_id,
+      COUNT(*),
+      SUM(CASE WHEN untimed THEN 1 ELSE 0 END),
+      SUM(input_tokens),
+      SUM(output_tokens),
+      SUM(reasoning_tokens),
+      SUM(cache_read_tokens),
+      SUM(cache_create_tokens),
+      SUM(CASE WHEN untimed THEN input_tokens ELSE 0 END),
+      SUM(CASE WHEN untimed THEN output_tokens ELSE 0 END),
+      SUM(CASE WHEN untimed THEN reasoning_tokens ELSE 0 END),
+      SUM(CASE WHEN untimed THEN cache_read_tokens ELSE 0 END),
+      SUM(CASE WHEN untimed THEN cache_create_tokens ELSE 0 END),
+      SUM(cost),
+      SUM(CASE WHEN untimed THEN cost ELSE 0 END)
+    FROM normalized
+    GROUP BY agent_name, session_id;
+  `);
+}
 function compactSessionDocuments(db) {
   if (!tableExists(db, "session_documents")) {
     createSearchTables(db);
@@ -12058,6 +12374,12 @@ function addMessagePartsFormatVersion(db) {
   }
   db.exec("ALTER TABLE messages ADD COLUMN parts_format_version INTEGER NOT NULL DEFAULT 0");
 }
+function addMessageContentChainDigest(db) {
+  if (!tableExists(db, "messages") || columnExists(db, "messages", "content_chain_digest")) {
+    return;
+  }
+  db.exec("ALTER TABLE messages ADD COLUMN content_chain_digest TEXT");
+}
 function addSessionParentReference(db) {
   if (!tableExists(db, "sessions")) return;
   if (!columnExists(db, "sessions", "parent_agent_name")) {
@@ -12213,6 +12535,7 @@ function ensureSchema(db, dbPath) {
     migrateSubagentTree(db);
     return;
   }
+  const resolveLegacyProjectIdentity = prepareLegacyProjectIdentityResolver(db, currentVersion);
   runSchemaMigrations(db, {
     dbPath,
     currentVersion,
@@ -12232,7 +12555,10 @@ function ensureSchema(db, dbPath) {
     migrations: [
       { version: 3, migrate: createCacheTables },
       { version: 4, migrate: createSearchTables },
-      { version: 5, migrate: migrateProjectIdentity },
+      {
+        version: 5,
+        migrate: (migrationDb) => migrateProjectIdentity(migrationDb, resolveLegacyProjectIdentity)
+      },
       {
         version: 6,
         destructive: true,
@@ -12246,7 +12572,7 @@ function ensureSchema(db, dbPath) {
         version: 7,
         migrate(db2) {
           addSessionParentReference(db2);
-          backfillStructuredSessions(db2);
+          backfillStructuredSessions(db2, resolveLegacyProjectIdentity);
         }
       },
       { version: 8, migrate: backfillFileActivity },
@@ -12266,7 +12592,7 @@ function ensureSchema(db, dbPath) {
       {
         version: 12,
         migrate(db2) {
-          refreshProjectIdentities(db2);
+          refreshProjectIdentities(db2, resolveLegacyProjectIdentity);
         }
       },
       { version: 13, migrate: createCacheTables },
@@ -12279,7 +12605,12 @@ function ensureSchema(db, dbPath) {
       { version: 21, migrate: addSessionPublicationId },
       { version: 22, migrate: addAtomicPublicationStaging },
       { version: 23, migrate: replaceSessionActivityIndex },
-      { version: 24, migrate: dropLegacyMessageSearchIndex }
+      { version: 24, migrate: dropLegacyMessageSearchIndex },
+      { version: 25, migrate: addMessageContentChainDigest },
+      { version: 26, migrate: addSessionActivityIndex },
+      { version: 27, migrate: addSessionModelCostRollup },
+      { version: 28, migrate: addSessionCostSummary },
+      { version: 29, migrate: addSessionUsageSummary }
     ]
   });
   createLatestCacheSchema(db);
@@ -12293,6 +12624,25 @@ function ensureSchema(db, dbPath) {
   migrateOpenCodeSubagentFold(db);
   migrateSubagentTree(db);
 }
+var ANALYTICS_REVISION_KEY = "analytics_revision";
+function readAnalyticsRevision(db) {
+  const row = db.prepare("SELECT value FROM cache_meta WHERE key = ?").get(ANALYTICS_REVISION_KEY);
+  return String(row?.value ?? "0");
+}
+function advanceAnalyticsRevision(db) {
+  db.prepare(
+    `
+      INSERT INTO cache_meta(key, value)
+      VALUES (?, '1')
+      ON CONFLICT(key) DO UPDATE SET value = CAST(value AS INTEGER) + 1
+    `
+  ).run(ANALYTICS_REVISION_KEY);
+}
+function getAnalyticsRevision() {
+  if (!hasCacheStorage()) return null;
+  const read = withCacheDbReadOnly((db) => readAnalyticsRevision(db));
+  return read.status === "success" ? read.value : null;
+}
 function escapeFtsTerm(value) {
   return value.replaceAll('"', '""');
 }
@@ -12417,6 +12767,54 @@ function toFtsQuery(input) {
     (token, index, values) => token !== "OR" || index > 0 && index < values.length - 1 && values[index - 1] !== "OR" && values[index + 1] !== "OR"
   ).join(" ");
 }
+var MESSAGE_CURSOR_VERSION = 2;
+function updateField(hash, value) {
+  if (value == null) {
+    hash.update("n;");
+    return;
+  }
+  const text = String(value);
+  hash.update(`v${text.length}:`).update(text).update(";");
+}
+function updateMessageContent(hash, content) {
+  updateField(hash, content.messageId);
+  updateField(hash, content.role);
+  updateField(hash, content.timeCreated);
+  updateField(hash, content.timeCompleted);
+  updateField(hash, content.agent);
+  updateField(hash, content.mode);
+  updateField(hash, content.model);
+  updateField(hash, content.provider);
+  updateField(hash, content.tokensJson);
+  updateField(hash, content.cost);
+  updateField(hash, content.costSource);
+  updateField(hash, content.partsJson);
+  updateField(hash, content.partsFormatVersion);
+  updateField(hash, content.subagentId);
+  updateField(hash, content.nickname);
+}
+function initialMessageCursorDigest(reference) {
+  const hash = createHash22("sha256");
+  hash.update("codesesh-session-messages\0");
+  updateField(hash, MESSAGE_CURSOR_VERSION);
+  updateField(hash, reference.agentName);
+  updateField(hash, reference.sessionId);
+  return hash.digest("hex");
+}
+function advanceMessageCursorDigest(previousDigest, content) {
+  const hash = createHash22("sha256");
+  hash.update("codesesh-session-messages-chain\0");
+  updateField(hash, previousDigest);
+  updateMessageContent(hash, content);
+  return hash.digest("hex");
+}
+function computeMessageCursorDigest(reference, messages) {
+  let digest = initialMessageCursorDigest(reference);
+  for (const message of messages) {
+    digest = advanceMessageCursorDigest(digest, message);
+  }
+  return digest;
+}
 var DETAIL_PROJECTION_VERSION = "session-detail-v1";
 function sessionDetailVersion(meta) {
   const parserVersions = Object.entries(meta ?? {}).filter(
@@ -12621,7 +13019,7 @@ function loadSearchIndexEntry(agentName, change, loadSessionData, detailVersion,
   try {
     const data = loadSessionData(change.session.id);
     const messages = normalizeMessages(data);
-    const identity = change.session.project_identity ?? data.project_identity ?? computeIdentity(change.session.directory, realFs);
+    const identity = requireSessionProjectIdentity(agentName, change.session);
     return {
       session: change.session,
       messages,
@@ -12673,6 +13071,77 @@ function writeSearchIndexRows(db, agentName, removedSessionIds, entries, failure
   const deleteFileActivity = db.prepare(
     "DELETE FROM session_file_activity WHERE agent_name = ? AND session_id = ?"
   );
+  const deleteModelCost = db.prepare(
+    "DELETE FROM session_model_cost WHERE agent_name = ? AND session_id = ?"
+  );
+  const deleteCostSummary = db.prepare(
+    "DELETE FROM session_cost_summary WHERE agent_name = ? AND session_id = ?"
+  );
+  const rebuildModelCost = db.prepare(`
+    INSERT INTO session_model_cost(agent_name, session_id, model, cost, cost_recorded)
+    SELECT
+      agent_name,
+      session_id,
+      model,
+      SUM(COALESCE(cost, 0)),
+      SUM(CASE WHEN cost_source = 'recorded' THEN COALESCE(cost, 0) ELSE 0 END)
+    FROM messages
+    WHERE agent_name = ? AND session_id = ? AND model IS NOT NULL AND model <> ''
+    GROUP BY agent_name, session_id, model
+  `);
+  const rebuildCostSummary = db.prepare(`
+    WITH normalized AS (
+      SELECT
+        agent_name,
+        session_id,
+        COALESCE(time_completed, 0) <= 0 AND COALESCE(time_created, 0) <= 0 AS untimed,
+        MAX(CAST(COALESCE(json_extract(tokens_json, '$.input'), 0) AS INTEGER), 0) AS input_tokens,
+        MAX(CAST(COALESCE(json_extract(tokens_json, '$.output'), 0) AS INTEGER), 0) AS output_tokens,
+        MAX(CAST(COALESCE(json_extract(tokens_json, '$.reasoning'), 0) AS INTEGER), 0) AS reasoning_tokens,
+        MAX(CAST(COALESCE(json_extract(tokens_json, '$.cache_read'), 0) AS INTEGER), 0) AS cache_read_tokens,
+        MAX(CAST(COALESCE(json_extract(tokens_json, '$.cache_create'), 0) AS INTEGER), 0) AS cache_create_tokens,
+        CASE WHEN cost > 0 THEN cost ELSE 0 END AS normalized_cost
+      FROM messages
+      WHERE agent_name = ? AND session_id = ?
+    )
+    INSERT INTO session_cost_summary(
+      agent_name,
+      session_id,
+      message_count,
+      untimed_message_count,
+      input_tokens,
+      output_tokens,
+      reasoning_tokens,
+      cache_read_tokens,
+      cache_create_tokens,
+      untimed_input_tokens,
+      untimed_output_tokens,
+      untimed_reasoning_tokens,
+      untimed_cache_read_tokens,
+      untimed_cache_create_tokens,
+      message_cost,
+      untimed_message_cost
+    )
+    SELECT
+      agent_name,
+      session_id,
+      COUNT(*),
+      SUM(CASE WHEN untimed THEN 1 ELSE 0 END),
+      SUM(input_tokens),
+      SUM(output_tokens),
+      SUM(reasoning_tokens),
+      SUM(cache_read_tokens),
+      SUM(cache_create_tokens),
+      SUM(CASE WHEN untimed THEN input_tokens ELSE 0 END),
+      SUM(CASE WHEN untimed THEN output_tokens ELSE 0 END),
+      SUM(CASE WHEN untimed THEN reasoning_tokens ELSE 0 END),
+      SUM(CASE WHEN untimed THEN cache_read_tokens ELSE 0 END),
+      SUM(CASE WHEN untimed THEN cache_create_tokens ELSE 0 END),
+      SUM(normalized_cost),
+      SUM(CASE WHEN untimed THEN normalized_cost ELSE 0 END)
+    FROM normalized
+    GROUP BY agent_name, session_id
+  `);
   const writeIndexedSession = prepareUpsertIndexedSession(db);
   const insertFileActivity = prepareInsertFileActivity(db);
   const insertMessageTool = prepareInsertMessageTool(db);
@@ -12694,11 +13163,12 @@ function writeSearchIndexRows(db, agentName, removedSessionIds, entries, failure
       cost_source,
       parts_json,
       parts_format_version,
+      content_chain_digest,
       subagent_id,
       nickname,
       content_text,
       tool_metadata_json
-    ) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
+    ) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
     ON CONFLICT(agent_name, session_id, message_index) DO UPDATE SET
       message_id = excluded.message_id,
       role = excluded.role,
@@ -12713,6 +13183,7 @@ function writeSearchIndexRows(db, agentName, removedSessionIds, entries, failure
       cost_source = excluded.cost_source,
       parts_json = excluded.parts_json,
       parts_format_version = excluded.parts_format_version,
+      content_chain_digest = excluded.content_chain_digest,
       subagent_id = excluded.subagent_id,
       nickname = excluded.nickname,
       content_text = excluded.content_text,
@@ -12748,6 +13219,8 @@ function writeSearchIndexRows(db, agentName, removedSessionIds, entries, failure
     deleteFileActivity.run(agentName, sessionId);
     deleteMessageTools.run(agentName, sessionId, 0);
     deleteMessages.run(agentName, sessionId, 0);
+    deleteModelCost.run(agentName, sessionId);
+    deleteCostSummary.run(agentName, sessionId);
     clearPendingReindex.run(agentName, sessionId);
   }
   let indexed = 0;
@@ -12764,7 +13237,15 @@ function writeSearchIndexRows(db, agentName, removedSessionIds, entries, failure
     deleteMessageTools.run(agentName, entry.session.id, 0);
     clearPendingReindex.run(agentName, entry.session.id);
     writeFileActivityRows(insertFileActivity, entry.fileActivity);
+    let contentChainDigest = initialMessageCursorDigest({
+      agentName,
+      sessionId: entry.session.id
+    });
     for (const message of entry.messages) {
+      contentChainDigest = advanceMessageCursorDigest(
+        contentChainDigest,
+        messageCursorContentFromStructuredRecord(message)
+      );
       upsertMessage.run(
         agentName,
         entry.session.id,
@@ -12782,6 +13263,7 @@ function writeSearchIndexRows(db, agentName, removedSessionIds, entries, failure
         message.costSource ?? null,
         message.partsJson,
         MESSAGE_PARTS_FORMAT_VERSION,
+        contentChainDigest,
         message.subagentId ?? null,
         message.nickname ?? null,
         message.contentText,
@@ -12792,6 +13274,10 @@ function writeSearchIndexRows(db, agentName, removedSessionIds, entries, failure
       }
     }
     deleteMessages.run(agentName, entry.session.id, entry.messages.length);
+    deleteModelCost.run(agentName, entry.session.id);
+    deleteCostSummary.run(agentName, entry.session.id);
+    rebuildModelCost.run(agentName, entry.session.id);
+    rebuildCostSummary.run(agentName, entry.session.id);
     upsertRow.run(
       agentName,
       entry.session.id,
@@ -13042,11 +13528,20 @@ function executeSearchIndexPlan(db, plan, loadSessionData, largeBacklogStrategy)
   if (largeBacklogStrategy === "chunked" && plan.changes.length > SEARCH_INDEX_COMMIT_CHUNK_SIZE) {
     runSearchIndexWrite(db, false, () => {
       indexed += writeSearchIndexRows(db, plan.agentName, plan.removedSessionIds, [], failures);
+      if (plan.removedSessionIds.length > 0) advanceAnalyticsRevision(db);
     });
     for (let offset = 0; offset < plan.changes.length; offset += SEARCH_INDEX_COMMIT_CHUNK_SIZE) {
       const chunk = plan.changes.slice(offset, offset + SEARCH_INDEX_COMMIT_CHUNK_SIZE);
       runSearchIndexWrite(db, false, () => {
-        indexed += writeSearchIndexRows(db, plan.agentName, [], loadEntries(chunk), failures);
+        const chunkIndexed = writeSearchIndexRows(
+          db,
+          plan.agentName,
+          [],
+          loadEntries(chunk),
+          failures
+        );
+        indexed += chunkIndexed;
+        if (chunkIndexed > 0) advanceAnalyticsRevision(db);
       });
     }
     return searchIndexSyncResult(plan, indexed, failures, void 0, "incremental");
@@ -13059,10 +13554,12 @@ function executeSearchIndexPlan(db, plan, loadSessionData, largeBacklogStrategy)
       loadEntries(plan.changes),
       failures
     );
+    if (indexed > 0 || plan.removedSessionIds.length > 0) advanceAnalyticsRevision(db);
   });
   return searchIndexSyncResult(plan, indexed, failures, rebuildDurationMs);
 }
 function syncSessionSearchIndex(agentName, sessions, loadSessionData, options = {}) {
+  assertSessionProjectIdentities(agentName, sessions);
   return withSearchIndexDb(
     (db) => executeSearchIndexPlan(
       db,
@@ -13085,6 +13582,10 @@ function syncSessionSearchIndexChanges(agentName, changes, removedSessionIds, lo
       durationMs: 0
     };
   }
+  assertSessionProjectIdentities(
+    agentName,
+    changes.map(({ session }) => session)
+  );
   return withSearchIndexDb(
     (db) => executeSearchIndexPlan(
       db,
@@ -13111,7 +13612,6 @@ function mergeSearchQueryOptions(query, options) {
       project: options.project ?? parsed.filters.project,
       projectKind: options.projectKind ?? parsed.filters.projectKind,
       projectKey: options.projectKey ?? parsed.filters.projectKey,
-      cwd: options.cwd ?? parsed.filters.cwd,
       tags: mergeSearchLists(options.tags, parsed.filters.tags),
       tools: mergeSearchLists(options.tools, parsed.filters.tools),
       file: options.file ?? parsed.filters.file,
@@ -13124,6 +13624,9 @@ function mergeSearchQueryOptions(query, options) {
     parsed
   };
 }
+function getSearchProjectDirectory(query, options) {
+  return options.cwd ?? parseSearchQuery(query).filters.cwd;
+}
 function sessionMatchesSearchCost(session, options, cost = session.stats.total_cost) {
   if (options.costMin != null) {
     if (options.costMinExclusive ? cost <= options.costMin : cost < options.costMin) {
@@ -13152,12 +13655,19 @@ function buildSessionSearchFilters(options) {
       clauses.push("0");
     }
   }
-  if (options.cwd) {
-    const identity = computeIdentity(options.cwd, realFs);
+  if (options.projectScope) {
+    const scopePath = normalizeProjectScopePath(options.projectScope.path).toLowerCase();
+    const normalizedDirectory = "REPLACE(LOWER(s.directory), char(92), '/')";
     clauses.push(
-      "((s.project_identity_kind = ? AND s.project_identity_key = ?) OR LOWER(s.directory) LIKE ? ESCAPE '\\')"
+      `((s.project_identity_kind = ? AND s.project_identity_key = ?) OR ${normalizedDirectory} = ? OR instr(${normalizedDirectory}, ? || '/') = 1 OR instr(?, ${normalizedDirectory} || '/') = 1)`
+    );
+    params.push(
+      options.projectScope.identity.kind,
+      options.projectScope.identity.key,
+      scopePath,
+      scopePath,
+      scopePath
     );
-    params.push(identity.kind, identity.key, likePattern(options.cwd));
   }
   if (options.project) {
     clauses.push(
@@ -13348,6 +13858,7 @@ function searchResultRowKey(row) {
   return `${String(row.agent_name)}\0${String(row.session_id)}`;
 }
 function fetchMessageSearchMatches(db, rows, terms) {
+  const startedAt = performance.now();
   const candidates = rows.filter((row) => !textMatchesTerms(String(row.title ?? ""), terms));
   if (candidates.length === 0) {
     return /* @__PURE__ */ new Map();
@@ -13357,11 +13868,11 @@ function fetchMessageSearchMatches(db, rows, terms) {
     String(row.agent_name),
     String(row.session_id)
   ]);
-  db.function(
-    "codesesh_message_matches_terms",
-    { deterministic: true },
-    (text) => textMatchesTerms(String(text ?? ""), terms) ? 1 : 0
-  );
+  let predicateEvaluations = 0;
+  db.function("codesesh_message_matches_terms", { deterministic: true }, (text) => {
+    predicateEvaluations += 1;
+    return textMatchesTerms(String(text ?? ""), terms) ? 1 : 0;
+  });
   const messageRows = db.prepare(
     `
         WITH candidate_sessions(agent_name, session_id) AS (
@@ -13405,6 +13916,12 @@ function fetchMessageSearchMatches(db, rows, terms) {
       matchType: messageMatchType(message)
     });
   }
+  getCoreDiagnostics()?.info?.("search.message_match_projection", {
+    candidate_sessions: candidates.length,
+    predicate_evaluations: predicateEvaluations,
+    matched_sessions: matches.size,
+    duration_ms: Math.round(performance.now() - startedAt)
+  });
   return matches;
 }
 function resolveSearchMatch(row, terms, messageMatches) {
@@ -13496,14 +14013,14 @@ function searchSessions(query, options = {}) {
 }
 function fileActivityFilters(options) {
   const path2 = options.path ? normalizeFilePathSearch(options.path) : "";
-  const cwdIdentity = options.cwd ? computeIdentity(options.cwd, realFs) : null;
+  const scope = options.projectScope;
   return {
     projectKind: options.projectKind ?? null,
     projectKey: options.projectKey ?? null,
     projectLike: options.project ? likePattern(options.project) : null,
-    cwdKind: cwdIdentity?.kind ?? null,
-    cwdKey: cwdIdentity?.key ?? null,
-    cwdLike: options.cwd ? likePattern(options.cwd) : null,
+    scopeKind: scope?.identity.kind ?? null,
+    scopeKey: scope?.identity.key ?? null,
+    scopePath: scope ? normalizeProjectScopePath(scope.path).toLowerCase() : null,
     path: path2,
     pathLike: path2 ? likePattern(path2) : null
   };
@@ -13547,11 +14064,18 @@ function buildFileActivityWhere(options) {
     );
     params.push(filters.projectLike, filters.projectLike, filters.projectLike);
   }
-  if (filters.cwdKey != null) {
+  if (filters.scopeKey != null && filters.scopePath != null) {
+    const normalizedDirectory = "REPLACE(LOWER(s.directory), char(92), '/')";
     clauses.push(
-      "((s.project_identity_kind = ? AND s.project_identity_key = ?) OR LOWER(s.directory) LIKE ? ESCAPE '\\')"
+      `((s.project_identity_kind = ? AND s.project_identity_key = ?) OR ${normalizedDirectory} = ? OR instr(${normalizedDirectory}, ? || '/') = 1 OR instr(?, ${normalizedDirectory} || '/') = 1)`
+    );
+    params.push(
+      filters.scopeKind,
+      filters.scopeKey,
+      filters.scopePath,
+      filters.scopePath,
+      filters.scopePath
     );
-    params.push(filters.cwdKind, filters.cwdKey, filters.cwdLike);
   }
   if (filters.pathLike != null) {
     const pathQuery = filePathFtsQuery(filters.path);
@@ -13771,11 +14295,11 @@ function deleteLegacyCacheFile() {
   } catch {
   }
 }
-function loadCachedSessions(agentName) {
+function readCachedSessions(agentName) {
   if (!hasCacheStorage()) {
-    return null;
+    return { status: "success", value: null };
   }
-  return withCacheDb((db) => {
+  return withCacheDbOutcome((db) => {
     const timestampRow = db.prepare("SELECT timestamp AS value FROM agent_cache WHERE agent_name = ?").get(agentName);
     const timestamp = Number(timestampRow?.value ?? 0);
     if (!timestamp) {
@@ -13801,6 +14325,10 @@ function loadCachedSessions(agentName) {
     return { sessions, meta, timestamp };
   });
 }
+function loadCachedSessions(agentName) {
+  const outcome = readCachedSessions(agentName);
+  return outcome.status === "success" ? outcome.value : null;
+}
 function loadCachedSessionHeads(references) {
   if (references.length === 0 || !hasCacheStorage()) return [];
   const unique2 = /* @__PURE__ */ new Map();
@@ -13859,10 +14387,6 @@ function readAgentCacheInitialization(agentName, indexVersion = CACHE_INITIALIZA
     return row?.index_version === indexVersion;
   });
 }
-function isAgentCacheInitialized(agentName, indexVersion = CACHE_INITIALIZATION_VERSION) {
-  const outcome = readAgentCacheInitialization(agentName, indexVersion);
-  return outcome.status === "success" && outcome.value;
-}
 function markAgentCacheInitialized(agentName, indexVersion = CACHE_INITIALIZATION_VERSION) {
   withCacheDb((db) => {
     db.prepare(
@@ -13876,7 +14400,7 @@ function markAgentCacheInitialized(agentName, indexVersion = CACHE_INITIALIZATIO
   });
 }
 function markAgentFullSyncStarted(agentName) {
-  withCacheDb((db) => {
+  const persisted = withCacheDb((db) => {
     db.prepare(
       `
         UPDATE cache_initialization
@@ -13884,7 +14408,9 @@ function markAgentFullSyncStarted(agentName) {
         WHERE agent_name = ?
       `
     ).run(agentName);
+    return true;
   });
+  return persisted ?? false;
 }
 function getAgentFullSyncCursor(agentName) {
   if (!hasCacheStorage()) return null;
@@ -13895,8 +14421,8 @@ function getAgentFullSyncCursor(agentName) {
   return outcome.status === "success" ? outcome.value : null;
 }
 function markAgentFullSyncProgress(agentName, cursor) {
-  if (!cursor) return;
-  withCacheDb((db) => {
+  if (!cursor) return true;
+  const persisted = withCacheDb((db) => {
     db.prepare(
       `
         INSERT INTO cache_meta(key, value)
@@ -13904,14 +14430,9 @@ function markAgentFullSyncProgress(agentName, cursor) {
         ON CONFLICT(key) DO UPDATE SET value = excluded.value
       `
     ).run(`${FULL_SYNC_CURSOR_PREFIX}${agentName}`, cursor);
+    return true;
   });
-}
-function clearAgentFullSyncCursor(agentName) {
-  withCacheDb((db) => {
-    db.prepare("DELETE FROM cache_meta WHERE key = ?").run(
-      `${FULL_SYNC_CURSOR_PREFIX}${agentName}`
-    );
-  });
+  return persisted ?? false;
 }
 function readAgentLastFullSyncAt(agentName) {
   if (!hasCacheStorage()) {
@@ -13929,97 +14450,149 @@ function readAgentLastFullSyncAt(agentName) {
     return row?.last_sync_at || null;
   });
 }
-function getAgentLastFullSyncAt(agentName) {
-  const outcome = readAgentLastFullSyncAt(agentName);
-  return outcome.status === "success" ? outcome.value : null;
-}
 function markAgentFullSyncCompleted(agentName) {
-  withCacheDb((db) => {
-    db.prepare(
+  const completedAt = Date.now();
+  const persisted = withCacheDb((db) => {
+    db.transaction(() => {
+      db.prepare(
+        `
+          INSERT INTO cache_initialization(agent_name, initialized_at, index_version, last_sync_at)
+          VALUES (?, ?, ?, ?)
+          ON CONFLICT(agent_name) DO UPDATE SET
+            last_sync_at = excluded.last_sync_at
+        `
+      ).run(agentName, completedAt, CACHE_INITIALIZATION_VERSION, completedAt);
+      db.prepare("DELETE FROM cache_meta WHERE key = ?").run(
+        `${FULL_SYNC_CURSOR_PREFIX}${agentName}`
+      );
+    }).immediate();
+    return true;
+  });
+  return persisted ?? false;
+}
+function loadCachedSessionEntryBase(db, agentName, sessionId) {
+  const row = db.prepare(
+    `
+        SELECT
+          sessions.*,
+          documents.detail_version AS detail_version
+        FROM sessions
+        LEFT JOIN session_documents AS documents
+          ON documents.agent_name = sessions.agent_name
+          AND documents.session_id = sessions.session_id
+        WHERE sessions.agent_name = ?
+          AND sessions.session_id = ?
+          AND sessions.publication_id IS NULL
       `
-        UPDATE cache_initialization
-        SET last_sync_at = ?
-        WHERE agent_name = ?
+  ).get(agentName, sessionId);
+  if (!row) return null;
+  const pendingReindex = db.prepare("SELECT 1 FROM pending_reindex WHERE agent_name = ? AND session_id = ?").get(agentName, sessionId) != null;
+  const fileActivityRows = db.prepare(
+    `
+        SELECT agent_name, session_id, project_identity_key, path, kind, count, latest_time
+        FROM session_file_activity
+        WHERE agent_name = ? AND session_id = ?
+        ORDER BY latest_time DESC, count DESC, path
+        LIMIT 500
       `
-    ).run(Date.now(), agentName);
-  });
-  clearAgentFullSyncCursor(agentName);
+  ).all(agentName, sessionId);
+  return {
+    data: {
+      ...sessionFromRow(row),
+      reference: { agentName, sessionId },
+      file_activity: fileActivityRows.map((activityRow) => fileActivityFromRow(activityRow))
+    },
+    meta: parseCachedSessionMeta(row.meta_json),
+    detailVersion: typeof row.detail_version === "string" ? row.detail_version : null,
+    pendingReindex
+  };
+}
+function readCachedSessionMessageRows(db, agentName, sessionId, startIndex) {
+  return db.prepare(
+    `
+        SELECT
+          message_id,
+          role,
+          time_created,
+          time_completed,
+          agent,
+          mode,
+          model,
+          provider,
+          tokens_json,
+          cost,
+          cost_source,
+          parts_json,
+          parts_format_version,
+          content_chain_digest,
+          subagent_id,
+          nickname
+        FROM messages
+        WHERE agent_name = ? AND session_id = ? AND message_index >= ?
+        ORDER BY message_index
+      `
+  ).all(agentName, sessionId, startIndex);
 }
 function loadCachedSessionRawEntry(agentName, sessionId) {
-  if (!hasCacheStorage()) {
-    return null;
-  }
+  if (!hasCacheStorage()) return null;
   const outcome = withCacheDbReadOnly((db) => {
-    const row = db.prepare(
-      `
-          SELECT
-            sessions.*,
-            documents.detail_version AS detail_version
-          FROM sessions
-          LEFT JOIN session_documents AS documents
-            ON documents.agent_name = sessions.agent_name
-            AND documents.session_id = sessions.session_id
-          WHERE sessions.agent_name = ?
-            AND sessions.session_id = ?
-            AND sessions.publication_id IS NULL
-        `
-    ).get(agentName, sessionId);
-    if (!row) {
-      return null;
-    }
-    const pendingReindex = db.prepare("SELECT 1 FROM pending_reindex WHERE agent_name = ? AND session_id = ?").get(agentName, sessionId) != null;
-    const messageRows = db.prepare(
-      `
-          SELECT
-            message_id,
-            role,
-            time_created,
-            time_completed,
-            agent,
-            mode,
-            model,
-            provider,
-            tokens_json,
-            cost,
-            cost_source,
-            parts_json,
-            parts_format_version,
-            subagent_id,
-            nickname
-          FROM messages
-          WHERE agent_name = ? AND session_id = ?
-          ORDER BY message_index
-        `
-    ).all(agentName, sessionId);
-    const head = sessionFromRow(row);
-    const fileActivityRows = db.prepare(
+    const entry = loadCachedSessionEntryBase(db, agentName, sessionId);
+    return entry ? { ...entry, messageRows: readCachedSessionMessageRows(db, agentName, sessionId, 0) } : null;
+  });
+  return outcome.status === "success" ? outcome.value : null;
+}
+function readCachedSessionMessageDigest(db, agentName, sessionId, messageCount) {
+  if (!Number.isSafeInteger(messageCount) || messageCount <= 0) return null;
+  const row = db.prepare(
+    `
+        SELECT content_chain_digest
+        FROM messages
+        WHERE agent_name = ? AND session_id = ? AND message_index = ?
       `
-          SELECT agent_name, session_id, project_identity_key, path, kind, count, latest_time
-          FROM session_file_activity
-          WHERE agent_name = ? AND session_id = ?
-          ORDER BY latest_time DESC, count DESC, path
-          LIMIT 500
+  ).get(agentName, sessionId, messageCount - 1);
+  return typeof row?.content_chain_digest === "string" ? row.content_chain_digest : null;
+}
+function readCachedSessionCursor(agentName, sessionId, read) {
+  if (!hasCacheStorage()) return null;
+  const outcome = withCacheDbReadOnly(
+    (db) => db.transaction(() => {
+      const entryBase = loadCachedSessionEntryBase(db, agentName, sessionId);
+      if (!entryBase) return null;
+      const messageState = db.prepare(
         `
-    ).all(agentName, sessionId);
-    return {
-      data: {
-        ...head,
-        reference: { agentName, sessionId },
-        file_activity: fileActivityRows.map((activityRow) => fileActivityFromRow(activityRow))
-      },
-      messageRows,
-      meta: parseCachedSessionMeta(row.meta_json),
-      detailVersion: typeof row.detail_version === "string" ? row.detail_version : null,
-      pendingReindex
-    };
-  });
+            SELECT
+              COUNT(*) AS message_count,
+              (
+                SELECT content_chain_digest
+                FROM messages
+                WHERE agent_name = ? AND session_id = ?
+                ORDER BY message_index DESC
+                LIMIT 1
+              ) AS content_chain_digest
+            FROM messages
+            WHERE agent_name = ? AND session_id = ?
+          `
+      ).get(agentName, sessionId, agentName, sessionId);
+      const entry = {
+        ...entryBase,
+        messageCount: Number(messageState.message_count ?? 0),
+        messageDigest: typeof messageState.content_chain_digest === "string" ? messageState.content_chain_digest : null
+      };
+      return read(entry, {
+        messageDigest: (messageCount) => readCachedSessionMessageDigest(db, agentName, sessionId, messageCount),
+        messageRows: (startIndex) => Number.isSafeInteger(startIndex) && startIndex >= 0 ? readCachedSessionMessageRows(db, agentName, sessionId, startIndex) : []
+      });
+    })()
+  );
   return outcome.status === "success" ? outcome.value : null;
 }
 function saveCachedSessions(agentName, sessions, meta = {}, options = {}) {
+  assertSessionProjectIdentities(agentName, sessions);
   const persisted = withCacheDb((db) => {
-    db.transaction(
-      () => writeCachedSessionSnapshot(db, agentName, sessions, meta, options)
-    ).immediate();
+    db.transaction(() => {
+      writeCachedSessionSnapshot(db, agentName, sessions, meta, options);
+      advanceAnalyticsRevision(db);
+    }).immediate();
     deleteLegacyCacheFile();
     return true;
   });
@@ -14032,6 +14605,12 @@ function writeCachedSessionSnapshot(db, agentName, sessions, meta = {}, options
     "DELETE FROM session_documents WHERE agent_name = ? AND session_id = ?"
   );
   const deleteMessages = db.prepare("DELETE FROM messages WHERE agent_name = ? AND session_id = ?");
+  const deleteModelCost = db.prepare(
+    "DELETE FROM session_model_cost WHERE agent_name = ? AND session_id = ?"
+  );
+  const deleteCostSummary = db.prepare(
+    "DELETE FROM session_cost_summary WHERE agent_name = ? AND session_id = ?"
+  );
   const deleteMessageTools = db.prepare(
     "DELETE FROM message_tools WHERE agent_name = ? AND session_id = ?"
   );
@@ -14058,6 +14637,8 @@ function writeCachedSessionSnapshot(db, agentName, sessions, meta = {}, options
     deleteSearchDocument.run(agentName, sessionId);
     deleteMessageTools.run(agentName, sessionId);
     deleteMessages.run(agentName, sessionId);
+    deleteModelCost.run(agentName, sessionId);
+    deleteCostSummary.run(agentName, sessionId);
     deleteFileActivity.run(agentName, sessionId);
     deleteSession.run(agentName, sessionId);
   }
@@ -14075,10 +14656,17 @@ function writeCachedSessionSnapshot(db, agentName, sessions, meta = {}, options
   });
 }
 function saveCachedSessionChanges(agentName, changes, removedSessionIds, meta = {}) {
+  assertSessionProjectIdentities(
+    agentName,
+    changes.map(({ session }) => session)
+  );
   const persisted = withCacheDb((db) => {
-    db.transaction(
-      () => writeCachedSessionChanges(db, agentName, changes, removedSessionIds, meta)
-    ).immediate();
+    db.transaction(() => {
+      writeCachedSessionChanges(db, agentName, changes, removedSessionIds, meta);
+      if (changes.length > 0 || removedSessionIds.length > 0) {
+        advanceAnalyticsRevision(db);
+      }
+    }).immediate();
     deleteLegacyCacheFile();
     return true;
   });
@@ -14090,6 +14678,12 @@ function writeCachedSessionChanges(db, agentName, changes, removedSessionIds, me
     "DELETE FROM session_documents WHERE agent_name = ? AND session_id = ?"
   );
   const deleteMessages = db.prepare("DELETE FROM messages WHERE agent_name = ? AND session_id = ?");
+  const deleteModelCost = db.prepare(
+    "DELETE FROM session_model_cost WHERE agent_name = ? AND session_id = ?"
+  );
+  const deleteCostSummary = db.prepare(
+    "DELETE FROM session_cost_summary WHERE agent_name = ? AND session_id = ?"
+  );
   const deleteMessageTools = db.prepare(
     "DELETE FROM message_tools WHERE agent_name = ? AND session_id = ?"
   );
@@ -14107,6 +14701,8 @@ function writeCachedSessionChanges(db, agentName, changes, removedSessionIds, me
     deleteSearchDocument.run(agentName, sessionId);
     deleteMessageTools.run(agentName, sessionId);
     deleteMessages.run(agentName, sessionId);
+    deleteModelCost.run(agentName, sessionId);
+    deleteCostSummary.run(agentName, sessionId);
     deleteFileActivity.run(agentName, sessionId);
     deleteSession.run(agentName, sessionId);
   }
@@ -14136,17 +14732,26 @@ function clearCache() {
     return;
   }
   withCacheDb((db) => {
-    db.exec(`
-      DELETE FROM agent_cache;
-      DELETE FROM cache_initialization;
-      DELETE FROM cached_sessions;
-      DELETE FROM session_documents;
-      DELETE FROM session_file_activity;
-      DELETE FROM message_tools;
-      DELETE FROM messages;
-      DELETE FROM sessions;
-      DELETE FROM project_sessions;
-    `);
+    db.transaction(() => {
+      db.exec(`
+        DELETE FROM agent_cache;
+        DELETE FROM cache_initialization;
+        DELETE FROM cached_sessions;
+        DELETE FROM pending_reindex;
+        DELETE FROM search_index_publication_entries;
+        DELETE FROM session_documents;
+        DELETE FROM session_file_activity;
+        DELETE FROM message_tools;
+        DELETE FROM messages;
+        DELETE FROM session_model_cost;
+        DELETE FROM session_cost_summary;
+        DELETE FROM sessions;
+        DELETE FROM project_sessions;
+        -- analytics_revision is an invalidation counter, not cached data.
+        DELETE FROM cache_meta WHERE key <> 'analytics_revision';
+      `);
+      advanceAnalyticsRevision(db);
+    }).immediate();
   });
   closeCacheStorage();
   deleteLegacyCacheFile();
@@ -14163,13 +14768,13 @@ function clearCache() {
     }
   }
 }
-function attachMissingProjectIdentities(sessions, resolve22 = (directory) => computeIdentityProjection(directory, realFs)) {
+function attachMissingProjectIdentities(sessions, resolve3 = (directory) => computeIdentityProjection(directory, realFs)) {
   const projections = /* @__PURE__ */ new Map();
   return sessions.map((session) => {
     const directory = normalizeProjectDirectory(session.directory);
     let projection = projections.get(directory);
     if (!projection) {
-      projection = resolve22(directory);
+      projection = resolve3(directory);
       projections.set(directory, projection);
     }
     const identity = session.project_identity;
@@ -14194,28 +14799,61 @@ function buildAgentCacheMeta(agent, sessionIds) {
   }
   return meta;
 }
+function signatureValues(value, spec) {
+  const values = [];
+  for (const key of Object.keys(spec)) {
+    values.push(...spec[key](value));
+  }
+  return values;
+}
+function objectSignatureValues(value, spec) {
+  const keys = Object.keys(spec);
+  if (!value) return keys.map(() => null);
+  return keys.map((key) => spec[key](value));
+}
+var SESSION_REFERENCE_SIGNATURE_SPEC = {
+  agentName: (reference) => reference.agentName,
+  sessionId: (reference) => reference.sessionId
+};
+var PROJECT_IDENTITY_SIGNATURE_SPEC = {
+  kind: (identity) => identity.kind,
+  key: (identity) => identity.key,
+  displayName: (identity) => identity.displayName
+};
+var SESSION_STATS_SIGNATURE_SPEC = {
+  message_count: (stats) => stats.message_count,
+  total_input_tokens: (stats) => stats.total_input_tokens,
+  total_output_tokens: (stats) => stats.total_output_tokens,
+  total_cost: (stats) => stats.total_cost,
+  cost_source: (stats) => stats.cost_source ?? null,
+  total_tokens: (stats) => stats.total_tokens ?? 0,
+  total_cache_read_tokens: (stats) => stats.total_cache_read_tokens ?? 0,
+  total_cache_create_tokens: (stats) => stats.total_cache_create_tokens ?? 0
+};
+function modelUsageSignature(modelUsage) {
+  if (!modelUsage) return null;
+  return Object.entries(modelUsage).sort(([left], [right]) => left < right ? -1 : left > right ? 1 : 0).map(([model, tokens]) => [model, tokens]);
+}
+var SESSION_HEAD_SIGNATURE_SPEC = {
+  slug: (session) => [session.slug],
+  title: (session) => [session.title],
+  directory: (session) => [session.directory],
+  parent_reference: (session) => objectSignatureValues(session.parent_reference, SESSION_REFERENCE_SIGNATURE_SPEC),
+  project_identity: (session) => objectSignatureValues(session.project_identity, PROJECT_IDENTITY_SIGNATURE_SPEC),
+  project_identity_resolver_revision: (session) => [
+    session.project_identity_resolver_revision ?? null
+  ],
+  project_identity_input_signature: (session) => [session.project_identity_input_signature ?? null],
+  time_created: (session) => [session.time_created],
+  time_updated: (session) => [session.time_updated ?? session.time_created],
+  stats: (session) => objectSignatureValues(session.stats, SESSION_STATS_SIGNATURE_SPEC),
+  model_usage: (session) => [modelUsageSignature(session.model_usage)],
+  smart_tags: (session) => [session.smart_tags ? [...session.smart_tags].sort() : null],
+  smart_tags_source_updated_at: (session) => [session.smart_tags_source_updated_at ?? null],
+  smart_tags_classifier_revision: (session) => [session.smart_tags_classifier_revision ?? null]
+};
 function sessionSignature(session) {
-  return JSON.stringify([
-    session.title,
-    session.directory,
-    session.parent_reference?.agentName ?? null,
-    session.parent_reference?.sessionId ?? null,
-    session.time_created,
-    session.time_updated ?? session.time_created,
-    session.stats.message_count,
-    session.stats.total_input_tokens,
-    session.stats.total_output_tokens,
-    session.stats.total_cost,
-    session.stats.total_tokens ?? 0,
-    session.project_identity?.kind ?? null,
-    session.project_identity?.key ?? null,
-    session.project_identity?.displayName ?? null,
-    session.project_identity_resolver_revision ?? null,
-    session.project_identity_input_signature ?? null,
-    session.smart_tags ? [...session.smart_tags].sort() : null,
-    session.smart_tags_source_updated_at ?? null,
-    session.smart_tags_classifier_revision ?? null
-  ]);
+  return JSON.stringify(signatureValues(session, SESSION_HEAD_SIGNATURE_SPEC));
 }
 function sortSessions(sessions) {
   return sortSessionsByActivity(sessions);
@@ -14286,7 +14924,20 @@ function saveCachedSessionDiff(agent, cachedSessions, updatedSessions, changedId
   const diff = computeSessionDiff(cachedSessions, updatedSessions, changedIds, sessionSignature);
   const explicitRemovals = new Set(explicitRemovedSessionIds);
   const removedSessionIds = completeness === "complete" ? diff.removedSessionIds : diff.removedSessionIds.filter((sessionId) => explicitRemovals.has(sessionId));
-  saveCachedSessionChanges(agent.name, diff.changes, removedSessionIds, buildAgentCacheMeta(agent));
+  const persisted = saveCachedSessionChanges(
+    agent.name,
+    diff.changes,
+    removedSessionIds,
+    buildAgentCacheMeta(agent)
+  );
+  if (persisted === false) {
+    getCoreDiagnostics()?.warn("cache.save_failed", {
+      agent: agent.name,
+      changed_sessions: diff.changes.length,
+      removed_sessions: removedSessionIds.length
+    });
+  }
+  return persisted;
 }
 function getSmartTagWorkerCount(sessionCount) {
   if (sessionCount < 50) return 1;
@@ -14357,30 +15008,46 @@ function ensureSessionTagsSync(agent, sessions, onProgress, classifierRevision =
   });
   return { sessions: tagged, changed, timing };
 }
+var SMART_TAG_WORKER_TIMEOUT_MS = 3e5;
 async function classifySessionTagsInWorker(workerUrl, agentName, sessionIds, meta) {
-  return new Promise((resolveWorker, rejectWorker) => {
-    const worker = new Worker(workerUrl, {
-      workerData: {
-        pricingGenerationId: getPricingGeneration().id,
-        agentName,
-        sessionIds,
-        meta
-      }
-    });
-    worker.on("message", (message) => {
-      if (isWorkerLogMessage(message)) {
-        relayWorkerLogMessage(message);
-        return;
-      }
-      resolveWorker(message);
+  const worker = new Worker(workerUrl, {
+    workerData: {
+      pricingGenerationId: getPricingGeneration().id,
+      agentName,
+      sessionIds,
+      meta
+    }
+  });
+  let timer;
+  try {
+    return await new Promise((resolveWorker, rejectWorker) => {
+      timer = setTimeout(() => {
+        rejectWorker(
+          new Error(`Smart tag worker timed out after ${SMART_TAG_WORKER_TIMEOUT_MS}ms`)
+        );
+      }, SMART_TAG_WORKER_TIMEOUT_MS);
+      worker.on("message", (message) => {
+        if (isWorkerLogMessage(message)) {
+          relayWorkerLogMessage(message);
+          return;
+        }
+        const results = message;
+        if (results.length === 0 && sessionIds.length > 0) {
+          rejectWorker(new Error("Smart tag worker returned no results"));
+          return;
+        }
+        resolveWorker(results);
+      });
+      worker.once("error", rejectWorker);
+      worker.once("exit", (code) => {
+        rejectWorker(new Error(`Smart tag worker exited with code ${code} before responding`));
+      });
     });
-    worker.once("error", rejectWorker);
-    worker.once("exit", (code) => {
-      if (code !== 0) {
-        rejectWorker(new Error(`Smart tag worker exited with code ${code}`));
-      }
+  } finally {
+    if (timer) clearTimeout(timer);
+    worker.terminate().catch(() => {
     });
-  });
+  }
 }
 function relayWorkerLogMessage(message) {
   const detail = {
@@ -14455,18 +15122,19 @@ async function finalizeAgentScan(agent, sessions, context) {
     tagged = options.includeSmartTags === false ? tagged : await ensureSessionTags(agent, sessionsWithIdentity, options.smartTagWorkerUrl);
     timing.tags = performance.now() - tagsStart;
   }
+  let cachePersistence = "not-requested";
   if (options.writeCache !== false) {
     if (finalization.kind === "incremental") {
-      saveCachedSessionDiff(
+      cachePersistence = saveCachedSessionDiff(
         agent,
         finalization.cached.sessions,
         tagged.sessions,
         finalization.changedIds,
         context.completeness,
         finalization.explicitRemovedSessionIds
-      );
+      ) === false ? "failed" : "persisted";
     } else if (finalization.kind === "unchanged" && (identityChanged || tagged.changed)) {
-      saveCachedSessionDiff(agent, finalization.cached.sessions, tagged.sessions);
+      cachePersistence = saveCachedSessionDiff(agent, finalization.cached.sessions, tagged.sessions) === false ? "failed" : "persisted";
     }
   }
   if (isIncremental) {
@@ -14478,10 +15146,11 @@ async function finalizeAgentScan(agent, sessions, context) {
     status: context.completeness,
     agent,
     heads,
+    cachePersistence,
     fromCache: true,
     ...isIncremental ? { refreshed: true } : {},
     timing,
-    cacheTimestamp: isIncremental ? finalization.cacheTimestamp : finalization.cached.timestamp
+    cacheTimestamp: isIncremental && cachePersistence === "persisted" ? finalization.cacheTimestamp : finalization.cached.timestamp
   };
 }
 async function refreshCachedFileAgent(agent, cached, options, timing, agentStart, onProgress) {
@@ -14597,6 +15266,7 @@ async function scanAgentSmart(agent, options, onProgress) {
           )
         );
         timing.scan = performance.now() - t2;
+        agent.commitChangeCheck();
         return finalizeAgentScan(agent, updatedSessions, {
           finalization: {
             kind: "incremental",
@@ -14611,6 +15281,7 @@ async function scanAgentSmart(agent, options, onProgress) {
           onProgress
         });
       }
+      agent.commitChangeCheck();
       return finalizeAgentScan(agent, cached.sessions, {
         finalization: { kind: "unchanged", cached },
         options,
@@ -14661,15 +15332,20 @@ async function scanAgentFull(agent, options, onProgress, timing = { total: 0 },
     const tagged = options.includeSmartTags === false ? { sessions: headsWithIdentity, changed: false } : await ensureSessionTags(agent, headsWithIdentity, options.smartTagWorkerUrl);
     timing.tags = performance.now() - t2;
     const meta = buildAgentCacheMeta(agent);
+    let cachePersistence = "not-requested";
     if (options.writeCache !== false) {
       const isFullWindow = options.from == null && options.to == null;
       const persisted = saveCachedSessions(agent.name, tagged.sessions, meta, {
         completeness: isFullWindow && sourceFailures.length === 0 ? "complete" : "partial"
       });
-      if (persisted) {
-        if (isFullWindow && sourceFailures.length === 0) markAgentFullSyncCompleted(agent.name);
+      if (persisted !== false) {
+        cachePersistence = "persisted";
         markAgentCacheInitialized(agent.name);
+        if (isFullWindow && sourceFailures.length === 0 && !markAgentFullSyncCompleted(agent.name)) {
+          getCoreDiagnostics()?.warn("cache.full_sync_marker_failed", { agent: agent.name });
+        }
       } else {
+        cachePersistence = "failed";
         getCoreDiagnostics()?.warn("cache.save_failed", {
           agent: agent.name,
           sessions: tagged.sessions.length
@@ -14683,6 +15359,7 @@ async function scanAgentFull(agent, options, onProgress, timing = { total: 0 },
       status: options.from == null && options.to == null && sourceFailures.length === 0 ? "complete" : "partial",
       agent,
       heads: filtered,
+      cachePersistence,
       fromCache: false,
       timing
     };
@@ -14718,6 +15395,7 @@ async function scanSessions(options = {}, onProgress) {
   const allSessions = [];
   const availableAgents = [];
   const cacheTimestamps = {};
+  const cacheFailures = {};
   const scanFailures = {};
   const agentFilter = options.agents?.length ? new Set(options.agents.map((a) => a.toLowerCase())) : null;
   const agentsToScan = agents.filter((agent) => {
@@ -14741,6 +15419,9 @@ async function scanSessions(options = {}, onProgress) {
       } else {
         byAgent[result.agent.name] = result.heads;
         allSessions.push(...result.heads);
+        if (result.cachePersistence === "failed") {
+          cacheFailures[result.agent.name] = { agentName: result.agent.name };
+        }
       }
       if (result.timing) {
         timings[result.agent.name] = result.timing;
@@ -14757,11 +15438,11 @@ async function scanSessions(options = {}, onProgress) {
     agents: availableAgents,
     timings,
     cacheTimestamps: Object.keys(cacheTimestamps).length > 0 ? cacheTimestamps : void 0,
+    cacheFailures: Object.keys(cacheFailures).length > 0 ? cacheFailures : void 0,
     scanFailures: Object.keys(scanFailures).length > 0 ? scanFailures : void 0
   };
 }
 var sessionDetailLookups = /* @__PURE__ */ new WeakMap();
-var MESSAGE_CURSOR_VERSION = 1;
 var MAX_MESSAGE_CURSOR_LENGTH = 512;
 function parseMessageCursor(value) {
   if (!value || value.length > MAX_MESSAGE_CURSOR_LENGTH) return null;
@@ -14782,49 +15463,36 @@ function encodeMessageCursor(count, digest) {
     "base64url"
   );
 }
-function createMessageCursorHash(reference) {
-  return createHash22("sha256").update("codesesh-session-messages-v1\0").update(JSON.stringify([reference.agentName, reference.sessionId])).update("\n");
-}
-function updateMessageCursorField(hash, value) {
-  if (value == null) {
-    hash.update("n;");
-    return;
-  }
-  const text = String(value);
-  hash.update(`v${text.length}:`).update(text).update(";");
-}
-function updateMessageCursorHash(hash, row) {
-  updateMessageCursorField(hash, row.message_id);
-  updateMessageCursorField(hash, row.role);
-  updateMessageCursorField(hash, row.time_created);
-  updateMessageCursorField(hash, row.time_completed);
-  updateMessageCursorField(hash, row.agent);
-  updateMessageCursorField(hash, row.mode);
-  updateMessageCursorField(hash, row.model);
-  updateMessageCursorField(hash, row.provider);
-  updateMessageCursorField(hash, row.tokens_json);
-  updateMessageCursorField(hash, row.cost);
-  updateMessageCursorField(hash, row.cost_source);
-  updateMessageCursorField(hash, row.parts_json);
-  updateMessageCursorField(hash, row.parts_format_version);
-  updateMessageCursorField(hash, row.subagent_id);
-  updateMessageCursorField(hash, row.nickname);
-  hash.update("\n");
-}
-function projectMessageStream(reference, rows, requestedCursor) {
+function loadCachedMessageStream(reference, entry, cursor, requestedCursor) {
   const requested = parseMessageCursor(requestedCursor);
-  const hash = createMessageCursorHash(reference);
-  let requestedDigest = requested?.count === 0 ? hash.copy().digest("hex") : null;
-  for (let index = 0; index < rows.length; index += 1) {
-    updateMessageCursorHash(hash, rows[index]);
-    if (requested?.count === index + 1) requestedDigest = hash.copy().digest("hex");
-  }
-  const digest = hash.digest("hex");
-  const canAppend = requested !== null && requested.count <= rows.length && requestedDigest === requested.digest;
+  const initialDigest = initialMessageCursorDigest(reference);
+  const hasStoredChain = entry.messageCount === 0 || entry.messageDigest !== null;
+  const canCheckAppend = hasStoredChain && requested !== null && requested.count <= entry.messageCount;
+  const requestedDigest = canCheckAppend && requested ? requested.count === 0 ? initialDigest : cursor.messageDigest(requested.count) : null;
+  const canAppend = canCheckAppend && requested !== null && requestedDigest === requested.digest;
+  let startIndex = canAppend ? requested.count : 0;
+  let update = canAppend ? "append" : "reset";
+  let messageRows = entry.messageCount === 0 ? [] : cursor.messageRows(startIndex);
+  let messageCount = entry.messageCount;
+  let digest = entry.messageCount === 0 ? initialDigest : entry.messageDigest;
+  if (messageRows.length !== entry.messageCount - startIndex) {
+    startIndex = 0;
+    update = "reset";
+    messageRows = cursor.messageRows(startIndex);
+    messageCount = messageRows.length;
+    digest = null;
+  }
+  if (!digest) {
+    digest = computeMessageCursorDigest(
+      reference,
+      messageRows.map((row) => messageCursorContentFromCachedRow(row))
+    );
+  }
   return {
-    cursor: encodeMessageCursor(rows.length, digest),
-    startIndex: canAppend ? requested.count : 0,
-    update: canAppend ? "append" : "reset"
+    cursor: encodeMessageCursor(messageCount, digest),
+    update,
+    messageRows,
+    messageCount
   };
 }
 function sessionReferenceKey(agentName, sessionId) {
@@ -14859,14 +15527,14 @@ function getSessionDetailContext(scanResult, reference) {
     )
   };
 }
-function cachedDetailState(cachedEntry, currentMeta) {
-  if (!cachedEntry || cachedEntry.messageRows.length === 0 && cachedEntry.data.stats.message_count > 0) {
+function cachedDetailState(cachedEntry, currentMeta, messageCount) {
+  if (!cachedEntry || messageCount === 0 && cachedEntry.data.stats.message_count > 0) {
     return "missing";
   }
   return !cachedEntry.pendingReindex && cachedEntry.detailVersion === sessionDetailVersion(currentMeta) ? "fresh" : "stale";
 }
-function getProjectIdentity(data, head) {
-  return head?.project_identity ?? data.project_identity ?? computeIdentity(data.directory, realFs);
+function getProjectIdentity(data, head, fallback) {
+  return head?.project_identity ?? data.project_identity ?? fallback ?? null;
 }
 function getSmartTags(data) {
   if (Array.isArray(data.smart_tags) && data.smart_tags_classifier_revision === SMART_TAG_CLASSIFIER_REVISION) {
@@ -14874,10 +15542,14 @@ function getSmartTags(data) {
   }
   return classifySessionTags(data);
 }
-function materializeStructuredSessionDetail(context, reference, cachedEntry = loadCachedSessionRawEntry(reference.agentName, reference.sessionId)) {
+function materializeStructuredSessionDetail(context, reference, cachedEntry = loadCachedSessionRawEntry(reference.agentName, reference.sessionId), identityFallback) {
   const { agent, head } = context;
   const currentMeta = head ? agent.getSessionMetaMap().get(reference.sessionId) : void 0;
-  const cacheState = cachedDetailState(cachedEntry, currentMeta);
+  const cacheState = cachedDetailState(
+    cachedEntry,
+    currentMeta,
+    cachedEntry?.messageRows.length ?? 0
+  );
   let useCache = cacheState === "fresh";
   let freshness = useCache ? "fresh" : void 0;
   let data = useCache ? {
@@ -14912,7 +15584,8 @@ function materializeStructuredSessionDetail(context, reference, cachedEntry = lo
   if (!data) {
     return { status: "not-ready" };
   }
-  const projectIdentity = getProjectIdentity(data, head);
+  const projectIdentity = getProjectIdentity(data, head, identityFallback);
+  if (!projectIdentity) return { status: "needs-identity", directory: data.directory };
   const fileActivity = data.file_activity ?? (useCache ? listSessionFileActivity(reference.agentName, reference.sessionId) : extractSessionFileActivity(
     reference.agentName,
     reference.sessionId,
@@ -14935,23 +15608,60 @@ function materializeStructuredSessionDetail(context, reference, cachedEntry = lo
     }
   };
 }
-function* serializeCachedMessages(entry, startIndex = 0) {
-  for (let index = startIndex; index < entry.messageRows.length; index += 1) {
-    yield messageJsonFromCachedRow(entry.messageRows[index]);
+function* serializeCachedMessages(messageRows) {
+  for (const messageRow of messageRows) {
+    yield messageJsonFromCachedRow(messageRow);
   }
 }
 function materializeSessionDetailResponse(scanResult, reference, options = {}) {
   const context = getSessionDetailContext(scanResult, reference);
   if (!context) return { status: "unknown-agent" };
-  const cachedEntry = loadCachedSessionRawEntry(reference.agentName, reference.sessionId);
   const currentMeta = context.head ? context.agent.getSessionMetaMap().get(reference.sessionId) : void 0;
-  const cacheState = cachedDetailState(cachedEntry, currentMeta);
+  const startedAt = performance.now();
+  const cursorRead = readCachedSessionCursor(
+    reference.agentName,
+    reference.sessionId,
+    (entry, cursor) => {
+      const cacheState2 = cachedDetailState(entry, currentMeta, entry.messageCount);
+      const stream2 = cacheState2 === "fresh" && entry.data.smart_tags != null && entry.data.smart_tags_classifier_revision === SMART_TAG_CLASSIFIER_REVISION ? loadCachedMessageStream(reference, entry, cursor, options.messageCursor) : null;
+      return { entry, cacheState: cacheState2, stream: stream2 };
+    }
+  );
+  const cachedEntry = cursorRead?.entry ?? null;
+  const cacheState = cursorRead?.cacheState ?? "missing";
   if (!cachedEntry || cacheState !== "fresh" || cachedEntry.data.smart_tags == null || cachedEntry.data.smart_tags_classifier_revision !== SMART_TAG_CLASSIFIER_REVISION) {
-    const result = materializeStructuredSessionDetail(context, reference, cachedEntry);
+    const result = materializeStructuredSessionDetail(
+      context,
+      reference,
+      void 0,
+      options.projectIdentityFallback
+    );
     return result.status === "found" ? { ...result, data: { ...result.data, message_update: "reset" } } : result;
   }
   const data = cachedEntry.data;
-  const stream = projectMessageStream(reference, cachedEntry.messageRows, options.messageCursor);
+  const projectIdentity = getProjectIdentity(data, context.head, options.projectIdentityFallback);
+  if (!projectIdentity) return { status: "needs-identity", directory: data.directory };
+  const stream = cursorRead?.stream;
+  if (!stream) {
+    const result = materializeStructuredSessionDetail(
+      context,
+      reference,
+      void 0,
+      options.projectIdentityFallback
+    );
+    return result.status === "found" ? { ...result, data: { ...result.data, message_update: "reset" } } : result;
+  }
+  const partsJsonBytes = stream.messageRows.reduce(
+    (total, row) => total + Buffer.byteLength(String(row.parts_json)),
+    0
+  );
+  getCoreDiagnostics()?.info?.("session_detail.cursor_stream", {
+    update: stream.update,
+    message_count: stream.messageCount,
+    sent_message_count: stream.messageRows.length,
+    parts_json_bytes: partsJsonBytes,
+    duration_ms: Math.round(performance.now() - startedAt)
+  });
   return {
     status: "found-json",
     data: {
@@ -14960,13 +15670,13 @@ function materializeSessionDetailResponse(scanResult, reference, options = {}) {
       detail_freshness: "fresh",
       message_cursor: stream.cursor,
       message_update: stream.update,
-      project_identity: getProjectIdentity(data, context.head),
+      project_identity: projectIdentity,
       smart_tags_source_updated_at: getSmartTagSourceTimestamp(data),
       file_activity: data.file_activity ?? listSessionFileActivity(reference.agentName, reference.sessionId)
     },
-    messages: serializeCachedMessages(cachedEntry, stream.startIndex),
-    messageCount: cachedEntry.messageRows.length,
-    sentMessageCount: cachedEntry.messageRows.length - stream.startIndex
+    messages: serializeCachedMessages(stream.messageRows),
+    messageCount: stream.messageCount,
+    sentMessageCount: stream.messageRows.length
   };
 }
 function listCachedProjectGroups(sessions) {
@@ -14997,6 +15707,158 @@ function listCachedProjectGroups(sessions) {
     lastActivity: row.last_activity == null ? null : Number(row.last_activity)
   }));
 }
+var EFFECTIVE_COST_TIME = `CASE
+  WHEN m.time_completed > 0 THEN m.time_completed
+  WHEN m.time_created > 0 THEN m.time_created
+END`;
+function sessionKey2(agentName, sessionId) {
+  return `${agentName}\0${sessionId}`;
+}
+function costSource(value) {
+  return value === "recorded" || value === "estimated" ? value : void 0;
+}
+function nonNegative2(value) {
+  return Math.max(0, Number(value ?? 0));
+}
+function readCostFacts(db, options) {
+  const summaries = db.prepare(
+    `
+        SELECT
+          c.agent_name,
+          c.session_id,
+          c.message_count,
+          c.untimed_message_count,
+          c.input_tokens,
+          c.output_tokens,
+          c.reasoning_tokens,
+          c.cache_read_tokens,
+          c.cache_create_tokens,
+          c.untimed_input_tokens,
+          c.untimed_output_tokens,
+          c.untimed_reasoning_tokens,
+          c.untimed_cache_read_tokens,
+          c.untimed_cache_create_tokens,
+          c.message_cost,
+          c.untimed_message_cost
+        FROM session_cost_summary c
+        JOIN sessions s
+          ON s.agent_name = c.agent_name
+          AND s.session_id = c.session_id
+          AND s.publication_id IS NULL
+        ORDER BY c.agent_name, c.session_id
+      `
+  ).all();
+  const bySession = /* @__PURE__ */ new Map();
+  for (const row of summaries) {
+    const agentName = String(row.agent_name ?? "");
+    const sessionId = String(row.session_id ?? "");
+    const summary = {
+      reference: { agentName, sessionId },
+      messageCount: nonNegative2(row.message_count),
+      untimedMessageCount: nonNegative2(row.untimed_message_count),
+      inputTokens: nonNegative2(row.input_tokens),
+      outputTokens: nonNegative2(row.output_tokens),
+      reasoningTokens: nonNegative2(row.reasoning_tokens),
+      cacheReadTokens: nonNegative2(row.cache_read_tokens),
+      cacheCreateTokens: nonNegative2(row.cache_create_tokens),
+      untimedInputTokens: nonNegative2(row.untimed_input_tokens),
+      untimedOutputTokens: nonNegative2(row.untimed_output_tokens),
+      untimedReasoningTokens: nonNegative2(row.untimed_reasoning_tokens),
+      untimedCacheReadTokens: nonNegative2(row.untimed_cache_read_tokens),
+      untimedCacheCreateTokens: nonNegative2(row.untimed_cache_create_tokens),
+      messageCost: Number(row.message_cost ?? 0),
+      untimedMessageCost: Number(row.untimed_message_cost ?? 0),
+      modelCosts: []
+    };
+    bySession.set(sessionKey2(agentName, sessionId), summary);
+  }
+  const modelRows = options.includeModelCosts === false ? [] : db.prepare(
+    `
+              SELECT
+                m.agent_name,
+                m.session_id,
+                m.model,
+                m.cost,
+                m.cost_recorded
+              FROM session_model_cost m
+              JOIN sessions s
+                ON s.agent_name = m.agent_name
+                AND s.session_id = m.session_id
+                AND s.publication_id IS NULL
+              ORDER BY m.agent_name, m.session_id, m.model
+            `
+  ).all();
+  for (const row of modelRows) {
+    const summary = bySession.get(
+      sessionKey2(String(row.agent_name ?? ""), String(row.session_id ?? ""))
+    );
+    if (!summary) continue;
+    summary.modelCosts.push({
+      model: String(row.model ?? ""),
+      cost: Number(row.cost ?? 0),
+      costRecorded: Number(row.cost_recorded ?? 0)
+    });
+  }
+  const clauses = [`${EFFECTIVE_COST_TIME} IS NOT NULL`];
+  const params = [];
+  if (options.from != null) {
+    clauses.push(`${EFFECTIVE_COST_TIME} >= ?`);
+    params.push(options.from);
+  }
+  if (options.to != null) {
+    clauses.push(`${EFFECTIVE_COST_TIME} <= ?`);
+    params.push(options.to);
+  }
+  const messageRows = db.prepare(
+    `
+        SELECT
+          m.agent_name,
+          m.session_id,
+          ${EFFECTIVE_COST_TIME} AS cost_time,
+          m.model,
+          CAST(COALESCE(json_extract(m.tokens_json, '$.input'), 0) AS INTEGER) AS input_tokens,
+          CAST(COALESCE(json_extract(m.tokens_json, '$.output'), 0) AS INTEGER) AS output_tokens,
+          CAST(COALESCE(json_extract(m.tokens_json, '$.reasoning'), 0) AS INTEGER) AS reasoning_tokens,
+          CAST(COALESCE(json_extract(m.tokens_json, '$.cache_read'), 0) AS INTEGER) AS cache_read_tokens,
+          CAST(COALESCE(json_extract(m.tokens_json, '$.cache_create'), 0) AS INTEGER) AS cache_create_tokens,
+          m.cost,
+          m.cost_source
+        FROM messages m INDEXED BY idx_messages_usage_time
+        JOIN sessions s
+          ON s.agent_name = m.agent_name
+          AND s.session_id = m.session_id
+          AND s.publication_id IS NULL
+        WHERE ${clauses.join(" AND ")}
+        ORDER BY cost_time, m.agent_name, m.session_id, m.message_index
+      `
+  ).all(...params);
+  const messages = messageRows.map((row) => {
+    const model = typeof row.model === "string" && row.model.length > 0 ? row.model : void 0;
+    return {
+      reference: {
+        agentName: String(row.agent_name ?? ""),
+        sessionId: String(row.session_id ?? "")
+      },
+      time: Number(row.cost_time ?? 0),
+      inputTokens: nonNegative2(row.input_tokens),
+      outputTokens: nonNegative2(row.output_tokens),
+      reasoningTokens: nonNegative2(row.reasoning_tokens),
+      cacheReadTokens: nonNegative2(row.cache_read_tokens),
+      cacheCreateTokens: nonNegative2(row.cache_create_tokens),
+      cost: Number(row.cost ?? 0),
+      costSource: costSource(row.cost_source),
+      ...model ? { model } : {}
+    };
+  });
+  return { messages, sessions: [...bySession.values()] };
+}
+function listDashboardCostFacts(options = {}) {
+  if (!hasCacheStorage()) return null;
+  const read = withCacheDbReadOnly(
+    (db) => db.transaction(() => readCostFacts(db, options))()
+  );
+  return read.status === "success" ? read.value : null;
+}
 var DEFAULT_MODEL_COST_LIMIT = 20;
 function buildModelCostWhere(options) {
   const clauses = ["m.model IS NOT NULL", "m.model <> ''"];
@@ -15026,10 +15888,10 @@ function buildModelCostWhere(options) {
 var MODEL_COST_SQL = `
   SELECT
     m.model AS model,
-    SUM(COALESCE(m.cost, 0)) AS cost,
-    SUM(CASE WHEN m.cost_source = 'recorded' THEN COALESCE(m.cost, 0) ELSE 0 END) AS cost_recorded,
-    SUM(CASE WHEN m.cost_source = 'recorded' THEN 0 ELSE COALESCE(m.cost, 0) END) AS cost_estimated
-  FROM messages m
+    SUM(m.cost) AS cost,
+    SUM(m.cost_recorded) AS cost_recorded,
+    SUM(m.cost - m.cost_recorded) AS cost_estimated
+  FROM session_model_cost m
   JOIN sessions s
     ON s.agent_name = m.agent_name
     AND s.session_id = m.session_id
@@ -15081,6 +15943,10 @@ function publicationSearchOptions(publication, options, publicationId) {
   };
 }
 function commitDurableSessionPublication(publication, loadSessionData, searchOptions = {}) {
+  assertSessionProjectIdentities(
+    publication.agentName,
+    publication.kind === "snapshot" ? publication.sessions : publication.changes.map(({ session }) => session)
+  );
   const publicationId = publication.publicationId ?? randomUUID();
   let failureStage = "prepare";
   const diagnostics2 = getCoreDiagnostics();
@@ -15139,6 +16005,7 @@ function commitDurableSessionPublication(publication, loadSessionData, searchOpt
         ...detail,
         stage: "search_staged"
       });
+      advanceAnalyticsRevision(db);
       failureStage = "commit";
       return result;
     }).immediate();
@@ -15554,9 +16421,187 @@ function materializeBookmarkViews(bookmarks, options) {
   });
   return views.sort(compareBookmarkViews);
 }
+var COST_ABSOLUTE_TOLERANCE = 1e-8;
+var COST_RELATIVE_TOLERANCE = 1e-6;
+function costFactKey(agentName, sessionId) {
+  return getSessionRouteKey(agentName, sessionId);
+}
+function indexFacts(facts) {
+  const messagesBySession = /* @__PURE__ */ new Map();
+  const summariesBySession = /* @__PURE__ */ new Map();
+  if (!facts) return { messagesBySession, summariesBySession };
+  for (const summary of facts.sessions) {
+    summariesBySession.set(
+      costFactKey(summary.reference.agentName, summary.reference.sessionId),
+      summary
+    );
+  }
+  for (const message of facts.messages) {
+    const key = costFactKey(message.reference.agentName, message.reference.sessionId);
+    const messages = messagesBySession.get(key);
+    if (messages) messages.push(message);
+    else messagesBySession.set(key, [message]);
+  }
+  return { messagesBySession, summariesBySession };
+}
+function nonNegative22(value) {
+  return Math.max(0, Number(value ?? 0));
+}
+function costsReconcile(left, right) {
+  const tolerance = Math.max(
+    COST_ABSOLUTE_TOLERANCE,
+    Math.max(Math.abs(left), Math.abs(right)) * COST_RELATIVE_TOLERANCE
+  );
+  return Math.abs(left - right) <= tolerance;
+}
+function hasDetailedCost(session, summary) {
+  const totalCost = Math.max(0, session.stats.total_cost);
+  return totalCost > 0 && summary != null && summary.untimedMessageCost <= COST_ABSOLUTE_TOLERANCE && costsReconcile(summary.messageCost, totalCost);
+}
+function hasDetailedMessages(session, summary) {
+  return summary != null && summary.untimedMessageCount === 0 && summary.messageCount === nonNegative22(session.stats.message_count);
+}
+function detailedOutputIncludesReasoning(session, summary) {
+  if (!summary) return null;
+  const stats = session.stats;
+  const sessionInput = nonNegative22(stats.total_input_tokens);
+  const sessionOutput = nonNegative22(stats.total_output_tokens);
+  const sessionCacheRead = nonNegative22(stats.total_cache_read_tokens);
+  const sessionCacheCreate = nonNegative22(stats.total_cache_create_tokens);
+  const sessionTotal = nonNegative22(stats.total_tokens ?? sessionInput + sessionOutput);
+  const outputIncludesReasoning = summary.outputTokens + summary.reasoningTokens;
+  const outputMatches = summary.outputTokens === sessionOutput;
+  const outputWithReasoningMatches = outputIncludesReasoning === sessionOutput;
+  const effectiveOutput = outputMatches ? summary.outputTokens : outputWithReasoningMatches ? outputIncludesReasoning : null;
+  if (effectiveOutput == null || summary.inputTokens !== sessionInput || summary.cacheReadTokens !== sessionCacheRead || summary.cacheCreateTokens !== sessionCacheCreate || summary.inputTokens + effectiveOutput !== sessionTotal || summary.untimedInputTokens > 0 || summary.untimedOutputTokens > 0 || summary.untimedReasoningTokens > 0 || summary.untimedCacheReadTokens > 0 || summary.untimedCacheCreateTokens > 0) {
+    return null;
+  }
+  return !outputMatches && outputWithReasoningMatches;
+}
+function isInWindow(time, from, to) {
+  return (from == null || time >= from) && time <= to;
+}
+function resolvedCostSource(session, source) {
+  return source ?? session.stats.cost_source ?? "recorded";
+}
+function fallbackModelCosts(summary, totalCost) {
+  if (!summary) return [];
+  const modelTotal = summary.modelCosts.reduce((sum, model) => sum + model.cost, 0);
+  return modelTotal > totalCost && !costsReconcile(modelTotal, totalCost) ? [] : summary.modelCosts;
+}
+function visitAttributedCosts(tree, options, visit) {
+  const factIndex = indexFacts(options.facts);
+  const factsAvailable = options.facts != null;
+  for (const entry of tree.entries) {
+    if (options.matchesEntry && !options.matchesEntry(entry.session)) continue;
+    const fallbackTime = entry.session.time_updated ?? entry.session.time_created;
+    const pending2 = [entry];
+    while (pending2.length > 0) {
+      const node = pending2.pop();
+      for (const child of node.children) pending2.push(child);
+      const session = node.session;
+      const totalCost = Math.max(0, session.stats.total_cost);
+      if (totalCost <= 0) continue;
+      const agentName = getSessionAgentKey(session);
+      const key = costFactKey(agentName, session.id);
+      const summary = factIndex.summariesBySession.get(key);
+      if (factsAvailable && hasDetailedCost(session, summary)) {
+        for (const message of factIndex.messagesBySession.get(key) ?? []) {
+          if (!isInWindow(message.time, options.from, options.to) || message.cost <= 0) continue;
+          const source = resolvedCostSource(session, message.costSource);
+          visit({
+            entry,
+            time: message.time,
+            cost: message.cost,
+            source,
+            modelCosts: message.model ? [
+              {
+                model: message.model,
+                cost: message.cost,
+                costRecorded: source === "recorded" ? message.cost : 0
+              }
+            ] : []
+          });
+        }
+        continue;
+      }
+      if (!isInWindow(fallbackTime, options.from, options.to)) continue;
+      visit({
+        entry,
+        time: fallbackTime,
+        cost: totalCost,
+        source: resolvedCostSource(session),
+        modelCosts: factsAvailable ? fallbackModelCosts(summary, totalCost) : []
+      });
+    }
+  }
+}
+function visitAttributedUsage(tree, options, visit) {
+  const factIndex = indexFacts(options.facts);
+  const factsAvailable = options.facts != null;
+  for (const entry of tree.entries) {
+    if (options.matchesEntry && !options.matchesEntry(entry.session)) continue;
+    const fallbackTime = entry.session.time_updated ?? entry.session.time_created;
+    const pending2 = [entry];
+    while (pending2.length > 0) {
+      const node = pending2.pop();
+      for (const child of node.children) pending2.push(child);
+      const session = node.session;
+      const key = costFactKey(getSessionAgentKey(session), session.id);
+      const summary = factIndex.summariesBySession.get(key);
+      const detailedMessages = factsAvailable && hasDetailedMessages(session, summary);
+      const outputIncludesReasoning = factsAvailable ? detailedOutputIncludesReasoning(session, summary) : null;
+      const detailedTokens = outputIncludesReasoning != null;
+      if (detailedMessages || detailedTokens) {
+        for (const message of factIndex.messagesBySession.get(key) ?? []) {
+          if (!isInWindow(message.time, options.from, options.to)) continue;
+          const outputTokens = detailedTokens ? message.outputTokens + (outputIncludesReasoning ? message.reasoningTokens : 0) : 0;
+          visit({
+            entry,
+            time: message.time,
+            messages: detailedMessages ? 1 : 0,
+            totalTokens: detailedTokens ? message.inputTokens + outputTokens : 0,
+            inputTokens: detailedTokens ? message.inputTokens : 0,
+            outputTokens,
+            cacheReadTokens: detailedTokens ? message.cacheReadTokens : 0,
+            cacheCreateTokens: detailedTokens ? message.cacheCreateTokens : 0
+          });
+        }
+      }
+      if (!isInWindow(fallbackTime, options.from, options.to)) continue;
+      if (!detailedMessages) {
+        visit({
+          entry,
+          time: fallbackTime,
+          messages: nonNegative22(session.stats.message_count),
+          totalTokens: 0,
+          inputTokens: 0,
+          outputTokens: 0,
+          cacheReadTokens: 0,
+          cacheCreateTokens: 0
+        });
+      }
+      if (!detailedTokens) {
+        const inputTokens = nonNegative22(session.stats.total_input_tokens);
+        const outputTokens = nonNegative22(session.stats.total_output_tokens);
+        visit({
+          entry,
+          time: fallbackTime,
+          messages: 0,
+          totalTokens: nonNegative22(session.stats.total_tokens ?? inputTokens + outputTokens),
+          inputTokens,
+          outputTokens,
+          cacheReadTokens: nonNegative22(session.stats.total_cache_read_tokens),
+          cacheCreateTokens: nonNegative22(session.stats.total_cache_create_tokens)
+        });
+      }
+    }
+  }
+}
 var DASHBOARD_RECENT_LIMIT = 10;
 var DASHBOARD_PROJECT_LIMIT = 12;
 var PROJECT_SPARKLINE_DAYS = 14;
+var MODEL_COST_LIMIT = 20;
 function getSessionAgentName(session) {
   return getSessionAgentKey(session);
 }
@@ -15611,7 +16656,9 @@ function createAccumulator(byAgentNames, scope, to) {
     agentKeys: /* @__PURE__ */ new Set(),
     daily: /* @__PURE__ */ new Map(),
     models: /* @__PURE__ */ new Map(),
+    modelCosts: /* @__PURE__ */ new Map(),
     projects: /* @__PURE__ */ new Map(),
+    projectKeys: /* @__PURE__ */ new Set(),
     sparklineSlots,
     recent: []
   };
@@ -15624,9 +16671,9 @@ function foldModelUsage(node, into) {
   }
   for (const child of node.children) foldModelUsage(child, into);
 }
-function trackProject(node, acc, dayKey, agentKey) {
-  const identity = node.session.project_identity;
-  if (!identity) return;
+function getOrCreateProject(session, acc) {
+  const identity = session.project_identity;
+  if (!identity) return void 0;
   const key = getProjectIdentityKey(identity);
   let project = acc.projects.get(key);
   if (!project) {
@@ -15644,36 +16691,25 @@ function trackProject(node, acc, dayKey, agentKey) {
     };
     acc.projects.set(key, project);
   }
-  const stats = node.inclusiveStats;
+  return project;
+}
+function trackProjectActivity(node, acc, agentKey) {
+  const identity = node.session.project_identity;
+  const project = getOrCreateProject(node.session, acc);
+  if (!identity || !project) return;
   project.sessions += 1;
-  project.messages += stats.messageCount;
-  project.tokens += stats.totalTokens;
-  project.cost += stats.cost;
-  if (stats.costSource === "estimated") project.hasEstimatedCost = true;
   project.agentSessions.set(agentKey, (project.agentSessions.get(agentKey) ?? 0) + 1);
-  const slot = acc.sparklineSlots.get(dayKey);
-  if (slot != null) project.sparkline[slot] += stats.cost;
+  acc.projectKeys.add(getProjectIdentityKey(identity));
 }
-function accumulate(node, acc) {
+function accumulateActivity(node, acc) {
   const session = node.session;
-  const stats = node.inclusiveStats;
   const activity = getSessionActivityTime(session);
   const agentKey = getSessionAgentName(session);
   acc.sessions += 1;
-  acc.messages += stats.messageCount;
-  acc.tokens += stats.totalTokens;
-  acc.cost += stats.cost;
-  acc.cacheReadTokens += stats.cacheReadTokens;
   acc.agentKeys.add(agentKey);
-  if (stats.costSource === "recorded") acc.costRecorded += stats.cost;
-  else acc.costEstimated += stats.cost;
-  if (stats.costSource === "estimated") acc.hasEstimatedCost = true;
   const metric = acc.agents.get(agentKey);
   if (metric) {
     metric.sessions += 1;
-    metric.messages += stats.messageCount;
-    metric.tokens += stats.totalTokens;
-    metric.cost += stats.cost;
   }
   const dayKey = toCalendarDayKey(activity);
   let bucket = acc.daily.get(dayKey);
@@ -15682,12 +16718,6 @@ function accumulate(node, acc) {
     acc.daily.set(dayKey, bucket);
   }
   bucket.sessions += 1;
-  bucket.messages += stats.messageCount;
-  bucket.cost += stats.cost;
-  bucket.input += Math.max(0, stats.inputTokens - stats.cacheReadTokens - stats.cacheCreateTokens);
-  bucket.output += stats.outputTokens;
-  bucket.cache_read += stats.cacheReadTokens;
-  bucket.cache_create += stats.cacheCreateTokens;
   const usage = /* @__PURE__ */ new Map();
   foldModelUsage(node, usage);
   for (const [model, tokens] of usage) {
@@ -15699,7 +16729,7 @@ function accumulate(node, acc) {
       acc.models.set(model, { tokens, sessions: 1 });
     }
   }
-  trackProject(node, acc, dayKey, agentKey);
+  trackProjectActivity(node, acc, agentKey);
   let recentIndex = acc.recent.length;
   for (let i = 0; i < acc.recent.length; i += 1) {
     if (activity > acc.recent[i].activity) {
@@ -15712,6 +16742,103 @@ function accumulate(node, acc) {
     if (acc.recent.length > DASHBOARD_RECENT_LIMIT) acc.recent.pop();
   }
 }
+function addUsage(acc, entry, time, usage) {
+  const { messages, totalTokens, inputTokens, outputTokens, cacheReadTokens, cacheCreateTokens } = usage;
+  if (messages <= 0 && totalTokens <= 0 && inputTokens <= 0 && outputTokens <= 0 && cacheReadTokens <= 0 && cacheCreateTokens <= 0) {
+    return;
+  }
+  acc.messages += messages;
+  acc.tokens += totalTokens;
+  acc.cacheReadTokens += cacheReadTokens;
+  const agentKey = getSessionAgentName(entry.session);
+  let metric = acc.agents.get(agentKey);
+  if (!metric) {
+    metric = { name: agentKey, sessions: 0, messages: 0, tokens: 0, cost: 0 };
+    acc.agents.set(agentKey, metric);
+  }
+  metric.messages += messages;
+  metric.tokens += totalTokens;
+  const dayKey = toCalendarDayKey(time);
+  let bucket = acc.daily.get(dayKey);
+  if (!bucket) {
+    bucket = emptyDailyBucket(dayKey);
+    acc.daily.set(dayKey, bucket);
+  }
+  bucket.messages += messages;
+  bucket.input += Math.max(0, inputTokens - cacheReadTokens - cacheCreateTokens);
+  bucket.output += outputTokens;
+  bucket.cache_read += cacheReadTokens;
+  bucket.cache_create += cacheCreateTokens;
+  const project = getOrCreateProject(entry.session, acc);
+  if (!project) return;
+  project.messages += messages;
+  project.tokens += totalTokens;
+}
+function accumulateUsage(tree, scope, acc, from, to, costFacts) {
+  visitAttributedUsage(
+    tree,
+    { from, to, facts: costFacts, matchesEntry: (session) => matchesScope(session, scope) },
+    ({ entry, time, ...usage }) => addUsage(acc, entry, time, usage)
+  );
+}
+function addModelCost(acc, model, cost, recordedCost) {
+  if (!model || cost <= 0) return;
+  const recorded = Math.max(0, Math.min(cost, recordedCost));
+  const current = acc.modelCosts.get(model);
+  if (current) {
+    current.cost += cost;
+    current.costRecorded += recorded;
+    current.costEstimated += cost - recorded;
+    return;
+  }
+  acc.modelCosts.set(model, {
+    model,
+    cost,
+    costRecorded: recorded,
+    costEstimated: cost - recorded
+  });
+}
+function addCost(acc, entry, time, cost, source) {
+  if (cost <= 0) return;
+  acc.cost += cost;
+  if (source === "recorded") acc.costRecorded += cost;
+  else {
+    acc.costEstimated += cost;
+    acc.hasEstimatedCost = true;
+  }
+  const agentKey = getSessionAgentName(entry.session);
+  let metric = acc.agents.get(agentKey);
+  if (!metric) {
+    metric = { name: agentKey, sessions: 0, messages: 0, tokens: 0, cost: 0 };
+    acc.agents.set(agentKey, metric);
+  }
+  metric.cost += cost;
+  const dayKey = toCalendarDayKey(time);
+  let bucket = acc.daily.get(dayKey);
+  if (!bucket) {
+    bucket = emptyDailyBucket(dayKey);
+    acc.daily.set(dayKey, bucket);
+  }
+  bucket.cost += cost;
+  const project = getOrCreateProject(entry.session, acc);
+  if (!project) return;
+  project.cost += cost;
+  if (source === "estimated") project.hasEstimatedCost = true;
+  const slot = acc.sparklineSlots.get(dayKey);
+  if (slot != null) project.sparkline[slot] += cost;
+}
+function accumulateCosts(tree, scope, acc, from, to, costFacts) {
+  visitAttributedCosts(
+    tree,
+    { from, to, facts: costFacts, matchesEntry: (session) => matchesScope(session, scope) },
+    ({ entry, time, cost, source, modelCosts }) => {
+      addCost(acc, entry, time, cost, source);
+      for (const model of modelCosts) {
+        addModelCost(acc, model.model, model.cost, model.costRecorded);
+      }
+    }
+  );
+}
 function toPreviousTotals(acc) {
   return { sessions: acc.sessions, messages: acc.messages, tokens: acc.tokens, cost: acc.cost };
 }
@@ -15730,8 +16857,9 @@ function toProjectStat(project) {
   };
 }
 function buildDashboard(sessions, options) {
-  const { byAgentNames, scope, from, to, agentInfoMap, compare } = options;
+  const { byAgentNames, scope, from, to, agentInfoMap, compare, costFacts } = options;
   const tree = buildSessionTree(sessions);
+  const costFactsAvailable = costFacts != null;
   const acc = createAccumulator(byAgentNames, scope, to);
   if (from != null) {
     const bucketDays = countCalendarDays(from, to);
@@ -15740,13 +16868,17 @@ function buildDashboard(sessions, options) {
       acc.daily.set(key, emptyDailyBucket(key));
     }
   }
-  for (const node of scopedEntries(tree, scope, from, to)) accumulate(node, acc);
+  for (const node of scopedEntries(tree, scope, from, to)) accumulateActivity(node, acc);
+  accumulateUsage(tree, scope, acc, from, to, costFacts);
+  accumulateCosts(tree, scope, acc, from, to, costFacts);
   let previous;
   if (compare) {
     const compareAcc = createAccumulator(byAgentNames, scope, compare.to);
     for (const node of scopedEntries(tree, scope, compare.from, compare.to)) {
-      accumulate(node, compareAcc);
+      accumulateActivity(node, compareAcc);
     }
+    accumulateUsage(tree, scope, compareAcc, compare.from, compare.to, costFacts);
+    accumulateCosts(tree, scope, compareAcc, compare.from, compare.to, costFacts);
     previous = toPreviousTotals(compareAcc);
   }
   const perAgent = [...acc.agents.values()].map((metrics) => {
@@ -15761,9 +16893,10 @@ function buildDashboard(sessions, options) {
       tokens: metrics.tokens,
       cost: metrics.cost
     };
-  }).filter((item) => item.sessions > 0).sort((a, b) => b.sessions - a.sessions);
+  }).filter((item) => item.sessions > 0 || item.messages > 0 || item.tokens > 0 || item.cost > 0).sort((a, b) => b.sessions - a.sessions || b.cost - a.cost);
   const dailyActivity = [...acc.daily.values()].sort((a, b) => a.date.localeCompare(b.date));
   const modelDistribution = [...acc.models.entries()].map(([model, { tokens, sessions: count }]) => ({ model, tokens, sessions: count })).sort((a, b) => b.tokens - a.tokens);
+  const modelCost = costFactsAvailable ? [...acc.modelCosts.values()].sort((a, b) => b.cost - a.cost).slice(0, MODEL_COST_LIMIT) : null;
   const rankedProjects = [...acc.projects.values()].sort((a, b) => b.cost - a.cost);
   const perProject = rankedProjects.slice(0, DASHBOARD_PROJECT_LIMIT).map(toProjectStat);
   const projectRollup = rankedProjects.slice(DASHBOARD_PROJECT_LIMIT).reduce(
@@ -15795,10 +16928,11 @@ function buildDashboard(sessions, options) {
       latestActivityAgent: latest ? getSessionAgentName(latest.session) : void 0,
       previous
     },
-    scopeCounts: { projects: acc.projects.size, agents: acc.agentKeys.size },
+    scopeCounts: { projects: acc.projectKeys.size, agents: acc.agentKeys.size },
     perAgent,
     dailyActivity,
     modelDistribution,
+    modelCost,
     perProject,
     projectRollup,
     recentSessions
@@ -15815,15 +16949,20 @@ function emptyMetrics() {
   };
 }
 function attachProjectMetrics(projects, sessions) {
-  return attachProjectMetricsToEntries(projects, buildSessionTree(sessions).entries);
+  const tree = buildSessionTree(sessions);
+  return attachProjectMetricsToEntries(projects, tree, tree.entries);
 }
-function attachProjectMetricsFromTree(projects, tree, from, to) {
+function attachProjectMetricsFromTree(projects, tree, from, to, costFacts) {
   return attachProjectMetricsToEntries(
     projects,
-    filterSessionTreeEntriesByActivityWindow(tree, from, to)
+    tree,
+    filterSessionTreeEntriesByActivityWindow(tree, from, to),
+    from,
+    to,
+    costFacts
   );
 }
-function attachProjectMetricsToEntries(projects, entries) {
+function attachProjectMetricsToEntries(projects, tree, entries, from, to, costFacts) {
   const metrics = /* @__PURE__ */ new Map();
   for (const node of entries) {
     const identity = node.session.project_identity;
@@ -15834,29 +16973,79 @@ function attachProjectMetricsToEntries(projects, entries) {
       current = emptyMetrics();
       metrics.set(key, current);
     }
-    const stats = node.inclusiveStats;
     current.sessions += 1;
-    current.messages += stats.messageCount;
-    current.tokens += stats.totalTokens;
-    current.cost += stats.cost;
-    if (stats.costSource === "estimated") current.hasEstimatedCost = true;
     const agentName = getSessionAgentName(node.session);
     const agent = current.agentStats.get(agentName);
     if (agent) {
       agent.sessions += 1;
-      agent.messages += stats.messageCount;
-      agent.tokens += stats.totalTokens;
-      agent.cost += stats.cost;
     } else {
       current.agentStats.set(agentName, {
         name: agentName,
         sessions: 1,
-        messages: stats.messageCount,
-        tokens: stats.totalTokens,
-        cost: stats.cost
+        messages: 0,
+        tokens: 0,
+        cost: 0
       });
     }
   }
+  visitAttributedUsage(
+    tree,
+    { from, to: to ?? Number.POSITIVE_INFINITY, facts: costFacts },
+    ({ entry, messages, totalTokens }) => {
+      const identity = entry.session.project_identity;
+      if (!identity) return;
+      const key = getProjectIdentityKey(identity);
+      let current = metrics.get(key);
+      if (!current) {
+        current = emptyMetrics();
+        metrics.set(key, current);
+      }
+      current.messages += messages;
+      current.tokens += totalTokens;
+      const agentName = getSessionAgentName(entry.session);
+      const agent = current.agentStats.get(agentName);
+      if (agent) {
+        agent.messages += messages;
+        agent.tokens += totalTokens;
+      } else {
+        current.agentStats.set(agentName, {
+          name: agentName,
+          sessions: 0,
+          messages,
+          tokens: totalTokens,
+          cost: 0
+        });
+      }
+    }
+  );
+  visitAttributedCosts(
+    tree,
+    { from, to: to ?? Number.POSITIVE_INFINITY, facts: costFacts },
+    ({ entry, cost, source }) => {
+      const identity = entry.session.project_identity;
+      if (!identity) return;
+      const key = getProjectIdentityKey(identity);
+      let current = metrics.get(key);
+      if (!current) {
+        current = emptyMetrics();
+        metrics.set(key, current);
+      }
+      current.cost += cost;
+      if (source === "estimated") current.hasEstimatedCost = true;
+      const agentName = getSessionAgentName(entry.session);
+      const agent = current.agentStats.get(agentName);
+      if (agent) agent.cost += cost;
+      else {
+        current.agentStats.set(agentName, {
+          name: agentName,
+          sessions: 0,
+          messages: 0,
+          tokens: 0,
+          cost
+        });
+      }
+    }
+  );
   return projects.map((project) => {
     const metric = metrics.get(
       getProjectIdentityKey({ kind: project.identityKind, key: project.identityKey })
@@ -15872,10 +17061,10 @@ function attachProjectMetricsToEntries(projects, entries) {
     };
   });
 }
-function executeSessionSearch(query, options, snapshot) {
+function executeSessionSearch(query, options, snapshot, context = {}) {
   const merged = mergeSearchQueryOptions(query, options);
   if (!needsIndexedSearch(merged.text, merged.options)) {
-    return searchRecentSessions(snapshot, merged.options);
+    return searchRecentSessions(snapshot, merged.options, context);
   }
   return searchIndexedSessions(query, merged.text, merged.parsed, merged.options);
 }
@@ -15917,9 +17106,10 @@ function matchesSessionSearchFilters(agentName, session, options, projectScope =
 function sessionReferenceKey2(agentName, sessionId) {
   return `${agentName}\0${sessionId}`;
 }
-function filterSessionSearchCandidates(candidates, options, sessionSnapshot = candidates.map((candidate) => candidate.session)) {
-  const projectScope = options.cwd ? createProjectScopeMatcher(options.cwd) : null;
-  const inclusiveCosts = buildInclusiveCostLookup(sessionSnapshot, options);
+function filterSessionSearchCandidates(candidates, options, context = {}) {
+  const projectScope = options.projectScope ?? null;
+  const sessionSnapshot = context.sessionSnapshot ?? candidates.map((candidate) => candidate.session);
+  const inclusiveCosts = buildInclusiveCostLookup(sessionSnapshot, options, context.sessionTree);
   const headMatches = candidates.filter(
     (candidate) => matchesSessionSearchFilters(
       candidate.reference.agentName,
@@ -15947,11 +17137,11 @@ function filterSessionSearchCandidates(candidates, options, sessionSnapshot = ca
     )
   );
 }
-function searchRecentSessions(snapshot, options) {
+function searchRecentSessions(snapshot, options, context) {
   const limit = Math.max(0, Math.trunc(options.limit ?? 50));
   if (limit === 0) return [];
-  const projectScope = options.cwd ? createProjectScopeMatcher(options.cwd) : null;
-  const inclusiveCosts = buildInclusiveCostLookup(snapshot.sessions, options);
+  const projectScope = options.projectScope ?? null;
+  const inclusiveCosts = buildInclusiveCostLookup(snapshot.sessions, options, context.sessionTree);
   const sessions = options.agent ? snapshot.byAgent[options.agent] ?? [] : snapshot.sessions;
   const results = [];
   for (const session of sessions) {
@@ -15976,9 +17166,9 @@ function searchRecentSessions(snapshot, options) {
   }
   return results;
 }
-function buildInclusiveCostLookup(sessions, options) {
+function buildInclusiveCostLookup(sessions, options, sessionTree) {
   if (options.costMin == null && options.costMax == null) return null;
-  return buildSessionTree(sessions).byRouteKey;
+  return (sessionTree ?? buildSessionTree(sessions)).byRouteKey;
 }
 function inclusiveCostFor(agentName, session, lookup) {
   return lookup?.get(getSessionRouteKey(agentName, session.id))?.inclusiveStats.cost ?? session.stats.total_cost;
@@ -16019,6 +17209,10 @@ function searchIndexedSessions(query, textQuery, parsed, options) {
 }
 
 export {
+  normalizeSessionReference,
+  formatSessionReference,
+  getSessionAgentKey,
+  sessionRoutePath,
   registerAgent,
   createRegisteredAgents,
   getRegisteredAgents,
@@ -16033,9 +17227,7 @@ export {
   hasPendingPricing,
   refreshPricingCache,
   PRICING_CAPTURE_EPOCH,
-  createSessionSourceFailure,
   reportSessionSourceOutcome,
-  diffSessionSources,
   synchronizeSessionSources,
   BaseAgent,
   FileSystemSessionSource,
@@ -16046,19 +17238,15 @@ export {
   countCalendarDays,
   isProjectIdentityKind,
   matchesProjectIdentity,
-  normalizeSessionReference,
-  formatSessionReference,
-  getSessionAgentKey,
-  sessionRoutePath,
   mergeSortedSessions,
-  getSessionRouteKey,
   createSessionIndex,
-  isChildSession,
-  getRootSessions,
   buildSessionTree,
   filterSessionTreeByActivityWindow,
   createSessionProjectionContext,
-  createProjectScopeMatcher,
+  PROJECT_IDENTITY_RESOLVER_REVISION,
+  normalizeProjectDirectory,
+  computeIdentityProjection,
+  createProjectScopeMatcherFromIdentity,
   matchesProjectScope,
   SMART_TAG_CLASSIFIER_REVISION,
   getSmartTagSourceTimestamp,
@@ -16066,23 +17254,23 @@ export {
   WORKER_LOG_MESSAGE_TYPE,
   isWorkerLogMessage,
   closeCacheStorage,
-  getCachePath2 as getCachePath,
+  getAnalyticsRevision,
   sessionDetailVersion,
   readPendingSearchIndexMaintenance,
   syncSessionSearchIndex,
   syncSessionSearchIndexChanges,
   mergeSearchQueryOptions,
+  getSearchProjectDirectory,
   listFileActivity,
+  readCachedSessions,
   loadCachedSessions,
   loadCachedSessionHeads,
   readAgentCacheInitialization,
-  isAgentCacheInitialized,
   markAgentCacheInitialized,
   markAgentFullSyncStarted,
   getAgentFullSyncCursor,
   markAgentFullSyncProgress,
   readAgentLastFullSyncAt,
-  getAgentLastFullSyncAt,
   markAgentFullSyncCompleted,
   saveCachedSessions,
   saveCachedSessionChanges,
@@ -16096,6 +17284,7 @@ export {
   scanSessions,
   materializeSessionDetailResponse,
   listCachedProjectGroups,
+  listDashboardCostFacts,
   listModelCostDistribution,
   commitDurableSessionPublication,
   StateStorageUnavailableError,
@@ -16107,7 +17296,6 @@ export {
   listSessionAliases,
   upsertSessionAlias,
   deleteSessionAlias,
-  compareBookmarkViews,
   materializeBookmarkViews,
   getSessionActivityTime,
   buildDashboard,
@@ -16116,4 +17304,4 @@ export {
   executeSessionSearch,
   filterSessionSearchCandidates
 };
-//# sourceMappingURL=chunk-VAUC2W7I.js.map
+//# sourceMappingURL=chunk-PSHZZITB.js.map