codesesh 0.14.0 → 0.16.0

package/dist/{chunk-VRVZJDNL.js → chunk-MWSJTNOW.js}

@@ -78,6 +78,7 @@ function getAgentInfoMap(sessionsByAgent) {
       name: agent.name,
       displayName: agent.displayName,
       icon: registration.icon,
+      iconColored: registration.iconColored,
       count: sessionsByAgent[agent.name] ?? 0
     };
   });
@@ -85,6 +86,23 @@ function getAgentInfoMap(sessionsByAgent) {
 function getAgentByName(name) {
   return registrations.find((registration) => registration.create().name === name);
 }
+var diagnostics = null;
+function toSafeSink(sink) {
+  return {
+    warn(event, detail) {
+      try {
+        sink.warn(event, detail);
+      } catch {
+      }
+    }
+  };
+}
+function setCoreDiagnostics(next) {
+  diagnostics = next ? toSafeSink(next) : null;
+}
+function getCoreDiagnostics() {
+  return diagnostics;
+}
 function parsedSession(session) {
   return { status: "parsed", data: session };
 }
@@ -117,7 +135,12 @@ var FileSystemSessionSource = class extends BaseAgent {
       try {
         const session = this.scanSessionSource(source.sourcePath, options);
         if (session) sessions.push(session);
-      } catch {
+      } catch (error) {
+        getCoreDiagnostics()?.warn("agent.session_parse_failed", {
+          agentName: this.name,
+          sourcePath: source.sourcePath,
+          message: error instanceof Error ? error.message : String(error)
+        });
         continue;
       } finally {
         options?.onProgress?.({
@@ -156,18 +179,20 @@ var FileSystemSessionSource = class extends BaseAgent {
     return {
       hasChanges: changedIdList.length > 0,
       changedIds: changedIdList,
-      timestamp: Date.now()
+      timestamp: Date.now(),
+      refs: currentRefs
     };
   }
   /**
    * 增量扫描：对变更/新增源调用 scanSessionSource 重解析，
    * 删除已消失的源，合并回 cachedSessions。
+   * refs 未传时回退为自行枚举，供独立调用方（如测试）沿用旧行为。
    */
-  incrementalScan(cachedSessions, changedIds) {
+  incrementalScan(cachedSessions, changedIds, refs) {
     const sessionMap = new Map(cachedSessions.map((session) => [session.id, session]));
     const changedSet = new Set(changedIds);
     const currentIds = /* @__PURE__ */ new Set();
-    for (const ref of this.listSessionSources()) {
+    for (const ref of refs ?? this.listSessionSources()) {
       currentIds.add(ref.sessionId);
       if (!changedSet.has(ref.sessionId)) continue;
       const head = this.scanSessionSource(ref.sourcePath);
@@ -283,14 +308,21 @@ function getZCodeDataPath() {
 }
 var READ_CHUNK_BYTES = 1 << 20;
 function* parseJsonlLines(content) {
+  let total = 0;
+  let skipped = 0;
   for (const line of content.split("\n")) {
     const trimmed = line.trim();
     if (!trimmed) continue;
+    total += 1;
     try {
       yield JSON.parse(trimmed);
     } catch {
+      skipped += 1;
     }
   }
+  if (skipped > 0) {
+    getCoreDiagnostics()?.warn("agent.jsonl_lines_skipped", { skipped, total });
+  }
 }
 function* readJsonlFileLines(filePath, chunkBytes = READ_CHUNK_BYTES) {
   const fd = openSync(filePath, "r");
@@ -315,12 +347,19 @@ function* readJsonlFileLines(filePath, chunkBytes = READ_CHUNK_BYTES) {
   }
 }
 function* readJsonlFile(filePath) {
+  let total = 0;
+  let skipped = 0;
   for (const line of readJsonlFileLines(filePath)) {
+    total += 1;
     try {
       yield JSON.parse(line);
     } catch {
+      skipped += 1;
     }
   }
+  if (skipped > 0) {
+    getCoreDiagnostics()?.warn("agent.jsonl_lines_skipped", { skipped, total, filePath });
+  }
 }
 var INTERNAL_TAGS = [
   "command-message",
@@ -794,6 +833,43 @@ function withEstimatedSessionCost(stats, model) {
 function estimateTokenCost(model, tokens) {
   return estimateCostForTokens(model, tokens)?.cost ?? null;
 }
+function asRecord(value) {
+  if (value && typeof value === "object" && !Array.isArray(value)) {
+    return value;
+  }
+  return void 0;
+}
+function asString(value) {
+  return typeof value === "string" ? value : void 0;
+}
+function asNumber(value) {
+  return typeof value === "number" && Number.isFinite(value) ? value : void 0;
+}
+function asArray(value) {
+  return Array.isArray(value) ? value : void 0;
+}
+function safeParseJsonRecord(json) {
+  let raw;
+  try {
+    raw = JSON.parse(json);
+  } catch {
+    return void 0;
+  }
+  return asRecord(raw);
+}
+var reportedFieldMismatches = /* @__PURE__ */ new Set();
+function reportFieldMismatch(agentName, field) {
+  const key = `${agentName}\0${field}`;
+  if (reportedFieldMismatches.has(key)) return;
+  reportedFieldMismatches.add(key);
+  getCoreDiagnostics()?.warn("agent.field_shape_mismatch", { agentName, field });
+}
+function narrowField(agent, field, value, narrow) {
+  if (value === void 0 || value === null) return void 0;
+  const result = narrow(value);
+  if (result === void 0) reportFieldMismatch(agent, field);
+  return result;
+}
 var TranscriptBuilder = class {
   constructor(options = {}) {
     this.options = options;
@@ -969,31 +1045,48 @@ var TranscriptBuilder = class {
 };
 var HEAD_INDEX_VERSION = "claudecode-head-v2";
 function parseTimestampMs(data) {
-  const raw = String(data["timestamp"] ?? "").trim();
-  if (!raw) return 0;
+  const raw = data["timestamp"];
+  const value = asString(raw);
+  if (value === void 0) {
+    if (raw !== void 0 && raw !== null) reportFieldMismatch("claudecode", "timestamp");
+    return 0;
+  }
+  const trimmed = value.trim();
+  if (!trimmed) return 0;
   try {
-    return new Date(raw.includes("Z") ? raw : raw + "Z").getTime();
+    return new Date(trimmed.includes("Z") ? trimmed : trimmed + "Z").getTime();
   } catch {
     return 0;
   }
 }
-function numericUsage(value) {
-  return typeof value === "number" && Number.isFinite(value) ? value : 0;
+function readUsageNumber(usage, field) {
+  const raw = usage[field];
+  if (raw === void 0) return 0;
+  const value = asNumber(raw);
+  if (value === void 0) {
+    reportFieldMismatch("claudecode", `message.usage.${field}`);
+    return 0;
+  }
+  return value;
 }
 function extractClaudeUsage(data, msg) {
-  const usage = msg["usage"];
-  if (!usage || typeof usage !== "object") return null;
-  const u = usage;
+  const rawUsage = msg["usage"];
+  if (rawUsage === void 0 || rawUsage === null) return null;
+  const usage = asRecord(rawUsage);
+  if (!usage) {
+    reportFieldMismatch("claudecode", "message.usage");
+    return null;
+  }
   const requestId = typeof data["requestId"] === "string" ? data["requestId"].trim() : "";
   const uuid = typeof data["uuid"] === "string" ? data["uuid"].trim() : "";
   const key = requestId || uuid;
   if (!key) return null;
   return {
     key,
-    input: numericUsage(u["input_tokens"]),
-    output: numericUsage(u["output_tokens"]),
-    cacheRead: numericUsage(u["cache_read_input_tokens"]),
-    cacheCreate: numericUsage(u["cache_creation_input_tokens"])
+    input: readUsageNumber(usage, "input_tokens"),
+    output: readUsageNumber(usage, "output_tokens"),
+    cacheRead: readUsageNumber(usage, "cache_read_input_tokens"),
+    cacheCreate: readUsageNumber(usage, "cache_creation_input_tokens")
   };
 }
 var ClaudeCodeAgent = class extends FileSystemSessionSource {
@@ -1025,17 +1118,20 @@ var ClaudeCodeAgent = class extends FileSystemSessionSource {
     if (!this.basePath) return [];
     const refs = [];
     for (const projectDir of this.listProjectDirs()) {
+      const indexPath = this.getSessionsIndexPath(projectDir);
       for (const file of this.listJsonlFiles(projectDir)) {
+        let stat;
         try {
-          if (!matchesScanWindow(statSync2(file).mtimeMs, options)) continue;
+          stat = statSync2(file);
         } catch {
           continue;
         }
+        if (!matchesScanWindow(stat.mtimeMs, options)) continue;
         const sessionId = basename2(file, ".jsonl");
         refs.push({
           sessionId,
           sourcePath: file,
-          fingerprint: this.sourceFingerprint(file, projectDir)
+          fingerprint: this.sourceFingerprint(stat, indexPath)
         });
       }
     }
@@ -1059,18 +1155,11 @@ var ClaudeCodeAgent = class extends FileSystemSessionSource {
     }
     const content = readFileSync2(meta.sourcePath, "utf-8");
     const builder = new TranscriptBuilder();
-    const ignoredToolCallIds = /* @__PURE__ */ new Set();
     const assistantUuidToToolCalls = /* @__PURE__ */ new Map();
     const countedUsageKeys = /* @__PURE__ */ new Set();
     for (const record of parseJsonlLines(content)) {
       try {
-        this.convertRecord(
-          record,
-          builder,
-          ignoredToolCallIds,
-          assistantUuidToToolCalls,
-          countedUsageKeys
-        );
+        this.convertRecord(record, builder, assistantUuidToToolCalls, countedUsageKeys);
       } catch {
       }
     }
@@ -1105,12 +1194,13 @@ var ClaudeCodeAgent = class extends FileSystemSessionSource {
   }
   buildSessionMeta(head, file, projectDir) {
     const indexPath = this.getSessionsIndexPath(projectDir);
+    const stat = statSync2(file);
     return {
       id: head.id,
       title: head.title,
       sourcePath: file,
-      sourceFingerprint: this.sourceFingerprint(file, projectDir),
-      sourceMtimeMs: statSync2(file).mtimeMs,
+      sourceFingerprint: this.sourceFingerprint(stat, indexPath),
+      sourceMtimeMs: stat.mtimeMs,
       indexPath: existsSync4(indexPath) ? indexPath : null,
       indexMtimeMs: this.getFileMtimeMs(indexPath),
       headIndexVersion: HEAD_INDEX_VERSION,
@@ -1121,9 +1211,8 @@ var ClaudeCodeAgent = class extends FileSystemSessionSource {
       updatedAt: head.time_updated ?? head.time_created
     };
   }
-  sourceFingerprint(file, projectDir) {
-    const stat = statSync2(file);
-    const indexPath = this.getSessionsIndexPath(projectDir);
+  /** Fingerprint depends on an already-fetched stat to avoid re-statting the same file. */
+  sourceFingerprint(stat, indexPath) {
     return JSON.stringify([
       HEAD_INDEX_VERSION,
       stat.mtimeMs,
@@ -1195,7 +1284,8 @@ var ClaudeCodeAgent = class extends FileSystemSessionSource {
     let totalCost = 0;
     const modelUsageMap = {};
     const countedUsageKeys = /* @__PURE__ */ new Set();
-    for (const line of lines) {
+    let messageTitle = null;
+    for (const [lineIndex, line] of lines.entries()) {
       try {
         const data = JSON.parse(line);
         if (isInternalEventType(data["type"])) continue;
@@ -1204,15 +1294,25 @@ var ClaudeCodeAgent = class extends FileSystemSessionSource {
         if (!cwd && data["cwd"] && typeof data["cwd"] === "string") {
           cwd = data["cwd"];
         }
-        const msg = data["message"];
-        if (msg && typeof msg === "object") {
-          const role = msg["role"];
-          if (typeof role === "string" && role.trim()) {
+        const msg = asRecord(data["message"]);
+        if (!msg && data["message"] !== void 0 && data["message"] !== null) {
+          reportFieldMismatch("claudecode", "message");
+        }
+        if (msg) {
+          const role = asString(msg["role"]);
+          if (msg["role"] !== void 0 && role === void 0) {
+            reportFieldMismatch("claudecode", "message.role");
+          }
+          if (role?.trim()) {
             messageCount++;
           }
           if (!model) {
-            const m = msg["model"];
-            if (typeof m === "string" && m.trim()) model = m.trim();
+            const m = asString(msg["model"]);
+            if (m?.trim()) model = m.trim();
+          }
+          if (messageTitle === null && lineIndex < 20 && role === "user") {
+            const candidate = this.extractUserMessageTitle(msg["content"]);
+            if (candidate) messageTitle = candidate;
           }
           if (role === "assistant") {
             const usage = extractClaudeUsage(data, msg);
@@ -1226,8 +1326,8 @@ var ClaudeCodeAgent = class extends FileSystemSessionSource {
               totalOutputTokens += outputTokens;
               totalCacheReadTokens += cacheRead;
               totalCacheCreateTokens += cacheCreate;
-              const m = msg["model"];
-              if (typeof m === "string" && m.trim()) {
+              const m = asString(msg["model"]);
+              if (m?.trim()) {
                 const name = m.trim();
                 const msgTotal = inputTokens + cacheRead + cacheCreate + outputTokens;
                 modelUsageMap[name] = (modelUsageMap[name] ?? 0) + msgTotal;
@@ -1246,7 +1346,6 @@ var ClaudeCodeAgent = class extends FileSystemSessionSource {
       }
     }
     const directory = cwd ?? projectDir;
-    const messageTitle = this.extractTitle(lines);
     const directoryTitle = basenameTitle(directory) || basenameTitle(projectDir);
     const title = resolveSessionTitle(explicitTitle, messageTitle, directoryTitle);
     const hasModelUsage = Object.keys(modelUsageMap).length > 0;
@@ -1270,113 +1369,93 @@ var ClaudeCodeAgent = class extends FileSystemSessionSource {
       model_usage: hasModelUsage ? modelUsageMap : void 0
     });
   }
-  extractTitle(lines) {
-    for (const line of lines.slice(0, 20)) {
-      try {
-        const data = JSON.parse(line);
-        if (isInternalEventType(data["type"])) continue;
-        const msg = data["message"];
-        if (!msg || typeof msg !== "object") continue;
-        if (msg["role"] !== "user") continue;
-        const content = msg["content"];
-        if (!content) continue;
-        if (typeof content === "string") {
-          const title = normalizeTitleText(content);
-          if (title) return title;
-        }
-        if (Array.isArray(content)) {
-          const texts = content.filter((item) => typeof item === "object" && item !== null && "text" in item).map((item) => String(item["text"] ?? "")).join(" ");
-          const title = normalizeTitleText(texts);
-          if (title) return title;
-        }
-      } catch {
-      }
+  /** Mirrors the title-candidate extraction previously done in a second JSON.parse pass. */
+  extractUserMessageTitle(content) {
+    if (!content) return null;
+    if (typeof content === "string") {
+      const title = normalizeTitleText(content);
+      return title || null;
+    }
+    if (Array.isArray(content)) {
+      const texts = content.filter((item) => {
+        const record = asRecord(item);
+        return record !== void 0 && "text" in record;
+      }).map((item) => String(item["text"] ?? "")).join(" ");
+      const title = normalizeTitleText(texts);
+      return title || null;
     }
     return null;
   }
   // --- Record conversion ---
-  convertRecord(data, builder, ignoredToolCallIds, assistantUuidToToolCalls, countedUsageKeys) {
+  convertRecord(data, builder, assistantUuidToToolCalls, countedUsageKeys) {
     if (data["isMeta"] === true) return;
     const msgType = String(data["type"] ?? "");
     if (isInternalEventType(msgType)) return;
     if (msgType === "assistant") {
-      this.convertAssistantRecord(
-        data,
-        builder,
-        ignoredToolCallIds,
-        assistantUuidToToolCalls,
-        countedUsageKeys
-      );
+      this.convertAssistantRecord(data, builder, assistantUuidToToolCalls, countedUsageKeys);
     } else if (msgType === "user") {
-      this.convertUserRecord(data, builder, ignoredToolCallIds, assistantUuidToToolCalls);
+      this.convertUserRecord(data, builder, assistantUuidToToolCalls);
     } else if (msgType === "tool_result") {
       this.convertToolResultRecord(data, builder);
     }
   }
-  convertAssistantRecord(data, builder, ignoredToolCallIds, assistantUuidToToolCalls, countedUsageKeys) {
-    const msg = data["message"] ?? {};
+  convertAssistantRecord(data, builder, assistantUuidToToolCalls, countedUsageKeys) {
+    const msg = asRecord(data["message"]) ?? {};
     const timestampMs = parseTimestampMs(data);
-    const rawContent = msg["content"] ?? [];
+    const rawContent = asArray(msg["content"]) ?? [];
     const uuid = String(data["uuid"] ?? "");
     const toolCallIds = [];
-    if (Array.isArray(rawContent)) {
-      for (const item of rawContent) {
-        if (!item || typeof item !== "object") continue;
-        const part = item;
-        const partType = String(part["type"] ?? "");
-        if (partType === "thinking") {
-          const text = cleanInternalText(String(part["thinking"] ?? ""));
-          if (text) {
-            const message2 = builder.appendAssistantPart(
-              this.buildReasoningPart(text, timestampMs),
-              { id: uuid, timestampMs, agent: "claude" },
-              { deduplicateTail: true }
-            );
-            this.applyAssistantMetadata(message2, data, msg, countedUsageKeys);
-          }
-          continue;
-        }
-        if (partType === "text") {
-          const text = cleanInternalText(String(part["text"] ?? ""));
-          if (text) {
-            const message2 = builder.appendAssistantPart(
-              this.buildTextPart(text, timestampMs),
-              {
-                id: uuid,
-                timestampMs,
-                agent: "claude"
-              },
-              { deduplicateTail: true }
-            );
-            this.applyAssistantMetadata(message2, data, msg, countedUsageKeys);
-          }
-          continue;
-        }
-        if (partType !== "tool_use") continue;
-        const toolName = String(part["name"] ?? "").trim();
-        const toolCallId = String(part["id"] ?? "").trim();
-        if (toolName && toolCallId && this.shouldIgnoreTool(toolName)) {
-          ignoredToolCallIds.add(toolCallId);
-          continue;
+    for (const item of rawContent) {
+      const part = asRecord(item);
+      if (!part) continue;
+      const partType = String(part["type"] ?? "");
+      if (partType === "thinking") {
+        const text = cleanInternalText(String(part["thinking"] ?? ""));
+        if (text) {
+          const message2 = builder.appendAssistantPart(
+            this.buildReasoningPart(text, timestampMs),
+            { id: uuid, timestampMs, agent: "claude" },
+            { deduplicateTail: true }
+          );
+          this.applyAssistantMetadata(message2, data, msg, countedUsageKeys);
         }
-        const toolPart = this.buildToolPart(part, timestampMs);
-        const message = builder.appendToolCall(
-          toolPart,
-          { id: uuid, timestampMs, agent: "claude" },
-          { modeOnCreate: "tool" }
-        );
-        this.applyAssistantMetadata(message, data, msg, countedUsageKeys);
-        if (toolCallId) {
-          toolCallIds.push(toolCallId);
+        continue;
+      }
+      if (partType === "text") {
+        const text = cleanInternalText(String(part["text"] ?? ""));
+        if (text) {
+          const message2 = builder.appendAssistantPart(
+            this.buildTextPart(text, timestampMs),
+            {
+              id: uuid,
+              timestampMs,
+              agent: "claude"
+            },
+            { deduplicateTail: true }
+          );
+          this.applyAssistantMetadata(message2, data, msg, countedUsageKeys);
         }
+        continue;
+      }
+      if (partType !== "tool_use") continue;
+      const toolCallId = String(part["id"] ?? "").trim();
+      const toolPart = this.buildToolPart(part, timestampMs);
+      const message = builder.appendToolCall(
+        toolPart,
+        { id: uuid, timestampMs, agent: "claude" },
+        { modeOnCreate: "tool" }
+      );
+      this.applyAssistantMetadata(message, data, msg, countedUsageKeys);
+      if (toolCallId) {
+        toolCallIds.push(toolCallId);
       }
     }
     if (toolCallIds.length > 0) {
       assistantUuidToToolCalls.set(uuid, toolCallIds);
     }
   }
-  convertUserRecord(data, builder, ignoredToolCallIds, assistantUuidToToolCalls) {
-    const msg = data["message"] ?? {};
+  convertUserRecord(data, builder, assistantUuidToToolCalls) {
+    const msg = asRecord(data["message"]) ?? {};
     const timestampMs = parseTimestampMs(data);
     const content = msg["content"] ?? "";
     const uuid = String(data["uuid"] ?? "");
@@ -1396,11 +1475,9 @@ var ClaudeCodeAgent = class extends FileSystemSessionSource {
     const visibleParts = this.normalizeUserTextParts(content, timestampMs);
     const toolStateUpdates = this.extractToolStateUpdates(data["toolUseResult"]);
     for (const item of content) {
-      if (!item || typeof item !== "object") continue;
-      const ci = item;
-      if (ci["type"] !== "tool_result") continue;
+      const ci = asRecord(item);
+      if (!ci || ci["type"] !== "tool_result") continue;
       const toolCallId = this.resolveToolCallId(data, ci, assistantUuidToToolCalls);
-      if (toolCallId && ignoredToolCallIds.has(toolCallId)) continue;
       const outputParts = this.normalizeClaudeToolOutput(ci["content"], timestampMs);
       if (this.backfillToolOutput(builder, toolCallId, outputParts, toolStateUpdates)) {
         continue;
@@ -1420,7 +1497,7 @@ var ClaudeCodeAgent = class extends FileSystemSessionSource {
   }
   convertToolResultRecord(data, builder) {
     const timestampMs = parseTimestampMs(data);
-    const msg = data["message"] ?? {};
+    const msg = asRecord(data["message"]) ?? {};
     const outputParts = this.normalizeClaudeToolOutput(msg["content"], timestampMs);
     const uuid = String(data["uuid"] ?? "");
     const fallback = this.buildFallbackToolMessage({
@@ -1482,8 +1559,8 @@ var ClaudeCodeAgent = class extends FileSystemSessionSource {
     if (!Array.isArray(content)) return [];
     const parts = [];
     for (const item of content) {
-      if (typeof item === "object" && item !== null) {
-        const ci = item;
+      const ci = asRecord(item);
+      if (ci) {
         if (ci["type"] === "tool_result") continue;
         const text = cleanInternalText(String(ci["text"] ?? ""));
         if (text) parts.push(this.buildTextPart(text, timestampMs));
@@ -1503,10 +1580,19 @@ var ClaudeCodeAgent = class extends FileSystemSessionSource {
     if (Array.isArray(content)) {
       const parts = [];
       for (const item of content) {
-        if (typeof item === "object" && item !== null) {
-          const text2 = String(
-            item["text"] ?? item["content"] ?? ""
-          );
+        const itemRecord = asRecord(item);
+        if (itemRecord) {
+          const rawSource = itemRecord["source"];
+          if (itemRecord["type"] === "image" && rawSource) {
+            const source = asRecord(rawSource);
+            const data = asString(source?.["data"]) ?? "";
+            const mimeType = asString(source?.["media_type"]) ?? "";
+            if (data && mimeType.startsWith("image/")) {
+              parts.push({ type: "image", data, mime_type: mimeType, time_created: timestampMs });
+            }
+            continue;
+          }
+          const text2 = String(itemRecord["text"] ?? itemRecord["content"] ?? "");
           const cleaned = cleanInternalText(text2);
           if (cleaned) parts.push(this.buildTextPart(cleaned, timestampMs));
         } else if (typeof item === "string") {
@@ -1544,8 +1630,8 @@ var ClaudeCodeAgent = class extends FileSystemSessionSource {
     return "";
   }
   extractToolStateUpdates(toolUseResult) {
-    if (!toolUseResult || typeof toolUseResult !== "object") return {};
-    const result = toolUseResult;
+    const result = asRecord(toolUseResult);
+    if (!result) return {};
     const updates = {};
     const success = result["success"];
     if (typeof success === "boolean") {
@@ -1567,17 +1653,21 @@ var ClaudeCodeAgent = class extends FileSystemSessionSource {
       parts: opts.outputParts
     };
   }
-  // --- Utilities ---
-  shouldIgnoreTool(toolName) {
-    return toolName === "TodoWrite";
-  }
 };
 var DatabaseConstructor = null;
+var loadErrorMessage = null;
 try {
   const require2 = createRequire(import.meta.url);
   const mod = require2("better-sqlite3");
   DatabaseConstructor = typeof mod === "function" ? mod : mod.default;
-} catch {
+} catch (error) {
+  loadErrorMessage = error instanceof Error ? error.message : String(error);
+}
+var unavailableReported = false;
+function reportUnavailableOnce() {
+  if (unavailableReported) return;
+  unavailableReported = true;
+  getCoreDiagnostics()?.warn("sqlite.unavailable", { message: loadErrorMessage });
 }
 function quoteIdentifier(value) {
   return `"${value.replaceAll('"', '""')}"`;
@@ -1672,16 +1762,27 @@ function runSchemaMigrations(db, options) {
   return backups;
 }
 function openDbReadOnly(dbPath) {
-  if (!DatabaseConstructor) return null;
+  if (!DatabaseConstructor) {
+    reportUnavailableOnce();
+    return null;
+  }
   try {
     const db = DatabaseConstructor(dbPath, { readonly: true });
     return db;
-  } catch {
+  } catch (error) {
+    getCoreDiagnostics()?.warn("sqlite.open_failed", {
+      dbPath,
+      readonly: true,
+      message: error instanceof Error ? error.message : String(error)
+    });
     return null;
   }
 }
 function openDb(dbPath) {
-  if (!DatabaseConstructor) return null;
+  if (!DatabaseConstructor) {
+    reportUnavailableOnce();
+    return null;
+  }
   try {
     mkdirSync2(dirname2(dbPath), { recursive: true });
     const db = DatabaseConstructor(dbPath);
@@ -1689,16 +1790,42 @@ function openDb(dbPath) {
       db.pragma("journal_mode = WAL");
       db.pragma("synchronous = NORMAL");
       db.pragma("foreign_keys = ON");
+      db.pragma("busy_timeout = 5000");
     } catch {
     }
     return db;
-  } catch {
+  } catch (error) {
+    getCoreDiagnostics()?.warn("sqlite.open_failed", {
+      dbPath,
+      readonly: false,
+      message: error instanceof Error ? error.message : String(error)
+    });
     return null;
   }
 }
 function isSqliteAvailable() {
   return DatabaseConstructor !== null;
 }
+var MESSAGE_ROLES = /* @__PURE__ */ new Set(["user", "assistant", "tool"]);
+function parseJsonRecord(raw, agentName, field) {
+  const parsed = asRecord(JSON.parse(String(raw ?? "{}")));
+  if (parsed) return parsed;
+  reportFieldMismatch(agentName, field);
+  return {};
+}
+function narrowMessageRole(value) {
+  const role = asString(value);
+  return role !== void 0 && MESSAGE_ROLES.has(role) ? role : void 0;
+}
+function parseMessageRole(value, agentName) {
+  return narrowField(agentName, "message.role", value, narrowMessageRole) ?? "assistant";
+}
+function parseTokens(value, agentName) {
+  return narrowField(agentName, "message.tokens", value, asRecord);
+}
+function parseModel(value, agentName) {
+  return narrowField(agentName, "message.modelID", value, asString) ?? null;
+}
 var OpenCodeSqliteAgent = class extends DatabaseSessionSource {
   constructor(config) {
     super();
@@ -1830,7 +1957,7 @@ var OpenCodeSqliteAgent = class extends DatabaseSessionSource {
     ).all(cutoffTime);
   }
   parsePartRow(partRow) {
-    const partData = JSON.parse(String(partRow.data ?? "{}"));
+    const partData = parseJsonRecord(partRow.data, this.name, "part.data");
     const partType = String(partData.type ?? "");
     if (isInternalEventType(partType)) return null;
     if (partType === "text" || partType === "reasoning") {
@@ -1848,7 +1975,7 @@ var OpenCodeSqliteAgent = class extends DatabaseSessionSource {
         tool: String(partData.tool ?? ""),
         callID: String(partData.callID ?? ""),
         title: cleanInternalText(String(partData.title ?? "")),
-        state: partData.state ?? {},
+        state: asRecord(partData.state) ?? {},
         time_created: Number(partRow.time_created ?? 0)
       };
     }
@@ -1880,7 +2007,7 @@ var OpenCodeSqliteAgent = class extends DatabaseSessionSource {
     for (const row of messageRows) {
       const sessionId = String(row.session_id ?? "");
       if (!sessionId) continue;
-      const msgData = JSON.parse(String(row.data ?? "{}"));
+      const msgData = parseJsonRecord(row.data, this.name, "message.data");
       if (isInternalEventType(msgData.type)) continue;
       const parts = partsByMessage.get(String(row.id ?? "")) ?? [];
       if (parts.length === 0) continue;
@@ -1898,10 +2025,10 @@ var OpenCodeSqliteAgent = class extends DatabaseSessionSource {
         contexts.set(sessionId, context);
       }
       const cost = Number(msgData.cost ?? 0);
-      const tokens = msgData.tokens;
+      const tokens = parseTokens(msgData.tokens, this.name);
       const inputTokens = Number(tokens?.input ?? 0);
       const outputTokens = Number(tokens?.output ?? 0);
-      const model = msgData.modelID ?? null;
+      const model = parseModel(msgData.modelID, this.name);
       const estimatedCost = cost > 0 ? null : estimateTokenCost(model, { input: inputTokens, output: outputTokens });
       if (estimatedCost !== null) context.stats.cost_source = "estimated";
       context.stats.total_cost += cost || estimatedCost || 0;
@@ -1955,24 +2082,24 @@ var OpenCodeSqliteAgent = class extends DatabaseSessionSource {
       let hasEstimatedCost = false;
       const msgRows = db.prepare("SELECT * FROM message WHERE session_id = ? ORDER BY time_created ASC").all(sessionId);
       for (const msgRow of msgRows) {
-        const msgData = JSON.parse(String(msgRow.data ?? "{}"));
+        const msgData = parseJsonRecord(msgRow.data, this.name, "message.data");
         if (isInternalEventType(msgData.type)) continue;
         const cost = Number(msgData.cost ?? 0);
-        const tokens = msgData.tokens;
+        const tokens = parseTokens(msgData.tokens, this.name);
         const inputTokens = Number(tokens?.input ?? 0);
         const outputTokens = Number(tokens?.output ?? 0);
-        const model = msgData.modelID ?? null;
+        const model = parseModel(msgData.modelID, this.name);
         const estimatedCost = cost > 0 ? null : estimateTokenCost(model, { input: inputTokens, output: outputTokens });
         const resolvedCost = cost || estimatedCost || 0;
         const parts = this.readMessageParts(db, msgRow.id);
         if (parts.length === 0) continue;
         messages.push({
           id: String(msgRow.id ?? ""),
-          role: String(msgData.role ?? "assistant"),
-          agent: msgData.agent ?? null,
-          mode: msgData.mode ?? null,
+          role: parseMessageRole(msgData.role, this.name),
+          agent: asString(msgData.agent) ?? null,
+          mode: asString(msgData.mode) ?? null,
           model,
-          provider: msgData.providerID ?? null,
+          provider: asString(msgData.providerID) ?? null,
           time_created: Number(msgRow.time_created ?? 0),
           tokens: tokens ? { input: inputTokens, output: outputTokens } : void 0,
           cost: resolvedCost,
@@ -1997,7 +2124,7 @@ var OpenCodeSqliteAgent = class extends DatabaseSessionSource {
         title,
         slug,
         directory,
-        version: sessionRow.version ?? void 0,
+        version: asString(sessionRow.version) ?? void 0,
         time_created: timeCreated,
         time_updated: timeUpdated,
         summary_files: sessionRow.summary_files ?? void 0,
@@ -2041,6 +2168,15 @@ var KIMI_IGNORED_TOOLS = /* @__PURE__ */ new Set(["SetTodoList"]);
 function mapToolTitle(toolName) {
   return KIMI_TOOL_TITLE_MAP[toolName] ?? toolName;
 }
+function readWireMtime(record) {
+  return narrowField("kimi", "session.wire_mtime", record.wire_mtime, asNumber) ?? null;
+}
+function readWireTimestamp(record) {
+  return narrowField("kimi", "wire.timestamp", record.timestamp, asNumber) ?? 0;
+}
+function extractTokenField(usage, field) {
+  return narrowField("kimi", `usage.${field}`, usage[field], asNumber) ?? 0;
+}
 function normalizeToolArguments(raw) {
   if (typeof raw === "string") {
     try {
@@ -2059,8 +2195,9 @@ function normalizeToolOutputParts(content, timestampMs) {
   if (Array.isArray(content)) {
     const parts = [];
     for (const item of content) {
-      if (typeof item === "object" && item !== null && "text" in item) {
-        const text2 = String(item.text ?? "");
+      const record = asRecord(item);
+      if (record && "text" in record) {
+        const text2 = String(record.text ?? "");
         const cleaned = cleanInternalText(text2);
         if (cleaned) parts.push({ type: "text", text: cleaned, time_created: timestampMs });
       } else if (typeof item === "string") {
@@ -2092,10 +2229,8 @@ function kimiContentText(content) {
   if (!Array.isArray(content)) return "";
   return content.map((item) => {
     if (typeof item === "string") return item;
-    if (typeof item === "object" && item !== null) {
-      const record = item;
-      return String(record.text ?? record.content ?? "");
-    }
+    const record = asRecord(item);
+    if (record) return String(record.text ?? record.content ?? "");
     return "";
   }).join(" ");
 }
@@ -2111,9 +2246,9 @@ function extractFirstUserTitle(contextFile, wireFile) {
   if (wireFile && existsSync6(wireFile)) {
     const content = readFileSync3(wireFile, "utf-8");
     for (const record of parseJsonlLines(content)) {
-      const message = record.message ?? {};
+      const message = asRecord(record.message) ?? {};
       if (message.type !== "TurnBegin") continue;
-      const payload = message.payload ?? {};
+      const payload = asRecord(message.payload) ?? {};
       const userInput = payload.user_input;
       if (!Array.isArray(userInput)) continue;
       const title = normalizeTitleText(kimiContentText(userInput));
@@ -2143,12 +2278,12 @@ var KimiAgent = class extends FileSystemSessionSource {
     }
     if (!existsSync6(configPath)) return;
     try {
-      const raw = JSON.parse(readFileSync3(configPath, "utf-8"));
-      const workDirs = raw?.work_dirs;
-      if (!Array.isArray(workDirs)) return;
+      const raw = asRecord(JSON.parse(readFileSync3(configPath, "utf-8")));
+      const workDirs = asArray(raw?.work_dirs);
+      if (!workDirs) return;
       for (const wd of workDirs) {
-        const path2 = wd.path;
-        if (typeof path2 !== "string") continue;
+        const path2 = asString(asRecord(wd)?.path);
+        if (!path2) continue;
         const hash = createHash("md5").update(path2).digest("hex");
         this.projectMap.set(hash, path2);
       }
@@ -2207,14 +2342,14 @@ var KimiAgent = class extends FileSystemSessionSource {
       let wireMtime = null;
       let metaFile = "";
       if (existsSync6(statePath)) {
-        const state = JSON.parse(readFileSync3(statePath, "utf-8"));
+        const state = asRecord(JSON.parse(readFileSync3(statePath, "utf-8"))) ?? {};
         title = String(state.custom_title ?? "");
-        wireMtime = typeof state.wire_mtime === "number" ? state.wire_mtime : null;
+        wireMtime = readWireMtime(state);
         metaFile = statePath;
       } else if (existsSync6(metaPath)) {
-        const meta = JSON.parse(readFileSync3(metaPath, "utf-8"));
+        const meta = asRecord(JSON.parse(readFileSync3(metaPath, "utf-8"))) ?? {};
         title = String(meta.title ?? "");
-        wireMtime = typeof meta.wire_mtime === "number" ? meta.wire_mtime : null;
+        wireMtime = readWireMtime(meta);
         metaFile = metaPath;
       }
       const cwd = this.projectMap.get(projectHash) || "";
@@ -2343,16 +2478,15 @@ var KimiAgent = class extends FileSystemSessionSource {
     for (const record of parseJsonlLines(content)) {
       seq++;
       try {
-        const message = record.message ?? {};
-        const msgType = String(message.type ?? "");
+        const message = asRecord(record.message) ?? {};
+        const msgType = asString(message.type) ?? "";
         if (isInternalEventType(msgType)) continue;
-        const payload = message.payload ?? {};
-        const timestamp = Number(record.timestamp ?? 0);
-        const timestampMs = Number.isFinite(timestamp) ? Math.floor(timestamp * 1e3) : 0;
-        const usage = message["usage"];
-        if (usage && typeof usage === "object") {
-          const inputTokens = Number(usage["input_tokens"] ?? 0);
-          const outputTokens = Number(usage["output_tokens"] ?? 0);
+        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);
@@ -2404,7 +2538,7 @@ var KimiAgent = class extends FileSystemSessionSource {
           continue;
         }
         if (msgType === "ToolCall") {
-          const function_ = payload.function;
+          const function_ = asRecord(payload.function);
           const toolName = String(function_?.name ?? "").trim();
           const callId = String(payload.id ?? "").trim();
           if (toolName && callId && KIMI_IGNORED_TOOLS.has(toolName)) {
@@ -2490,8 +2624,8 @@ var KimiAgent = class extends FileSystemSessionSource {
     const content = record.content;
     if (Array.isArray(content)) {
       for (const item of content) {
-        if (typeof item !== "object" || item === null) continue;
-        const ci = item;
+        const ci = asRecord(item);
+        if (!ci) continue;
         const partType = String(ci.type ?? "");
         if (partType === "think") {
           const text = cleanInternalText(String(ci.think ?? ""));
@@ -2502,15 +2636,14 @@ var KimiAgent = class extends FileSystemSessionSource {
         }
       }
     }
-    const toolCalls = record.tool_calls;
-    if (Array.isArray(toolCalls)) {
+    const toolCalls = asArray(record.tool_calls);
+    if (toolCalls) {
       for (const tc of toolCalls) {
-        if (typeof tc !== "object" || tc === null) continue;
-        const tcRecord = tc;
-        const function_ = tcRecord.function;
+        const tcRecord = asRecord(tc);
+        const function_ = asRecord(tcRecord?.function);
         if (!function_) continue;
         const toolName = String(function_.name ?? "").trim();
-        const callId = String(tcRecord.id ?? "").trim();
+        const callId = String(tcRecord?.id ?? "").trim();
         if (toolName && callId && KIMI_IGNORED_TOOLS.has(toolName)) {
           ignoredToolCallIds.add(callId);
           continue;
@@ -2575,11 +2708,11 @@ var KimiAgent = class extends FileSystemSessionSource {
       const content = readFileSync3(wirePath, "utf-8");
       for (const line of content.split("\n").filter((l) => l.trim())) {
         try {
-          const data = JSON.parse(line);
-          const tokenUsage = data.message?.usage;
+          const data = asRecord(JSON.parse(line));
+          const tokenUsage = asRecord(asRecord(data?.message)?.usage);
           if (!tokenUsage) continue;
-          const inputTokens = Number(tokenUsage.input_tokens ?? 0);
-          const outputTokens = Number(tokenUsage.output_tokens ?? 0);
+          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, {
@@ -2599,10 +2732,14 @@ var KimiAgent = class extends FileSystemSessionSource {
       const rawContent = readFileSync3(rawPath, "utf-8");
       for (const line of rawContent.split("\n").filter((l) => l.trim())) {
         try {
-          const data = JSON.parse(line);
-          if (data.role === "_usage" && typeof data.token_count === "number") {
-            stats.total_tokens = data.token_count;
+          const data = asRecord(JSON.parse(line));
+          if (data?.role !== "_usage") continue;
+          const tokenCount = asNumber(data.token_count);
+          if (tokenCount === void 0) {
+            reportFieldMismatch("kimi", "usage.token_count");
+            continue;
           }
+          stats.total_tokens = tokenCount;
         } catch {
         }
       }
@@ -2628,11 +2765,268 @@ var KimiAgent = class extends FileSystemSessionSource {
     };
   }
 };
+var PARSE_FAIL = /* @__PURE__ */ Symbol("parse-fail");
+var EXEC_OUTPUT_ENVELOPE_RE = /^Script completed\nWall time [^\n]*\nOutput:\n?/;
+function stripExecOutputEnvelope(text) {
+  return text.replace(EXEC_OUTPUT_ENVELOPE_RE, "");
+}
+function splitExecToolName(name) {
+  if (name.startsWith("mcp__")) {
+    const separator = name.lastIndexOf("__");
+    if (separator > 0 && separator + 2 < name.length) {
+      return { name: name.slice(separator + 2), namespace: name.slice(0, separator + 2) };
+    }
+  }
+  return { name };
+}
+function pickExecOutputTarget(calls) {
+  for (let index = calls.length - 1; index >= 0; index -= 1) {
+    const { name } = splitExecToolName(calls[index].name);
+    if (name !== "apply_patch" && name !== "update_plan") return index;
+  }
+  return calls.length - 1;
+}
+function getExecPatchText(args) {
+  if (typeof args === "string") return args;
+  if (args && typeof args === "object") {
+    const patch = args["patch"];
+    if (typeof patch === "string") return patch;
+  }
+  return "";
+}
+function decodeExecCalls(input) {
+  if (typeof input !== "string" || !input.includes("tools.")) return [];
+  const scope = collectStringVars(input);
+  const calls = [];
+  const callRe = /tools\.([A-Za-z_$][\w$]*)\s*\(/g;
+  let match;
+  while ((match = callRe.exec(input)) !== null) {
+    const reader = new JsValueReader(input, callRe.lastIndex, scope);
+    const args = reader.parseValue();
+    if (args !== PARSE_FAIL) {
+      calls.push({ name: match[1], args });
+      callRe.lastIndex = reader.pos;
+    }
+  }
+  return calls;
+}
+function collectStringVars(input) {
+  const scope = /* @__PURE__ */ new Map();
+  const assignRe = /(?:const|let|var)\s+([A-Za-z_$][\w$]*)\s*=\s*/g;
+  let match;
+  while ((match = assignRe.exec(input)) !== null) {
+    const reader = new JsValueReader(input, assignRe.lastIndex, scope);
+    const value = reader.parseValue();
+    if (value !== PARSE_FAIL) {
+      if (typeof value === "string") scope.set(match[1], value);
+      assignRe.lastIndex = reader.pos;
+    }
+  }
+  return scope;
+}
+var IDENT_START_RE = /[A-Za-z_$]/;
+var IDENT_PART_RE = /[\w$]/;
+var JsValueReader = class {
+  pos;
+  src;
+  scope;
+  constructor(src, start, scope) {
+    this.src = src;
+    this.pos = start;
+    this.scope = scope;
+  }
+  parseValue() {
+    this.skipTrivia();
+    const char = this.src[this.pos];
+    if (char === void 0) return PARSE_FAIL;
+    if (char === "{") return this.parseObject();
+    if (char === "[") return this.parseArray();
+    if (char === '"' || char === "'" || char === "`") return this.parseString(char);
+    if (char === "-" || char === "+" || char >= "0" && char <= "9") return this.parseNumber();
+    if (IDENT_START_RE.test(char)) return this.parseIdentifierValue();
+    return PARSE_FAIL;
+  }
+  parseObject() {
+    this.pos++;
+    const result = {};
+    this.skipTrivia();
+    if (this.src[this.pos] === "}") {
+      this.pos++;
+      return result;
+    }
+    while (this.pos < this.src.length) {
+      this.skipTrivia();
+      const key = this.parseKey();
+      if (key === PARSE_FAIL) return PARSE_FAIL;
+      this.skipTrivia();
+      if (this.src[this.pos] === ":") {
+        this.pos++;
+        const value = this.parseValue();
+        if (value === PARSE_FAIL) return PARSE_FAIL;
+        result[key] = value;
+      } else {
+        result[key] = this.resolveIdentifier(key);
+      }
+      this.skipTrivia();
+      const next = this.src[this.pos];
+      if (next === ",") {
+        this.pos++;
+        this.skipTrivia();
+        if (this.src[this.pos] === "}") {
+          this.pos++;
+          return result;
+        }
+        continue;
+      }
+      if (next === "}") {
+        this.pos++;
+        return result;
+      }
+      return PARSE_FAIL;
+    }
+    return PARSE_FAIL;
+  }
+  parseArray() {
+    this.pos++;
+    const result = [];
+    this.skipTrivia();
+    if (this.src[this.pos] === "]") {
+      this.pos++;
+      return result;
+    }
+    while (this.pos < this.src.length) {
+      const value = this.parseValue();
+      if (value === PARSE_FAIL) return PARSE_FAIL;
+      result.push(value);
+      this.skipTrivia();
+      const next = this.src[this.pos];
+      if (next === ",") {
+        this.pos++;
+        this.skipTrivia();
+        if (this.src[this.pos] === "]") {
+          this.pos++;
+          return result;
+        }
+        continue;
+      }
+      if (next === "]") {
+        this.pos++;
+        return result;
+      }
+      return PARSE_FAIL;
+    }
+    return PARSE_FAIL;
+  }
+  parseKey() {
+    const char = this.src[this.pos];
+    if (char === '"' || char === "'" || char === "`") {
+      const value = this.parseString(char);
+      return typeof value === "string" ? value : PARSE_FAIL;
+    }
+    if (char !== void 0 && IDENT_START_RE.test(char)) return this.readIdentifier();
+    return PARSE_FAIL;
+  }
+  parseString(quote) {
+    this.pos++;
+    let out = "";
+    while (this.pos < this.src.length) {
+      const char = this.src[this.pos++];
+      if (char === "\\") {
+        out += this.readEscape();
+        continue;
+      }
+      if (char === quote) break;
+      out += char;
+    }
+    return out;
+  }
+  readEscape() {
+    const char = this.src[this.pos++];
+    switch (char) {
+      case "n":
+        return "\n";
+      case "t":
+        return "	";
+      case "r":
+        return "\r";
+      case "b":
+        return "\b";
+      case "f":
+        return "\f";
+      case "v":
+        return "\v";
+      case "0":
+        return "\0";
+      case "u": {
+        const hex = this.src.slice(this.pos, this.pos + 4);
+        if (/^[0-9a-fA-F]{4}$/.test(hex)) {
+          this.pos += 4;
+          return String.fromCharCode(parseInt(hex, 16));
+        }
+        return "u";
+      }
+      case "x": {
+        const hex = this.src.slice(this.pos, this.pos + 2);
+        if (/^[0-9a-fA-F]{2}$/.test(hex)) {
+          this.pos += 2;
+          return String.fromCharCode(parseInt(hex, 16));
+        }
+        return "x";
+      }
+      default:
+        return char ?? "";
+    }
+  }
+  parseNumber() {
+    const numberRe = /[-+]?(?:0[xX][0-9a-fA-F]+|(?:\d+\.?\d*|\.\d+)(?:[eE][-+]?\d+)?)/y;
+    numberRe.lastIndex = this.pos;
+    const match = numberRe.exec(this.src);
+    if (!match) return PARSE_FAIL;
+    this.pos += match[0].length;
+    return Number(match[0]);
+  }
+  parseIdentifierValue() {
+    const name = this.readIdentifier();
+    if (name === "true") return true;
+    if (name === "false") return false;
+    if (name === "null") return null;
+    if (name === "undefined") return void 0;
+    return this.resolveIdentifier(name);
+  }
+  resolveIdentifier(name) {
+    return this.scope.has(name) ? this.scope.get(name) : void 0;
+  }
+  readIdentifier() {
+    const start = this.pos;
+    while (this.pos < this.src.length && IDENT_PART_RE.test(this.src[this.pos])) this.pos++;
+    return this.src.slice(start, this.pos);
+  }
+  skipTrivia() {
+    while (this.pos < this.src.length) {
+      const char = this.src[this.pos];
+      if (char === " " || char === "	" || char === "\n" || char === "\r") {
+        this.pos++;
+        continue;
+      }
+      if (char === "/" && this.src[this.pos + 1] === "/") {
+        const newline = this.src.indexOf("\n", this.pos + 2);
+        this.pos = newline === -1 ? this.src.length : newline + 1;
+        continue;
+      }
+      if (char === "/" && this.src[this.pos + 1] === "*") {
+        const close = this.src.indexOf("*/", this.pos + 2);
+        this.pos = close === -1 ? this.src.length : close + 2;
+        continue;
+      }
+      break;
+    }
+  }
+};
 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 PARSER_VERSION = "codex-parser-v3";
+var PARSER_VERSION = "codex-parser-v4";
 var DEVELOPER_LIKE_USER_MARKERS = [
   "agents.md instructions for",
   "<instructions>",
@@ -2675,6 +3069,19 @@ function extractCachedInputTokens(usage) {
   if (!usage) return 0;
   return Number(usage["cached_input_tokens"] ?? usage["cache_read_input_tokens"] ?? 0);
 }
+function narrowRecordField(value, field) {
+  return narrowField("codex", field, value, asRecord);
+}
+function extractPayload(data) {
+  return narrowRecordField(data["payload"], "payload") ?? {};
+}
+function extractTokenUsage(payload) {
+  const info = narrowRecordField(payload["info"], "token_count.info");
+  return {
+    totalUsage: info ? narrowRecordField(info["total_token_usage"], "token_count.total_token_usage") : void 0,
+    lastUsage: info ? narrowRecordField(info["last_token_usage"], "token_count.last_token_usage") : void 0
+  };
+}
 function resolveToolIdentity(name, namespace) {
   const mappedName = CODEX_TOOL_TITLE_MAP[name];
   if (mappedName) return { tool: mappedName };
@@ -2709,6 +3116,17 @@ function normalizeCustomToolArguments(toolName, input) {
   }
   return input;
 }
+function flattenOutputText(output) {
+  if (typeof output === "string") return output;
+  if (Array.isArray(output)) {
+    return output.map((item) => {
+      if (typeof item === "string") return item;
+      const record = asRecord(item);
+      return record ? asString(record["text"]) ?? "" : "";
+    }).join("");
+  }
+  return "";
+}
 var PATCH_BEGIN_RE = /\*\*\* Begin Patch/;
 var PATCH_END_RE = /\*\*\* End Patch/;
 var PATCH_HEADER_RE = /\*\*\*\s+(Add|Delete|Update|Move)\s+File:\s*(.+)/;
@@ -2815,10 +3233,10 @@ var CodexAgent = class extends FileSystemSessionSource {
   listSessionSources(options) {
     if (!this.basePath) return [];
     this.loadSessionIndex();
-    return this.listRolloutFiles(options).map((file) => ({
+    return this.listRolloutFiles(options).map(({ file, stat }) => ({
       sessionId: extractSessionId(file),
       sourcePath: file,
-      fingerprint: this.sourceFingerprint(file)
+      fingerprint: this.sourceFingerprint(file, stat)
     }));
   }
   scanSessionSource(sourcePath, options) {
@@ -2849,20 +3267,18 @@ var CodexAgent = class extends FileSystemSessionSource {
       try {
         const recordType = String(record["type"] ?? "");
         if (recordType === "turn_context") {
-          const payload = record["payload"] ?? {};
+          const payload = extractPayload(record);
           activeModel = extractModelName(payload["model"]) ?? activeModel;
         }
         pendingPlan = this.convertRecord(record, transcript, pendingPlan, activeModel);
         if (recordType === "event_msg") {
-          const payload = record["payload"] ?? {};
+          const payload = extractPayload(record);
           if (String(payload["type"] ?? "") === "token_count") {
-            const info = payload["info"];
-            const totalUsage = info?.["total_token_usage"];
+            const { totalUsage, lastUsage } = extractTokenUsage(payload);
             const cumulativeTotal = Number(totalUsage?.["total_tokens"] ?? 0);
             if (cumulativeTotal > 0 && cumulativeTotal === prevCumulativeTotal) {
             } else {
               prevCumulativeTotal = cumulativeTotal;
-              const lastUsage = info?.["last_token_usage"];
               let inputTokens = 0;
               let outputTokens = 0;
               let reasoningTokens = 0;
@@ -2937,6 +3353,7 @@ var CodexAgent = class extends FileSystemSessionSource {
       return [];
     }
   }
+  /** Stats each rollout file once during the walk; caller reuses it for the scan window check and the fingerprint. */
   walkDirForRolloutFiles(dir, options) {
     const files = [];
     try {
@@ -2945,14 +3362,14 @@ var CodexAgent = class extends FileSystemSessionSource {
         if (entry.isDirectory()) {
           files.push(...this.walkDirForRolloutFiles(fullPath, options));
         } else if (entry.name.endsWith(".jsonl") && entry.name.startsWith("rollout-")) {
-          if (options?.from != null || options?.to != null) {
-            try {
-              if (!matchesScanWindow(statSync4(fullPath).mtimeMs, options)) continue;
-            } catch {
-              continue;
-            }
+          let stat;
+          try {
+            stat = statSync4(fullPath);
+          } catch {
+            continue;
           }
-          files.push(fullPath);
+          if (!matchesScanWindow(stat.mtimeMs, options)) continue;
+          files.push({ file: fullPath, stat });
         }
       }
     } catch {
@@ -2961,12 +3378,13 @@ var CodexAgent = class extends FileSystemSessionSource {
   }
   buildSessionMeta(head, file) {
     const indexPath = this.getSessionIndexPath();
+    const stat = statSync4(file);
     return {
       id: head.id,
       title: head.title,
       sourcePath: file,
-      sourceFingerprint: this.sourceFingerprint(file),
-      sourceMtimeMs: statSync4(file).mtimeMs,
+      sourceFingerprint: this.sourceFingerprint(file, stat),
+      sourceMtimeMs: stat.mtimeMs,
       indexPath: existsSync7(indexPath) ? indexPath : null,
       indexMtimeMs: this.getFileMtimeMs(indexPath),
       headIndexVersion: HEAD_INDEX_VERSION2,
@@ -2978,8 +3396,8 @@ var CodexAgent = class extends FileSystemSessionSource {
       updatedAt: head.time_updated ?? head.time_created
     };
   }
-  sourceFingerprint(file) {
-    const stat = statSync4(file);
+  /** Fingerprint depends on an already-fetched stat to avoid re-statting the same file. */
+  sourceFingerprint(file, stat) {
     const sessionId = extractSessionId(file);
     return JSON.stringify([
       HEAD_INDEX_VERSION2,
@@ -3046,7 +3464,7 @@ var CodexAgent = class extends FileSystemSessionSource {
     let firstPayload = {};
     let createdAt = 0;
     let lineCount = 0;
-    const titleLines = [];
+    let messageTitle = null;
     let updatedAt = 0;
     let messageCount = 0;
     let model = null;
@@ -3072,20 +3490,23 @@ var CodexAgent = class extends FileSystemSessionSource {
         } catch {
           return skippedSession("malformed first record");
         }
-        firstPayload = firstRecord["payload"] ?? {};
+        firstPayload = extractPayload(firstRecord);
         createdAt = parseTimestampMs2(firstRecord) || parseTimestampMs2(firstPayload) || statSync4(filePath).mtimeMs;
         updatedAt = createdAt;
       }
-      if (titleLines.length < 20) titleLines.push(line);
       try {
         const data = JSON.parse(line);
         const recordType = String(data["type"] ?? "");
-        const payload = data["payload"] ?? {};
+        const payload = extractPayload(data);
         const payloadType = String(payload["type"] ?? "");
         if (isInternalEventType2(recordType) || isInternalEventType2(payloadType)) continue;
         hasNonInternalRecord = true;
-        const recordTs = parseTimestampMs2(data) || parseTimestampMs2(data["payload"] ?? {});
+        const recordTs = parseTimestampMs2(data) || parseTimestampMs2(payload);
         if (recordTs > updatedAt) updatedAt = recordTs;
+        if (messageTitle === null && lineCount <= 20) {
+          const candidate = this.extractCodexRecordTitle(data);
+          if (candidate) messageTitle = candidate;
+        }
         if (recordType === "session_meta" || recordType === "turn_context") {
           const nextModel = extractModelName(payload["model"]);
           if (nextModel) {
@@ -3100,7 +3521,7 @@ var CodexAgent = class extends FileSystemSessionSource {
           if (COUNTED_TYPES.has(pType)) {
             messageCount++;
           }
-          const info = p["info"];
+          const info = narrowRecordField(p["info"], "response_item.info");
           const m = info?.["model"] ?? p["model"];
           if (typeof m === "string" && m.trim()) {
             activeModel = m.trim();
@@ -3108,14 +3529,11 @@ var CodexAgent = class extends FileSystemSessionSource {
           }
         }
         if (recordType === "event_msg") {
-          const p = data["payload"] ?? {};
-          if (String(p["type"] ?? "") === "token_count") {
-            const info = p["info"];
-            const totalUsage = info?.["total_token_usage"];
+          if (String(payload["type"] ?? "") === "token_count") {
+            const { totalUsage, lastUsage } = extractTokenUsage(payload);
             const cumulativeTotal = Number(totalUsage?.["total_tokens"] ?? 0);
             if (cumulativeTotal > 0 && cumulativeTotal !== scanPrevCumulativeTotal) {
               scanPrevCumulativeTotal = cumulativeTotal;
-              const lastUsage = info?.["last_token_usage"];
               let inputTokens = 0;
               let outputTokens = 0;
               let reasoningTokens = 0;
@@ -3160,7 +3578,6 @@ var CodexAgent = class extends FileSystemSessionSource {
     if (lineCount === 0) return skippedSession("empty file");
     if (!hasNonInternalRecord) return filteredSession("internal events only");
     const indexTitle = this.getTitleForSession(sessionId);
-    const messageTitle = this.extractTitleFromLines(titleLines);
     const directory = firstPayload["cwd"] ? String(firstPayload["cwd"]) : "";
     const title = resolveSessionTitle(indexTitle, messageTitle, basenameTitle(directory || null));
     return parsedSession({
@@ -3195,7 +3612,7 @@ var CodexAgent = class extends FileSystemSessionSource {
     } catch {
       return skippedSession("malformed first record");
     }
-    const payload = firstRecord["payload"] ?? {};
+    const payload = extractPayload(firstRecord);
     const stat = statSync4(filePath);
     const createdAt = parseTimestampMs2(firstRecord) || parseTimestampMs2(payload) || stat.mtimeMs;
     const indexTitle = this.getTitleForSession(sessionId);
@@ -3218,31 +3635,42 @@ var CodexAgent = class extends FileSystemSessionSource {
       }
     });
   }
+  /** Fast path only: parses each of the first 20 lines to find a title (no full stats pass available). */
   extractTitleFromLines(lines) {
     for (const line of lines.slice(0, 20)) {
       try {
-        const data = JSON.parse(line);
-        const recordType = String(data["type"] ?? "");
-        if (recordType !== "response_item" || isInternalEventType2(recordType)) continue;
-        const payload = data["payload"] ?? {};
-        const pType = String(payload["type"] ?? "");
-        if (pType !== "message" || isInternalEventType2(pType)) continue;
-        if (String(payload["role"] ?? "") !== "user") continue;
-        const content = payload["content"];
-        let text = null;
-        if (Array.isArray(content)) {
-          text = content.filter((item) => typeof item === "object" && item !== null && "text" in item).map((item) => String(item["text"] ?? "")).join(" ");
-        } else if (typeof content === "string") {
-          text = content;
-        }
-        if (!text || isDeveloperLikeUserMessage(text)) continue;
-        const title = normalizeTitleText(text);
+        const title = this.extractCodexRecordTitle(JSON.parse(line));
         if (title) return title;
       } catch {
       }
     }
     return null;
   }
+  /**
+   * Title candidate from a single already-parsed record, if it's a visible
+   * user message. Shared by the main streaming pass (which parses every line
+   * once) and the fast path's extractTitleFromLines().
+   */
+  extractCodexRecordTitle(data) {
+    const recordType = String(data["type"] ?? "");
+    if (recordType !== "response_item" || isInternalEventType2(recordType)) return null;
+    const payload = extractPayload(data);
+    const pType = String(payload["type"] ?? "");
+    if (pType !== "message" || isInternalEventType2(pType)) return null;
+    if (String(payload["role"] ?? "") !== "user") return null;
+    const content = payload["content"];
+    let text = null;
+    if (Array.isArray(content)) {
+      text = content.map((item) => {
+        const record = asRecord(item);
+        return record ? String(record["text"] ?? "") : "";
+      }).join(" ");
+    } else if (typeof content === "string") {
+      text = content;
+    }
+    if (!text || isDeveloperLikeUserMessage(text)) return null;
+    return normalizeTitleText(text) || null;
+  }
   // ---- Record conversion ----
   convertRecord(data, transcript, pendingPlan, activeModel) {
     const recordType = String(data["type"] ?? "");
@@ -3251,7 +3679,7 @@ var CodexAgent = class extends FileSystemSessionSource {
       return pendingPlan;
     }
     if (recordType !== "response_item") return pendingPlan;
-    const payload = data["payload"] ?? {};
+    const payload = extractPayload(data);
     const payloadType = String(payload["type"] ?? "");
     if (isInternalEventType2(payloadType)) return pendingPlan;
     const timestampMs = parseTimestampMs2(data) || parseTimestampMs2(payload);
@@ -3296,8 +3724,8 @@ var CodexAgent = class extends FileSystemSessionSource {
     if (!Array.isArray(content)) return pendingPlan;
     const textParts = [];
     for (const item of content) {
-      if (typeof item !== "object" || item === null) continue;
-      const ci = item;
+      const ci = asRecord(item);
+      if (!ci) continue;
       if (String(ci["type"] ?? "") === "output_text") {
         const text = String(ci["text"] ?? "");
         if (text.trim()) textParts.push(text);
@@ -3330,9 +3758,11 @@ var CodexAgent = class extends FileSystemSessionSource {
   // ---- User message ----
   convertUserMessage(payload, transcript, timestampMs, pendingPlan) {
     const content = payload["content"];
-    const text = Array.isArray(content) ? content.map(
-      (c) => typeof c === "object" && c !== null ? String(c["text"] ?? "") : String(c ?? "")
-    ).join(" ") : String(content ?? "");
+    const text = Array.isArray(content) ? content.map((c) => {
+      if (Array.isArray(c)) return "";
+      const record = asRecord(c);
+      return record ? String(record["text"] ?? "") : String(c ?? "");
+    }).join(" ") : String(content ?? "");
     const visibleText = cleanInternalText(text);
     if (!visibleText) return pendingPlan;
     if (isDeveloperLikeUserMessage(visibleText)) return pendingPlan;
@@ -3348,8 +3778,13 @@ var CodexAgent = class extends FileSystemSessionSource {
     }
     const subagentMatch = visibleText.match(SUBAGENT_NOTIFICATION_PATTERN);
     if (subagentMatch) {
+      let notifPayload;
       try {
-        const notifPayload = JSON.parse(subagentMatch[1]);
+        notifPayload = asRecord(JSON.parse(subagentMatch[1]));
+      } catch {
+        notifPayload = void 0;
+      }
+      if (notifPayload) {
         const agentId = String(notifPayload["agent_id"] ?? "");
         const nickname = String(notifPayload["nickname"] ?? "");
         const completedText = String(notifPayload["completed"] ?? "");
@@ -3369,7 +3804,6 @@ var CodexAgent = class extends FileSystemSessionSource {
         });
         transcript.beginTurn();
         return pendingPlan;
-      } catch {
       }
     }
     transcript.appendMessage({
@@ -3386,12 +3820,11 @@ var CodexAgent = class extends FileSystemSessionSource {
     if (!Array.isArray(summary)) return;
     const texts = [];
     for (const item of summary) {
-      if (typeof item === "object" && item !== null) {
-        const ci = item;
-        if (String(ci["type"] ?? "") === "summary_text") {
-          const text = String(ci["text"] ?? "");
-          if (text.trim()) texts.push(text);
-        }
+      const ci = asRecord(item);
+      if (!ci) continue;
+      if (String(ci["type"] ?? "") === "summary_text") {
+        const text = String(ci["text"] ?? "");
+        if (text.trim()) texts.push(text);
       }
     }
     if (texts.length === 0) return;
@@ -3437,7 +3870,9 @@ var CodexAgent = class extends FileSystemSessionSource {
   convertToolCallOutput(payload, transcript, timestampMs) {
     const callId = String(payload["call_id"] ?? "").trim();
     if (!callId) return;
-    const outputText = cleanInternalText(String(payload["output"] ?? ""));
+    const outputText = cleanInternalText(
+      stripExecOutputEnvelope(flattenOutputText(payload["output"]))
+    );
     const outputParts = outputText ? [{ type: "text", text: outputText, time_created: timestampMs }] : [];
     if (outputParts.length > 0) {
       transcript.resolveToolCall(callId, { output: outputParts, status: "completed" });
@@ -3448,6 +3883,13 @@ var CodexAgent = class extends FileSystemSessionSource {
     const callId = String(payload["call_id"] ?? "").trim();
     const name = String(payload["name"] ?? "").trim();
     if (!name) return;
+    if (name === "exec") {
+      const decoded = decodeExecCalls(payload["input"]);
+      if (decoded.length > 0) {
+        this.appendDecodedExecCalls(decoded, callId, transcript, timestampMs, activeModel);
+        return;
+      }
+    }
     const toolIdentity = resolveToolIdentity(name, payload["namespace"]);
     const rawInput = payload["input"];
     const normalizedInput = normalizeCustomToolArguments(name, rawInput);
@@ -3469,6 +3911,36 @@ var CodexAgent = class extends FileSystemSessionSource {
       { markModeAsTool: true }
     );
   }
+  // ---- Decoded code-mode exec calls ----
+  appendDecodedExecCalls(calls, callId, transcript, timestampMs, activeModel) {
+    const outputIndex = pickExecOutputTarget(calls);
+    calls.forEach((call, index) => {
+      const partCallId = index === outputIndex ? callId : `${callId}#${index}`;
+      this.appendDecodedExecCall(call, partCallId, transcript, timestampMs, activeModel);
+    });
+  }
+  appendDecodedExecCall(call, callId, transcript, timestampMs, activeModel) {
+    const { name, namespace } = splitExecToolName(call.name);
+    const toolIdentity = resolveToolIdentity(name, namespace);
+    const arguments_ = name === "apply_patch" ? parseApplyPatchInput(getExecPatchText(call.args)) : call.args;
+    const toolPart = {
+      type: "tool",
+      tool: toolIdentity.tool,
+      callID: callId,
+      title: `Tool: ${toolIdentity.tool}`,
+      state: {
+        arguments: arguments_,
+        output: null,
+        metadata: toolIdentity.metadata
+      },
+      time_created: timestampMs
+    };
+    transcript.appendToolCall(
+      toolPart,
+      { id: "", timestampMs, agent: "codex", model: activeModel },
+      { markModeAsTool: true }
+    );
+  }
 };
 var PerfTracer = class {
   rootMarkers = [];
@@ -3544,6 +4016,106 @@ var PerfTracer = class {
   }
 };
 var perf = new PerfTracer();
+function narrowString(field, value) {
+  return narrowField("cursor", field, value, asString);
+}
+function narrowNumber(field, value) {
+  return narrowField("cursor", field, value, asNumber);
+}
+function parseSubagentInfos(value) {
+  const arr = asArray(value);
+  if (arr === void 0) return void 0;
+  const infos = [];
+  for (const item of arr) {
+    const record = asRecord(item);
+    if (!record) continue;
+    infos.push({
+      id: narrowString("subagentInfo.id", record.id),
+      composerId: narrowString("subagentInfo.composerId", record.composerId),
+      title: narrowString("subagentInfo.title", record.title),
+      nickname: narrowString("subagentInfo.nickname", record.nickname)
+    });
+  }
+  return infos;
+}
+function parseChatMessages(value) {
+  const arr = asArray(value);
+  if (arr === void 0) return void 0;
+  const messages = [];
+  for (const item of arr) {
+    const record = asRecord(item);
+    if (!record) continue;
+    const role = narrowString("chatMessage.role", record.role);
+    if (role === void 0) continue;
+    messages.push({ ...record, role, text: narrowString("chatMessage.text", record.text) });
+  }
+  return messages;
+}
+function parseComposerRow(value) {
+  const record = safeParseJsonRecord(value);
+  if (!record) return null;
+  const modelConfig = asRecord(record.modelConfig);
+  return {
+    id: narrowString("composer.id", record.id),
+    composerId: narrowString("composer.composerId", record.composerId),
+    text: narrowString("composer.text", record.text),
+    name: narrowString("composer.name", record.name),
+    title: narrowString("composer.title", record.title),
+    createdAt: narrowNumber("composer.createdAt", record.createdAt),
+    updatedAt: narrowNumber("composer.updatedAt", record.updatedAt),
+    lastSendTime: narrowNumber("composer.lastSendTime", record.lastSendTime),
+    lastUpdatedAt: narrowNumber("composer.lastUpdatedAt", record.lastUpdatedAt),
+    model: narrowString("composer.model", record.model),
+    modelConfig: modelConfig ? { modelName: narrowString("composer.modelConfig.modelName", modelConfig.modelName) } : void 0,
+    inputTokenCount: narrowNumber("composer.inputTokenCount", record.inputTokenCount),
+    outputTokenCount: narrowNumber("composer.outputTokenCount", record.outputTokenCount),
+    subagentInfos: parseSubagentInfos(record.subagentInfos),
+    chatMessages: parseChatMessages(record.chatMessages)
+  };
+}
+function parseBubbleRow(value) {
+  const record = safeParseJsonRecord(value);
+  if (!record) return null;
+  const timingInfo = asRecord(record.timingInfo);
+  const tokenCount = asRecord(record.tokenCount);
+  const modelInfo = asRecord(record.modelInfo);
+  const toolFormerData = asRecord(record.toolFormerData);
+  return {
+    ...record,
+    id: narrowString("bubble.id", record.id),
+    composerId: narrowString("bubble.composerId", record.composerId),
+    chatMessages: parseChatMessages(record.chatMessages),
+    type: narrowNumber("bubble.type", record.type),
+    text: narrowString("bubble.text", record.text),
+    requestId: narrowString("bubble.requestId", record.requestId),
+    createdAt: narrowNumber("bubble.createdAt", record.createdAt),
+    timestamp: narrowNumber("bubble.timestamp", record.timestamp),
+    timingInfo: timingInfo ? {
+      clientRpcSendTime: narrowNumber(
+        "bubble.timingInfo.clientRpcSendTime",
+        timingInfo.clientRpcSendTime
+      ),
+      clientSettleTime: narrowNumber(
+        "bubble.timingInfo.clientSettleTime",
+        timingInfo.clientSettleTime
+      ),
+      clientEndTime: narrowNumber("bubble.timingInfo.clientEndTime", timingInfo.clientEndTime)
+    } : void 0,
+    tokenCount: tokenCount ? {
+      inputTokens: narrowNumber("bubble.tokenCount.inputTokens", tokenCount.inputTokens),
+      outputTokens: narrowNumber("bubble.tokenCount.outputTokens", tokenCount.outputTokens)
+    } : void 0,
+    modelInfo: modelInfo ? { modelName: narrowString("bubble.modelInfo.modelName", modelInfo.modelName) } : void 0,
+    toolFormerData: toolFormerData ? {
+      name: narrowString("bubble.toolFormerData.name", toolFormerData.name),
+      toolCallId: narrowString("bubble.toolFormerData.toolCallId", toolFormerData.toolCallId),
+      status: narrowString("bubble.toolFormerData.status", toolFormerData.status),
+      params: toolFormerData.params,
+      result: toolFormerData.result,
+      additionalData: asRecord(toolFormerData.additionalData)
+    } : void 0
+  };
+}
 var CURSOR_TOOL_TITLE_MAP = {
   read_file_v2: "read",
   edit_file_v2: "edit",
@@ -3564,9 +4136,8 @@ function normalizeToolOutputParts2(output, timestampMs) {
     const parts = [];
     for (const item of output) {
       if (typeof item === "object" && item !== null) {
-        const text2 = String(
-          item.text ?? item.content ?? ""
-        );
+        const record = asRecord(item);
+        const text2 = String(record?.text ?? record?.content ?? "");
         const cleaned = cleanInternalText(text2);
         if (cleaned) parts.push({ type: "text", text: cleaned, time_created: timestampMs });
       } else if (typeof item === "string") {
@@ -3606,9 +4177,9 @@ function buildToolState(action) {
   }
   if (!state.status) {
     if (typeof action.output === "object" && action.output !== null) {
-      const out = action.output;
-      if (out.success === true) state.status = "completed";
-      else if (out.success === false) state.status = "error";
+      const out = asRecord(action.output);
+      if (out?.success === true) state.status = "completed";
+      else if (out?.success === false) state.status = "error";
       else state.status = "completed";
     } else if (action.output != null) {
       state.status = "completed";
@@ -3697,8 +4268,8 @@ var CursorAgent = class extends DatabaseSessionSource {
       if (!existsSync8(wsJsonPath)) continue;
       let workspacePath;
       try {
-        const data = JSON.parse(readFileSync5(wsJsonPath, "utf-8"));
-        const uri = data.folder ?? data.workspace ?? "";
+        const data = asRecord(JSON.parse(readFileSync5(wsJsonPath, "utf-8")));
+        const uri = narrowString("workspaceJson.folder", data?.folder) ?? narrowString("workspaceJson.workspace", data?.workspace) ?? "";
         if (!uri) continue;
         workspacePath = normalize(decodeURIComponent(uri.replace(/^file:\/\//, "")));
       } catch {
@@ -3712,16 +4283,11 @@ var CursorAgent = class extends DatabaseSessionSource {
         const row = wsDb.prepare("SELECT value FROM ItemTable WHERE key = 'composer.composerData'").get();
         if (!row?.value) continue;
         const parsed = JSON.parse(row.value);
-        let composers;
-        if (parsed !== null && typeof parsed === "object" && "allComposers" in parsed && Array.isArray(parsed["allComposers"])) {
-          composers = parsed.allComposers;
-        } else if (Array.isArray(parsed)) {
-          composers = parsed;
-        } else {
-          continue;
-        }
-        for (const c of composers) {
-          const id = c.composerId ?? c.id;
+        const composers = asArray(asRecord(parsed)?.allComposers) ?? asArray(parsed) ?? [];
+        for (const item of composers) {
+          const composer = asRecord(item);
+          if (!composer) continue;
+          const id = narrowString("workspaceComposer.composerId", composer.composerId) ?? narrowString("workspaceComposer.id", composer.id);
           if (id) map.set(id, workspacePath);
         }
       } catch {
@@ -3752,8 +4318,8 @@ var CursorAgent = class extends DatabaseSessionSource {
       let processed = 0;
       for (const row of rows) {
         try {
-          const composer = JSON.parse(row.value);
-          if (!composer.id && !composer.composerId) continue;
+          const composer = parseComposerRow(row.value);
+          if (!composer || !composer.id && !composer.composerId) continue;
           const composerId = composer.id || composer.composerId || "";
           const createdAt = composer.createdAt ?? 0;
           const updatedAt = composer.updatedAt ?? composer.lastUpdatedAt ?? composer.lastSendTime ?? createdAt;
@@ -3954,8 +4520,8 @@ var CursorAgent = class extends DatabaseSessionSource {
       const rows = db.prepare("SELECT value FROM cursorDiskKV WHERE key LIKE ? ORDER BY key").all(`bubbleId:${composerId}:%`);
       for (const row of rows) {
         try {
-          const bubble = JSON.parse(row.value);
-          if (bubble.requestId && typeof bubble.requestId === "string" && bubble.requestId.trim()) {
+          const bubble = parseBubbleRow(row.value);
+          if (bubble?.requestId?.trim()) {
             return bubble.requestId.trim();
           }
         } catch {
@@ -3971,8 +4537,8 @@ var CursorAgent = class extends DatabaseSessionSource {
       const rows = db.prepare("SELECT key, value FROM cursorDiskKV WHERE key LIKE 'bubbleId:%' AND value LIKE ?").all(`%"requestId":"${requestId}"%`);
       for (const row of rows) {
         try {
-          const bubble = JSON.parse(row.value);
-          if (bubble.requestId === requestId) {
+          const bubble = parseBubbleRow(row.value);
+          if (bubble?.requestId === requestId) {
             const keyParts = row.key.split(":");
             if (keyParts.length >= 2 && keyParts[1]) {
               return keyParts[1];
@@ -3998,8 +4564,8 @@ var CursorAgent = class extends DatabaseSessionSource {
       let count = 0;
       for (const row of rows) {
         try {
-          const bubble = JSON.parse(row.value);
-          if (bubble.type === 1 || bubble.type === 2) {
+          const bubble = parseBubbleRow(row.value);
+          if (bubble?.type === 1 || bubble?.type === 2) {
             count++;
           }
         } catch {
@@ -4019,8 +4585,8 @@ var CursorAgent = class extends DatabaseSessionSource {
       let messageIndex = 0;
       for (const row of rows) {
         try {
-          const bubble = JSON.parse(row.value);
-          if (isInternalBubble(bubble)) continue;
+          const bubble = parseBubbleRow(row.value);
+          if (!bubble || isInternalBubble(bubble)) continue;
           const bubbleId = row.key.split(":").pop() || String(messageIndex);
           const role = bubble.type === 2 ? "assistant" : "user";
           let timestampMs = 0;
@@ -4109,7 +4675,7 @@ var CursorAgent = class extends DatabaseSessionSource {
       }
     }
     if (toolName === "create_plan") {
-      const planText = typeof state.input === "object" && state.input !== null ? state.input.plan : void 0;
+      const planText = asRecord(state.input)?.plan;
       return {
         type: "plan",
         title: "Plan",
@@ -4131,20 +4697,12 @@ var CursorAgent = class extends DatabaseSessionSource {
   loadComposer(db, sessionId) {
     const row = db.prepare("SELECT value FROM cursorDiskKV WHERE key = ?").get(`composerData:${sessionId}`);
     if (!row) return null;
-    try {
-      return JSON.parse(row.value);
-    } catch {
-      return null;
-    }
+    return parseComposerRow(row.value);
   }
   loadBubble(db, sessionId) {
     const row = db.prepare("SELECT value FROM cursorDiskKV WHERE key = ?").get(`bubble:${sessionId}`);
     if (!row) return null;
-    try {
-      return JSON.parse(row.value);
-    } catch {
-      return null;
-    }
+    return parseBubbleRow(row.value);
   }
   appendSubagentMessages(db, composer, messages) {
     const subagentInfos = composer.subagentInfos;
@@ -4198,6 +4756,17 @@ function parseTimestampMs3(value) {
   const ts = Date.parse(text);
   return Number.isNaN(ts) ? 0 : ts;
 }
+function narrowPiField(field, value, narrow) {
+  return narrowField("pi", field, value, narrow);
+}
+function narrowTimestampMs(field, value) {
+  const shaped = narrowPiField(
+    field,
+    value,
+    (v) => typeof v === "number" || typeof v === "string" ? v : void 0
+  );
+  return shaped === void 0 ? 0 : parseTimestampMs3(shaped);
+}
 function extractSessionIdFromFilename(filePath) {
   const stem = basename6(filePath, ".jsonl");
   const underscore = stem.indexOf("_");
@@ -4221,7 +4790,7 @@ function normalizeTextParts(content, timestampMs) {
   return text ? [{ type: "text", text, time_created: timestampMs }] : [];
 }
 function getEntryTimestamp(entry) {
-  return parseTimestampMs3(entry["timestamp"]);
+  return narrowTimestampMs("entry.timestamp", entry["timestamp"]);
 }
 function chooseLeafEntry(entries) {
   for (let index = entries.length - 1; index >= 0; index -= 1) {
@@ -4265,10 +4834,10 @@ var PiAgent = class extends FileSystemSessionSource {
   }
   listSessionSources(options) {
     if (!this.basePath) return [];
-    return this.listSessionFiles(options).map((file) => ({
+    return this.walkJsonlFiles(this.basePath, options).map(({ file, stat }) => ({
       sessionId: extractSessionIdFromFilename(file),
       sourcePath: file,
-      fingerprint: this.sourceFingerprint(file)
+      fingerprint: this.sourceFingerprint(stat)
     }));
   }
   scanSessionSource(sourcePath) {
@@ -4305,8 +4874,9 @@ var PiAgent = class extends FileSystemSessionSource {
   }
   listSessionFiles(options) {
     if (!this.basePath) return [];
-    return this.walkJsonlFiles(this.basePath, options);
+    return this.walkJsonlFiles(this.basePath, options).map(({ file }) => file);
   }
+  /** Stats each file once during the walk; caller reuses it for both the scan window check and the fingerprint. */
   walkJsonlFiles(dir, options) {
     const files = [];
     try {
@@ -4317,20 +4887,27 @@ var PiAgent = class extends FileSystemSessionSource {
           continue;
         }
         if (!entry.isFile() || !entry.name.endsWith(".jsonl")) continue;
-        if (!matchesScanWindow(statSync6(fullPath).mtimeMs, options)) continue;
-        files.push(fullPath);
+        let stat;
+        try {
+          stat = statSync6(fullPath);
+        } catch {
+          continue;
+        }
+        if (!matchesScanWindow(stat.mtimeMs, options)) continue;
+        files.push({ file: fullPath, stat });
       }
     } catch {
     }
     return files;
   }
   buildSessionMeta(head, file) {
+    const stat = statSync6(file);
     return {
       id: head.id,
       title: head.title,
       sourcePath: file,
-      sourceFingerprint: this.sourceFingerprint(file),
-      sourceMtimeMs: statSync6(file).mtimeMs,
+      sourceFingerprint: this.sourceFingerprint(stat),
+      sourceMtimeMs: stat.mtimeMs,
       headIndexVersion: HEAD_INDEX_VERSION3,
       parserVersion: PARSER_VERSION2,
       directory: head.directory,
@@ -4339,8 +4916,8 @@ var PiAgent = class extends FileSystemSessionSource {
       updatedAt: head.time_updated ?? head.time_created
     };
   }
-  sourceFingerprint(file) {
-    const stat = statSync6(file);
+  /** Fingerprint depends on an already-fetched stat to avoid re-statting the same file. */
+  sourceFingerprint(stat) {
     return JSON.stringify([HEAD_INDEX_VERSION3, PARSER_VERSION2, stat.mtimeMs, stat.size]);
   }
   parseSessionHeadResult(filePath) {
@@ -4380,7 +4957,7 @@ var PiAgent = class extends FileSystemSessionSource {
     if (!sessionId) throw new Error("missing session id");
     const stat = statSync6(filePath);
     const directory = String(header["cwd"] ?? "").trim() || basename6(filePath, ".jsonl");
-    const createdAt = parseTimestampMs3(header["timestamp"]) || stat.mtimeMs;
+    const createdAt = narrowTimestampMs("session.timestamp", header["timestamp"]) || stat.mtimeMs;
     const updatedAt = pathEntries.reduce(
       (max, entry) => Math.max(max, getEntryTimestamp(entry)),
       createdAt
@@ -4423,8 +5000,8 @@ var PiAgent = class extends FileSystemSessionSource {
       const timestampMs = getEntryTimestamp(entry);
       const type = String(entry["type"] ?? "");
       if (type === "message") {
-        const message = entry["message"];
-        if (!isObject(message)) continue;
+        const message = narrowPiField("entry.message", entry["message"], asRecord);
+        if (!message) continue;
         const result2 = this.convertAgentMessage(entry, message, timestampMs, builder);
         if (!result2) continue;
         if (result2.message) builder.appendMessage(result2.message);
@@ -4448,8 +5025,8 @@ var PiAgent = class extends FileSystemSessionSource {
     };
   }
   convertAgentMessage(entry, message, timestampMs, builder) {
-    const id = String(entry["id"] ?? "");
-    const role = String(message["role"] ?? "");
+    const id = narrowPiField("message.id", entry["id"], asString) ?? "";
+    const role = narrowPiField("message.role", message["role"], asString) ?? "";
     if (role === "user") {
       const parts = normalizeTextParts(message["content"], timestampMs);
       if (parts.length === 0) return null;
@@ -4588,7 +5165,7 @@ var PiAgent = class extends FileSystemSessionSource {
     const text = cleanInternalText(rawText);
     if (!text) return null;
     return {
-      id: String(entry["id"] ?? ""),
+      id: narrowPiField("summary.id", entry["id"], asString) ?? "",
       role: type === "custom_message" ? "user" : "assistant",
       agent: type === "custom_message" ? void 0 : "pi",
       timestampMs,
@@ -4596,14 +5173,12 @@ var PiAgent = class extends FileSystemSessionSource {
     };
   }
   normalizeUsage(raw) {
-    const usage = isObject(raw) ? raw : {};
-    const inputTokens = Number(usage["input"] ?? 0);
-    const outputTokens = Number(usage["output"] ?? 0);
-    const cacheReadTokens = Number(usage["cacheRead"] ?? 0);
-    const cacheCreateTokens = Number(usage["cacheWrite"] ?? 0);
-    const totalTokens = Number(
-      usage["totalTokens"] ?? inputTokens + outputTokens + cacheReadTokens + cacheCreateTokens
-    );
+    const usage = narrowPiField("message.usage", raw, asRecord) ?? {};
+    const inputTokens = narrowPiField("message.usage.input", usage["input"], asNumber) ?? 0;
+    const outputTokens = narrowPiField("message.usage.output", usage["output"], asNumber) ?? 0;
+    const cacheReadTokens = narrowPiField("message.usage.cacheRead", usage["cacheRead"], asNumber) ?? 0;
+    const cacheCreateTokens = narrowPiField("message.usage.cacheWrite", usage["cacheWrite"], asNumber) ?? 0;
+    const totalTokens = narrowPiField("message.usage.totalTokens", usage["totalTokens"], asNumber) ?? inputTokens + outputTokens + cacheReadTokens + cacheCreateTokens;
     const cost = isObject(usage["cost"]) ? Number(usage["cost"]["total"] ?? 0) : null;
     return {
       inputTokens: inputTokens + cacheReadTokens + cacheCreateTokens,
@@ -4645,6 +5220,7 @@ var ZCodeAgent = class extends OpenCodeSqliteAgent {
 };
 registerAgent({
   icon: "/icon/agent/claudecode.svg",
+  iconColored: true,
   create: () => new ClaudeCodeAgent()
 });
 registerAgent({
@@ -4734,7 +5310,23 @@ function normalizeGitRemote(url) {
   if (!value.includes("/")) return null;
   return value.toLowerCase();
 }
+var IDENTITY_CACHE_TTL_MS = 10 * 60 * 1e3;
+var identityCache = /* @__PURE__ */ new Map();
+function clearIdentityCache() {
+  identityCache.clear();
+}
 function computeIdentity(cwd, fs) {
+  if (fs !== realFs) return resolveIdentity(cwd, fs);
+  const key = cwd ?? "";
+  const cached = identityCache.get(key);
+  if (cached && Date.now() - cached.resolvedAt < IDENTITY_CACHE_TTL_MS) {
+    return cached.identity;
+  }
+  const identity = resolveIdentity(cwd, fs);
+  identityCache.set(key, { identity, resolvedAt: Date.now() });
+  return identity;
+}
+function resolveIdentity(cwd, fs) {
   if (!cwd) return loose();
   const pathOps = getPathOps(cwd);
   const absoluteCwd = pathOps.resolve(cwd);
@@ -5668,7 +6260,10 @@ function withCacheDb(fn) {
       setSchemaEnsuredPath(cachePath);
     }
     return fn(db);
-  } catch {
+  } catch (error) {
+    getCoreDiagnostics()?.warn("cache.write_failed", {
+      message: error instanceof Error ? error.message : String(error)
+    });
     return null;
   } finally {
     db.close();
@@ -5711,6 +6306,12 @@ function createCacheTables(db) {
       index_version TEXT NOT NULL,
       last_sync_at INTEGER NOT NULL
     );
+
+    CREATE TABLE IF NOT EXISTS pending_reindex (
+      agent_name TEXT NOT NULL,
+      session_id TEXT NOT NULL,
+      PRIMARY KEY (agent_name, session_id)
+    );
   `);
 }
 function createSessionTables(db) {
@@ -6408,6 +7009,20 @@ function invalidateSearchContentHashes(db) {
     db.exec("UPDATE session_documents SET content_hash = ''");
   }
 }
+var CODEX_EXEC_DECODE_MIGRATION_KEY = "codex_exec_decode_migrated_v3";
+function migrateCodexExecDecode(db) {
+  if (!tableExists(db, "cache_meta")) return;
+  const done = db.prepare("SELECT value FROM cache_meta WHERE key = ?").get(CODEX_EXEC_DECODE_MIGRATION_KEY);
+  if (done) return;
+  if (tableExists(db, "sessions") && tableExists(db, "pending_reindex")) {
+    db.exec(
+      "INSERT OR IGNORE INTO pending_reindex(agent_name, session_id) SELECT agent_name, session_id FROM sessions WHERE agent_name = 'codex'"
+    );
+  }
+  db.prepare(
+    "INSERT INTO cache_meta(key, value) VALUES (?, '1') ON CONFLICT(key) DO UPDATE SET value = '1'"
+  ).run(CODEX_EXEC_DECODE_MIGRATION_KEY);
+}
 function rebuildSearchIndex(db) {
   if (!tableExists(db, "session_documents_fts")) {
     return;
@@ -6465,6 +7080,7 @@ function ensureSchema(db, dbPath) {
   if (currentVersion === 0 && !hasAnyCacheSchema(db)) {
     createLatestCacheSchema(db);
     setCacheSchemaVersion(db);
+    migrateCodexExecDecode(db);
     return;
   }
   runSchemaMigrations(db, {
@@ -6532,6 +7148,7 @@ function ensureSchema(db, dbPath) {
   if (getUserVersion(db) <= CACHE_SCHEMA_VERSION) {
     setCacheSchemaVersion(db);
   }
+  migrateCodexExecDecode(db);
 }
 function escapeFtsTerm(value) {
   return value.replaceAll('"', '""');
@@ -6657,6 +7274,10 @@ function toFtsQuery(input) {
     (token, index, values) => token !== "OR" || index > 0 && index < values.length - 1 && values[index - 1] !== "OR" && values[index + 1] !== "OR"
   ).join(" ");
 }
+function readPendingReindexIds(db, agentName) {
+  const rows = db.prepare("SELECT session_id FROM pending_reindex WHERE agent_name = ?").all(agentName);
+  return new Set(rows.map((row) => String(row.session_id)));
+}
 var SEARCH_INDEX_STATE_BATCH_SIZE = 900;
 function shouldBulkSyncSearchIndex(options, changedCount) {
   if (options.isBulk != null) {
@@ -6682,7 +7303,7 @@ function sessionContentHash(session) {
     session.stats.total_tokens ?? 0
   ]);
 }
-function searchIndexStateFromRows(indexedRows, messageCountRows) {
+function searchIndexStateFromRows(indexedRows, messageCountRows, pendingReindexSessionIds = /* @__PURE__ */ new Set()) {
   return {
     contentHashBySessionId: new Map(
       indexedRows.map((row) => [String(row.session_id), String(row.content_hash ?? "")])
@@ -6692,7 +7313,8 @@ function searchIndexStateFromRows(indexedRows, messageCountRows) {
     ),
     messageCountBySessionId: new Map(
       messageCountRows.map((row) => [String(row.session_id), Number(row.value ?? 0)])
-    )
+    ),
+    pendingReindexSessionIds
   };
 }
 function readSearchIndexState(db, agentName, sessionIds) {
@@ -6722,11 +7344,11 @@ function readSearchIndexState(db, agentName, sessionIds) {
     ).all(...batch, agentName, agentName);
     rows.push(...batchRows);
   }
-  return searchIndexStateFromRows(rows, rows);
+  return searchIndexStateFromRows(rows, rows, readPendingReindexIds(db, agentName));
 }
 function searchIndexEntryNeedsUpdate(state, session) {
   const sessionId = session.id;
-  return state.contentHashBySessionId.get(sessionId) !== sessionContentHash(session) || state.indexedMessageCountBySessionId.get(sessionId) !== (state.messageCountBySessionId.get(sessionId) ?? 0);
+  return state.pendingReindexSessionIds.has(sessionId) || state.contentHashBySessionId.get(sessionId) !== sessionContentHash(session) || state.indexedMessageCountBySessionId.get(sessionId) !== (state.messageCountBySessionId.get(sessionId) ?? 0);
 }
 function loadSearchIndexEntry(agentName, change, loadSessionData) {
   try {
@@ -6846,11 +7468,15 @@ function writeSearchIndexRows(db, agentName, removedSessionIds, entries) {
       indexed_message_count = excluded.indexed_message_count,
       indexed_at = excluded.indexed_at
   `);
+  const clearPendingReindex = db.prepare(
+    "DELETE FROM pending_reindex WHERE agent_name = ? AND session_id = ?"
+  );
   for (const sessionId of new Set(removedSessionIds)) {
     deleteRow.run(agentName, sessionId);
     deleteFileActivity.run(agentName, sessionId);
     deleteMessageTools.run(agentName, sessionId, 0);
     deleteMessages.run(agentName, sessionId, 0);
+    clearPendingReindex.run(agentName, sessionId);
   }
   let indexed = 0;
   for (const entry of entries) {
@@ -6858,6 +7484,7 @@ function writeSearchIndexRows(db, agentName, removedSessionIds, entries) {
     upsertSessionRow(upsertIndexedSession, agentName, entry.session, null, entry.sortIndex, null);
     deleteFileActivity.run(agentName, entry.session.id);
     deleteMessageTools.run(agentName, entry.session.id, 0);
+    clearPendingReindex.run(agentName, entry.session.id);
     writeFileActivityRows(insertFileActivity, entry.fileActivity);
     for (const message of entry.messages) {
       upsertMessage.run(
@@ -6918,7 +7545,11 @@ function syncSessionSearchIndex(agentName, sessions, loadSessionData, options =
     const messageCountRows = db.prepare(
       "SELECT session_id, COUNT(*) AS value FROM messages WHERE agent_name = ? GROUP BY session_id"
     ).all(agentName);
-    const searchIndexState = searchIndexStateFromRows(existingRows, messageCountRows);
+    const searchIndexState = searchIndexStateFromRows(
+      existingRows,
+      messageCountRows,
+      readPendingReindexIds(db, agentName)
+    );
     const sessionMap = new Map(sessions.map((session) => [session.id, session]));
     const toDelete = existingRows.map((row) => String(row.session_id)).filter((sessionId) => !sessionMap.has(sessionId));
     const toUpsert = sessions.filter(
@@ -7523,6 +8154,14 @@ function searchFileActivitySessions(query, options = {}) {
   return results;
 }
 var CACHE_INITIALIZATION_VERSION = "session-cache-v2";
+function parseCachedSessionMeta(value) {
+  if (!value) return null;
+  try {
+    return JSON.parse(value);
+  } catch {
+    return null;
+  }
+}
 function deleteLegacyCacheFile() {
   const legacyPath = getLegacyCachePath();
   if (!existsSync12(legacyPath)) {
@@ -7641,7 +8280,7 @@ function markAgentFullSyncCompleted(agentName) {
     ).run(Date.now(), agentName);
   });
 }
-function loadCachedSessionData(agentName, sessionId) {
+function loadCachedSessionDataEntry(agentName, sessionId) {
   if (!hasCacheStorage()) {
     return null;
   }
@@ -7679,7 +8318,8 @@ function loadCachedSessionData(agentName, sessionId) {
     if (!row) {
       return null;
     }
-    const messageRows = db.prepare(
+    const pendingReindex = db.prepare("SELECT 1 FROM pending_reindex WHERE agent_name = ? AND session_id = ?").get(agentName, sessionId) != null;
+    const messageRows = pendingReindex ? [] : db.prepare(
       `
           SELECT
             message_id,
@@ -7712,12 +8352,18 @@ function loadCachedSessionData(agentName, sessionId) {
         `
     ).all(agentName, sessionId);
     return {
-      ...head,
-      messages: messageRows.map((messageRow) => messageFromCachedRow(messageRow)),
-      file_activity: fileActivityRows.map((activityRow) => fileActivityFromRow(activityRow))
+      data: {
+        ...head,
+        messages: messageRows.map((messageRow) => messageFromCachedRow(messageRow)),
+        file_activity: fileActivityRows.map((activityRow) => fileActivityFromRow(activityRow))
+      },
+      meta: parseCachedSessionMeta(row.meta_json)
     };
   });
 }
+function loadCachedSessionData(agentName, sessionId) {
+  return loadCachedSessionDataEntry(agentName, sessionId)?.data ?? null;
+}
 function saveCachedSessions(agentName, sessions, meta = {}) {
   withCacheDb((db) => {
     const deleteAgent = db.prepare("DELETE FROM agent_cache WHERE agent_name = ?");
@@ -7907,9 +8553,8 @@ function listCachedProjectGroups(sessions) {
   if (!hasCacheStorage()) {
     return [];
   }
-  const groups = withCacheDb((db) => {
-    const rows = db.prepare(
-      `
+  const queryRows = (db) => db.prepare(
+    `
           SELECT identity_kind, identity_key, display_name, sources_csv, session_count, last_activity
           FROM project_groups_v
           ORDER BY
@@ -7917,34 +8562,24 @@ function listCachedProjectGroups(sessions) {
             last_activity IS NULL,
             last_activity DESC
         `
-    ).all();
-    return rows.map((row) => ({
-      identityKind: row.identity_kind ?? "path",
-      identityKey: String(row.identity_key ?? ""),
-      displayName: String(row.display_name ?? ""),
-      sources: String(row.sources_csv ?? "").split(",").filter(Boolean).sort(),
-      sessionCount: Number(row.session_count ?? 0),
-      lastActivity: row.last_activity == null ? null : Number(row.last_activity)
-    }));
-  });
-  return groups ?? [];
-}
-function createIdentityResolver() {
-  const cache = /* @__PURE__ */ new Map();
-  return (directory) => {
-    const key = directory || "";
-    const cached = cache.get(key);
-    if (cached) return cached;
-    const identity = computeIdentity(directory, realFs);
-    cache.set(key, identity);
-    return identity;
-  };
+  ).all();
+  let rows = withCacheDbReadOnly(queryRows);
+  if (rows == null) {
+    rows = withCacheDb(queryRows);
+  }
+  return (rows ?? []).map((row) => ({
+    identityKind: row.identity_kind ?? "path",
+    identityKey: String(row.identity_key ?? ""),
+    displayName: String(row.display_name ?? ""),
+    sources: String(row.sources_csv ?? "").split(",").filter(Boolean).sort(),
+    sessionCount: Number(row.session_count ?? 0),
+    lastActivity: row.last_activity == null ? null : Number(row.last_activity)
+  }));
 }
 function attachMissingProjectIdentities(sessions) {
-  const resolveIdentity = createIdentityResolver();
   return sessions.map((session) => {
     if (session.project_identity) return session;
-    return { ...session, project_identity: resolveIdentity(session.directory) };
+    return { ...session, project_identity: computeIdentity(session.directory, realFs) };
   });
 }
 function buildAgentCacheMeta(agent, sessionIds) {
@@ -7974,7 +8609,7 @@ function sessionSignature(session) {
 function sortSessions(sessions) {
   return sortSessionsByActivity(sessions);
 }
-function computeSessionDiff(cachedSessions, updatedSessions, changedIds = [], signature = sessionSignature) {
+function computeSessionDiff(cachedSessions, updatedSessions, changedIds = [], signature = sessionSignature, signatureCache) {
   const cachedMap = new Map(cachedSessions.map((session) => [session.id, session]));
   const updatedIds = new Set(updatedSessions.map((session) => session.id));
   const changedIdSet = new Set(changedIds);
@@ -7987,10 +8622,13 @@ function computeSessionDiff(cachedSessions, updatedSessions, changedIds = [], si
     if (!cached) {
       newCount += 1;
       changes.push({ session, sortIndex });
+      signatureCache?.set(session.id, signature(session));
       return;
     }
-    const hasSignatureChange = signature(cached) !== signature(session);
-    if (changedIdSet.has(session.id) || hasSignatureChange) {
+    const cachedSignature = signatureCache?.get(cached.id) ?? signature(cached);
+    const updatedSignature = signature(session);
+    signatureCache?.set(session.id, updatedSignature);
+    if (changedIdSet.has(session.id) || cachedSignature !== updatedSignature) {
       updatedCount += 1;
       changes.push({ session, sortIndex });
     }
@@ -8208,7 +8846,7 @@ async function scanAgentSmart(agent, options, onProgress) {
         });
         const t2 = performance.now();
         const updatedSessions = await Promise.resolve(
-          agent.incrementalScan(cached.sessions, checkResult.changedIds || [])
+          agent.incrementalScan(cached.sessions, checkResult.changedIds || [], checkResult.refs)
         );
         timing.scan = performance.now() - t2;
         return finalizeAgentScan(agent, updatedSessions, {
@@ -8272,10 +8910,12 @@ 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);
-    if (options.writeCache !== false && options.from == null && options.to == null) {
-      saveCachedSessions(agent.name, tagged.sessions, meta);
+    if (options.writeCache !== false) {
+      if (options.from == null && options.to == null) {
+        saveCachedSessions(agent.name, tagged.sessions, meta);
+        markAgentFullSyncCompleted(agent.name);
+      }
       markAgentCacheInitialized(agent.name);
-      markAgentFullSyncCompleted(agent.name);
     }
     onProgress?.({ agent: agent.name, phase: "complete", newCount: tagged.sessions.length });
     const filtered = filterSessions(tagged.sessions, options);
@@ -8331,6 +8971,13 @@ async function scanSessionsAsync(options = {}, onProgress) {
 var STATE_DB_FILENAME = "state.db";
 var STATE_SCHEMA_VERSION = 2;
 var MEMORY_STATE_STORE = "memory";
+var stateSchemaEnsuredPath = null;
+function getStateSchemaEnsuredPath() {
+  return stateSchemaEnsuredPath;
+}
+function setStateSchemaEnsuredPath(path2) {
+  stateSchemaEnsuredPath = path2;
+}
 var StateStorageUnavailableError = class extends Error {
   constructor() {
     super("SQLite state database is unavailable");
@@ -8437,7 +9084,7 @@ function ensureSchema2(db, dbPath) {
       { version: 2, migrate: createSessionAliasesTable }
     ]
   });
-  if (currentVersion <= STATE_SCHEMA_VERSION) {
+  if (currentVersion < STATE_SCHEMA_VERSION) {
     setStateSchemaVersion(db);
   }
 }
@@ -8446,7 +9093,10 @@ function withStateDb(fn) {
   const db = openDb(statePath);
   if (!db) throw new StateStorageUnavailableError();
   try {
-    ensureSchema2(db, statePath);
+    if (getStateSchemaEnsuredPath() !== statePath) {
+      ensureSchema2(db, statePath);
+      setStateSchemaEnsuredPath(statePath);
+    }
     return fn(db);
   } finally {
     db.close();
@@ -8847,6 +9497,7 @@ function buildDashboard(sessions, options) {
       name,
       displayName: info?.displayName ?? name,
       icon: info?.icon ?? "",
+      iconColored: info?.iconColored,
       sessions: metrics.sessions,
       messages: metrics.messages,
       tokens: metrics.tokens
@@ -8887,15 +9538,6 @@ function executeSessionSearch(query, options, snapshot) {
 function needsIndexedSearch(textQuery, options) {
   return Boolean(textQuery || options.file || options.fileKind || options.tools?.length);
 }
-function filterSessionsByActivityWindow(sessions, from, to) {
-  if (from == null && to == null) return sessions;
-  return sessions.filter((session) => {
-    const activity = getSessionActivityTime(session);
-    if (from != null && activity < from) return false;
-    if (to != null && activity > to) return false;
-    return true;
-  });
-}
 function matchesRecentSearchFilters(session, options, projectScope) {
   if (options.projectKind || options.projectKey) {
     if (!options.projectKind || !options.projectKey || !matchesProjectIdentity(session.project_identity, {
@@ -8921,11 +9563,18 @@ function matchesRecentSearchFilters(session, options, projectScope) {
   if (!sessionMatchesSearchCost(session, options)) return false;
   return true;
 }
+function matchesSessionSearchFilters(agentName, session, options, projectScope = null) {
+  if (options.agent && agentName !== options.agent) return false;
+  const activity = getSessionActivityTime(session);
+  if (options.from != null && activity < options.from) return false;
+  if (options.to != null && activity > options.to) return false;
+  return matchesRecentSearchFilters(session, options, projectScope);
+}
 function searchRecentSessions(snapshot, options) {
   const projectScope = options.cwd ? createProjectScopeMatcher(options.cwd) : null;
   const entries = options.agent ? [[options.agent, snapshot.byAgent[options.agent] ?? []]] : Object.entries(snapshot.byAgent);
   return entries.flatMap(
-    ([agentName, sessions]) => filterSessionsByActivityWindow(sessions, options.from, options.to).filter((session) => matchesRecentSearchFilters(session, options, projectScope)).map((session) => ({ agentName, session }))
+    ([agentName, sessions]) => sessions.filter((session) => matchesSessionSearchFilters(agentName, session, options, projectScope)).map((session) => ({ agentName, session }))
   ).sort(
     (a, b) => (b.session.time_updated ?? b.session.time_created) - (a.session.time_updated ?? a.session.time_created)
   ).slice(0, options.limit ?? 50).map(({ agentName, session }) => ({
@@ -8968,6 +9617,7 @@ export {
   getRegisteredAgents,
   getAgentInfoMap,
   getAgentByName,
+  setCoreDiagnostics,
   parsedSession,
   skippedSession,
   filteredSession,
@@ -9001,6 +9651,11 @@ export {
   applyMessageCosts,
   withEstimatedSessionCost,
   estimateTokenCost,
+  asRecord,
+  asString,
+  asNumber,
+  asArray,
+  reportFieldMismatch,
   openDbReadOnly,
   openDb,
   isSqliteAvailable,
@@ -9011,6 +9666,7 @@ export {
   getProjectIdentityKey,
   matchesProjectIdentity,
   normalizeGitRemote,
+  clearIdentityCache,
   computeIdentity,
   buildProjectGroups,
   createProjectScopeMatcher,
@@ -9036,6 +9692,7 @@ export {
   markAgentCacheInitialized,
   getAgentLastFullSyncAt,
   markAgentFullSyncCompleted,
+  loadCachedSessionDataEntry,
   loadCachedSessionData,
   saveCachedSessions,
   saveCachedSessionChanges,
@@ -9068,6 +9725,7 @@ export {
   toLocalDateKey,
   startOfLocalDay,
   buildDashboard,
-  executeSessionSearch
+  executeSessionSearch,
+  matchesSessionSearchFilters
 };
-//# sourceMappingURL=chunk-VRVZJDNL.js.map
+//# sourceMappingURL=chunk-MWSJTNOW.js.map