vibe-replay 0.2.0 → 0.2.2

package/dist/index.js

@@ -40,8 +40,15 @@ function normalizeTitle(value) {
   return cleaned || void 0;
 }
 function extractToolFilePath(input) {
-  const fp = input?.file_path ?? input?.filePath ?? input?.path ?? input?.relativeWorkspacePath;
-  return typeof fp === "string" && fp.trim() ? fp : void 0;
+  return extractToolFilePaths(input)[0];
+}
+function extractToolFilePaths(input) {
+  if (!input) return [];
+  const plural2 = input.file_paths ?? input.filePaths ?? input.paths;
+  const paths = Array.isArray(plural2) ? plural2.filter((fp) => typeof fp === "string" && fp.trim().length > 0) : [];
+  const singular = input.file_path ?? input.filePath ?? input.path ?? input.relativeWorkspacePath;
+  if (typeof singular === "string" && singular.trim()) paths.unshift(singular);
+  return [...new Set(paths)];
 }
 function localDayKey(input) {
   if (input == null || input === "") return void 0;
@@ -68,13 +75,13 @@ var init_utils = __esm({
 });
 
 // src/overlays.ts
-import { readFile as readFile12 } from "fs/promises";
-import { join as join12, resolve } from "path";
+import { readFile as readFile14 } from "fs/promises";
+import { join as join13, resolve } from "path";
 async function loadOverlays(baseDir, slug) {
-  const dirs = [join12(baseDir, slug), resolve("./vibe-replay", slug)];
+  const dirs = [join13(baseDir, slug), resolve("./vibe-replay", slug)];
   for (const dir of dirs) {
     try {
-      const raw = await readFile12(join12(dir, "overlays.json"), "utf-8");
+      const raw = await readFile14(join13(dir, "overlays.json"), "utf-8");
       const parsed = JSON.parse(raw);
       if (parsed && typeof parsed === "object" && Array.isArray(parsed.overlays)) {
         return parsed;
@@ -133,9 +140,9 @@ __export(cloud_exports, {
   saveAuthTokenSync: () => saveAuthTokenSync
 });
 import { existsSync, mkdirSync, readFileSync as readFileSync2, rmSync, writeFileSync } from "fs";
-import { mkdir as mkdir3, readFile as readFile13, unlink, writeFile as writeFile3 } from "fs/promises";
-import { homedir as homedir11 } from "os";
-import { basename as basename5, dirname as dirname3, join as join13 } from "path";
+import { mkdir as mkdir3, readFile as readFile15, unlink, writeFile as writeFile3 } from "fs/promises";
+import { homedir as homedir12 } from "os";
+import { basename as basename5, dirname as dirname3, join as join14 } from "path";
 function authOrigin(url) {
   try {
     return new URL(url).origin;
@@ -225,7 +232,7 @@ function getAuthFilePath() {
   return AUTH_FILE;
 }
 function getApiUrl() {
-  return process.env.VIBE_REPLAY_API_URL || DEFAULT_API_URL;
+  return (process.env.VIBE_REPLAY_API_URL || DEFAULT_API_URL).replace(/\/$/, "");
 }
 function getSessionCookieName(apiUrl) {
   const url = apiUrl || getApiUrl();
@@ -236,8 +243,8 @@ async function publishCloud(outputDir, opts) {
   if (!auth) {
     throw new Error("Not logged in. Run `vibe-replay auth login` first.");
   }
-  const jsonPath = join13(outputDir, "replay.json");
-  const content = await readFile13(jsonPath, "utf-8");
+  const jsonPath = join14(outputDir, "replay.json");
+  const content = await readFile15(jsonPath, "utf-8");
   const replay = JSON.parse(content);
   const sizeBytes = Buffer.byteLength(content, "utf-8");
   const MAX_SIZE = 10 * 1024 * 1024;
@@ -284,8 +291,8 @@ async function publishCloudWithOverlays(outputDir, opts) {
   if (overlays.overlays.length === 0) {
     return publishCloud(outputDir, opts);
   }
-  const replayPath = join13(outputDir, "replay.json");
-  const originalContent = await readFile13(replayPath, "utf-8");
+  const replayPath = join14(outputDir, "replay.json");
+  const originalContent = await readFile15(replayPath, "utf-8");
   const session = JSON.parse(originalContent);
   const merged = sessionWithEffectiveContent(session, overlays);
   await writeFile3(replayPath, JSON.stringify(merged), "utf-8");
@@ -297,7 +304,7 @@ async function publishCloudWithOverlays(outputDir, opts) {
 }
 async function loadSavedCloudInfo(outputDir) {
   try {
-    const raw = await readFile13(join13(outputDir, CLOUD_META_FILE), "utf-8");
+    const raw = await readFile15(join14(outputDir, CLOUD_META_FILE), "utf-8");
     const parsed = JSON.parse(raw);
     if (!parsed?.id || !parsed?.url) return void 0;
     return parsed;
@@ -306,7 +313,7 @@ async function loadSavedCloudInfo(outputDir) {
   }
 }
 async function saveCloudInfo(outputDir, info) {
-  await writeFile3(join13(outputDir, CLOUD_META_FILE), JSON.stringify(info, null, 2), "utf-8");
+  await writeFile3(join14(outputDir, CLOUD_META_FILE), JSON.stringify(info, null, 2), "utf-8");
 }
 var CLOUD_META_FILE, DEFAULT_API_URL, AUTH_DIR, AUTH_FILE;
 var init_cloud = __esm({
@@ -315,8 +322,8 @@ var init_cloud = __esm({
     init_overlays();
     CLOUD_META_FILE = ".vibe-replay-cloud.json";
     DEFAULT_API_URL = "https://vibe-replay.com";
-    AUTH_DIR = join13(homedir11(), ".config", "vibe-replay");
-    AUTH_FILE = join13(AUTH_DIR, "auth.json");
+    AUTH_DIR = join14(homedir12(), ".config", "vibe-replay");
+    AUTH_FILE = join14(AUTH_DIR, "auth.json");
   }
 });
 
@@ -399,12 +406,12 @@ __export(insights_exports, {
   scanResultToInsight: () => scanResultToInsight,
   writeInsightsStore: () => writeInsightsStore
 });
-import { mkdir as mkdir4, readFile as readFile15, rename, writeFile as writeFile5 } from "fs/promises";
-import { homedir as homedir12 } from "os";
-import { dirname as dirname4, join as join15 } from "path";
+import { mkdir as mkdir4, readFile as readFile17, rename, writeFile as writeFile5 } from "fs/promises";
+import { homedir as homedir13 } from "os";
+import { dirname as dirname4, join as join16 } from "path";
 async function readInsightsStore() {
   try {
-    const raw = await readFile15(STORE_PATH, "utf-8");
+    const raw = await readFile17(STORE_PATH, "utf-8");
     const parsed = JSON.parse(raw);
     return migrateInsightsStore(parsed);
   } catch {
@@ -600,8 +607,8 @@ var init_insights = __esm({
     init_machine_id();
     init_utils();
     init_version();
-    INSIGHTS_DIR = join15(homedir12(), ".vibe-replay", "insights");
-    STORE_PATH = join15(INSIGHTS_DIR, "store.json");
+    INSIGHTS_DIR = join16(homedir13(), ".vibe-replay", "insights");
+    STORE_PATH = join16(INSIGHTS_DIR, "store.json");
   }
 });
 
@@ -834,7 +841,7 @@ function generateGitHubMarkdown(session, opts = {}) {
     }
     lines.push("");
   }
-  const risks = detectRiskSignals(session.scenes, filesChanged);
+  const risks = detectRiskSignals(session, filesChanged);
   if (risks.length > 0) {
     lines.push("**Signals:**");
     for (const risk of risks) {
@@ -967,9 +974,9 @@ function parseToolCall(scene) {
     case "View":
       return { kind: "read", file: baseName(input.file_path || input.path || "") };
     case "Edit":
-      return { kind: "edit", file: baseName(input.file_path || "") };
+      return { kind: "edit", file: baseName(firstFilePath(input) || "") };
     case "Write":
-      return { kind: "create", file: baseName(input.file_path || "") };
+      return { kind: "create", file: baseName(firstFilePath(input) || "") };
     case "Bash": {
       const cmd = (input.command || "").split("\n")[0];
       const lower = result.toLowerCase();
@@ -1040,8 +1047,9 @@ function groupActions(raw) {
   flushReads();
   return grouped;
 }
-function detectRiskSignals(scenes, filesChanged) {
+function detectRiskSignals(session, filesChanged) {
   const risks = [];
+  const { scenes } = session;
   for (const [file, count] of filesChanged) {
     if (count >= 4) {
       risks.push(`\`${file}\` modified ${count}x`);
@@ -1066,7 +1074,7 @@ function detectRiskSignals(scenes, filesChanged) {
     const resolved = testPasses > 0 ? " (resolved)" : "";
     risks.push(`${testFailures} test failure(s)${resolved}`);
   }
-  if (scenes.some((s) => s.type === "compaction-summary")) {
+  if (scenes.some((s) => s.type === "compaction-summary") || (session.meta.compactions?.length || 0) > 0) {
     risks.push("Session was compacted (very long conversation)");
   }
   return risks;
@@ -1180,6 +1188,17 @@ function stripMarkdown(s) {
 function selectKeyPhases(phases, max) {
   return phases.slice(0, max);
 }
+function buildSvgFooter(session, opts) {
+  const duration = formatDuration(session.meta.stats.durationMs);
+  const tStats = computeToolStats(session.scenes);
+  const parts = [duration];
+  if (tStats.responses > 0) parts.push(`${tStats.responses} responses`);
+  if (tStats.totalTools > 0) parts.push(`${tStats.totalTools} tools`);
+  return {
+    footerLeft: parts.filter(Boolean).join(" \xB7 "),
+    footerRight: opts.replayUrl ? "View full replay \u2192" : "vibe-replay.com"
+  };
+}
 function renderSvg(frames, session, opts = {}) {
   const N = frames.length;
   const secPerFrame = 5;
@@ -1193,13 +1212,7 @@ function renderSvg(frames, session, opts = {}) {
     const fill = i === 0 ? " animation-fill-mode: backwards;" : "";
     return `    .frame-${i} { animation: fadeInOut ${cycleDuration}s ${delay}s infinite;${fill} }`;
   }).join("\n");
-  const duration = formatDuration(session.meta.stats.durationMs);
-  const tStats = computeToolStats(session.scenes);
-  const footerParts = [duration];
-  if (tStats.responses > 0) footerParts.push(`${tStats.responses} responses`);
-  if (tStats.totalTools > 0) footerParts.push(`${tStats.totalTools} tools`);
-  const footerLeft = footerParts.filter(Boolean).join(" \xB7 ");
-  const footerRight = opts.replayUrl ? "View full replay \u2192" : "vibe-replay.com";
+  const { footerLeft, footerRight } = buildSvgFooter(session, opts);
   const framesSvg = frames.map((f, i) => renderFrame(f, i)).join("\n\n");
   return `<svg xmlns="http://www.w3.org/2000/svg" width="${SVG_W}" height="${SVG_H}" viewBox="0 0 ${SVG_W} ${SVG_H}">
   <style>
@@ -1383,13 +1396,7 @@ function renderTurnFrame(frame, _index, gAttr) {
   return parts.join("\n");
 }
 function renderStaticFrameSvg(frame, session, opts = {}) {
-  const duration = formatDuration(session.meta.stats.durationMs);
-  const tStats = computeToolStats(session.scenes);
-  const footerParts = [duration];
-  if (tStats.responses > 0) footerParts.push(`${tStats.responses} responses`);
-  if (tStats.totalTools > 0) footerParts.push(`${tStats.totalTools} tools`);
-  const footerLeft = footerParts.filter(Boolean).join(" \xB7 ");
-  const footerRight = opts.replayUrl ? "View full replay \u2192" : "vibe-replay.com";
+  const { footerLeft, footerRight } = buildSvgFooter(session, opts);
   let frameContent;
   if (frame.userPrompt != null) {
     frameContent = renderTurnFrame(frame, 0, "");
@@ -1426,8 +1433,7 @@ function collectFilesChanged(scenes) {
   for (const scene of scenes) {
     if (scene.type !== "tool-call") continue;
     if (scene.toolName === "Edit" || scene.toolName === "Write") {
-      const fp = scene.input.file_path;
-      if (fp) {
+      for (const fp of filePathsFromInput(scene.input)) {
         const name = shortPath(fp);
         files.set(name, (files.get(name) || 0) + 1);
       }
@@ -1435,6 +1441,16 @@ function collectFilesChanged(scenes) {
   }
   return files;
 }
+function firstFilePath(input) {
+  return filePathsFromInput(input)[0];
+}
+function filePathsFromInput(input) {
+  const plural2 = input.file_paths || input.filePaths || input.paths;
+  const paths = Array.isArray(plural2) ? plural2.filter((fp) => typeof fp === "string" && fp.trim().length > 0) : [];
+  const singular = input.file_path || input.filePath || input.path || input.relativeWorkspacePath;
+  if (typeof singular === "string" && singular.trim()) paths.unshift(singular);
+  return [...new Set(paths)];
+}
 function shortPath(fullPath) {
   const parts = fullPath.split("/");
   if (parts.length <= 2) return parts.join("/");
@@ -1852,13 +1868,37 @@ function estimateActiveDuration(timestamps, maxGapMs = DEFAULT_MAX_GAP_MS) {
   return active > 0 ? active : void 0;
 }
 
+// src/providers/warnings.ts
+function addParseWarning(warnings, warning) {
+  const existing = warnings.find(
+    (w) => w.kind === warning.kind && w.source === warning.source && w.message === warning.message
+  );
+  if (existing) {
+    existing.count += warning.count ?? 1;
+    return;
+  }
+  warnings.push({
+    kind: warning.kind,
+    count: warning.count ?? 1,
+    message: warning.message,
+    source: warning.source,
+    firstLine: warning.firstLine,
+    sample: warning.kind === "malformed-json" ? void 0 : warning.sample
+  });
+}
+function compactWarningSample(value, max = 160) {
+  const compacted = value.replace(/\s+/g, " ").trim();
+  if (compacted.length <= max) return compacted;
+  return `${compacted.slice(0, max)}...`;
+}
+
 // src/providers/claude-code/parser.ts
 async function parseClaudeCodeSession(filePaths) {
   const paths = Array.isArray(filePaths) ? filePaths : [filePaths];
   const allLines = [];
   for (const fp of paths) {
     const content = await readFile4(fp, "utf-8");
-    allLines.push(...content.split("\n").filter((l) => l.trim()));
+    allLines.push(...content.split("\n"));
   }
   return parseClaudeCodeLines(allLines, { subagentsSourcePath: paths[0] });
 }
@@ -1902,11 +1942,21 @@ async function parseClaudeCodeLines(lines, options = {}) {
   const toolImages = /* @__PURE__ */ new Map();
   const userTurns = [];
   const allTimestamps = [];
-  for (const line of lines) {
+  const parseWarnings = [];
+  for (let lineIndex = 0; lineIndex < lines.length; lineIndex++) {
+    const line = lines[lineIndex];
+    if (!line.trim()) continue;
     let obj;
     try {
       obj = JSON.parse(line);
     } catch {
+      addParseWarning(parseWarnings, {
+        kind: "malformed-json",
+        source: "claude-code JSONL",
+        firstLine: lineIndex + 1,
+        message: "Skipped malformed JSONL line",
+        sample: line
+      });
       continue;
     }
     if (obj.timestamp) allTimestamps.push(obj.timestamp);
@@ -2013,6 +2063,14 @@ async function parseClaudeCodeLines(lines, options = {}) {
     }
     if (!obj.message) continue;
     const { role, content: msgContent, id: msgId } = obj.message;
+    if (obj.isApiErrorMessage && obj.timestamp) {
+      const text = extractMessageText(msgContent);
+      const errorType = inferApiErrorMessageType(text);
+      apiErrors.push({
+        timestamp: obj.timestamp,
+        ...errorType ? { errorType } : {}
+      });
+    }
     if (obj.isMeta && role === "user") {
       const text = extractMessageText(msgContent);
       if (text.trim()) {
@@ -2123,7 +2181,7 @@ async function parseClaudeCodeLines(lines, options = {}) {
       }
     }
   }
-  const subAgentData = options.subagentsSourcePath ? await readSubagents(options.subagentsSourcePath, usageByMsgId) : /* @__PURE__ */ new Map();
+  const subAgentData = options.subagentsSourcePath ? await readSubagents(options.subagentsSourcePath, usageByMsgId, parseWarnings) : /* @__PURE__ */ new Map();
   const assistantTurns = [];
   for (const msgId of assistantOrder) {
     const blocks = assistantBlocks.get(msgId);
@@ -2259,7 +2317,8 @@ async function parseClaudeCodeLines(lines, options = {}) {
     mcpServersUsed: mcpServersUsed.size > 0 ? [...mcpServersUsed].sort() : void 0,
     agentName,
     worktree,
-    queueOperationStats
+    queueOperationStats,
+    parseWarnings: parseWarnings.length > 0 ? parseWarnings : void 0
   };
 }
 function extractMessageText(content) {
@@ -2269,6 +2328,13 @@ function extractMessageText(content) {
   }
   return "";
 }
+function inferApiErrorMessageType(text) {
+  const lower = text.toLowerCase();
+  if (lower.includes("rate limit")) return "rate_limit_error";
+  if (lower.includes("overloaded")) return "overloaded_error";
+  if (lower.includes("api error")) return "api_error";
+  return void 0;
+}
 function extractImages(block) {
   if (block.type !== "tool_result") return [];
   const { content } = block;
@@ -2367,16 +2433,16 @@ function buildTurnStats(finalTurns, usageByMsgId, turnDurations) {
     } else if (group.startTimestamp && group.endTimestamp) {
       durationMs = estimateActiveDuration([group.startTimestamp, group.endTimestamp]);
     }
-    const stat10 = { turnIndex: i };
-    if (turnModel) stat10.model = turnModel;
-    if (durationMs !== void 0) stat10.durationMs = durationMs;
-    if (turnTokens) stat10.tokenUsage = turnTokens;
-    if (maxContextTokens > 0) stat10.contextTokens = maxContextTokens;
-    stats.push(stat10);
+    const stat11 = { turnIndex: i };
+    if (turnModel) stat11.model = turnModel;
+    if (durationMs !== void 0) stat11.durationMs = durationMs;
+    if (turnTokens) stat11.tokenUsage = turnTokens;
+    if (maxContextTokens > 0) stat11.contextTokens = maxContextTokens;
+    stats.push(stat11);
   }
   return stats;
 }
-async function readSubagents(mainFilePath, usageByMsgId) {
+async function readSubagents(mainFilePath, usageByMsgId, parseWarnings) {
   const result = /* @__PURE__ */ new Map();
   const sessionDir = mainFilePath.replace(/\.jsonl$/, "");
   const subagentsDir = join5(sessionDir, "subagents");
@@ -2418,12 +2484,21 @@ async function readSubagents(mainFilePath, usageByMsgId) {
     const saAssistantBlocks = /* @__PURE__ */ new Map();
     const saAssistantOrder = [];
     const saAssistantTimestamps = /* @__PURE__ */ new Map();
+    let lineNumber = 0;
     for (const line of content.split("\n")) {
+      lineNumber++;
       if (!line.trim()) continue;
       let obj;
       try {
         obj = JSON.parse(line);
       } catch {
+        addParseWarning(parseWarnings, {
+          kind: "malformed-json",
+          source: "claude-code subagent JSONL",
+          firstLine: lineNumber,
+          message: "Skipped malformed subagent JSONL line",
+          sample: line
+        });
         continue;
       }
       const msg = obj?.message;
@@ -2641,6 +2716,7 @@ async function extractCoworkSessionInfo(jsonPath) {
   const timestamp = meta.lastActivityAt ? new Date(meta.lastActivityAt).toISOString() : meta.createdAt ? new Date(meta.createdAt).toISOString() : auditStat.mtime.toISOString();
   const fileSize = auditStat.size;
   const model = meta.model ? meta.model.replace(/\[[^\]]*\]$/, "") : void 0;
+  const fsDetectedFiles = Array.isArray(meta.fsDetectedFiles) ? meta.fsDetectedFiles.filter((file) => typeof file === "string") : void 0;
   const project = "Cowork";
   return {
     provider: "claude-cowork",
@@ -2659,7 +2735,13 @@ async function extractCoworkSessionInfo(jsonPath) {
     prompts,
     promptCount,
     toolCallCount,
-    model
+    model,
+    isStarred: meta.isStarred,
+    spaceId: meta.spaceId,
+    spaceIdSetBy: meta.spaceIdSetBy,
+    pluginsEnabled: meta.pluginsEnabled,
+    skillsEnabled: meta.skillsEnabled,
+    fsDetectedFiles
   };
 }
 function collectPromptsFromLines(lines, initialMessage) {
@@ -2694,11 +2776,12 @@ function collectPromptsFromLines(lines, initialMessage) {
 
 // src/providers/claude-cowork/parser.ts
 import { readFile as readFile6 } from "fs/promises";
-function normalizeCoworkLine(line) {
+function normalizeCoworkLine(line, onMalformedJson) {
   let obj;
   try {
     obj = JSON.parse(line);
   } catch {
+    onMalformedJson?.();
     return null;
   }
   if (!obj || typeof obj !== "object") return null;
@@ -2718,16 +2801,30 @@ function normalizeCoworkLine(line) {
 async function parseClaudeCoworkSession(filePaths, sessionInfo) {
   const paths = Array.isArray(filePaths) ? filePaths : [filePaths];
   const normalized = [];
+  const parseWarnings = [];
   for (const fp of paths) {
     const content = await readFile6(fp, "utf-8");
-    for (const raw of content.split("\n")) {
+    const lines = content.split("\n");
+    for (let lineIndex = 0; lineIndex < lines.length; lineIndex++) {
+      const raw = lines[lineIndex];
       const t = raw.trim();
       if (!t) continue;
-      const line = normalizeCoworkLine(t);
+      const line = normalizeCoworkLine(t, () => {
+        addParseWarning(parseWarnings, {
+          kind: "malformed-json",
+          source: "claude-cowork audit JSONL",
+          firstLine: lineIndex + 1,
+          message: "Skipped malformed JSONL line",
+          sample: t
+        });
+      });
       if (line) normalized.push(line);
     }
   }
   const result = await parseClaudeCodeLines(normalized);
+  if (parseWarnings.length > 0) {
+    result.parseWarnings = [...parseWarnings, ...result.parseWarnings || []];
+  }
   if (sessionInfo) {
     if (!result.title && sessionInfo.title) result.title = sessionInfo.title;
     if (!result.model && sessionInfo.model) result.model = sessionInfo.model;
@@ -2833,7 +2930,7 @@ var claudeDesktopProvider = {
 
 // src/providers/codex/discover.ts
 import { createReadStream as createReadStream3 } from "fs";
-import { readdir as readdir5, stat as stat4 } from "fs/promises";
+import { readFile as readFile8, readdir as readdir5, stat as stat4 } from "fs/promises";
 import { homedir as homedir7 } from "os";
 import { basename, join as join8 } from "path";
 import { createInterface as createInterface3 } from "readline";
@@ -2841,6 +2938,47 @@ init_utils();
 
 // src/providers/codex/constants.ts
 var USER_MESSAGE_BEGIN = "## My request for Codex:";
+var CODEX_CONTEXT_TAGS = [
+  "environment_context",
+  "permissions instructions",
+  "app-context",
+  "collaboration_mode",
+  "apps_instructions",
+  "skills_instructions",
+  "plugins_instructions"
+];
+function isCodexToolCallType(type) {
+  return type === "function_call" || type === "local_shell_call" || type === "custom_tool_call" || type === "tool_search_call" || type === "web_search_call" || type === "image_generation_call";
+}
+function stripUserMessagePrefix(text) {
+  const idx = text.indexOf(USER_MESSAGE_BEGIN);
+  return idx === -1 ? text : text.slice(idx + USER_MESSAGE_BEGIN.length);
+}
+function stripLeadingCodexContextBlocks(text) {
+  let remaining = text.trim();
+  let stripped = true;
+  while (stripped) {
+    stripped = false;
+    for (const tag of CODEX_CONTEXT_TAGS) {
+      const open3 = `<${tag}>`;
+      const close = `</${tag}>`;
+      if (!remaining.startsWith(open3)) continue;
+      const closeIndex = remaining.indexOf(close);
+      if (closeIndex === -1) return "";
+      remaining = remaining.slice(closeIndex + close.length).trim();
+      stripped = true;
+      break;
+    }
+  }
+  return remaining;
+}
+function codexStripTwoPass(text) {
+  let result = text;
+  for (let i = 0; i < 2; i++) {
+    result = stripUserMessagePrefix(stripLeadingCodexContextBlocks(result)).trim();
+  }
+  return result;
+}
 
 // src/providers/codex/discover.ts
 var STATE_DB_FILENAME = "state_5.sqlite";
@@ -2864,7 +3002,8 @@ async function sessionInfoFromThreadRow(row) {
   const fileStat = await stat4(row.rollout_path).catch(() => null);
   if (!fileStat?.isFile()) return null;
   const extracted = await extractCodexSessionInfo(row.rollout_path, fileStat.size);
-  const firstPrompt = cleanCodexUserMessage(row.first_user_message || extracted?.firstPrompt || "");
+  const rowFirstPrompt = row.first_user_message ? normalizeDiscoveredUserMessage(row.first_user_message) : "";
+  const firstPrompt = rowFirstPrompt || extracted?.firstPrompt || "";
   if (!firstPrompt) return extracted;
   return {
     provider: "codex",
@@ -2904,6 +3043,7 @@ async function extractCodexSessionInfo(filePath, fileSize) {
   let editCountEst = 0;
   let durationMsEst = 0;
   const prompts = [];
+  const promptSeen = /* @__PURE__ */ new Map();
   let rl;
   try {
     const input = createReadStream3(filePath, { encoding: "utf-8" });
@@ -2937,13 +3077,11 @@ async function extractCodexSessionInfo(filePath, fileSize) {
         const p = obj.payload || {};
         if (p.type === "thread_name_updated" && p.thread_name) title = p.thread_name;
         if (p.type === "user_message") {
-          const cleaned = typeof p.message === "string" ? cleanCodexUserMessage(p.message) : "";
-          const hasImages = hasUserImages(p);
-          if (cleaned.length >= 10 || hasImages) {
+          const rawText = typeof p.message === "string" ? p.message : "";
+          const cleaned = normalizeDiscoveredUserMessage(rawText);
+          const imageKey = userImageDedupeKey(p);
+          if (recordDiscoveredPrompt(promptSeen, prompts, obj.timestamp, cleaned, imageKey)) {
             promptCount++;
-            if (prompts.length < 2) {
-              prompts.push((cleaned || "[Image]").slice(0, 200));
-            }
           }
         }
         if (p.type === "exec_command_end" && typeof p.duration?.secs === "number") {
@@ -2953,7 +3091,15 @@ async function extractCodexSessionInfo(filePath, fileSize) {
       }
       if (obj.type === "response_item") {
         const p = obj.payload || {};
-        if (p.type === "function_call") {
+        if (p.type === "message" && p.role === "user") {
+          const rawText = contentText(p.content);
+          const cleaned = normalizeDiscoveredUserMessage(rawText);
+          const imageKey = contentImageDedupeKey(p.content);
+          if (recordDiscoveredPrompt(promptSeen, prompts, obj.timestamp, cleaned, imageKey)) {
+            promptCount++;
+          }
+        }
+        if (isCodexToolCallType(p.type)) {
           toolCallCount++;
           if (isEditTool(p.name)) editCountEst++;
         }
@@ -2999,7 +3145,7 @@ async function readThreadRowsFromStateDb() {
   try {
     const mod = await import("sql.js");
     const SQL = await mod.default();
-    const dbBuffer = await import("fs/promises").then((fs) => fs.readFile(stateDbPath));
+    const dbBuffer = await readFile8(stateDbPath);
     const db = new SQL.Database(dbBuffer);
     try {
       const result = db.exec(`
@@ -3062,28 +3208,74 @@ function toIsoFlexible(value) {
 function isEditTool(name) {
   return !!name && ["apply_patch", "edit", "write_file"].includes(name);
 }
-function cleanCodexUserMessage(text) {
-  const withoutPrefix = text.includes(USER_MESSAGE_BEGIN) ? text.slice(text.indexOf(USER_MESSAGE_BEGIN) + USER_MESSAGE_BEGIN.length) : text;
-  return cleanPromptText(withoutPrefix);
+function normalizeDiscoveredUserMessage(text) {
+  return cleanPromptText(codexStripTwoPass(text));
+}
+function recordDiscoveredPrompt(promptSeen, prompts, timestamp, text, imageKey) {
+  const hasImages = imageKey.length > 0;
+  if (isCodexContextMessage(text)) return false;
+  if (text.length < 10 && !hasImages) return false;
+  const key = `${text}:images:${imageKey}`;
+  const time = timestamp ? Date.parse(timestamp) : Number.NaN;
+  const previous = promptSeen.get(key) || [];
+  const isDuplicate = Number.isNaN(time) ? previous.length > 0 : previous.some((prev) => Math.abs(time - prev) <= 2e3);
+  if (isDuplicate) return false;
+  promptSeen.set(key, [...previous, Number.isNaN(time) ? Number.NEGATIVE_INFINITY : time]);
+  if (prompts.length < 2) prompts.push((text || "[Image]").slice(0, 200));
+  return true;
 }
-function hasUserImages(payload) {
-  return Array.isArray(payload.images) && payload.images.length > 0 || Array.isArray(payload.local_images) && payload.local_images.length > 0;
+function contentText(content) {
+  if (typeof content === "string") return content;
+  if (!Array.isArray(content)) return "";
+  return content.map((part) => {
+    if (typeof part === "string") return part;
+    if (part?.type === "output_text" || part?.type === "input_text" || part?.type === "text") {
+      return part.text || "";
+    }
+    return "";
+  }).filter(Boolean).join("\n");
+}
+function isCodexContextMessage(text) {
+  const trimmed = text.trim();
+  return CODEX_CONTEXT_TAGS.some((tag) => trimmed.startsWith(`<${tag}>`));
+}
+function userImageDedupeKey(payload) {
+  return [
+    ...Array.isArray(payload.images) ? payload.images : [],
+    ...Array.isArray(payload.local_images) ? payload.local_images : []
+  ].filter((image) => typeof image === "string" && image.length > 0).map(imageDedupeKey).join(",");
+}
+function contentImageDedupeKey(content) {
+  if (!Array.isArray(content)) return "";
+  return content.flatMap((part) => {
+    if (part?.type !== "input_image" && part?.type !== "image" && part?.type !== "local_image") {
+      return [];
+    }
+    const image = typeof part.image_url === "string" ? part.image_url : typeof part.image_url?.url === "string" ? part.image_url.url : typeof part.source?.data === "string" ? `data:${part.source.media_type || "image/png"};base64,${part.source.data}` : typeof part.path === "string" ? part.path : "";
+    return image ? [image] : [];
+  }).map(imageDedupeKey).join(",");
+}
+function imageDedupeKey(image) {
+  return `${image.slice(0, 64)}:${image.length}:${image.slice(-32)}`;
 }
 
 // src/providers/codex/parser.ts
 import { readFileSync } from "fs";
-import { readFile as readFile8 } from "fs/promises";
+import { readFile as readFile9 } from "fs/promises";
 import { extname } from "path";
 function asCodexTokenInfo(value) {
   if (!value || typeof value !== "object" || Array.isArray(value)) return void 0;
   return value;
 }
+function asOptionalString(value) {
+  return typeof value === "string" && value.trim() ? value : void 0;
+}
 async function parseCodexSession(filePaths, sessionInfo) {
   const paths = Array.isArray(filePaths) ? filePaths : [filePaths];
   const lines = [];
   for (const fp of paths) {
-    const content = await readFile8(fp, "utf-8");
-    lines.push(...content.split("\n").filter((l) => l.trim()));
+    const content = await readFile9(fp, "utf-8");
+    lines.push(...content.split("\n"));
   }
   return parseCodexLines(lines, sessionInfo, paths);
 }
@@ -3099,20 +3291,34 @@ function parseCodexLines(lines, sessionInfo, sourcePaths = []) {
   let entrypoint;
   let permissionMode;
   let approvalPolicy;
+  let memoryMode;
   const turns = [];
   const allTimestamps = [];
   const compactions = [];
   const tools = /* @__PURE__ */ new Map();
   const toolResults = /* @__PURE__ */ new Map();
   const tokenSnapshots = [];
+  const taskDurations = [];
   const mcpServersUsed = /* @__PURE__ */ new Set();
   const skillsUsed = /* @__PURE__ */ new Set();
   const gitBranches = [];
-  for (const line of lines) {
+  const seenUserMessages = /* @__PURE__ */ new Map();
+  const seenAssistantMessages = /* @__PURE__ */ new Map();
+  const parseWarnings = [];
+  for (let lineIndex = 0; lineIndex < lines.length; lineIndex++) {
+    const line = lines[lineIndex];
+    if (!line.trim()) continue;
     let obj;
     try {
       obj = JSON.parse(line);
     } catch {
+      addParseWarning(parseWarnings, {
+        kind: "malformed-json",
+        source: "codex JSONL",
+        firstLine: lineIndex + 1,
+        message: "Skipped malformed JSONL line",
+        sample: line
+      });
       continue;
     }
     if (obj.timestamp) {
@@ -3129,6 +3335,7 @@ function parseCodexLines(lines, sessionInfo, sourcePaths = []) {
       gitBranch = gitBranch || p2.git?.branch || p2.git_branch;
       if (gitBranch) pushUnique(gitBranches, gitBranch);
       entrypoint = entrypoint || p2.originator || p2.source;
+      memoryMode = memoryMode || asOptionalString(p2.memory_mode);
       continue;
     }
     if (obj.type === "turn_context") {
@@ -3146,11 +3353,27 @@ function parseCodexLines(lines, sessionInfo, sourcePaths = []) {
       }
       if (p2.type === "user_message") {
         const blocks = userMessageBlocks(p2);
-        if (blocks.length > 0) {
-          turns.push({ role: "user", timestamp: obj.timestamp, blocks });
+        const text = textFromBlocks(blocks);
+        if (blocks.length > 0 && shouldRecordMessage(seenUserMessages, obj.timestamp, blocks)) {
+          turns.push({
+            role: "user",
+            ...isCompactionSummaryText(text) ? { subtype: "compaction-summary" } : {},
+            timestamp: obj.timestamp,
+            blocks
+          });
         }
         continue;
       }
+      if (p2.type === "agent_message" && typeof p2.message === "string" && p2.message.trim().length > 0) {
+        const blocks = [{ type: "text", text: p2.message }];
+        if (!shouldRecordMessage(seenAssistantMessages, obj.timestamp, blocks)) continue;
+        turns.push({
+          role: "assistant",
+          timestamp: obj.timestamp,
+          blocks
+        });
+        continue;
+      }
       if (p2.type === "agent_reasoning" && typeof p2.text === "string" && p2.text.trim()) {
         turns.push({
           role: "assistant",
@@ -3160,7 +3383,7 @@ function parseCodexLines(lines, sessionInfo, sourcePaths = []) {
         continue;
       }
       if (p2.type === "exec_command_end" && p2.call_id) {
-        toolResults.set(p2.call_id, {
+        mergeToolResult(toolResults, p2.call_id, {
           result: formatExecResult(p2),
           isError: typeof p2.exit_code === "number" ? p2.exit_code !== 0 : void 0,
           timestamp: obj.timestamp,
@@ -3172,12 +3395,34 @@ function parseCodexLines(lines, sessionInfo, sourcePaths = []) {
         tokenSnapshots.push({
           timestamp: obj.timestamp,
           total: asCodexTokenInfo(p2.info?.total_token_usage),
-          last: asCodexTokenInfo(p2.info?.last_token_usage)
+          last: asCodexTokenInfo(p2.info?.last_token_usage),
+          contextLimit: typeof p2.info?.model_context_window === "number" ? p2.info.model_context_window : void 0
+        });
+        continue;
+      }
+      if (p2.type === "task_complete" && typeof p2.duration_ms === "number") {
+        if (p2.duration_ms > 0) taskDurations.push(p2.duration_ms);
+        continue;
+      }
+      if (p2.type === "context_compacted") {
+        recordCompaction(compactions, obj.timestamp || "", "codex-context");
+        continue;
+      }
+      if (p2.type === "patch_apply_end" && p2.call_id) {
+        const tool = tools.get(p2.call_id);
+        const changedFiles = patchApplyChangedFiles(p2);
+        if (tool && changedFiles.length > 0) {
+          tool.input = mergeToolFilePaths(tool.input, changedFiles);
+        }
+        mergeToolResult(toolResults, p2.call_id, {
+          result: formatPatchApplyResult(p2),
+          isError: typeof p2.success === "boolean" ? !p2.success : void 0,
+          timestamp: obj.timestamp
         });
         continue;
       }
-      if (p2.type === "web_search_end" && p2.query) {
-        const callId = p2.call_id || `web_search:${obj.timestamp}`;
+      if (p2.type === "web_search_end") {
+        const callId = (p2.call_id && tools.has(p2.call_id) ? p2.call_id : void 0) || findWebSearchToolId(tools, toolResults, p2, obj.timestamp) || p2.call_id || `web_search:${obj.timestamp}`;
         if (!tools.has(callId)) {
           tools.set(callId, {
             id: callId,
@@ -3186,31 +3431,84 @@ function parseCodexLines(lines, sessionInfo, sourcePaths = []) {
             timestamp: obj.timestamp
           });
         }
-        toolResults.set(callId, {
-          result: `[Search: ${typeof p2.query === "string" ? p2.query : JSON.stringify(p2.query)}]`,
+        mergeToolResult(toolResults, callId, {
+          result: formatWebSearchResult(p2),
           timestamp: obj.timestamp
         });
       }
+      if (p2.type === "mcp_tool_call_end" && p2.call_id) {
+        const invocation = p2.invocation || {};
+        const server = typeof invocation.server === "string" ? invocation.server : "";
+        const toolName = typeof invocation.tool === "string" ? invocation.tool : "";
+        const tool = tools.get(p2.call_id);
+        if (tool && server && toolName) {
+          tool.name = `mcp__${server}__${toolName}`;
+          mcpServersUsed.add(server);
+        }
+        mergeToolResult(toolResults, p2.call_id, {
+          result: formatMcpToolResult(p2),
+          isError: isMcpToolError(p2),
+          timestamp: obj.timestamp,
+          durationMs: durationToMs(p2.duration)
+        });
+      }
+      continue;
+    }
+    if (obj.type === "compacted") {
+      recordCompaction(compactions, obj.timestamp || "", "codex");
+      const text = compactedSummaryText(obj.payload);
+      if (text) {
+        turns.push({
+          role: "user",
+          subtype: "compaction-summary",
+          timestamp: obj.timestamp,
+          blocks: [{ type: "text", text }]
+        });
+      }
       continue;
     }
     if (obj.type !== "response_item") continue;
     const p = obj.payload || {};
+    if (p.type === "message" && p.role === "developer") {
+      const text = contentText2(p.content);
+      if (text.trim()) {
+        turns.push({
+          role: "user",
+          subtype: "context-injection",
+          timestamp: obj.timestamp,
+          blocks: [{ type: "text", text }]
+        });
+      }
+      continue;
+    }
+    if (p.type === "message" && p.role === "user") {
+      const blocks = userMessageBlocksFromContent(p.content);
+      const text = textFromBlocks(blocks);
+      if (blocks.length > 0 && shouldRecordMessage(seenUserMessages, obj.timestamp, blocks)) {
+        turns.push({
+          role: "user",
+          ...isCompactionSummaryText(text) ? { subtype: "compaction-summary" } : {},
+          timestamp: obj.timestamp,
+          blocks
+        });
+      }
+      continue;
+    }
     if (p.type === "message" && p.role === "assistant") {
-      const text = contentText(p.content);
+      const text = contentText2(p.content);
       if (text.trim()) {
+        const blocks = [{ type: "text", text }];
+        if (!shouldRecordMessage(seenAssistantMessages, obj.timestamp, blocks)) continue;
         turns.push({
           role: "assistant",
           timestamp: obj.timestamp,
-          blocks: [{ type: "text", text }]
+          blocks
         });
       }
       continue;
     }
     if (p.type === "compaction") {
-      compactions.push({
-        timestamp: obj.timestamp || "",
-        trigger: "codex"
-      });
+      recordCompaction(compactions, obj.timestamp || "", "codex");
       continue;
     }
     if (p.type === "reasoning") {
@@ -3224,8 +3522,9 @@ function parseCodexLines(lines, sessionInfo, sourcePaths = []) {
       }
       continue;
     }
-    if (p.type === "function_call" || p.type === "local_shell_call" || p.type === "custom_tool_call" || p.type === "tool_search_call" || p.type === "web_search_call" || p.type === "image_generation_call") {
-      const callId = p.call_id || p.id || `${p.type}:${obj.timestamp}:${tools.size}`;
+    if (isCodexToolCallType(p.type)) {
+      const existingWebSearchId = p.type === "web_search_call" && !p.call_id && !p.id ? findWebSearchToolId(tools, toolResults, p, obj.timestamp, { includeResolved: true }) : void 0;
+      const callId = p.call_id || p.id || existingWebSearchId || `${p.type}:${obj.timestamp}:${tools.size}`;
       const name = p.name || normalizeCodexToolName(p.type);
       const input = inputForResponseItem(p);
       tools.set(callId, { id: callId, name, input, timestamp: obj.timestamp });
@@ -3238,10 +3537,15 @@ function parseCodexLines(lines, sessionInfo, sourcePaths = []) {
     }
     if (p.type === "function_call_output" || p.type === "custom_tool_call_output" || p.type === "tool_search_output") {
       if (p.call_id) {
-        toolResults.set(p.call_id, {
-          result: formatOutputPayload(p),
-          timestamp: obj.timestamp
-        });
+        mergeToolResult(
+          toolResults,
+          p.call_id,
+          {
+            result: formatOutputPayload(p),
+            timestamp: obj.timestamp
+          },
+          { preferExistingResult: true }
+        );
       }
       continue;
     }
@@ -3266,10 +3570,14 @@ function parseCodexLines(lines, sessionInfo, sourcePaths = []) {
   }
   turns.sort((a, b) => (a.timestamp || "").localeCompare(b.timestamp || ""));
   const tokenUsage = tokenUsageFromSnapshots(tokenSnapshots);
+  const contextLimit = [...tokenSnapshots].toReversed().find((s) => s.contextLimit)?.contextLimit;
   const tokenUsageByModel = tokenUsage && model ? {
     [model]: tokenUsage
   } : void 0;
-  const turnStats = buildCodexTurnStats(turns, tokenSnapshots, model);
+  const turnStats = buildCodexTurnStats(turns, tokenSnapshots, taskDurations, model);
+  const summedTaskDurationMs = taskDurations.reduce((sum, duration) => sum + duration, 0);
+  const userPromptTurnCount = turns.filter((turn) => turn.role === "user" && !turn.subtype).length;
+  const completeTaskDurationMs = userPromptTurnCount > 0 && taskDurations.length >= userPromptTurnCount ? summedTaskDurationMs : void 0;
   return {
     sessionId,
     slug: slug || sessionId.slice(0, 8),
@@ -3278,16 +3586,18 @@ function parseCodexLines(lines, sessionInfo, sourcePaths = []) {
     model,
     startTime,
     endTime,
-    totalDurationMs: estimateActiveDuration(allTimestamps),
+    totalDurationMs: completeTaskDurationMs || estimateActiveDuration(allTimestamps),
     turns,
     tokenUsage,
     tokenUsageByModel,
     compactions: compactions.length > 0 ? compactions : void 0,
     turnStats: turnStats.length > 0 ? turnStats : void 0,
+    contextLimit,
     gitBranch,
     gitBranches: gitBranches.length > 1 ? gitBranches : void 0,
     entrypoint,
     permissionMode: approvalPolicy || permissionMode,
+    memoryMode,
     skillsUsed: skillsUsed.size > 0 ? [...skillsUsed].sort() : void 0,
     mcpServersUsed: mcpServersUsed.size > 0 ? [...mcpServersUsed].sort() : void 0,
     dataSource: "jsonl",
@@ -3296,12 +3606,13 @@ function parseCodexLines(lines, sessionInfo, sourcePaths = []) {
       sources: ["~/.codex/state_5.sqlite", "~/.codex/sessions"],
       supplements: sourcePaths,
       notes: ["Discovered from Codex state and parsed from rollout JSONL (local beta)."]
-    }
+    },
+    parseWarnings: parseWarnings.length > 0 ? parseWarnings : void 0
   };
 }
 function userMessageBlocks(payload) {
   const blocks = [];
-  const text = typeof payload.message === "string" ? stripUserMessagePrefix(payload.message).trim() : "";
+  const text = typeof payload.message === "string" ? normalizeUserMessageText(payload.message) : "";
   if (text) blocks.push({ type: "text", text });
   const imageUrls = [...Array.isArray(payload.images) ? payload.images : []].filter(
     (v) => typeof v === "string" && v.trim()
@@ -3311,7 +3622,42 @@ function userMessageBlocks(payload) {
   if (imageUrls.length > 0) blocks.push({ type: "_user_images", images: imageUrls });
   return blocks;
 }
-function contentText(content) {
+function userMessageBlocksFromContent(content) {
+  const blocks = [];
+  const text = normalizeUserMessageText(contentText2(content));
+  if (text) blocks.push({ type: "text", text });
+  const images = contentImages(content);
+  if (images.length > 0) blocks.push({ type: "_user_images", images });
+  return blocks;
+}
+function textFromBlocks(blocks) {
+  return blocks.filter((block) => block.type === "text").map((block) => block.text || "").join("\n").trim();
+}
+function shouldRecordMessage(seen, timestamp, blocks) {
+  const key = messageDedupeKey(blocks);
+  const time = timestamp ? Date.parse(timestamp) : Number.NaN;
+  const previous = seen.get(key) || [];
+  const isDuplicate = Number.isNaN(time) ? previous.length > 0 : previous.some((prev) => Math.abs(time - prev) <= 2e3);
+  if (isDuplicate) return false;
+  seen.set(key, [...previous, Number.isNaN(time) ? Number.NEGATIVE_INFINITY : time]);
+  return true;
+}
+function messageDedupeKey(blocks) {
+  return blocks.map((block) => {
+    if (block.type === "text") return `text:${block.text || ""}`;
+    if (block.type === "_user_images") {
+      return `images:${block.images.map(imageDedupeKey2).join(",")}`;
+    }
+    return `block:${block.type}`;
+  }).join("|");
+}
+function imageDedupeKey2(image) {
+  return `${image.slice(0, 64)}:${image.length}:${image.slice(-32)}`;
+}
+function isCompactionSummaryText(text) {
+  return text.startsWith("This session is being continued from a previous conversation");
+}
+function contentText2(content) {
   if (typeof content === "string") return content;
   if (!Array.isArray(content)) return "";
   return content.map((part) => {
@@ -3322,10 +3668,22 @@ function contentText(content) {
     return "";
   }).filter(Boolean).join("\n");
 }
+function contentImages(content) {
+  if (!Array.isArray(content)) return [];
+  const images = [];
+  for (const part of content) {
+    if (part?.type !== "input_image" && part?.type !== "image" && part?.type !== "local_image") {
+      continue;
+    }
+    const imageUrl = typeof part.image_url === "string" ? part.image_url : typeof part.image_url?.url === "string" ? part.image_url.url : typeof part.source?.data === "string" ? `data:${part.source.media_type || "image/png"};base64,${part.source.data}` : typeof part.path === "string" ? localImageToDataUrl(part.path) || "" : "";
+    if (imageUrl) images.push(imageUrl);
+  }
+  return images;
+}
 function reasoningText(payload) {
   if (typeof payload.content === "string") return payload.content;
-  if (Array.isArray(payload.content)) return contentText(payload.content);
-  if (Array.isArray(payload.summary)) return contentText(payload.summary);
+  if (Array.isArray(payload.content)) return contentText2(payload.content);
+  if (Array.isArray(payload.summary)) return contentText2(payload.summary);
   return "";
 }
 function parseArguments(value) {
@@ -3356,6 +3714,20 @@ function inputForResponseItem(payload) {
   }
   return parseArguments(payload.arguments ?? payload.action ?? {});
 }
+function patchApplyChangedFiles(payload) {
+  const changes = payload?.changes;
+  if (!changes || typeof changes !== "object" || Array.isArray(changes)) return [];
+  return Object.keys(changes).filter((file) => file.trim().length > 0);
+}
+function mergeToolFilePaths(input, filePaths) {
+  const unique = [...new Set(filePaths)];
+  if (unique.length === 0) return input;
+  return {
+    ...input,
+    file_paths: unique,
+    ...input.file_path || unique.length !== 1 ? {} : { file_path: unique[0] }
+  };
+}
 function localShellActionInput(action) {
   const command = Array.isArray(action?.command) ? action.command.map(String).join(" ") : typeof action?.command === "string" ? action.command : "";
   return {
@@ -3393,6 +3765,27 @@ function formatExecResult(payload) {
   const exit = typeof payload.exit_code === "number" ? `Exit code: ${payload.exit_code}` : "";
   return [output, status, exit].filter(Boolean).join("\n");
 }
+function formatPatchApplyResult(payload) {
+  const status = payload.status ? `Status: ${payload.status}` : "";
+  const stdout = payload.stdout || "";
+  const stderr = payload.stderr || "";
+  const files = patchApplyChangedFiles(payload);
+  const changed = files.length > 0 ? `Changed files:
+${files.map((file) => `- ${file}`).join("\n")}` : "";
+  return [stdout, stderr, status, changed].filter(Boolean).join("\n");
+}
+function formatWebSearchResult(payload) {
+  if (typeof payload.query === "string" && payload.query.trim()) {
+    return `[Search: ${payload.query}]`;
+  }
+  const action = payload.action || {};
+  if (typeof action.url === "string" && action.url.trim()) return `[Open: ${action.url}]`;
+  if (typeof action.pattern === "string" && action.pattern.trim())
+    return `[Find: ${action.pattern}]`;
+  if (typeof action.query === "string" && action.query.trim()) return `[Search: ${action.query}]`;
+  if (typeof action.type === "string" && action.type.trim()) return `[Web search: ${action.type}]`;
+  return "[Web search]";
+}
 function formatOutputPayload(payload) {
   if (typeof payload.output === "string") return payload.output;
   if (Array.isArray(payload.output)) return formatContentItems(payload.output);
@@ -3400,6 +3793,81 @@ function formatOutputPayload(payload) {
   if (payload.action) return JSON.stringify(payload.action, null, 2);
   return JSON.stringify(payload);
 }
+function mergeToolResult(toolResults, callId, next, options = {}) {
+  const previous = toolResults.get(callId);
+  if (!previous) {
+    toolResults.set(callId, next);
+    return;
+  }
+  toolResults.set(callId, {
+    result: options.preferExistingResult && previous.result ? previous.result : next.result || previous.result,
+    isError: next.isError ?? previous.isError,
+    timestamp: next.timestamp || previous.timestamp,
+    durationMs: next.durationMs ?? previous.durationMs
+  });
+}
+function formatMcpToolResult(payload) {
+  const result = payload.result?.Ok ?? payload.result?.Err ?? payload.result;
+  if (result?.content) return formatContentItems(result.content);
+  if (typeof result === "string") return result;
+  return result ? JSON.stringify(result, null, 2) : "";
+}
+function isMcpToolError(payload) {
+  return Boolean(
+    payload.isError || payload.is_error || payload.result?.Err || payload.result?.isError
+  );
+}
+function findWebSearchToolId(tools, toolResults, payload, timestamp, options = {}) {
+  for (const tool of tools.values()) {
+    if (tool.name !== "web_search") continue;
+    if (!options.includeResolved && toolResults.has(tool.id)) continue;
+    if (!sameWebSearchAction(tool.input, payload.action || { query: payload.query })) continue;
+    if (!timestamp || !tool.timestamp) return tool.id;
+    const diff = Math.abs(Date.parse(timestamp) - Date.parse(tool.timestamp));
+    if (!Number.isFinite(diff) || diff <= 5e3) return tool.id;
+  }
+  return void 0;
+}
+function sameWebSearchAction(a, b) {
+  try {
+    return stableStringify(a || {}) === stableStringify(b || {});
+  } catch {
+    return false;
+  }
+}
+function stableStringify(value) {
+  return JSON.stringify(stableNormalize(value));
+}
+function stableNormalize(value) {
+  if (Array.isArray(value)) return value.map(stableNormalize);
+  if (!value || typeof value !== "object") return value;
+  return Object.fromEntries(
+    Object.entries(value).sort(([a], [b]) => a.localeCompare(b)).map(([key, nested]) => [key, stableNormalize(nested)])
+  );
+}
+function compactedSummaryText(payload) {
+  if (typeof payload?.message === "string" && payload.message.trim()) return payload.message.trim();
+  return "";
+}
+function recordCompaction(compactions, timestamp, trigger) {
+  const time = Date.parse(timestamp);
+  const duplicateIndex = compactions.findIndex((compaction) => {
+    const previous = Date.parse(compaction.timestamp);
+    return Number.isFinite(time) && Number.isFinite(previous) ? Math.abs(time - previous) <= 2e3 : compaction.timestamp === timestamp;
+  });
+  if (duplicateIndex >= 0) {
+    if (compactionPriority(trigger) > compactionPriority(compactions[duplicateIndex].trigger)) {
+      compactions[duplicateIndex] = { ...compactions[duplicateIndex], trigger };
+    }
+    return;
+  }
+  compactions.push({ timestamp, trigger });
+}
+function compactionPriority(trigger) {
+  if (trigger === "codex-context") return 2;
+  if (trigger === "codex") return 1;
+  return 0;
+}
 function formatContentItems(items) {
   return items.map((item) => {
     if (item?.type === "input_text" || item?.type === "output_text" || item?.type === "text") {
@@ -3428,41 +3896,43 @@ function tokenUsageFromSnapshots(snapshots) {
     cacheReadTokens: cached
   };
 }
-function buildCodexTurnStats(turns, snapshots, model) {
-  const userTurns = turns.filter((t) => t.role === "user");
+function buildCodexTurnStats(turns, snapshots, taskDurations, model) {
+  const userTurns = turns.filter((t) => t.role === "user" && !t.subtype);
   const usable = snapshots.filter((s) => s.last);
   return userTurns.map((turn, i) => {
     const usage = usable[i]?.last;
-    const stat10 = { turnIndex: i };
-    if (model) stat10.model = model;
+    const stat11 = { turnIndex: i };
+    if (model) stat11.model = model;
     if (usage) {
       const input = usage.input_tokens || 0;
       const cached = usage.cached_input_tokens || 0;
-      stat10.tokenUsage = {
+      stat11.tokenUsage = {
         inputTokens: Math.max(0, input - cached),
         outputTokens: usage.output_tokens || 0,
         cacheCreationTokens: 0,
         cacheReadTokens: cached
       };
-      stat10.contextTokens = input;
+      stat11.contextTokens = input;
     }
     const nextUser = userTurns[i + 1]?.timestamp;
-    if (turn.timestamp) {
+    const taskDuration = taskDurations[i];
+    if (typeof taskDuration === "number" && taskDuration > 0) {
+      stat11.durationMs = taskDuration;
+    } else if (turn.timestamp) {
       const end = nextUser || usable[i]?.timestamp;
       if (end) {
         const diff = Date.parse(end) - Date.parse(turn.timestamp);
-        if (diff > 0 && diff < 12 * 60 * 60 * 1e3) stat10.durationMs = diff;
+        if (diff > 0 && diff < 12 * 60 * 60 * 1e3) stat11.durationMs = diff;
       }
     }
-    return stat10;
+    return stat11;
   });
 }
 function pushUnique(items, value) {
   if (items.length === 0 || items[items.length - 1] !== value) items.push(value);
 }
-function stripUserMessagePrefix(text) {
-  const idx = text.indexOf(USER_MESSAGE_BEGIN);
-  return idx === -1 ? text : text.slice(idx + USER_MESSAGE_BEGIN.length);
+function normalizeUserMessageText(text) {
+  return codexStripTwoPass(text);
 }
 function localImageToDataUrl(path) {
   try {
@@ -3499,16 +3969,16 @@ var codexProvider = {
 
 // src/providers/cursor/discover.ts
 init_utils();
-import { readdir as readdir7, readFile as readFile10, stat as stat6 } from "fs/promises";
-import { homedir as homedir9 } from "os";
-import { basename as basename3, join as join10 } from "path";
+import { readdir as readdir8, readFile as readFile12, stat as stat7 } from "fs/promises";
+import { homedir as homedir10 } from "os";
+import { basename as basename3, join as join11 } from "path";
 
 // src/providers/cursor/sqlite-reader.ts
 import { createHash } from "crypto";
 import { execFile } from "child_process";
-import { readdir as readdir6, readFile as readFile9, stat as stat5 } from "fs/promises";
+import { readdir as readdir6, readFile as readFile10, stat as stat5 } from "fs/promises";
 import { homedir as homedir8 } from "os";
-import { basename as basename2, dirname as dirname2, join as join9 } from "path";
+import { basename as basename2, dirname as dirname2, join as join9, posix } from "path";
 import { promisify } from "util";
 init_utils();
 
@@ -3589,6 +4059,7 @@ var MAX_CURSOR_REQUEST_CONTEXT_ROWS = 500;
 var SQLITE_CLI_MAX_BUFFER = 256 * 1024 * 1024;
 var SQLITE_CLI_QUERY_TIMEOUT_MS = 12e4;
 var MAX_CURSOR_GLOBAL_STATE_TOOL_RESULT_CHARS = 1e4;
+var GLOBAL_STATE_BUBBLE_KEY_CHUNK_SIZE = 200;
 var execFileAsync = promisify(execFile);
 function createRetryableInit(factory) {
   let promise = null;
@@ -3616,7 +4087,7 @@ function closeCachedSqlJsDb() {
 }
 var cachedStoreDbIndex = null;
 var resolvedProjectRootCache = /* @__PURE__ */ new Map();
-var GLOBAL_STATE_DISCOVERY_CACHE_PREFIX = "cursor-global-state-discovery-v3";
+var GLOBAL_STATE_DISCOVERY_CACHE_PREFIX = "cursor-global-state-discovery-v4";
 function workspaceHash(absolutePath) {
   return createHash("md5").update(absolutePath).digest("hex");
 }
@@ -3656,10 +4127,21 @@ async function globalStateWalFingerprint(dbPath) {
 function sqlString(value) {
   return `'${value.replaceAll("'", "''")}'`;
 }
-function sqlLikePrefix(prefix) {
-  return sqlString(
-    `${prefix.replaceAll("\\", "\\\\").replaceAll("%", "\\%").replaceAll("_", "\\_")}%`
-  );
+function nextStringPrefix(prefix) {
+  if (!prefix) return null;
+  const chars = [...prefix];
+  const last = chars.pop();
+  if (!last) return null;
+  const codePoint = last.codePointAt(0);
+  if (codePoint === void 0 || codePoint >= 1114111) return null;
+  const next = codePoint + 1;
+  if (next >= 55296 && next <= 57343) return null;
+  return `${chars.join("")}${String.fromCodePoint(next)}`;
+}
+function sqlKeyPrefixRange(prefix, column = "key") {
+  const upperBound = nextStringPrefix(prefix);
+  if (!upperBound) return `${column} >= ${sqlString(prefix)}`;
+  return `${column} >= ${sqlString(prefix)} AND ${column} < ${sqlString(upperBound)}`;
 }
 function projectedCursorBubbleSelectSql() {
   const value = "value";
@@ -3696,6 +4178,41 @@ function projectedCursorBubbleSelectSql() {
     `json_extract(${value}, '$.recentlyViewedFiles') AS recentlyViewedFiles`
   ].join(", ");
 }
+function replayableGlobalStateBubblePredicateSql(valueExpr) {
+  const nonEmptyText = (path) => `(json_type(${valueExpr}, ${sqlString(path)}) = 'text' AND length(trim(COALESCE(json_extract(${valueExpr}, ${sqlString(
+    path
+  )}), ''))) > 0)`;
+  return [
+    nonEmptyText("$.text"),
+    nonEmptyText("$.thinking"),
+    nonEmptyText("$.thinking.text"),
+    nonEmptyText("$.toolFormerData.name")
+  ].join(" OR ");
+}
+function replayableGlobalStateBubbleCountSql(composerValueExpr, composerKeyExpr) {
+  const inlineBubblePredicate = replayableGlobalStateBubblePredicateSql("conversation.value");
+  const referencedBubblePredicate = replayableGlobalStateBubblePredicateSql("bubble.value");
+  return [
+    "COALESCE((",
+    "SELECT COUNT(*) FROM json_each(",
+    composerValueExpr,
+    ", '$.conversation') AS conversation",
+    " WHERE json_type(conversation.value) = 'object' AND (",
+    inlineBubblePredicate,
+    ")",
+    "), 0) + COALESCE((",
+    "SELECT COUNT(*) FROM json_each(",
+    composerValueExpr,
+    ", '$.fullConversationHeadersOnly') AS header",
+    " JOIN cursorDiskKV AS bubble ON bubble.key = 'bubbleId:' || substr(",
+    composerKeyExpr,
+    ", length('composerData:') + 1) || ':' || json_extract(header.value, '$.bubbleId')",
+    " WHERE json_valid(bubble.value) AND (",
+    referencedBubblePredicate,
+    ")",
+    "), 0)"
+  ].join("");
+}
 var SQLITE_CLI_NEGATIVE_CACHE_TTL_MS = 3e4;
 var sqliteCliUsabilityCache = /* @__PURE__ */ new Map();
 async function canUseSqliteCli(dbPath) {
@@ -3728,6 +4245,13 @@ async function querySqliteCli(dbPath, sql) {
   if (!trimmed) return [];
   return JSON.parse(trimmed);
 }
+async function querySqliteCliText(dbPath, sql) {
+  const { stdout } = await execFileAsync("sqlite3", ["-readonly", dbPath, sql], {
+    maxBuffer: SQLITE_CLI_MAX_BUFFER,
+    timeout: SQLITE_CLI_QUERY_TIMEOUT_MS
+  });
+  return stdout.replace(/\r?\n$/, "");
+}
 function sqlJsRows(db, sql) {
   const result = db.exec(sql);
   if (!result.length) return [];
@@ -3746,6 +4270,21 @@ async function queryGlobalStateRows(globalStateDb, sql) {
   }
   return sqlJsRows(globalStateDb.db, sql);
 }
+async function queryGlobalStateTextValue(globalStateDb, key) {
+  if (globalStateDb.backend === "sqlite-cli") {
+    const value = await querySqliteCliText(
+      globalStateDb.dbPath,
+      `SELECT CAST(value AS TEXT) FROM cursorDiskKV WHERE key = ${sqlString(key)} LIMIT 1`
+    );
+    return value || null;
+  }
+  const rows = sqlJsRows(
+    globalStateDb.db,
+    `SELECT value FROM cursorDiskKV WHERE key = ${sqlString(key)} LIMIT 1`
+  );
+  if (rows.length === 0) return null;
+  return valueToString(rows[0].value) || null;
+}
 async function openGlobalStateDb() {
   const dbPath = await findGlobalStateDb();
   if (!dbPath) return null;
@@ -3772,7 +4311,7 @@ async function openGlobalStateDb() {
   } catch {
     return null;
   }
-  const dbBuffer = await readFile9(dbPath).catch(() => null);
+  const dbBuffer = await readFile10(dbPath).catch(() => null);
   if (!dbBuffer) return null;
   const db = new SQL.Database(dbBuffer);
   closeCachedSqlJsDb();
@@ -3867,6 +4406,110 @@ async function resolveCursorLiveWatchPaths(sessionId) {
   }
   return [...paths];
 }
+async function readCursorLiveDiagnostics(sessionId) {
+  const globalStateDb = await openGlobalStateDb();
+  if (!globalStateDb || !await hasGlobalStateSession(globalStateDb, sessionId)) return null;
+  const rawComposer = await queryGlobalStateTextValue(globalStateDb, `composerData:${sessionId}`);
+  const composer = parseJson(rawComposer || "");
+  if (!composer) return null;
+  const headerBubbleIds = Array.isArray(composer.fullConversationHeadersOnly) ? composer.fullConversationHeadersOnly.map(
+    (header) => header && typeof header === "object" && typeof header.bubbleId === "string" ? header.bubbleId : ""
+  ).filter(Boolean) : Array.isArray(composer.conversation) ? composer.conversation.map(
+    (item) => item && typeof item === "object" && typeof item.bubbleId === "string" ? item.bubbleId : ""
+  ).filter(Boolean) : [];
+  const latestBubbleId = headerBubbleIds[headerBubbleIds.length - 1];
+  const bubbleRows = [];
+  const bubbleKeys = headerBubbleIds.map((bubbleId) => `bubbleId:${sessionId}:${bubbleId}`);
+  for (let i = 0; i < bubbleKeys.length; i += GLOBAL_STATE_BUBBLE_KEY_CHUNK_SIZE) {
+    const chunk = bubbleKeys.slice(i, i + GLOBAL_STATE_BUBBLE_KEY_CHUNK_SIZE);
+    bubbleRows.push(
+      ...await queryGlobalStateRows(
+        globalStateDb,
+        [
+          "SELECT",
+          "key,",
+          "length(value) AS bytes,",
+          "json_extract(value,'$.type') AS type,",
+          "json_extract(value,'$.text') AS text,",
+          "json_extract(value,'$.createdAt') AS createdAt,",
+          "json_extract(value,'$.lastUpdatedAt') AS lastUpdatedAt,",
+          "json_extract(value,'$.toolFormerData.name') AS toolName,",
+          "json_extract(value,'$.toolFormerData.result') IS NOT NULL AS toolHasResult,",
+          "length(json_extract(value,'$.toolFormerData.result')) AS toolResultLength",
+          "FROM cursorDiskKV",
+          `WHERE key IN (${chunk.map(sqlString).join(",")}) AND json_valid(value)`
+        ].join(" ")
+      )
+    );
+  }
+  const bubbleRowsByKey = new Map(bubbleRows.map((row) => [valueToString(row.key), row]));
+  const latest = latestBubbleId ? bubbleRowsByKey.get(`bubbleId:${sessionId}:${latestBubbleId}`) || {} : {};
+  const latestToolName = valueToString(latest.toolName).trim();
+  let toolCallCount = 0;
+  let toolResultCount = 0;
+  let pendingToolCount = 0;
+  let maxBubbleBytes = 0;
+  let totalBubbleBytes = 0;
+  for (const row of bubbleRows) {
+    const bytes = toNonNegativeInt(row.bytes);
+    maxBubbleBytes = Math.max(maxBubbleBytes, bytes);
+    totalBubbleBytes += bytes;
+    if (!valueToString(row.toolName)) continue;
+    toolCallCount++;
+    if (Number(row.toolHasResult)) {
+      toolResultCount++;
+    } else {
+      pendingToolCount++;
+    }
+  }
+  const wal = await globalStateWalFingerprint(globalStateDb.dbPath);
+  const diagnostics = {
+    source: "global-state",
+    probedAt: (/* @__PURE__ */ new Date()).toISOString(),
+    dbPath: globalStateDb.dbPath,
+    dbMtimeMs: Math.round(globalStateDb.mtimeMs),
+    walMtimeMs: Math.round(wal.walMtimeMs),
+    walSize: Math.round(wal.walSize),
+    composerBytes: rawComposer ? Buffer.byteLength(rawComposer, "utf-8") : 0,
+    headerCount: headerBubbleIds.length,
+    ...toIsoTimestamp(composer.lastUpdatedAt) ? { composerLastUpdatedAt: toIsoTimestamp(composer.lastUpdatedAt) } : {},
+    ...latestBubbleId ? { latestBubbleId } : {},
+    ...toIsoTimestamp(latest.createdAt) ? { latestBubbleCreatedAt: toIsoTimestamp(latest.createdAt) } : {},
+    ...toIsoTimestamp(latest.lastUpdatedAt) ? { latestBubbleUpdatedAt: toIsoTimestamp(latest.lastUpdatedAt) } : {},
+    ...typeof latest.type === "number" ? { latestBubbleType: latest.type } : {},
+    ...valueToString(latest.text).trim() ? { latestTextPreview: valueToString(latest.text).replace(/\s+/g, " ").trim().slice(0, 160) } : {},
+    ...latestToolName ? { latestToolName } : {},
+    ...latestToolName && latest.toolHasResult !== void 0 ? { latestToolHasResult: Number(latest.toolHasResult) !== 0 } : {},
+    ...latest.toolResultLength !== null && latest.toolResultLength !== void 0 ? { latestToolResultLength: toNonNegativeInt(latest.toolResultLength) } : {},
+    bubbleCount: bubbleRows.length,
+    toolCallCount,
+    toolResultCount,
+    pendingToolCount,
+    maxBubbleBytes,
+    totalBubbleBytes,
+    signature: ""
+  };
+  diagnostics.signature = cursorLiveDiagnosticsSignature(diagnostics);
+  return diagnostics;
+}
+function cursorLiveDiagnosticsSignature(diagnostics) {
+  return [
+    diagnostics.headerCount,
+    diagnostics.bubbleCount,
+    diagnostics.toolCallCount,
+    diagnostics.toolResultCount,
+    diagnostics.pendingToolCount,
+    diagnostics.composerBytes,
+    diagnostics.composerLastUpdatedAt || "",
+    diagnostics.latestBubbleId || "",
+    diagnostics.latestBubbleCreatedAt || "",
+    diagnostics.latestBubbleUpdatedAt || "",
+    diagnostics.latestToolName || "",
+    diagnostics.latestToolHasResult ? "1" : "0",
+    diagnostics.latestToolResultLength ?? "",
+    diagnostics.totalBubbleBytes
+  ].join("|");
+}
 async function listStoreDbSessionIds(forceRefresh = false) {
   return new Set((await getStoreDbIndex(forceRefresh)).keys());
 }
@@ -4193,7 +4836,7 @@ async function readStoreDbMeta(dbPath) {
   } catch {
     return null;
   }
-  const dbBuffer = await readFile9(dbPath).catch(() => null);
+  const dbBuffer = await readFile10(dbPath).catch(() => null);
   if (!dbBuffer) return null;
   const db = new SQL.Database(dbBuffer);
   try {
@@ -4252,6 +4895,32 @@ function countComposerConversationHeaders(composer) {
   const legacyConversation = Array.isArray(composer.conversation) ? composer.conversation.length : 0;
   return Math.max(fullHeaders, legacyConversation);
 }
+function composerHeaderBubbleIds(composer) {
+  if (!Array.isArray(composer.fullConversationHeadersOnly)) return [];
+  return composer.fullConversationHeadersOnly.map(
+    (header) => header && typeof header === "object" && typeof header.bubbleId === "string" ? header.bubbleId : ""
+  ).filter((bubbleId) => Boolean(bubbleId));
+}
+function isReplayableGlobalStateBubble(bubble) {
+  return bubbleToTurn(bubble) !== null;
+}
+async function hasReplayableGlobalStateComposer(globalStateDb, sessionId, composer) {
+  if (Array.isArray(composer.conversation) && composer.conversation.some(
+    (item) => item && typeof item === "object" && isReplayableGlobalStateBubble(item)
+  )) {
+    return true;
+  }
+  const bubbleIds = composerHeaderBubbleIds(composer);
+  if (bubbleIds.length === 0) return false;
+  const rows = await loadProjectedBubbleRowsByKeys(
+    globalStateDb,
+    bubbleIds.map((bubbleId) => `bubbleId:${sessionId}:${bubbleId}`)
+  );
+  return rows.some((row) => {
+    const bubble = projectedCursorBubbleRowToBubble(row);
+    return bubble ? isReplayableGlobalStateBubble(bubble) : false;
+  });
+}
 function firstUserTextSnippet(turns) {
   const firstUser = turns.find((t) => t.role === "user");
   const firstText = firstUser?.blocks.find(
@@ -4284,15 +4953,19 @@ async function discoverGlobalStateOnlySessions(knownSessionIds, decodedWorkspace
   const discoveredSessions = [];
   try {
     const composerDiscoverySql = globalStateDb.backend === "sqlite-cli" ? [
-      "SELECT key,",
-      "MAX(COALESCE(json_array_length(value,'$.fullConversationHeadersOnly'),0),",
-      "COALESCE(json_array_length(value,'$.conversation'),0)) AS headerCount,",
-      "json_extract(value,'$.lastUpdatedAt') AS lastUpdatedAt,",
-      "json_extract(value,'$.createdAt') AS createdAt,",
-      "json_extract(value,'$.name') AS title,",
-      "length(value) AS fileSize",
-      "FROM cursorDiskKV WHERE key LIKE 'composerData:%' AND json_valid(value)"
-    ].join(" ") : "SELECT key, value FROM cursorDiskKV WHERE key LIKE 'composerData:%'";
+      "SELECT kv.key,",
+      "MAX(COALESCE(json_array_length(kv.value,'$.fullConversationHeadersOnly'),0),",
+      "COALESCE(json_array_length(kv.value,'$.conversation'),0)) AS headerCount,",
+      "json_extract(kv.value,'$.lastUpdatedAt') AS lastUpdatedAt,",
+      "json_extract(kv.value,'$.createdAt') AS createdAt,",
+      "json_extract(kv.value,'$.name') AS title,",
+      "length(kv.value) AS fileSize,",
+      `${replayableGlobalStateBubbleCountSql("kv.value", "kv.key")} AS replayableBubbleCount`,
+      `FROM cursorDiskKV AS kv WHERE ${sqlKeyPrefixRange(
+        "composerData:",
+        "kv.key"
+      )} AND json_valid(kv.value)`
+    ].join(" ") : `SELECT key, value FROM cursorDiskKV WHERE ${sqlKeyPrefixRange("composerData:")}`;
     const rows = await queryGlobalStateRows(globalStateDb, composerDiscoverySql);
     if (rows.length === 0) return { sessions: [], sessionIds };
     for (const row of rows) {
@@ -4304,6 +4977,8 @@ async function discoverGlobalStateOnlySessions(knownSessionIds, decodedWorkspace
       if (rawComposer && !composer) continue;
       const headerCount = composer ? countComposerConversationHeaders(composer) : toNonNegativeInt(row.headerCount);
       if (headerCount === 0) continue;
+      const hasReplayableBubble = composer ? await hasReplayableGlobalStateComposer(globalStateDb, sessionId, composer) : toNonNegativeInt(row.replayableBubbleCount) > 0;
+      if (!hasReplayableBubble) continue;
       sessionIds.add(sessionId);
       const timestamp = toIsoTimestamp(composer?.lastUpdatedAt ?? row.lastUpdatedAt) || toIsoTimestamp(composer?.createdAt ?? row.createdAt) || (/* @__PURE__ */ new Date()).toISOString();
       const title = typeof (composer?.name ?? row.title) === "string" && valueToString(composer?.name ?? row.title).trim() ? valueToString(composer?.name ?? row.title).trim() : void 0;
@@ -4390,7 +5065,7 @@ async function parseCursorStoreDb(sessionId, workspacePath = "") {
   } catch {
     return null;
   }
-  const dbBuffer = await readFile9(dbPath);
+  const dbBuffer = await readFile10(dbPath);
   const db = new SQL.Database(dbBuffer);
   try {
     const metaRows = db.exec("SELECT value FROM meta WHERE key = '0'");
@@ -4472,7 +5147,7 @@ function buildCursorStoreResult(sessionId, workspacePath, metaJson, messages) {
   const { turns, turnStats, totalDurationMs } = messagesToTurns(messages);
   const slug = sessionId.slice(0, 8);
   const title = metaJson.name || firstUserTextSnippet(turns);
-  const hasDurationStats = turnStats.some((stat10) => (stat10.durationMs || 0) > 0);
+  const hasDurationStats = turnStats.some((stat11) => (stat11.durationMs || 0) > 0);
   const notes = [];
   if (hasDurationStats) {
     notes.push("Per-turn duration is estimated from Cursor tool execution metadata.");
@@ -4485,7 +5160,7 @@ function buildCursorStoreResult(sessionId, workspacePath, metaJson, messages) {
     slug,
     title,
     cwd: workspacePath,
-    model: normalizeCursorModelName(metaJson.lastUsedModel) || turnStats.find((stat10) => typeof stat10.model === "string" && stat10.model)?.model,
+    model: normalizeCursorModelName(metaJson.lastUsedModel) || turnStats.find((stat11) => typeof stat11.model === "string" && stat11.model)?.model,
     startTime: metaJson.createdAt ? new Date(metaJson.createdAt).toISOString() : void 0,
     ...totalDurationMs !== void 0 ? { totalDurationMs } : {},
     ...turnStats.length > 0 ? { turnStats } : {},
@@ -4754,7 +5429,7 @@ function addContextFilesFromAttachedFolderResult(files, seen, value) {
     for (const file of parsed.files) {
       const name = file && typeof file === "object" ? normalizeCursorContextFile(file.name) : normalizeCursorContextFile(file);
       if (directory && name) {
-        addUniqueContextFile(files, seen, join9(directory, name));
+        addUniqueContextFile(files, seen, posix.join(directory, name));
         continue;
       }
       const direct = file && typeof file === "object" ? normalizeCursorContextFile(file.filePath) || normalizeCursorContextFile(file.path) || normalizeCursorContextFile(file.fsPath) || normalizeCursorContextFile(file.uri) || normalizeCursorContextFile(file.relativeWorkspacePath) || normalizeCursorContextFile(file.relativePath) : void 0;
@@ -4825,9 +5500,9 @@ function buildBubbleProjectHintData(entries) {
 async function loadCursorRequestContexts(globalStateDb, sessionId) {
   const rows = await queryGlobalStateRows(
     globalStateDb,
-    `SELECT value FROM cursorDiskKV WHERE key LIKE ${sqlLikePrefix(
+    `SELECT value FROM cursorDiskKV WHERE ${sqlKeyPrefixRange(
       `messageRequestContext:${sessionId}:`
-    )} ESCAPE '\\' LIMIT ${MAX_CURSOR_REQUEST_CONTEXT_ROWS}`
+    )} LIMIT ${MAX_CURSOR_REQUEST_CONTEXT_ROWS}`
   );
   const contexts = [];
   for (const row of rows) {
@@ -4840,12 +5515,25 @@ async function loadCursorRequestContexts(globalStateDb, sessionId) {
 async function countCursorCheckpointEntries(globalStateDb, sessionId) {
   const rows = await queryGlobalStateRows(
     globalStateDb,
-    `SELECT COUNT(*) AS count FROM cursorDiskKV WHERE key LIKE ${sqlLikePrefix(
+    `SELECT COUNT(*) AS count FROM cursorDiskKV WHERE ${sqlKeyPrefixRange(
       `checkpointId:${sessionId}:`
-    )} ESCAPE '\\'`
+    )}`
   );
   return toNonNegativeInt(rows[0]?.count);
 }
+async function loadProjectedBubbleRowsByKeys(globalStateDb, keys) {
+  const rows = [];
+  for (let i = 0; i < keys.length; i += GLOBAL_STATE_BUBBLE_KEY_CHUNK_SIZE) {
+    const chunk = keys.slice(i, i + GLOBAL_STATE_BUBBLE_KEY_CHUNK_SIZE);
+    rows.push(
+      ...await queryGlobalStateRows(
+        globalStateDb,
+        `SELECT ${projectedCursorBubbleSelectSql()} FROM cursorDiskKV WHERE key IN (${chunk.map(sqlString).join(",")}) AND json_valid(value)`
+      )
+    );
+  }
+  return rows;
+}
 function mergeUniqueStrings(...groups) {
   const merged = [];
   const seen = /* @__PURE__ */ new Set();
@@ -4861,13 +5549,13 @@ function mergeUniqueStrings(...groups) {
 }
 function mergeCursorParseResults(primary, enrichment) {
   const mergedModel = chooseMergedCursorModel(primary.model, enrichment.model);
-  const preferEnrichmentDuration = enrichment.dataSource === "global-state" && (enrichment.totalDurationMs !== void 0 || enrichment.turnStats?.some((stat10) => stat10.durationMs !== void 0) === true);
+  const preferEnrichmentDuration = enrichment.dataSource === "global-state" && (enrichment.totalDurationMs !== void 0 || enrichment.turnStats?.some((stat11) => stat11.durationMs !== void 0) === true);
   const mergedTurnStats = mergeTurnStats(primary.turnStats, enrichment.turnStats, {
     preferEnrichmentDuration
   });
   const mergedTokenUsage = primary.tokenUsage || enrichment.tokenUsage;
   const mergedTokenUsageByModel = primary.tokenUsageByModel || enrichment.tokenUsageByModel;
-  const mergedTotalDurationMs = (preferEnrichmentDuration ? enrichment.totalDurationMs : void 0) || primary.totalDurationMs || (!preferEnrichmentDuration ? enrichment.totalDurationMs : void 0) || (mergedTurnStats && mergedTurnStats.length > 0 ? mergedTurnStats.reduce((sum, stat10) => sum + (stat10.durationMs || 0), 0) || void 0 : void 0);
+  const mergedTotalDurationMs = (preferEnrichmentDuration ? enrichment.totalDurationMs : void 0) || primary.totalDurationMs || (!preferEnrichmentDuration ? enrichment.totalDurationMs : void 0) || (mergedTurnStats && mergedTurnStats.length > 0 ? mergedTurnStats.reduce((sum, stat11) => sum + (stat11.durationMs || 0), 0) || void 0 : void 0);
   const mergedDuration = mergedTotalDurationMs !== primary.totalDurationMs;
   const mergedTokens = !primary.tokenUsage && !!enrichment.tokenUsage || !primary.tokenUsageByModel && !!enrichment.tokenUsageByModel;
   const supplements = mergeUniqueStrings(
@@ -4937,11 +5625,11 @@ function mergeTurnStats(primary, enrichment, options) {
   if (!primary?.length) return enrichment;
   if (!enrichment?.length) return primary;
   const maxTurnIndex = Math.max(
-    ...primary.map((stat10) => stat10.turnIndex),
-    ...enrichment.map((stat10) => stat10.turnIndex)
+    ...primary.map((stat11) => stat11.turnIndex),
+    ...enrichment.map((stat11) => stat11.turnIndex)
   );
-  const primaryByIndex = new Map(primary.map((stat10) => [stat10.turnIndex, stat10]));
-  const enrichmentByIndex = new Map(enrichment.map((stat10) => [stat10.turnIndex, stat10]));
+  const primaryByIndex = new Map(primary.map((stat11) => [stat11.turnIndex, stat11]));
+  const enrichmentByIndex = new Map(enrichment.map((stat11) => [stat11.turnIndex, stat11]));
   const merged = [];
   for (let turnIndex = 0; turnIndex <= maxTurnIndex; turnIndex++) {
     const current = primaryByIndex.get(turnIndex);
@@ -5035,17 +5723,17 @@ function applyGlobalStateWallClockDurations(entries, turnStats) {
   if (durationsByTurn.size === 0) {
     return {
       turnStats,
-      totalDurationMs: turnStats.reduce((sum, stat10) => sum + (stat10.durationMs || 0), 0) || void 0,
+      totalDurationMs: turnStats.reduce((sum, stat11) => sum + (stat11.durationMs || 0), 0) || void 0,
       usedWallClock: false
     };
   }
-  const mergedTurnStats = turnStats.map((stat10) => {
-    const wallClockDuration = durationsByTurn.get(stat10.turnIndex);
-    return wallClockDuration !== void 0 ? { ...stat10, durationMs: wallClockDuration } : stat10;
+  const mergedTurnStats = turnStats.map((stat11) => {
+    const wallClockDuration = durationsByTurn.get(stat11.turnIndex);
+    return wallClockDuration !== void 0 ? { ...stat11, durationMs: wallClockDuration } : stat11;
   });
   return {
     turnStats: mergedTurnStats,
-    totalDurationMs: mergedTurnStats.reduce((sum, stat10) => sum + (stat10.durationMs || 0), 0) || void 0,
+    totalDurationMs: mergedTurnStats.reduce((sum, stat11) => sum + (stat11.durationMs || 0), 0) || void 0,
     usedWallClock: true
   };
 }
@@ -5091,15 +5779,15 @@ function buildGlobalStateMetrics(entries, fallbackModel, sessionTokenUsage) {
       current.durationMs = (current.durationMs || 0) + bubbleDurationMs;
     }
   }
-  for (const stat10 of turnStats) {
-    if (stat10.tokenUsage && !hasAnyTokens(stat10.tokenUsage)) {
-      delete stat10.tokenUsage;
+  for (const stat11 of turnStats) {
+    if (stat11.tokenUsage && !hasAnyTokens(stat11.tokenUsage)) {
+      delete stat11.tokenUsage;
     }
-    if ((stat10.durationMs || 0) <= 0) {
-      delete stat10.durationMs;
+    if ((stat11.durationMs || 0) <= 0) {
+      delete stat11.durationMs;
     }
-    if ((stat10.contextTokens || 0) <= 0) {
-      delete stat10.contextTokens;
+    if ((stat11.contextTokens || 0) <= 0) {
+      delete stat11.contextTokens;
     }
   }
   const {
@@ -5146,12 +5834,11 @@ async function parseCursorGlobalStateDb(sessionId, globalStateDb, preferredWorks
   const resolvedGlobalStateDb = globalStateDb ?? await openGlobalStateDb();
   if (!resolvedGlobalStateDb) return null;
   try {
-    const composerRows = await queryGlobalStateRows(
+    const rawComposer = await queryGlobalStateTextValue(
       resolvedGlobalStateDb,
-      `SELECT value FROM cursorDiskKV WHERE key = ${sqlString(`composerData:${sessionId}`)}`
+      `composerData:${sessionId}`
     );
-    if (composerRows.length === 0) return null;
-    const rawComposer = valueToString(composerRows[0].value);
+    if (!rawComposer) return null;
     const composer = parseJson(rawComposer);
     if (!composer) return null;
     const entries = [];
@@ -5173,10 +5860,9 @@ async function parseCursorGlobalStateDb(sessionId, globalStateDb, preferredWorks
         bubbleIds.map((bubbleId) => `bubbleId:${sessionId}:${bubbleId}`)
       );
       const bubblesByKey = /* @__PURE__ */ new Map();
-      const rows = await queryGlobalStateRows(
-        resolvedGlobalStateDb,
-        `SELECT ${projectedCursorBubbleSelectSql()} FROM cursorDiskKV WHERE key LIKE ${sqlLikePrefix(`bubbleId:${sessionId}:`)} AND json_valid(value)`
-      );
+      const rows = await loadProjectedBubbleRowsByKeys(resolvedGlobalStateDb, [
+        ...expectedBubbleKeys
+      ]);
       for (const row of rows) {
         const key = valueToString(row.key);
         if (!expectedBubbleKeys.has(key)) continue;
@@ -5233,7 +5919,7 @@ ${buildBubbleProjectHintData(bubbleEntries)}`,
     }
     const hasDetailedTurnStats = Boolean(
       metrics.turnStats?.some(
-        (stat10) => !!stat10.durationMs || !!stat10.contextTokens || !!stat10.tokenUsage
+        (stat11) => !!stat11.durationMs || !!stat11.contextTokens || !!stat11.tokenUsage
       )
     );
     if (!hasDetailedTurnStats) {
@@ -5325,7 +6011,7 @@ function messagesToTurns(messages) {
     }
   }
   const turnStats = buildStoreTurnStats(turns);
-  const totalDurationMs = turnStats.length > 0 ? turnStats.reduce((sum, stat10) => sum + (stat10.durationMs || 0), 0) || void 0 : void 0;
+  const totalDurationMs = turnStats.length > 0 ? turnStats.reduce((sum, stat11) => sum + (stat11.durationMs || 0), 0) || void 0 : void 0;
   return { turns, turnStats, totalDurationMs };
 }
 var CURSOR_SYSTEM_CONTEXT_RE = /^<(?:user_info|system_reminder|agent_transcripts|rules|git_status)>/;
@@ -5407,10 +6093,14 @@ function buildStoreTurnStats(turns) {
 function mapCursorToolName(name) {
   const mapping = {
     Shell: "Bash",
+    shell: "Bash",
+    // Cursor SDK lowercase tool name
     run_terminal_command_v2: "Bash",
     run_terminal_cmd: "Bash",
     Read: "Read",
     ReadFile: "Read",
+    read: "Read",
+    // Cursor SDK lowercase tool name
     read_file_v2: "Read",
     read_file: "Read",
     read_lints: "ReadLints",
@@ -5428,6 +6118,8 @@ function mapCursorToolName(name) {
     LS: "Glob",
     StrReplace: "Edit",
     EditFile: "Edit",
+    edit: "Edit",
+    // Cursor SDK lowercase tool name
     edit_file_v2: "Edit",
     edit_file: "Edit",
     search_replace: "Edit",
@@ -5690,42 +6382,426 @@ function extractModel(msg) {
   return void 0;
 }
 
+// src/providers/cursor/sdk-reader.ts
+import { execFile as execFile2 } from "child_process";
+import { readdir as readdir7, readFile as readFile11, stat as stat6 } from "fs/promises";
+import { homedir as homedir9 } from "os";
+import { join as join10 } from "path";
+import { promisify as promisify2 } from "util";
+var CURSOR_PROJECTS_ROOT = join10(homedir9(), ".cursor", "projects");
+var SDK_STORE_SUBDIR = "sdk-agent-store";
+var SDK_INDEX_DB_BASENAME = "index.db";
+var MIN_INDEX_DB_SIZE = 1024;
+var MAX_SQLJS_DB_BYTES = 128 * 1024 * 1024;
+var execFileAsync2 = promisify2(execFile2);
+var getSqlJs2 = /* @__PURE__ */ (() => {
+  let promise = null;
+  return async () => {
+    if (!promise) {
+      promise = (async () => {
+        const mod = await import("sql.js");
+        return mod.default();
+      })().catch((err) => {
+        promise = null;
+        throw err;
+      });
+    }
+    return promise;
+  };
+})();
+var cachedAgentIndex = null;
+var cachedAgentIndexAt = 0;
+var AGENT_INDEX_TTL_MS = 5e3;
+async function discoverSdkAgents() {
+  const index = await getSdkAgentIndex();
+  return [...index.values()];
+}
+async function findSdkAgentById(agentId) {
+  if (!agentId) return null;
+  const index = await getSdkAgentIndex();
+  return index.get(agentId) || null;
+}
+async function getSdkAgentIndex() {
+  if (cachedAgentIndex && Date.now() - cachedAgentIndexAt < AGENT_INDEX_TTL_MS) {
+    return cachedAgentIndex;
+  }
+  const dbPaths = await listSdkIndexDbPaths(CURSOR_PROJECTS_ROOT);
+  const index = /* @__PURE__ */ new Map();
+  for (const dbPath of dbPaths) {
+    let handle = null;
+    try {
+      handle = await openIndexDb(dbPath);
+      if (!handle) continue;
+      const rows = await queryIndexDb(
+        handle,
+        "SELECT agent_id, workspace_ref, status, name, created_at, updated_at FROM agents"
+      );
+      for (const row of rows) {
+        const agentId = stringOrEmpty(row.agent_id);
+        if (!agentId) continue;
+        index.set(agentId, {
+          agentId,
+          workspaceRef: stringOrEmpty(row.workspace_ref),
+          status: stringOrEmpty(row.status) || "UNKNOWN",
+          name: typeof row.name === "string" ? row.name : void 0,
+          createdAt: stringOrEmpty(row.created_at),
+          updatedAt: stringOrEmpty(row.updated_at),
+          dbPath
+        });
+      }
+    } catch {
+    } finally {
+      closeIndexDb(handle);
+    }
+  }
+  cachedAgentIndex = index;
+  cachedAgentIndexAt = Date.now();
+  return index;
+}
+async function loadSdkAgentEnrichment(agent) {
+  let handle = null;
+  try {
+    handle = await openIndexDb(agent.dbPath);
+    if (!handle) return null;
+    const runRows = await queryIndexDb(
+      handle,
+      [
+        "SELECT run_id, agent_id, turn_number, status, model,",
+        "started_at, finished_at, result",
+        `FROM runs WHERE agent_id = ${sqlString2(agent.agentId)}`,
+        "ORDER BY turn_number ASC, created_at ASC"
+      ].join(" ")
+    );
+    if (runRows.length === 0) return null;
+    const runs = runRows.map((row) => ({
+      runId: stringOrEmpty(row.run_id),
+      agentId: stringOrEmpty(row.agent_id),
+      turnNumber: typeof row.turn_number === "number" ? row.turn_number : Number(row.turn_number),
+      status: stringOrEmpty(row.status),
+      model: row.model ? String(row.model) : void 0,
+      startedAt: row.started_at ? String(row.started_at) : void 0,
+      finishedAt: row.finished_at ? String(row.finished_at) : void 0,
+      result: row.result ? String(row.result) : void 0
+    }));
+    const runIds = runs.map((r) => r.runId).filter(Boolean);
+    if (runIds.length === 0) return { agent, runs, toolCallsByRun: /* @__PURE__ */ new Map() };
+    const inList = runIds.map(sqlString2).join(", ");
+    const eventRows = await queryIndexDb(
+      handle,
+      [
+        "SELECT run_id, seq, payload_json FROM run_events",
+        `WHERE run_id IN (${inList}) ORDER BY run_id, seq`
+      ].join(" ")
+    );
+    const toolCallsByRun = collectToolCalls(eventRows);
+    return finalizeEnrichment(agent, runs, toolCallsByRun);
+  } catch {
+    return null;
+  } finally {
+    closeIndexDb(handle);
+  }
+}
+function finalizeEnrichment(agent, runs, toolCallsByRun) {
+  let startedAt;
+  let finishedAt;
+  let totalDurationMs = 0;
+  let totalDurationSeen = false;
+  let latestModel;
+  for (const run of runs) {
+    if (run.startedAt && (!startedAt || run.startedAt < startedAt)) startedAt = run.startedAt;
+    if (run.finishedAt && (!finishedAt || run.finishedAt > finishedAt)) finishedAt = run.finishedAt;
+    if (run.startedAt && run.finishedAt) {
+      const startMs = Date.parse(run.startedAt);
+      const endMs = Date.parse(run.finishedAt);
+      if (Number.isFinite(startMs) && Number.isFinite(endMs) && endMs >= startMs) {
+        totalDurationMs += endMs - startMs;
+        totalDurationSeen = true;
+      }
+    }
+    if (run.model) latestModel = run.model;
+  }
+  return {
+    agent,
+    runs,
+    toolCallsByRun,
+    startedAt,
+    finishedAt,
+    totalDurationMs: totalDurationSeen ? totalDurationMs : void 0,
+    latestModel
+  };
+}
+function collectToolCalls(rows) {
+  const out = /* @__PURE__ */ new Map();
+  const inProgress = /* @__PURE__ */ new Map();
+  for (const rawRow of rows) {
+    const row = rawRow;
+    const payload = row.payload_json;
+    if (typeof payload !== "string" || !payload) continue;
+    const parsed = safeJsonParse(payload);
+    const message = parsed?.message;
+    if (!message || message.type !== "tool_call") continue;
+    const runId = stringOrEmpty(row.run_id);
+    const callId = stringOrEmpty(message.call_id);
+    if (!runId || !callId) continue;
+    const seq = typeof row.seq === "number" ? row.seq : Number(row.seq);
+    if (!Number.isFinite(seq)) continue;
+    const key = `${runId}::${callId}`;
+    const rawName = typeof message.name === "string" ? message.name : "Tool";
+    const mappedName = mapCursorToolName(rawName);
+    const argsObj = isPlainObject(message.args) ? message.args : {};
+    const status = typeof message.status === "string" ? message.status : "unknown";
+    let entry = inProgress.get(key);
+    if (!entry) {
+      entry = {
+        callId,
+        runId,
+        firstSeq: seq,
+        lastSeq: seq,
+        name: mappedName,
+        args: argsObj,
+        status
+      };
+      inProgress.set(key, entry);
+      const list = out.get(runId) || [];
+      list.push(entry);
+      out.set(runId, list);
+    } else {
+      entry.lastSeq = seq;
+      entry.status = status;
+      if (Object.keys(argsObj).length > 0) {
+        entry.args = argsObj;
+      }
+    }
+    if (message.result !== void 0) {
+      const formatted = formatSdkToolResult(rawName, message.result);
+      entry.result = formatted.text;
+      entry.isError = formatted.isError || status === "error";
+    }
+  }
+  for (const [runId, list] of out) {
+    list.sort((a, b) => a.firstSeq - b.firstSeq);
+    out.set(runId, list);
+  }
+  return out;
+}
+function formatSdkToolResult(rawToolName, result) {
+  if (result === null || result === void 0) return { text: "", isError: false };
+  if (typeof result === "string") return { text: result, isError: false };
+  if (!isPlainObject(result)) {
+    return { text: safeJsonStringify(result), isError: false };
+  }
+  const status = typeof result.status === "string" ? result.status : "";
+  const isError = status === "error" || status === "failed" || result.error !== void 0;
+  const value = result.value !== void 0 ? result.value : result;
+  const mapped = mapCursorToolName(rawToolName);
+  if (isError && typeof result.error === "string") {
+    return { text: result.error, isError: true };
+  }
+  if (mapped === "Bash" && isPlainObject(value)) {
+    const stdout = typeof value.stdout === "string" ? value.stdout : "";
+    const stderr = typeof value.stderr === "string" ? value.stderr : "";
+    const exitCode = typeof value.exitCode === "number" ? value.exitCode : void 0;
+    const parts = [];
+    if (stdout) parts.push(stdout.endsWith("\n") ? stdout.slice(0, -1) : stdout);
+    if (stderr) parts.push(`[stderr]
+${stderr}`);
+    if (parts.length === 0 && typeof exitCode === "number") parts.push(`exit ${exitCode}`);
+    return {
+      text: parts.join("\n"),
+      isError: isError || exitCode !== void 0 && exitCode !== 0
+    };
+  }
+  if (mapped === "Read" && isPlainObject(value) && typeof value.content === "string") {
+    return { text: value.content, isError };
+  }
+  if ((mapped === "Edit" || mapped === "Write" || mapped === "MultiEdit") && isPlainObject(value)) {
+    const diffString = typeof value.diffString === "string" ? value.diffString : "";
+    if (diffString) {
+      const wrapped = {
+        ...value,
+        diff: { chunks: [{ diffString }] }
+      };
+      return { text: safeJsonStringify(wrapped), isError };
+    }
+  }
+  return { text: safeJsonStringify(value), isError };
+}
+function applySdkEnrichmentToTurns(turns, enrichment) {
+  const sortedRuns = [...enrichment.runs].sort((a, b) => a.turnNumber - b.turnNumber);
+  if (sortedRuns.length === 0) {
+    return { turns, toolCallsEnriched: 0, assistantTurnsModelTagged: 0 };
+  }
+  let runIdx = -1;
+  let toolUseIdx = 0;
+  let toolCallsEnriched = 0;
+  let assistantTurnsModelTagged = 0;
+  for (const turn of turns) {
+    if (turn.role === "user") {
+      runIdx++;
+      toolUseIdx = 0;
+      continue;
+    }
+    if (turn.role !== "assistant") continue;
+    if (runIdx < 0) {
+      continue;
+    }
+    const run = sortedRuns[runIdx];
+    if (!run) continue;
+    if (run.model && !turn.model) {
+      turn.model = run.model;
+      assistantTurnsModelTagged++;
+    }
+    const sdkCalls = enrichment.toolCallsByRun.get(run.runId) || [];
+    for (const block of turn.blocks) {
+      if (block.type !== "tool_use") continue;
+      if (typeof block._result === "string") continue;
+      const sdkCall = sdkCalls[toolUseIdx];
+      toolUseIdx++;
+      if (!sdkCall) continue;
+      if (sdkCall.result === void 0) continue;
+      block._result = sdkCall.result;
+      if (sdkCall.isError) block._isError = true;
+      try {
+        block.input = mapToolArgs(block.name, block.input, block._result);
+      } catch {
+      }
+      toolCallsEnriched++;
+    }
+  }
+  return { turns, toolCallsEnriched, assistantTurnsModelTagged };
+}
+async function openIndexDb(dbPath) {
+  const st = await stat6(dbPath).catch(() => null);
+  if (!st?.isFile() || st.size < MIN_INDEX_DB_SIZE) return null;
+  if (await canUseSqliteCliFor(dbPath)) {
+    return { dbPath, backend: "sqlite-cli" };
+  }
+  let SQL;
+  try {
+    SQL = await getSqlJs2();
+  } catch {
+    return null;
+  }
+  if (st.size > MAX_SQLJS_DB_BYTES) return null;
+  const buffer = await readFile11(dbPath).catch(() => null);
+  if (!buffer) return null;
+  const db = new SQL.Database(buffer);
+  return { dbPath, backend: "sqljs", db };
+}
+function closeIndexDb(handle) {
+  if (!handle || handle.backend !== "sqljs" || !handle.db) return;
+  try {
+    handle.db.close();
+  } catch {
+  }
+}
+async function queryIndexDb(handle, sql) {
+  if (handle.backend === "sqlite-cli") {
+    const { stdout } = await execFileAsync2("sqlite3", ["-readonly", "-json", handle.dbPath, sql], {
+      maxBuffer: 64 * 1024 * 1024,
+      timeout: 6e4
+    });
+    const trimmed = stdout.trim();
+    if (!trimmed) return [];
+    const parsed = JSON.parse(trimmed);
+    return Array.isArray(parsed) ? parsed : [];
+  }
+  const result = handle.db.exec(sql);
+  if (!Array.isArray(result) || result.length === 0) return [];
+  const [{ columns, values }] = result;
+  return values.map((row) => {
+    const record = {};
+    columns.forEach((column, index) => {
+      record[column] = row[index];
+    });
+    return record;
+  });
+}
+var sqliteCliCheckCache = /* @__PURE__ */ new Map();
+var SQLITE_CLI_CHECK_TTL_MS = 3e4;
+async function canUseSqliteCliFor(dbPath) {
+  const cached = sqliteCliCheckCache.get(dbPath);
+  if (cached && Date.now() - cached.checkedAt < SQLITE_CLI_CHECK_TTL_MS) return cached.canUse;
+  let canUse = false;
+  try {
+    const { stdout } = await execFileAsync2(
+      "sqlite3",
+      ["-readonly", "-json", dbPath, "SELECT json_valid('{}') AS ok;"],
+      { maxBuffer: 1024 * 1024 }
+    );
+    const rows = JSON.parse(stdout.trim());
+    canUse = rows[0]?.ok === 1;
+  } catch {
+    canUse = false;
+  }
+  sqliteCliCheckCache.set(dbPath, { canUse, checkedAt: Date.now() });
+  return canUse;
+}
+async function listSdkIndexDbPaths(projectsRoot) {
+  const projects = await readdir7(projectsRoot).catch(() => []);
+  const perProjectPaths = await Promise.all(
+    projects.map(async (project) => {
+      const out = [];
+      const sdkRoot = join10(projectsRoot, project, SDK_STORE_SUBDIR);
+      const sdkStat = await stat6(sdkRoot).catch(() => null);
+      if (!sdkStat?.isDirectory()) return out;
+      const projectHashes = await readdir7(sdkRoot).catch(() => []);
+      for (const hash of projectHashes) {
+        const dbPath = join10(sdkRoot, hash, SDK_INDEX_DB_BASENAME);
+        const dbStat = await stat6(dbPath).catch(() => null);
+        if (!dbStat?.isFile() || dbStat.size < MIN_INDEX_DB_SIZE) continue;
+        out.push(dbPath);
+      }
+      return out;
+    })
+  );
+  return perProjectPaths.flat();
+}
+function sqlString2(value) {
+  return `'${value.replaceAll("'", "''")}'`;
+}
+function stringOrEmpty(value) {
+  return typeof value === "string" ? value : "";
+}
+function isPlainObject(value) {
+  return !!value && typeof value === "object" && !Array.isArray(value);
+}
+function safeJsonParse(text) {
+  try {
+    return JSON.parse(text);
+  } catch {
+    return null;
+  }
+}
+function safeJsonStringify(value) {
+  try {
+    return JSON.stringify(value);
+  } catch {
+    return String(value);
+  }
+}
+
 // src/providers/cursor/discover.ts
-var CURSOR_DIR = join10(homedir9(), ".cursor", "projects");
+var CURSOR_DIR = join11(homedir10(), ".cursor", "projects");
+var PROJECT_DISCOVERY_CONCURRENCY = 6;
+var TRANSCRIPT_INFO_CONCURRENCY = 6;
+var ENTRY_STAT_CONCURRENCY = 32;
+var decodedProjectDirCache = /* @__PURE__ */ new Map();
 async function discoverCursorSessions() {
   const sessions = [];
   let projectDirs;
   try {
-    projectDirs = await readdir7(CURSOR_DIR);
+    projectDirs = await readdir8(CURSOR_DIR);
   } catch {
     return sessions;
   }
-  for (const projDir of projectDirs) {
-    const transcriptsDir = join10(CURSOR_DIR, projDir, "agent-transcripts");
-    const dirStat = await stat6(transcriptsDir).catch(() => null);
-    if (!dirStat?.isDirectory()) continue;
-    const project = await decodeProjectDir2(projDir);
-    const transcriptEntries = await collectTranscriptEntries(transcriptsDir);
-    if (transcriptEntries.length === 0) continue;
-    transcriptEntries.sort((a, b) => a.mtimeMs - b.mtimeMs);
-    const toolEntries = await collectToolEntries(join10(CURSOR_DIR, projDir, "agent-tools"));
-    toolEntries.sort((a, b) => a.mtimeMs - b.mtimeMs);
-    for (let i = 0; i < transcriptEntries.length; i++) {
-      const transcript = transcriptEntries[i];
-      const prevMtimeMs = i === 0 ? Number.NEGATIVE_INFINITY : transcriptEntries[i - 1].mtimeMs;
-      const toolPaths = toolEntries.filter((t) => t.mtimeMs > prevMtimeMs && t.mtimeMs <= transcript.mtimeMs).map((t) => t.path);
-      const info = await extractSessionInfo2(
-        transcript.path,
-        transcript.fileSize,
-        transcript.mtimeMs,
-        project,
-        toolPaths
-      );
-      if (!info) continue;
-      info.workspacePath = project;
-      info.hasSqlite = false;
-      sessions.push(info);
-    }
+  const projectSessions = await mapLimit(
+    projectDirs,
+    PROJECT_DISCOVERY_CONCURRENCY,
+    (projDir) => discoverProjectSessions(projDir)
+  );
+  for (const projectSessionList of projectSessions) {
+    sessions.push(...projectSessionList);
   }
   const transcriptSessions = sessions.slice();
   const knownIds = new Set(transcriptSessions.map((s) => s.sessionId));
@@ -5740,54 +6816,159 @@ async function discoverCursorSessions() {
     const hasStoreDb = storeDbSessionIds.has(session.sessionId);
     session.hasSqlite = hasStoreDb || globalState.sessionIds.has(session.sessionId);
   }
+  await enrichWithSdkAgents(sessions);
   sessions.sort((a, b) => b.timestamp.localeCompare(a.timestamp));
   return sessions;
 }
+async function discoverProjectSessions(projDir) {
+  const transcriptsDir = join11(CURSOR_DIR, projDir, "agent-transcripts");
+  const dirStat = await stat7(transcriptsDir).catch(() => null);
+  if (!dirStat?.isDirectory()) return [];
+  const project = await decodeProjectDir2(projDir);
+  const transcriptEntries = await collectTranscriptEntries(transcriptsDir);
+  if (transcriptEntries.length === 0) return [];
+  transcriptEntries.sort((a, b) => a.mtimeMs - b.mtimeMs);
+  const toolEntries = await collectToolEntries(join11(CURSOR_DIR, projDir, "agent-tools"));
+  toolEntries.sort((a, b) => a.mtimeMs - b.mtimeMs);
+  const jobs = [];
+  let toolStart = 0;
+  let toolEnd = 0;
+  for (let i = 0; i < transcriptEntries.length; i++) {
+    const transcript = transcriptEntries[i];
+    const prevMtimeMs = i === 0 ? Number.NEGATIVE_INFINITY : transcriptEntries[i - 1].mtimeMs;
+    while (toolStart < toolEntries.length && toolEntries[toolStart].mtimeMs <= prevMtimeMs) {
+      toolStart++;
+    }
+    while (toolEnd < toolEntries.length && toolEntries[toolEnd].mtimeMs <= transcript.mtimeMs) {
+      toolEnd++;
+    }
+    jobs.push({
+      ...transcript,
+      toolPaths: toolEntries.slice(toolStart, toolEnd).map((tool) => tool.path)
+    });
+  }
+  const infos = await mapLimit(jobs, TRANSCRIPT_INFO_CONCURRENCY, async (job) => {
+    const info = await extractSessionInfo2(
+      job.path,
+      job.fileSize,
+      job.mtimeMs,
+      project,
+      job.toolPaths
+    );
+    if (!info) return null;
+    info.workspacePath = project;
+    info.hasSqlite = false;
+    return info;
+  });
+  return infos.filter((info) => info !== null);
+}
+async function enrichWithSdkAgents(sessions) {
+  let sdkAgents = [];
+  try {
+    sdkAgents = await discoverSdkAgents();
+  } catch {
+    return;
+  }
+  if (sdkAgents.length === 0) return;
+  const sessionsByAgentId = /* @__PURE__ */ new Map();
+  for (const session of sessions) {
+    sessionsByAgentId.set(session.sessionId, session);
+  }
+  for (const agent of sdkAgents) {
+    const existing = sessionsByAgentId.get(agent.agentId);
+    if (!existing) continue;
+    existing.hasSdk = true;
+    if (agent.workspaceRef && (!existing.cwd || existing.cwd.startsWith("/-"))) {
+      existing.cwd = agent.workspaceRef;
+      existing.workspacePath = agent.workspaceRef;
+    }
+  }
+}
 async function decodeProjectDir2(encoded) {
+  let cached = decodedProjectDirCache.get(encoded);
+  if (!cached) {
+    cached = decodeProjectDirUncached(encoded).catch((err) => {
+      decodedProjectDirCache.delete(encoded);
+      throw err;
+    });
+    decodedProjectDirCache.set(encoded, cached);
+  }
+  return cached;
+}
+async function decodeProjectDirUncached(encoded) {
+  if (process.platform === "win32") return decodeWindowsProjectDir(encoded);
   const parts = encoded.split("-");
-  async function resolve3(idx, current) {
-    if (idx >= parts.length) {
-      const s = await stat6(current).catch(() => null);
-      return s?.isDirectory() ? current : null;
+  const startIdx = parts[0] ? 0 : 1;
+  const resolved = await resolveEncodedProjectParts(parts, startIdx, "/");
+  const fallbackEncoded = encoded.startsWith("-") ? encoded.slice(1) : encoded;
+  return `/${resolved ? resolved.slice(1) : fallbackEncoded.replace(/-/g, "/")}`;
+}
+async function decodeWindowsProjectDir(encoded) {
+  const parts = encoded.split("-").filter((part, idx) => part !== "" || idx !== 0);
+  if (parts.length === 0) return encoded;
+  const drive = parts[0];
+  if (!/^[a-zA-Z]$/.test(drive)) {
+    return parts.join("\\");
+  }
+  const root = `${drive.toUpperCase()}:\\`;
+  const resolved = await resolveEncodedProjectParts(parts, 1, root);
+  if (resolved) return resolved;
+  return parts.length === 1 ? root : `${root}${parts.slice(1).join("\\")}`;
+}
+async function resolveEncodedProjectParts(parts, idx, current) {
+  if (idx >= parts.length) {
+    const currentStat = await stat7(current).catch(() => null);
+    return currentStat?.isDirectory() ? current : null;
+  }
+  const entries = await readdir8(current, { withFileTypes: true }).catch(() => []);
+  if (entries.length === 0) return null;
+  const dirNames = new Set(
+    entries.filter((entry) => entry.isDirectory() || entry.isSymbolicLink()).map((entry) => entry.name)
+  );
+  for (let end = idx + 1; end <= parts.length; end++) {
+    const candidate = parts.slice(idx, end).join("-");
+    const candidatePath = join11(current, candidate);
+    if (!dirNames.has(candidate)) {
+      if (process.platform !== "win32") continue;
+      const candidateStat = await stat7(candidatePath).catch(() => null);
+      if (!candidateStat?.isDirectory()) continue;
     }
-    const withSlash = `${current}/${parts[idx]}`;
-    const slashResult = await resolve3(idx + 1, withSlash);
-    if (slashResult) return slashResult;
-    const withHyphen = `${current}-${parts[idx]}`;
-    return resolve3(idx + 1, withHyphen);
+    const resolved = await resolveEncodedProjectParts(parts, end, candidatePath);
+    if (resolved) return resolved;
   }
-  const result = await resolve3(1, `/${parts[0]}`);
-  return result || `/${encoded.replace(/-/g, "/")}`;
+  return null;
 }
 async function extractSessionInfo2(filePath, fileSize, mtimeMs, project, toolPaths) {
   try {
-    const content = await readFile10(filePath, "utf-8");
-    const lines = content.split("\n").filter((l) => l.trim());
-    if (lines.length < 2) return null;
+    const content = await readFile12(filePath, "utf-8");
     const sessionId = basename3(filePath, ".jsonl");
     let firstPrompt = "";
-    for (const line of lines.slice(0, 10)) {
-      try {
-        const obj = JSON.parse(line);
-        if (obj.role === "user") {
-          const textBlock = obj.message?.content?.find?.((b) => b.type === "text");
-          if (textBlock?.text) {
-            firstPrompt = sanitizeCursorUserText(textBlock.text).slice(0, 200);
-            break;
-          }
-        }
-      } catch {
-      }
-    }
-    if (!firstPrompt) return null;
     let promptCount = 0;
     let toolCallCount = 0;
     let editCountEst = 0;
     let model;
+    let lineCount = 0;
+    let promptScanCount = 0;
     const toolUseRe = /"type"\s*:\s*"tool_use"/g;
     const editToolRe = /"name"\s*:\s*"(edit_file|file_edit|create_file)"/;
     const modelRe = /"model(?:Id)?"\s*:\s*"([^"]+)"/;
-    for (const line of lines) {
+    for (const rawLine of content.split("\n")) {
+      const line = rawLine.trim();
+      if (!line) continue;
+      lineCount++;
+      if (!firstPrompt && promptScanCount < 10) {
+        promptScanCount++;
+        try {
+          const obj = JSON.parse(line);
+          if (obj.role === "user") {
+            const textBlock = obj.message?.content?.find?.((b) => b.type === "text");
+            if (textBlock?.text) {
+              firstPrompt = sanitizeCursorUserText(textBlock.text).slice(0, 200);
+            }
+          }
+        } catch {
+        }
+      }
       if ((line.includes('"role":"user"') || line.includes('"role": "user"')) && !line.includes('"tool_result"')) {
         promptCount++;
       }
@@ -5801,6 +6982,8 @@ async function extractSessionInfo2(filePath, fileSize, mtimeMs, project, toolPat
         if (m) model = m[1];
       }
     }
+    if (lineCount < 2) return null;
+    if (!firstPrompt) return null;
     toolCallCount = Math.max(toolCallCount, toolPaths.length);
     const timestamp = new Date(mtimeMs).toISOString();
     return {
@@ -5811,7 +6994,7 @@ async function extractSessionInfo2(filePath, fileSize, mtimeMs, project, toolPat
       cwd: project,
       version: "",
       timestamp,
-      lineCount: lines.length,
+      lineCount,
       fileSize,
       filePath,
       filePaths: [filePath],
@@ -5829,59 +7012,73 @@ async function extractSessionInfo2(filePath, fileSize, mtimeMs, project, toolPat
 async function collectTranscriptEntries(transcriptsDir) {
   let entries;
   try {
-    entries = await readdir7(transcriptsDir);
+    entries = await readdir8(transcriptsDir);
   } catch {
     return [];
   }
-  const transcripts = [];
-  for (const entry of entries) {
-    const entryPath = join10(transcriptsDir, entry);
-    const entryStat = await stat6(entryPath).catch(() => null);
-    if (!entryStat) continue;
+  const transcripts = await mapLimit(entries, ENTRY_STAT_CONCURRENCY, async (entry) => {
+    const entryPath = join11(transcriptsDir, entry);
+    const entryStat = await stat7(entryPath).catch(() => null);
+    if (!entryStat) return null;
     if (entry.endsWith(".jsonl") && entryStat.isFile()) {
-      transcripts.push({
+      return {
         path: entryPath,
         fileSize: entryStat.size,
         mtimeMs: entryStat.mtimeMs
-      });
-      continue;
+      };
     }
-    if (!entryStat.isDirectory()) continue;
-    const innerPath = join10(entryPath, `${entry}.jsonl`);
-    const innerStat = await stat6(innerPath).catch(() => null);
-    if (!innerStat?.isFile()) continue;
-    transcripts.push({
+    if (!entryStat.isDirectory()) return null;
+    const innerPath = join11(entryPath, `${entry}.jsonl`);
+    const innerStat = await stat7(innerPath).catch(() => null);
+    if (!innerStat?.isFile()) return null;
+    return {
       path: innerPath,
       fileSize: innerStat.size,
       mtimeMs: innerStat.mtimeMs
-    });
-  }
-  return transcripts;
+    };
+  });
+  return transcripts.filter((entry) => entry !== null);
 }
 async function collectToolEntries(toolDir) {
-  const dirStat = await stat6(toolDir).catch(() => null);
+  const dirStat = await stat7(toolDir).catch(() => null);
   if (!dirStat?.isDirectory()) return [];
   let entries;
   try {
-    entries = await readdir7(toolDir);
+    entries = await readdir8(toolDir);
   } catch {
     return [];
   }
-  const tools = [];
-  for (const entry of entries) {
-    if (!entry.endsWith(".txt")) continue;
-    const entryPath = join10(toolDir, entry);
-    const entryStat = await stat6(entryPath).catch(() => null);
-    if (!entryStat?.isFile()) continue;
-    tools.push({ path: entryPath, mtimeMs: entryStat.mtimeMs });
-  }
-  return tools;
+  const toolFiles = entries.filter((entry) => entry.endsWith(".txt"));
+  const tools = await mapLimit(toolFiles, ENTRY_STAT_CONCURRENCY, async (entry) => {
+    const entryPath = join11(toolDir, entry);
+    const entryStat = await stat7(entryPath).catch(() => null);
+    if (!entryStat?.isFile()) return null;
+    return { path: entryPath, mtimeMs: entryStat.mtimeMs };
+  });
+  return tools.filter((entry) => entry !== null);
+}
+async function mapLimit(items, concurrency, worker) {
+  if (items.length === 0) return [];
+  const results = [];
+  results.length = items.length;
+  let nextIndex = 0;
+  const workerCount = Math.min(Math.max(1, concurrency), items.length);
+  await Promise.all(
+    Array.from({ length: workerCount }, async () => {
+      while (nextIndex < items.length) {
+        const index = nextIndex++;
+        results[index] = await worker(items[index], index);
+      }
+    })
+  );
+  return results;
 }
 
 // src/providers/cursor/parser.ts
-import { readdir as readdir8, readFile as readFile11, stat as stat7 } from "fs/promises";
-import { homedir as homedir10 } from "os";
-import { basename as basename4, extname as extname2, join as join11 } from "path";
+import { readdir as readdir9, readFile as readFile13, stat as stat8 } from "fs/promises";
+import { homedir as homedir11 } from "os";
+import { basename as basename4, extname as extname2, join as join12 } from "path";
+var CURSOR_UUID_SESSION_ID_RE = /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i;
 function toErrorMessage(err) {
   if (err instanceof Error && err.message) return err.message;
   return String(err);
@@ -5895,15 +7092,17 @@ async function parseCursorSession(filePaths, sessionInfo) {
   const paths = Array.isArray(filePaths) ? filePaths : [filePaths];
   const transcriptPaths = paths.filter((p) => p.endsWith(".jsonl"));
   const explicitToolPaths = paths.filter((p) => p.endsWith(".txt"));
+  const inferredSqliteSession = inferCursorSqliteSession(paths);
   let sqliteError;
   let sqliteFallbackNote;
   let sqliteAttempted = false;
-  if (sessionInfo?.sessionId) {
+  const sqliteSessionId = sessionInfo?.sessionId || inferredSqliteSession?.sessionId;
+  if (sqliteSessionId) {
     sqliteAttempted = true;
     let sqliteResult = null;
     try {
-      const preferredWorkspacePath2 = sessionInfo.workspacePath || sessionInfo.cwd || "";
-      sqliteResult = await parseCursorSqlite(preferredWorkspacePath2, sessionInfo.sessionId);
+      const preferredWorkspacePath2 = sessionInfo?.workspacePath || sessionInfo?.cwd || "";
+      sqliteResult = await parseCursorSqlite(preferredWorkspacePath2, sqliteSessionId);
     } catch (err) {
       sqliteError = compactErrorMessage(err);
       sqliteFallbackNote = `cursor SQLite parse failed (${sqliteError}); fell back to JSONL transcript`;
@@ -5916,6 +7115,10 @@ async function parseCursorSession(filePaths, sessionInfo) {
         const jsonlThinking = await parseCursorJsonl(transcriptPaths, [], {
           inferToolPaths: false
         });
+        sqliteResult.parseWarnings = mergeParseWarnings(
+          sqliteResult.parseWarnings,
+          jsonlThinking.parseWarnings
+        );
         sqliteResult.turns = mergeJsonlSupplementsIntoCursorTurns(
           sqliteResult.turns,
           jsonlThinking.turns
@@ -5958,8 +7161,83 @@ async function parseCursorSession(filePaths, sessionInfo) {
       sqliteFallbackNote
     );
   }
+  const sdkSessionId = sessionInfo?.sessionId || deriveSessionIdFromTranscript(transcriptPaths);
+  if (sdkSessionId) {
+    const enrichment = await tryLoadSdkEnrichment(sdkSessionId);
+    if (enrichment) {
+      const { toolCallsEnriched, assistantTurnsModelTagged } = applySdkEnrichmentToTurns(
+        jsonlResult.turns,
+        enrichment
+      );
+      if (toolCallsEnriched > 0 || assistantTurnsModelTagged > 0) {
+        jsonlResult.dataSourceInfo = withSupplement(
+          jsonlResult.dataSourceInfo || defaultDataSourceInfo(jsonlResult.dataSource),
+          `cursor-sdk index.db (tool results +${toolCallsEnriched}, model tags +${assistantTurnsModelTagged})`
+        );
+      }
+      if (enrichment.latestModel && !jsonlResult.model) {
+        jsonlResult.model = enrichment.latestModel;
+      }
+      if (enrichment.startedAt && !jsonlResult.startTime) {
+        jsonlResult.startTime = enrichment.startedAt;
+      }
+      if (enrichment.finishedAt && !jsonlResult.endTime) {
+        jsonlResult.endTime = enrichment.finishedAt;
+      }
+      if (enrichment.totalDurationMs && !jsonlResult.totalDurationMs) {
+        jsonlResult.totalDurationMs = enrichment.totalDurationMs;
+      }
+    }
+  }
   return jsonlResult;
 }
+function inferCursorSqliteSession(paths) {
+  for (const path of paths) {
+    const sessionId = sessionIdFromGlobalStatePath(path) || sessionIdFromStoreDbPath(path);
+    if (sessionId) return { sessionId };
+  }
+  return void 0;
+}
+function sessionIdFromGlobalStatePath(path) {
+  const marker = "#composerData:";
+  const markerIndex = path.indexOf(marker);
+  if (markerIndex < 0) return void 0;
+  const rawSessionId = path.slice(markerIndex + marker.length).split(/[/?#]/, 1)[0]?.trim();
+  return rawSessionId || void 0;
+}
+function sessionIdFromStoreDbPath(path) {
+  const normalized = path.replaceAll("\\", "/");
+  const parts = normalized.split("/");
+  if (parts.at(-1) !== "store.db") return void 0;
+  const rawSessionId = parts.at(-2)?.trim();
+  if (!rawSessionId || !CURSOR_UUID_SESSION_ID_RE.test(rawSessionId)) return void 0;
+  return rawSessionId;
+}
+async function tryLoadSdkEnrichment(sessionId) {
+  if (!sessionId.startsWith("agent-")) return null;
+  try {
+    const agent = await findSdkAgentById(sessionId);
+    if (!agent) return null;
+    return await loadSdkAgentEnrichment(agent);
+  } catch {
+    return null;
+  }
+}
+function deriveSessionIdFromTranscript(transcriptPaths) {
+  for (let i = transcriptPaths.length - 1; i >= 0; i--) {
+    const p = transcriptPaths[i];
+    const base = basename4(p, ".jsonl");
+    if (base.startsWith("agent-")) return base;
+  }
+  return null;
+}
+function mergeParseWarnings(base, extra) {
+  const merged = [];
+  for (const warning of [...base || [], ...extra || []]) {
+    addParseWarning(merged, warning);
+  }
+  return merged.length > 0 ? merged : void 0;
+}
 function defaultDataSourceInfo(dataSource) {
   if (!dataSource) return void 0;
   return {
@@ -5985,16 +7263,26 @@ async function parseCursorJsonl(transcriptPaths, explicitToolPaths, options) {
   const toolResults = /* @__PURE__ */ new Map();
   const toolErrors = /* @__PURE__ */ new Map();
   const toolImages = /* @__PURE__ */ new Map();
+  const parseWarnings = [];
   const sortedTranscriptPaths = await sortByMtime(transcriptPaths);
   const sessionId = basename4(sortedTranscriptPaths[sortedTranscriptPaths.length - 1], ".jsonl");
   for (const filePath of sortedTranscriptPaths) {
-    const content = await readFile11(filePath, "utf-8");
-    const lines = content.split("\n").filter((l) => l.trim());
-    for (const line of lines) {
+    const content = await readFile13(filePath, "utf-8");
+    const lines = content.split("\n");
+    for (let lineIndex = 0; lineIndex < lines.length; lineIndex++) {
+      const line = lines[lineIndex];
+      if (!line.trim()) continue;
       let obj;
       try {
         obj = JSON.parse(line);
       } catch {
+        addParseWarning(parseWarnings, {
+          kind: "malformed-json",
+          source: "cursor transcript JSONL",
+          firstLine: lineIndex + 1,
+          message: "Skipped malformed JSONL line",
+          sample: line
+        });
         continue;
       }
       const role = obj.role;
@@ -6031,7 +7319,17 @@ async function parseCursorJsonl(transcriptPaths, explicitToolPaths, options) {
       }
       for (const imagePath of imageFilePaths) {
         const dataUrl = await readImageFileAsDataUrl(imagePath);
-        if (dataUrl) userImages.push(dataUrl);
+        if (dataUrl) {
+          userImages.push(dataUrl);
+        } else {
+          addParseWarning(parseWarnings, {
+            kind: "missing-image",
+            source: "cursor transcript image reference",
+            firstLine: lineIndex + 1,
+            message: "Skipped image reference because the file could not be read",
+            sample: imagePath
+          });
+        }
       }
       if (role === "user" && textParts.length === 0 && userImages.length === 0) continue;
       if (role === "user") {
@@ -6118,7 +7416,8 @@ async function parseCursorJsonl(transcriptPaths, explicitToolPaths, options) {
         "cursor/projects/agent-transcripts/*.jsonl",
         ...hasToolData ? ["cursor/projects/agent-tools/*.txt"] : []
       ]
-    }
+    },
+    parseWarnings: parseWarnings.length > 0 ? parseWarnings : void 0
   };
 }
 function stripUserQueryWrapper(text) {
@@ -6133,7 +7432,9 @@ function normalizeImagePlaceholderLines(text) {
   return filtered.join("\n").trim();
 }
 function resolveImagePath(pathValue) {
-  if (pathValue.startsWith("~/")) return join11(homedir10(), pathValue.slice(2));
+  if (pathValue.startsWith("~/") || pathValue.startsWith("~\\")) {
+    return join12(homedir11(), pathValue.slice(2));
+  }
   return pathValue;
 }
 function imageMediaType(pathValue) {
@@ -6149,7 +7450,7 @@ function extractImageFilePathsFromText(text) {
   let match;
   while ((match = blockPattern.exec(text)) !== null) {
     const blockContent = match[1];
-    const pathRegex = /(?:^|\n)\s*(?:\d+\.\s*)?((?:~\/|\/)[^\n]+\.(?:png|jpe?g|gif|webp))/gi;
+    const pathRegex = /(?:^|\n)\s*(?:\d+\.\s*)?((?:~[\\/]|[\\/]|[A-Za-z]:[\\/])[^\n]+\.(?:png|jpe?g|gif|webp))/gi;
     let pathMatch;
     while ((pathMatch = pathRegex.exec(blockContent)) !== null) {
       const pathValue = pathMatch[1].trim();
@@ -6161,7 +7462,7 @@ function extractImageFilePathsFromText(text) {
 }
 async function readImageFileAsDataUrl(pathValue) {
   try {
-    const data = await readFile11(pathValue);
+    const data = await readFile13(pathValue);
     return `data:${imageMediaType(pathValue)};base64,${data.toString("base64")}`;
   } catch {
     return null;
@@ -6298,7 +7599,7 @@ function mergeJsonlSupplementsIntoCursorTurns(primaryTurns, jsonlTurns) {
 async function sortByMtime(paths) {
   const entries = [];
   for (const path of paths) {
-    const st = await stat7(path).catch(() => null);
+    const st = await stat8(path).catch(() => null);
     if (!st?.isFile()) continue;
     entries.push({ path, mtimeMs: st.mtimeMs });
   }
@@ -6316,8 +7617,8 @@ async function inferToolPaths(transcriptPaths) {
     projects.get(projectRoot)?.add(transcriptPath);
   }
   for (const [projectRoot, selectedPaths] of projects.entries()) {
-    const transcriptsDir = join11(projectRoot, "agent-transcripts");
-    const toolDir = join11(projectRoot, "agent-tools");
+    const transcriptsDir = join12(projectRoot, "agent-transcripts");
+    const toolDir = join12(projectRoot, "agent-tools");
     const transcriptEntries = await collectTranscriptEntries2(transcriptsDir);
     const toolEntries = await collectToolEntries2(toolDir);
     if (transcriptEntries.length === 0 || toolEntries.length === 0) continue;
@@ -6340,22 +7641,22 @@ async function inferToolPaths(transcriptPaths) {
 async function collectTranscriptEntries2(transcriptsDir) {
   let entries;
   try {
-    entries = await readdir8(transcriptsDir);
+    entries = await readdir9(transcriptsDir);
   } catch {
     return [];
   }
   const transcripts = [];
   for (const entry of entries) {
-    const entryPath = join11(transcriptsDir, entry);
-    const st = await stat7(entryPath).catch(() => null);
+    const entryPath = join12(transcriptsDir, entry);
+    const st = await stat8(entryPath).catch(() => null);
     if (!st) continue;
     if (entry.endsWith(".jsonl") && st.isFile()) {
       transcripts.push({ path: entryPath, mtimeMs: st.mtimeMs });
       continue;
     }
     if (!st.isDirectory()) continue;
-    const nested = join11(entryPath, `${entry}.jsonl`);
-    const nestedStat = await stat7(nested).catch(() => null);
+    const nested = join12(entryPath, `${entry}.jsonl`);
+    const nestedStat = await stat8(nested).catch(() => null);
     if (!nestedStat?.isFile()) continue;
     transcripts.push({ path: nested, mtimeMs: nestedStat.mtimeMs });
   }
@@ -6364,15 +7665,15 @@ async function collectTranscriptEntries2(transcriptsDir) {
 async function collectToolEntries2(toolDir) {
   let entries;
   try {
-    entries = await readdir8(toolDir);
+    entries = await readdir9(toolDir);
   } catch {
     return [];
   }
   const tools = [];
   for (const entry of entries) {
     if (!entry.endsWith(".txt")) continue;
-    const entryPath = join11(toolDir, entry);
-    const st = await stat7(entryPath).catch(() => null);
+    const entryPath = join12(toolDir, entry);
+    const st = await stat8(entryPath).catch(() => null);
     if (!st?.isFile()) continue;
     tools.push({ path: entryPath, mtimeMs: st.mtimeMs });
   }
@@ -6386,10 +7687,10 @@ function getCursorProjectRoot(transcriptPath) {
 async function loadToolEvents(toolPaths) {
   const events = [];
   for (const path of toolPaths) {
-    const content = await readFile11(path, "utf-8").catch(() => "");
+    const content = await readFile13(path, "utf-8").catch(() => "");
     const result = content.trim();
     if (!result) continue;
-    const st = await stat7(path).catch(() => null);
+    const st = await stat8(path).catch(() => null);
     const id = basename4(path, extname2(path));
     events.push({
       id,
@@ -6532,8 +7833,8 @@ init_cloud();
 // src/publishers/gist.ts
 init_cloud();
 import { createHash as createHash2 } from "crypto";
-import { readFile as readFile14, writeFile as writeFile4 } from "fs/promises";
-import { join as join14 } from "path";
+import { readFile as readFile16, writeFile as writeFile4 } from "fs/promises";
+import { join as join15 } from "path";
 var GIST_META_FILE = ".vibe-replay-gist.json";
 function checkPublishStatus() {
   const auth = loadAuthToken();
@@ -6545,12 +7846,16 @@ async function publishGist(outputDir, title, opts) {
   if (!auth) {
     throw new Error("Not logged in. Run `vibe-replay auth login` first.");
   }
-  const jsonPath = join14(outputDir, "replay.json");
-  const content = await readFile14(jsonPath, "utf-8");
+  const jsonPath = join15(outputDir, "replay.json");
+  const content = await readFile16(jsonPath, "utf-8");
   const overwrite = opts?.overwrite;
   const filename = overwrite?.filename || `${sanitizeFilename(title)}.json`;
   const description = `vibe-replay: ${title}`;
   const apiUrl = getApiUrl();
+  const headers = {
+    "Content-Type": "application/json",
+    Cookie: `${getSessionCookieName(apiUrl)}=${auth.token}`
+  };
   let gistId;
   let gistUrl;
   let viewerUrl;
@@ -6558,10 +7863,7 @@ async function publishGist(outputDir, title, opts) {
   if (overwrite) {
     const resp = await fetch(`${apiUrl}/api/gists/${overwrite.gistId}`, {
       method: "PATCH",
-      headers: {
-        "Content-Type": "application/json",
-        Cookie: `${getSessionCookieName(apiUrl)}=${auth.token}`
-      },
+      headers,
       body: JSON.stringify({ filename, content, description })
     });
     if (!resp.ok) {
@@ -6578,10 +7880,7 @@ async function publishGist(outputDir, title, opts) {
   } else {
     const resp = await fetch(`${apiUrl}/api/gists`, {
       method: "POST",
-      headers: {
-        "Content-Type": "application/json",
-        Cookie: `${getSessionCookieName(apiUrl)}=${auth.token}`
-      },
+      headers,
       body: JSON.stringify({ filename, content, description, public: true })
     });
     if (!resp.ok) {
@@ -6612,7 +7911,7 @@ async function publishGist(outputDir, title, opts) {
 }
 async function loadSavedGistInfo(outputDir) {
   try {
-    const raw = await readFile14(join14(outputDir, GIST_META_FILE), "utf-8");
+    const raw = await readFile16(join15(outputDir, GIST_META_FILE), "utf-8");
     const parsed = JSON.parse(raw);
     if (!parsed?.gistId || !parsed?.filename) return void 0;
     return parsed;
@@ -6621,7 +7920,7 @@ async function loadSavedGistInfo(outputDir) {
   }
 }
 async function saveGistInfo(outputDir, info) {
-  await writeFile4(join14(outputDir, GIST_META_FILE), JSON.stringify(info, null, 2), "utf-8");
+  await writeFile4(join15(outputDir, GIST_META_FILE), JSON.stringify(info, null, 2), "utf-8");
 }
 function sanitizeFilename(s) {
   return s.replace(/[^a-zA-Z0-9_-]/g, "-").replace(/-+/g, "-").slice(0, 60);
@@ -6732,21 +8031,21 @@ function scanForSecrets(content) {
 }
 
 // src/server.ts
-import { execFile as execFile2 } from "child_process";
+import { execFile as execFile3 } from "child_process";
 import { createHash as createHash4 } from "crypto";
 import { watch as fsWatch } from "fs";
 import {
   mkdir as mkdir5,
   open as fsOpen,
-  readdir as readdir10,
-  readFile as readFile17,
-  stat as stat9,
+  readdir as readdir11,
+  readFile as readFile19,
+  stat as stat10,
   unlink as unlink2,
   writeFile as writeFile6
 } from "fs/promises";
-import { homedir as homedir15 } from "os";
-import { basename as basename6, dirname as dirname5, join as join17, resolve as resolve2 } from "path";
-import { promisify as promisify2 } from "util";
+import { homedir as homedir16 } from "os";
+import { basename as basename6, dirname as dirname5, join as join18, resolve as resolve2 } from "path";
+import { promisify as promisify3 } from "util";
 import { serve } from "@hono/node-server";
 import chalk from "chalk";
 import { Hono } from "hono";
@@ -6756,6 +8055,14 @@ import open2 from "open";
 // src/feedback.ts
 import { spawn } from "child_process";
 import { randomUUID } from "crypto";
+var IS_WINDOWS = process.platform === "win32";
+function spawnTool(command, args, options) {
+  if (IS_WINDOWS) {
+    const quoted = /\s/.test(command) ? `"${command}"` : command;
+    return spawn(quoted, args, { ...options, shell: true });
+  }
+  return spawn(command, args, options);
+}
 var TOOL_PRIORITY = ["claude", "agent", "opencode"];
 async function detectFeedbackTools() {
   const insideClaude = !!process.env.CLAUDECODE;
@@ -6767,8 +8074,8 @@ async function detectFeedbackTools() {
   const tools = [];
   for (const tool of candidates) {
     try {
-      const path = await shell(`which ${tool.cmd}`);
-      if (path.trim()) tools.push({ name: tool.name, command: path.trim() });
+      const located = await locateCommand(tool.cmd);
+      if (located) tools.push({ name: tool.name, command: located });
     } catch {
     }
   }
@@ -6994,7 +8301,7 @@ async function executeFeedback(prompt, tool) {
 }
 function runClaude(prompt, cmd) {
   return new Promise((resolve3, reject) => {
-    const proc = spawn(cmd, ["-p", "--output-format", "json"], {
+    const proc = spawnTool(cmd, ["-p", "--output-format", "json"], {
       env: { ...process.env, NO_COLOR: "1" },
       timeout: 6e5,
       stdio: ["pipe", "pipe", "pipe"]
@@ -7022,7 +8329,7 @@ function runClaude(prompt, cmd) {
 }
 function runOpencode(prompt, cmd) {
   return new Promise((resolve3, reject) => {
-    const proc = spawn(cmd, ["run"], {
+    const proc = spawnTool(cmd, ["run"], {
       env: { ...process.env, NO_COLOR: "1", TERM: "dumb" },
       timeout: 6e5,
       stdio: ["pipe", "pipe", "pipe"]
@@ -7045,7 +8352,7 @@ function runOpencode(prompt, cmd) {
 }
 function runAgent(prompt, cmd) {
   return new Promise((resolve3, reject) => {
-    const proc = spawn(cmd, ["-p", "--output-format", "json", "--mode", "ask", "--trust"], {
+    const proc = spawnTool(cmd, ["-p", "--output-format", "json", "--mode", "ask", "--trust"], {
       env: { ...process.env, NO_COLOR: "1" },
       timeout: 6e5,
       stdio: ["pipe", "pipe", "pipe"]
@@ -7398,10 +8705,13 @@ async function generateFeedback(session, tool, { debug = false } = {}) {
   }
   return { annotations: feedbackToAnnotations(result), result };
 }
-function buildTranslationPrompt(session, opts) {
-  const translatableScenes = session.scenes.map(
+function collectTranslatableScenes(scenes) {
+  return scenes.map(
     (s, i) => s.type === "user-prompt" || s.type === "text-response" ? { index: i, content: s.content } : null
   ).filter((s) => s !== null);
+}
+function buildTranslationPrompt(session, opts) {
+  const translatableScenes = collectTranslatableScenes(session.scenes);
   const scenesBlock = translatableScenes.map((s) => `--- SCENE ${s.index} ---
 ${s.content}`).join("\n\n");
   const sourcePart = opts.sourceLang ? `from ${opts.sourceLang} ` : "";
@@ -7483,9 +8793,7 @@ function parseTranslationBatch(output, batchScenes, opts, now) {
 }
 async function generateTranslation(session, tool, opts) {
   if (session.scenes.length === 0) return null;
-  const allScenes = session.scenes.map(
-    (s, i) => s.type === "user-prompt" || s.type === "text-response" ? { index: i, content: s.content } : null
-  ).filter((s) => s !== null);
+  const allScenes = collectTranslatableScenes(session.scenes);
   if (allScenes.length === 0) return null;
   const batches = [];
   for (let i = 0; i < allScenes.length; i += TRANSLATE_BATCH_SIZE) {
@@ -7654,14 +8962,19 @@ async function generateToneAdjustment(session, tool, opts) {
 function stripAnsi(str) {
   return str.replace(/\x1B\[[0-9;]*[a-zA-Z]/g, "").replace(/\x1B\][^\x07]*\x07/g, "");
 }
-function shell(cmd) {
+function locateCommand(cmd) {
   return new Promise((resolve3, reject) => {
-    const proc = spawn("sh", ["-c", cmd], { timeout: 5e3 });
+    const locator = IS_WINDOWS ? "where" : "which";
+    const proc = spawn(locator, [cmd], { timeout: 5e3 });
     let out = "";
     proc.stdout.on("data", (d) => out += d.toString());
     proc.on("close", (code) => {
-      if (code === 0) resolve3(out);
-      else reject(new Error(`${cmd} failed`));
+      if (code !== 0) {
+        resolve3(null);
+        return;
+      }
+      const first = out.split(/\r?\n/).find((line) => line.trim());
+      resolve3(first ? first.trim() : null);
     });
     proc.on("error", reject);
   });
@@ -7673,12 +8986,30 @@ init_overlays();
 init_cloud();
 
 // src/scanner.ts
-import { readdir as readdir9, readFile as readFile16, stat as stat8 } from "fs/promises";
-import { homedir as homedir13 } from "os";
-import { join as join16 } from "path";
+import { readdir as readdir10, readFile as readFile18, stat as stat9 } from "fs/promises";
+import { homedir as homedir14 } from "os";
+import { join as join17 } from "path";
 
 // src/pricing.ts
 var MODEL_PRICING = {
+  "gpt-5.5": {
+    inputRate: 5,
+    outputRate: 30,
+    cacheCreateRate: 5,
+    cacheReadRate: 0.5
+  },
+  "gpt-5.4": {
+    inputRate: 2.5,
+    outputRate: 15,
+    cacheCreateRate: 2.5,
+    cacheReadRate: 0.25
+  },
+  "gpt-5.4-mini": {
+    inputRate: 0.75,
+    outputRate: 4.5,
+    cacheCreateRate: 0.75,
+    cacheReadRate: 0.075
+  },
   // Opus 4.6/4.5
   "opus-4-new": {
     inputRate: 5,
@@ -7732,6 +9063,9 @@ var MODEL_PRICING = {
 var DEFAULT_PRICING = MODEL_PRICING.sonnet;
 function getModelPricing(model) {
   const lower = model.toLowerCase();
+  if (lower.includes("gpt-5.4-mini")) return MODEL_PRICING["gpt-5.4-mini"];
+  if (lower.includes("gpt-5.5")) return MODEL_PRICING["gpt-5.5"];
+  if (lower.includes("gpt-5.4")) return MODEL_PRICING["gpt-5.4"];
   if (lower.includes("opus-4-6") || lower.includes("opus-4-5")) return MODEL_PRICING["opus-4-new"];
   if (lower.includes("opus")) return MODEL_PRICING.opus;
   if (lower.includes("sonnet-4-6") || lower.includes("sonnet-4-5"))
@@ -7743,6 +9077,9 @@ function getModelPricing(model) {
   return DEFAULT_PRICING;
 }
 var MODEL_CONTEXT_LIMITS = {
+  "gpt-5.5": 27e4,
+  "gpt-5.4-mini": 27e4,
+  "gpt-5.4": 27e4,
   "gpt-4o": 128e3,
   "gpt-4-turbo": 128e3,
   "gpt-4": 8192,
@@ -7856,7 +9193,7 @@ async function scanSession(input) {
   for (const filePath of input.filePaths) {
     let content;
     try {
-      content = await readFile16(filePath, "utf-8");
+      content = await readFile18(filePath, "utf-8");
     } catch {
       continue;
     }
@@ -7911,6 +9248,9 @@ async function scanSession(input) {
         if (obj.subtype === "api_error") apiErrorCount++;
         continue;
       }
+      if (obj.type === "assistant" && obj.isApiErrorMessage) {
+        apiErrorCount++;
+      }
       if (obj.isMeta) {
         const text = extractMetaText(obj.message?.content);
         if (text.startsWith("Base directory for this skill:")) {
@@ -7975,15 +9315,15 @@ async function scanSession(input) {
   if (input.filePaths.length > 0) {
     const mainFile = input.filePaths[0];
     const sessionDir = mainFile.replace(/\.jsonl$/, "");
-    const subagentsDir = join16(sessionDir, "subagents");
+    const subagentsDir = join17(sessionDir, "subagents");
     try {
-      const files = await readdir9(subagentsDir);
+      const files = await readdir10(subagentsDir);
       const jsonlFiles = files.filter((f) => f.endsWith(".jsonl"));
       subAgentCount = jsonlFiles.length;
       for (const saFile of jsonlFiles) {
         let saContent;
         try {
-          saContent = await readFile16(join16(subagentsDir, saFile), "utf-8");
+          saContent = await readFile18(join17(subagentsDir, saFile), "utf-8");
         } catch {
           continue;
         }
@@ -8170,7 +9510,7 @@ function buildScanResultFromParsed(input, parsed) {
   let derivedSubAgentCount = 0;
   const fileEditCounts = /* @__PURE__ */ new Map();
   for (const turn of parsed.turns) {
-    if (turn.role === "user" && turn.subtype !== "compaction-summary") {
+    if (turn.role === "user" && !turn.subtype) {
       const hasText = turn.blocks.some(
         (block) => block.type === "text" && typeof block.text === "string" && block.text.trim().length > 0
       );
@@ -8193,16 +9533,18 @@ function buildScanResultFromParsed(input, parsed) {
           const saPath = extractToolFilePath(saScene.input);
           if (!saPath) continue;
           editCount++;
-          const short2 = shortenPath(saPath);
-          fileEditCounts.set(short2, (fileEditCounts.get(short2) || 0) + 1);
+          const short = shortenPath(saPath);
+          fileEditCounts.set(short, (fileEditCounts.get(short) || 0) + 1);
         }
       }
       if (!FILE_EDIT_TOOLS.has(block.name)) continue;
-      const rawPath = extractToolFilePath(block.input);
-      if (!rawPath) continue;
+      const rawPaths = extractToolFilePaths(block.input);
+      if (rawPaths.length === 0) continue;
       editCount++;
-      const short = shortenPath(rawPath);
-      fileEditCounts.set(short, (fileEditCounts.get(short) || 0) + 1);
+      for (const rawPath of rawPaths) {
+        const short = shortenPath(rawPath);
+        fileEditCounts.set(short, (fileEditCounts.get(short) || 0) + 1);
+      }
     }
   }
   const costEstimate = estimateParsedCost(parsed);
@@ -8244,7 +9586,7 @@ function buildScanResultFromParsed(input, parsed) {
 }
 function firstUserPrompt(turns) {
   for (const turn of turns) {
-    if (turn.role !== "user" || turn.subtype === "compaction-summary") continue;
+    if (turn.role !== "user" || turn.subtype) continue;
     for (const block of turn.blocks) {
       if (block.type !== "text") continue;
       const text = block.text.replace(/\s+/g, " ").trim();
@@ -8274,7 +9616,7 @@ async function getFileMeta(filePaths) {
   let maxMtime = 0;
   for (const fp of filePaths) {
     try {
-      const s = await stat8(fp);
+      const s = await stat9(fp);
       totalSize += s.size;
       if (s.mtimeMs > maxMtime) maxMtime = s.mtimeMs;
     } catch {
@@ -8627,33 +9969,33 @@ function buildAggregateDataQuality(scans) {
   }
   return notes.length > 0 ? { notes } : void 0;
 }
-var CLAUDE_DIR2 = join16(homedir13(), ".claude", "projects");
+var CLAUDE_DIR2 = join17(homedir14(), ".claude", "projects");
 function encodeProjectDir(project) {
   let resolved = project;
   if (resolved.startsWith("~/")) {
-    resolved = join16(homedir13(), resolved.slice(2));
+    resolved = join17(homedir14(), resolved.slice(2));
   } else if (resolved === "~") {
-    resolved = homedir13();
+    resolved = homedir14();
   }
   return resolved.replace(/\//g, "-");
 }
 async function readProjectMemory(project) {
   const encoded = encodeProjectDir(project);
-  const projectDir = join16(CLAUDE_DIR2, encoded);
-  const memoryDir = join16(projectDir, "memory");
+  const projectDir = join17(CLAUDE_DIR2, encoded);
+  const memoryDir = join17(projectDir, "memory");
   const memoryFiles = [];
   let claudeMd;
   try {
-    const content = await readFile16(join16(projectDir, "CLAUDE.md"), "utf-8");
+    const content = await readFile18(join17(projectDir, "CLAUDE.md"), "utf-8");
     if (content.trim()) claudeMd = content.slice(0, 5e3);
   } catch {
   }
   try {
-    const files = await readdir9(memoryDir);
+    const files = await readdir10(memoryDir);
     for (const file of files) {
       if (!file.endsWith(".md") || file === "MEMORY.md") continue;
       try {
-        const content = await readFile16(join16(memoryDir, file), "utf-8");
+        const content = await readFile18(join17(memoryDir, file), "utf-8");
         const fm = parseFrontmatter(content);
         memoryFiles.push({
           name: fm.name || file.replace(/\.md$/, ""),
@@ -8694,7 +10036,7 @@ function extractMetaText(content) {
 }
 
 // src/transform.ts
-import { homedir as homedir14 } from "os";
+import { homedir as homedir15 } from "os";
 
 // src/utils/tokenEstimate.ts
 function estimateTokens(s) {
@@ -8704,11 +10046,15 @@ function estimateTokens(s) {
 }
 
 // src/transform.ts
-var HOME = homedir14();
+var HOME = homedir15();
 function redactPath(s) {
   if (!HOME) return s;
   return s.replaceAll(HOME, "~");
 }
+function redactFilePath(s) {
+  const redacted = redactPath(s);
+  return process.platform === "win32" ? redacted.replaceAll("\\", "/") : redacted;
+}
 function transformToReplay(parsed, provider, project, options) {
   const scenes = [];
   let userPrompts = 0;
@@ -8834,7 +10180,7 @@ function transformToReplay(parsed, provider, project, options) {
       startTime: parsed.startTime || (/* @__PURE__ */ new Date()).toISOString(),
       endTime: parsed.endTime,
       model: parsed.model,
-      cwd: redactPath(parsed.cwd),
+      cwd: redactFilePath(parsed.cwd),
       project,
       ...options?.generator ? { generator: options.generator } : {},
       stats: {
@@ -8847,7 +10193,7 @@ function transformToReplay(parsed, provider, project, options) {
         costEstimate,
         ...parsed.turnStats ? { turnStats: parsed.turnStats } : {}
       },
-      ...parsed.model ? { contextLimit: getModelContextLimit(parsed.model) } : {},
+      ...parsed.contextLimit || parsed.model ? { contextLimit: parsed.contextLimit || getModelContextLimit(parsed.model || "") } : {},
       ...parsed.tokenUsageByModel ? { tokenUsageByModel: parsed.tokenUsageByModel } : {},
       ...parsed.prLinks && parsed.prLinks.length > 0 ? { prLinks: parsed.prLinks } : {},
       compactions: parsed.compactions,
@@ -8856,10 +10202,19 @@ function transformToReplay(parsed, provider, project, options) {
       ...parsed.gitBranches ? { gitBranches: parsed.gitBranches } : {},
       ...parsed.entrypoint ? { entrypoint: parsed.entrypoint } : {},
       ...parsed.permissionMode ? { permissionMode: parsed.permissionMode } : {},
+      ...parsed.memoryMode ? { memoryMode: parsed.memoryMode } : {},
       ...parsed.apiErrors && parsed.apiErrors.length > 0 ? { apiErrors: parsed.apiErrors } : {},
-      ...parsed.trackedFiles && parsed.trackedFiles.length > 0 ? { trackedFiles: parsed.trackedFiles.map(redactPath) } : {},
-      ...parsed.contextFiles && parsed.contextFiles.length > 0 ? { contextFiles: parsed.contextFiles.map(redactPath) } : {},
+      ...parsed.trackedFiles && parsed.trackedFiles.length > 0 ? { trackedFiles: parsed.trackedFiles.map(redactFilePath) } : {},
+      ...parsed.contextFiles && parsed.contextFiles.length > 0 ? { contextFiles: parsed.contextFiles.map(redactFilePath) } : {},
       ...parsed.cursorSidecars ? { cursorSidecars: parsed.cursorSidecars } : {},
+      ...parsed.parseWarnings && parsed.parseWarnings.length > 0 ? {
+        parseWarnings: parsed.parseWarnings.map((warning) => ({
+          ...warning,
+          message: redactWarningText(warning.message),
+          ...warning.source ? { source: redactWarningText(warning.source) } : {},
+          sample: warning.kind !== "malformed-json" && warning.sample ? compactWarningSample(redactWarningText(warning.sample)) : void 0
+        }))
+      } : {},
       ...parsed.serviceTier ? { serviceTier: parsed.serviceTier } : {},
       ...parsed.skillsUsed ? { skillsUsed: parsed.skillsUsed } : {},
       ...parsed.mcpServersUsed ? { mcpServersUsed: parsed.mcpServersUsed } : {},
@@ -8874,9 +10229,9 @@ function transformToReplay(parsed, provider, project, options) {
 function buildFileDiff(toolName, input) {
   if (toolName === "Edit" && input.file_path) {
     return {
-      filePath: redactPath(input.file_path),
-      oldContent: input.old_string ?? "",
-      newContent: input.new_string ?? ""
+      filePath: redactFilePath(input.file_path),
+      oldContent: redactDiffContent(input.old_string),
+      newContent: redactDiffContent(input.new_string)
     };
   }
   if (toolName === "MultiEdit" && input.file_path && Array.isArray(input.edits)) {
@@ -8885,28 +10240,49 @@ function buildFileDiff(toolName, input) {
     });
     if (edits.length > 0) {
       return {
-        filePath: redactPath(input.file_path),
-        oldContent: edits.map((edit) => edit.old_string ?? "").join("\n\n"),
-        newContent: edits.map((edit) => edit.new_string ?? "").join("\n\n")
+        filePath: redactFilePath(input.file_path),
+        oldContent: edits.map((edit) => redactDiffContent(edit.old_string)).join("\n\n"),
+        newContent: edits.map((edit) => redactDiffContent(edit.new_string)).join("\n\n")
       };
     }
   }
   if (toolName === "Write" && input.file_path) {
     return {
-      filePath: redactPath(input.file_path),
+      filePath: redactFilePath(input.file_path),
       oldContent: "",
-      newContent: truncate(input.content || "", 3e3)
+      newContent: truncate(redactDiffContent(input.content), 3e3)
     };
   }
   if (toolName === "Delete" && input.file_path) {
     return {
-      filePath: redactPath(input.file_path),
-      oldContent: input.old_string ?? "(file deleted)",
+      filePath: redactFilePath(input.file_path),
+      oldContent: typeof input.old_string === "string" ? redactDiffContent(input.old_string) : "(file deleted)",
       newContent: ""
     };
   }
   return void 0;
 }
+function redactDiffContent(value) {
+  return typeof value === "string" ? redactSecrets(redactPath(value)) : "";
+}
+function redactWarningText(value) {
+  return redactSecrets(redactWarningPaths(redactPath(value))).replace(
+    /[A-Za-z0-9_-]{4,}\.\.\.\[REDACTED\]/g,
+    "[REDACTED]"
+  );
+}
+function redactWarningPaths(value) {
+  let result = value;
+  if (HOME) {
+    const slashEscapedHome = HOME.replaceAll("/", "\\/");
+    result = result.replaceAll(slashEscapedHome, "~");
+    const backslashEscapedHome = HOME.replaceAll("\\", "\\\\");
+    if (backslashEscapedHome !== HOME) {
+      result = result.replaceAll(backslashEscapedHome, "~");
+    }
+  }
+  return result.replace(/[A-Za-z]:(?:\\\\|\\)Users(?:\\\\|\\)[^\\/"\s]+/g, "~");
+}
 function buildToolScene(toolName, input, result, images) {
   const resultTokens = estimateTokens(result);
   const scene = {
@@ -9123,7 +10499,7 @@ function getErrorMessage(err) {
   return "Unknown error";
 }
 function normalizeProjectPath(project) {
-  const home = homedir15();
+  const home = homedir16();
   return project.startsWith(home) ? `~${project.slice(home.length)}` : project;
 }
 var MAX_INSIGHTS_SYNC_DAYS_PER_REQUEST = 90;
@@ -9194,20 +10570,20 @@ function resolveGenerateInputs(body, discoveredSessions) {
 var ARCHIVE_DIR = ".archive";
 async function getArchivedSlugs(baseDir) {
   try {
-    const entries = await readdir10(join17(baseDir, ARCHIVE_DIR));
+    const entries = await readdir11(join18(baseDir, ARCHIVE_DIR));
     return new Set(entries);
   } catch {
     return /* @__PURE__ */ new Set();
   }
 }
 async function archiveSlug(baseDir, slug) {
-  const dir = join17(baseDir, ARCHIVE_DIR);
+  const dir = join18(baseDir, ARCHIVE_DIR);
   await mkdir5(dir, { recursive: true });
-  await writeFile6(join17(dir, slug), "");
+  await writeFile6(join18(dir, slug), "");
 }
 async function unarchiveSlug(baseDir, slug) {
   try {
-    await unlink2(join17(baseDir, ARCHIVE_DIR, slug));
+    await unlink2(join18(baseDir, ARCHIVE_DIR, slug));
   } catch {
   }
 }
@@ -9215,29 +10591,29 @@ async function scanSessionsFromDir(baseDir) {
   const results = [];
   let entries;
   try {
-    entries = await readdir10(baseDir);
+    entries = await readdir11(baseDir);
   } catch {
     return results;
   }
   for (const entry of entries) {
-    const replayPath = join17(baseDir, entry, "replay.json");
+    const replayPath = join18(baseDir, entry, "replay.json");
     try {
-      const raw = await readFile17(replayPath, "utf-8");
+      const raw = await readFile19(replayPath, "utf-8");
       const session = JSON.parse(raw);
-      const annotationsPath = join17(baseDir, entry, "annotations.json");
+      const annotationsPath = join18(baseDir, entry, "annotations.json");
       let annotationCount = 0;
       try {
-        const annRaw = await readFile17(annotationsPath, "utf-8");
+        const annRaw = await readFile19(annotationsPath, "utf-8");
         const anns = JSON.parse(annRaw);
         annotationCount = Array.isArray(anns) ? anns.length : 0;
       } catch {
       }
       let gist;
       try {
-        gist = await loadSavedGistInfo(join17(baseDir, entry));
+        gist = await loadSavedGistInfo(join18(baseDir, entry));
       } catch {
       }
-      const cloudInfo = await loadSavedCloudInfo(join17(baseDir, entry));
+      const cloudInfo = await loadSavedCloudInfo(join18(baseDir, entry));
       const userPrompts = (session.scenes || []).filter((sc) => sc.type === "user-prompt").map((sc) => previewPrompt(sc.content)).filter((m) => m.length >= 10);
       const firstMessage = userPrompts[0] || void 0;
       const messages = userPrompts.length > 0 ? userPrompts.slice(0, 2) : void 0;
@@ -9265,7 +10641,7 @@ async function scanSessionsFromDir(baseDir) {
           let outdated = false;
           if (gist?.contentHash) {
             try {
-              const content = await readFile17(replayPath, "utf-8");
+              const content = await readFile19(replayPath, "utf-8");
               const currentHash = createHash4("sha256").update(content).digest("hex").slice(0, 16);
               outdated = currentHash !== gist?.contentHash;
             } catch {
@@ -9311,20 +10687,20 @@ async function scanSessions(baseDir) {
   return allResults;
 }
 async function loadSessionFromDisk(baseDir, slug) {
-  let replayPath = join17(baseDir, slug, "replay.json");
+  let replayPath = join18(baseDir, slug, "replay.json");
   try {
-    await stat9(replayPath);
+    await stat10(replayPath);
   } catch {
     const fallback = resolve2("./vibe-replay", slug, "replay.json");
-    await stat9(fallback);
+    await stat10(fallback);
     replayPath = fallback;
   }
-  const raw = await readFile17(replayPath, "utf-8");
+  const raw = await readFile19(replayPath, "utf-8");
   const session = JSON.parse(raw);
   const sessionDir = dirname5(replayPath);
-  const annotationsPath = join17(sessionDir, "annotations.json");
+  const annotationsPath = join18(sessionDir, "annotations.json");
   try {
-    const annRaw = await readFile17(annotationsPath, "utf-8");
+    const annRaw = await readFile19(annotationsPath, "utf-8");
     const anns = JSON.parse(annRaw);
     if (Array.isArray(anns) && anns.length > 0) {
       session.annotations = anns;
@@ -9340,7 +10716,12 @@ function pickSourceRecordForSession(session, bySessionId, byKey) {
   const byIdMatch = bySessionId.get(session.sessionId);
   return (byIdMatch?.provider === session.provider ? byIdMatch : void 0) ?? byKey.get(sourceSessionKey(session.provider, session.project, session.slug));
 }
-function selectCursorEnrichmentCandidates(merged, baseSources, limit = 30) {
+function selectCursorEnrichmentCandidates(merged, baseSources, limitOrHints = 30) {
+  const hints = typeof limitOrHints === "number" ? { limit: limitOrHints } : limitOrHints;
+  const limit = Math.max(1, Math.min(hints.limit ?? 30, 100));
+  const preferredSessionIds = new Set(hints.sessionIds || []);
+  const preferredSlugs = new Set(hints.slugs || []);
+  const preferredProjects = new Set(hints.projects || []);
   const mergedBySessionId = /* @__PURE__ */ new Map();
   const mergedByKey = /* @__PURE__ */ new Map();
   for (const session of merged) {
@@ -9352,7 +10733,91 @@ function selectCursorEnrichmentCandidates(merged, baseSources, limit = 30) {
   ).map((s) => {
     const byId = s.sessionId ? mergedBySessionId.get(s.sessionId) : void 0;
     return byId || mergedByKey.get(sourceSessionKey(s.provider, s.project, s.slug));
-  }).filter((s) => Boolean(s)).sort((a, b) => b.timestamp.localeCompare(a.timestamp)).slice(0, limit);
+  }).filter((s) => Boolean(s)).sort((a, b) => {
+    const scoreDelta = enrichmentPriorityScore(b, preferredSessionIds, preferredSlugs, preferredProjects) - enrichmentPriorityScore(a, preferredSessionIds, preferredSlugs, preferredProjects);
+    return scoreDelta || b.timestamp.localeCompare(a.timestamp);
+  }).slice(0, limit);
+}
+function enrichmentPriorityScore(session, preferredSessionIds, preferredSlugs, preferredProjects) {
+  let score = 0;
+  if (preferredSessionIds.has(session.sessionId)) score += 1e3;
+  if (preferredSlugs.has(session.slug)) score += 800;
+  if (preferredProjects.has(session.project)) score += 400;
+  if (session.timestamp && Date.now() - Date.parse(session.timestamp) <= 24 * 60 * 60 * 1e3) {
+    score += 100;
+  }
+  if (session.hasPR) score += 25;
+  if (session.hasSqlite) score += 10;
+  return score;
+}
+function prioritizeScanInputs(inputs, previousResults, hints = {}) {
+  const previousSessionIds = new Set(previousResults.map((result) => result.sessionId));
+  const preferredSessionIds = new Set(hints.sessionIds || []);
+  const preferredSlugs = new Set(hints.slugs || []);
+  const preferredProjects = new Set(hints.projects || []);
+  return [...inputs].sort((a, b) => {
+    const scoreDelta = scanInputPriorityScore(
+      b,
+      previousSessionIds,
+      preferredSessionIds,
+      preferredSlugs,
+      preferredProjects
+    ) - scanInputPriorityScore(
+      a,
+      previousSessionIds,
+      preferredSessionIds,
+      preferredSlugs,
+      preferredProjects
+    );
+    return scoreDelta || (b.timestamp || "").localeCompare(a.timestamp || "");
+  });
+}
+function scanInputPriorityScore(input, previousSessionIds, preferredSessionIds, preferredSlugs, preferredProjects) {
+  let score = 0;
+  if (!previousSessionIds.has(input.sessionId)) score += 1e3;
+  if (preferredSessionIds.has(input.sessionId)) score += 2e3;
+  if (preferredSlugs.has(input.slug)) score += 1600;
+  if (preferredProjects.has(input.project)) score += 400;
+  if (input.timestamp && Date.now() - Date.parse(input.timestamp) <= 24 * 60 * 60 * 1e3) {
+    score += 100;
+  }
+  return score;
+}
+function mergeEnrichmentHints(existing, next) {
+  return {
+    sessionIds: uniqueStrings([...existing?.sessionIds || [], ...next.sessionIds || []]),
+    slugs: uniqueStrings([...existing?.slugs || [], ...next.slugs || []]),
+    projects: uniqueStrings([...existing?.projects || [], ...next.projects || []]),
+    limit: Math.max(existing?.limit || 0, next.limit || 0) || void 0
+  };
+}
+function uniqueStrings(values) {
+  return [...new Set(values.filter((value) => typeof value === "string" && value.trim()))].slice(
+    0,
+    200
+  );
+}
+function enrichmentHintsFromBody(value) {
+  if (!value || typeof value !== "object") return {};
+  const body = value;
+  return {
+    sessionIds: stringArrayFromUnknown(body.sessionIds),
+    slugs: stringArrayFromUnknown(body.slugs),
+    projects: stringArrayFromUnknown(body.projects),
+    limit: typeof body.limit === "number" ? body.limit : void 0
+  };
+}
+function stringArrayFromUnknown(value) {
+  if (!Array.isArray(value)) return void 0;
+  const strings = value.filter(
+    (item) => typeof item === "string" && item.trim().length > 0
+  );
+  return strings.length > 0 ? [...new Set(strings)] : void 0;
+}
+function normalizeSessionProjectsForHome(sessions, home) {
+  return sessions.map(
+    (session) => session.project.startsWith(home) ? { ...session, project: `~${session.project.slice(home.length)}` } : { ...session }
+  );
 }
 function countSessionStats(turns) {
   let promptCount = 0;
@@ -9408,13 +10873,13 @@ async function buildSourcesResult(merged, baseDir, home, previousSources = [], c
   const projectExistsMap = /* @__PURE__ */ new Map();
   const projectIsGitMap = /* @__PURE__ */ new Map();
   for (const p of uniqueProjects) {
-    const resolved = p.startsWith("~/") ? join17(home, p.slice(2)) : p === "~" ? home : p;
+    const resolved = p === "~" ? home : p.startsWith("~/") || p.startsWith("~\\") ? join18(home, p.slice(2)) : p;
     try {
-      const s = await stat9(resolved);
+      const s = await stat10(resolved);
       projectExistsMap.set(p, s.isDirectory());
       if (s.isDirectory()) {
         try {
-          await stat9(join17(resolved, ".git"));
+          await stat10(join18(resolved, ".git"));
           projectIsGitMap.set(p, true);
         } catch {
           projectIsGitMap.set(p, false);
@@ -9456,11 +10921,18 @@ async function buildSourcesResult(merged, baseDir, home, previousSources = [], c
       filePaths: s.filePaths,
       toolPaths: s.toolPaths,
       hasSqlite: s.hasSqlite,
+      hasSdk: s.hasSdk,
       gitBranch: s.gitBranch,
       model: s.model,
       durationMsEst: s.durationMsEst,
       editCountEst: s.editCountEst,
       hasPR: s.hasPR,
+      isStarred: s.isStarred,
+      spaceId: s.spaceId,
+      spaceIdSetBy: s.spaceIdSetBy,
+      pluginsEnabled: s.pluginsEnabled,
+      skillsEnabled: s.skillsEnabled,
+      fsDetectedFiles: s.fsDetectedFiles,
       expiresInDays: s.provider === "claude-code" && cleanupPeriodDays > 0 ? computeDaysUntilCleanup(s.timestamp, cleanupPeriodDays) : void 0,
       existingReplay: replay ? replay.slug : null,
       projectExists: projectExistsMap.get(s.project) ?? false,
@@ -9487,10 +10959,10 @@ async function buildSourcesResult(merged, baseDir, home, previousSources = [], c
   });
 }
 async function readClaudeSessionState(sessionId) {
-  const sessionsDir = join17(homedir15(), ".claude", "sessions");
+  const sessionsDir = join18(homedir16(), ".claude", "sessions");
   let files;
   try {
-    files = await readdir10(sessionsDir);
+    files = await readdir11(sessionsDir);
   } catch {
     return "stopped";
   }
@@ -9498,7 +10970,7 @@ async function readClaudeSessionState(sessionId) {
     if (!file.endsWith(".json")) continue;
     let data;
     try {
-      const content = await readFile17(join17(sessionsDir, file), "utf-8");
+      const content = await readFile19(join18(sessionsDir, file), "utf-8");
       data = JSON.parse(content);
     } catch {
       continue;
@@ -9548,10 +11020,10 @@ function mergeSameSessions(sessions) {
   return result;
 }
 async function loadAnnotations(baseDir, slug) {
-  const dirs = [join17(baseDir, slug), resolve2("./vibe-replay", slug)];
+  const dirs = [join18(baseDir, slug), resolve2("./vibe-replay", slug)];
   for (const dir of dirs) {
     try {
-      const raw = await readFile17(join17(dir, "annotations.json"), "utf-8");
+      const raw = await readFile19(join18(dir, "annotations.json"), "utf-8");
       const anns = JSON.parse(raw);
       if (Array.isArray(anns)) return anns;
     } catch {
@@ -9560,11 +11032,11 @@ async function loadAnnotations(baseDir, slug) {
   return [];
 }
 async function saveAnnotations(baseDir, slug, annotations) {
-  const annPath = join17(baseDir, slug, "annotations.json");
+  const annPath = join18(baseDir, slug, "annotations.json");
   await writeFile6(annPath, JSON.stringify(annotations, null, 2), "utf-8");
 }
 async function saveOverlays(baseDir, slug, overlays) {
-  const overlayPath = join17(baseDir, slug, "overlays.json");
+  const overlayPath = join18(baseDir, slug, "overlays.json");
   await writeFile6(overlayPath, JSON.stringify(overlays, null, 2), "utf-8");
 }
 async function startServer(baseDir, opts) {
@@ -9573,7 +11045,7 @@ async function startServer(baseDir, opts) {
   const viewerHtml = isDevMode ? "" : await loadViewerHtml();
   const cleanupPeriodDays = await getClaudeCodeCleanupPeriod();
   const cacheKeySuffix = createHash4("sha1").update(baseDir).digest("hex").slice(0, 12);
-  const sourcesCacheKey = `dashboard-sources-v3-${cacheKeySuffix}`;
+  const sourcesCacheKey = `dashboard-sources-v4-${cacheKeySuffix}`;
   const replaysCacheKey = `dashboard-replays-v1-${cacheKeySuffix}`;
   const scanResultsCacheKey = `dashboard-scan-results-v1-${cacheKeySuffix}`;
   const insightsCacheKey = `dashboard-insights-v1-${cacheKeySuffix}`;
@@ -9634,11 +11106,20 @@ async function startServer(baseDir, opts) {
     total: 0,
     updated: 0
   };
-  const enrichCursorStatsInBackground = (merged, baseSources) => {
-    if (sourcesEnrichmentStatus.running) return;
+  let pendingSourcesEnrichment = null;
+  let lastDiscoveredMergedSessions = [];
+  const enrichCursorStatsInBackground = (merged, baseSources, hints = {}) => {
+    if (sourcesEnrichmentStatus.running) {
+      pendingSourcesEnrichment = {
+        merged,
+        baseSources,
+        hints: mergeEnrichmentHints(pendingSourcesEnrichment?.hints, hints)
+      };
+      return;
+    }
     const cursorProvider2 = getProvider("cursor");
     if (!cursorProvider2) return;
-    const candidates = selectCursorEnrichmentCandidates(merged, baseSources);
+    const candidates = selectCursorEnrichmentCandidates(merged, baseSources, hints);
     sourcesEnrichmentStatus = {
       running: true,
       processed: 0,
@@ -9655,9 +11136,9 @@ async function startServer(baseDir, opts) {
       };
       return;
     }
+    const enrichedSources = baseSources.map((s) => ({ ...s }));
     void (async () => {
       let changed = false;
-      const enrichedSources = baseSources.map((s) => ({ ...s }));
       const bySessionId = /* @__PURE__ */ new Map();
       const byKey = /* @__PURE__ */ new Map();
       for (const source of enrichedSources) {
@@ -9733,6 +11214,11 @@ async function startServer(baseDir, opts) {
         running: false,
         finishedAt: (/* @__PURE__ */ new Date()).toISOString()
       };
+      const pending = pendingSourcesEnrichment;
+      pendingSourcesEnrichment = null;
+      if (pending) {
+        enrichCursorStatsInBackground(pending.merged, enrichedSources, pending.hints);
+      }
     })().catch(() => {
       sourcesEnrichmentStatus = {
         ...sourcesEnrichmentStatus,
@@ -9740,6 +11226,11 @@ async function startServer(baseDir, opts) {
         finishedAt: (/* @__PURE__ */ new Date()).toISOString(),
         message: "Cursor stat backfill failed"
       };
+      const pending = pendingSourcesEnrichment;
+      pendingSourcesEnrichment = null;
+      if (pending) {
+        enrichCursorStatsInBackground(pending.merged, enrichedSources, pending.hints);
+      }
     });
   };
   const persistedScanResults = await readFileCache(scanResultsCacheKey);
@@ -9871,7 +11362,7 @@ async function startServer(baseDir, opts) {
       computedAt: insightsCache.computedAt
     });
   };
-  const startBackgroundScan = () => {
+  const startBackgroundScan = (hints = {}) => {
     if (scanState.running) return;
     const previousResults = scanState.results;
     const previousFinishedAt = scanState.finishedAt;
@@ -9893,29 +11384,34 @@ async function startServer(baseDir, opts) {
           allSessions.push(...sessions);
         }
         const merged = mergeSameSessions(allSessions);
-        const home = homedir15();
+        const home = homedir16();
         for (const s of merged) {
           if (s.project.startsWith(home)) {
             s.project = `~${s.project.slice(home.length)}`;
           }
         }
-        const scanInputs = merged.map((s) => ({
-          sessionId: s.sessionId,
-          provider: s.provider,
-          project: s.project,
-          slug: s.slug,
-          filePaths: s.filePaths,
-          toolPaths: s.toolPaths,
-          sourceFilePath: s.filePath,
-          sourceFileSize: s.fileSize,
-          sourceLineCount: s.lineCount,
-          workspacePath: s.workspacePath,
-          hasSqlite: s.hasSqlite,
-          deferRichCursorParse: s.provider === "cursor" && !!s.hasSqlite,
-          timestamp: s.timestamp,
-          title: s.title,
-          firstPrompt: s.firstPrompt
-        }));
+        lastDiscoveredMergedSessions = merged.map((session) => ({ ...session }));
+        const scanInputs = prioritizeScanInputs(
+          merged.map((s) => ({
+            sessionId: s.sessionId,
+            provider: s.provider,
+            project: s.project,
+            slug: s.slug,
+            filePaths: s.filePaths,
+            toolPaths: s.toolPaths,
+            sourceFilePath: s.filePath,
+            sourceFileSize: s.fileSize,
+            sourceLineCount: s.lineCount,
+            workspacePath: s.workspacePath,
+            hasSqlite: s.hasSqlite,
+            deferRichCursorParse: s.provider === "cursor" && !!s.hasSqlite,
+            timestamp: s.timestamp,
+            title: s.title,
+            firstPrompt: s.firstPrompt
+          })),
+          previousResults,
+          hints
+        );
         scanState.total = scanInputs.length;
         const results = await runBackgroundScan(scanInputs, (progress) => {
           scanState = {
@@ -10002,7 +11498,7 @@ async function startServer(baseDir, opts) {
         await sendError(`Session not found: ${sessionId}`);
         return;
       }
-      const home = homedir15();
+      const home = homedir16();
       const projectFor = (info) => info.project.startsWith(home) ? `~${info.project.slice(home.length)}` : info.project;
       const watchers = [];
       const watchedPaths = /* @__PURE__ */ new Set();
@@ -10011,6 +11507,7 @@ async function startServer(baseDir, opts) {
       let inFlight = false;
       let dirty = false;
       let lastSignature = null;
+      let lastCursorDiagnosticsSignature = null;
       const isClaudeProvider = providerName === "claude-code";
       const isCursorProvider = providerName === "cursor";
       const isCodexProvider = providerName === "codex";
@@ -10068,13 +11565,13 @@ async function startServer(baseDir, opts) {
         const cached = jsonlTail.get(filePath);
         let size;
         try {
-          size = (await stat9(filePath)).size;
+          size = (await stat10(filePath)).size;
         } catch {
           jsonlTail.delete(filePath);
           return cached?.lines ?? [];
         }
         if (!cached || size < cached.offset) {
-          const content = await readFile17(filePath);
+          const content = await readFile19(filePath);
           const { lines, partial } = splitDecodedLines(content);
           jsonlTail.set(filePath, { offset: content.length, partial, lines });
           return lines;
@@ -10114,6 +11611,17 @@ async function startServer(baseDir, opts) {
           const paths = [...info.filePaths, ...info.toolPaths || []];
           ensureWatchersFor(paths);
           await ensureCursorDbWatchersFor(info);
+          const cursorDiagnostics = isCursorProvider && info.hasSqlite ? await readCursorLiveDiagnostics(info.sessionId).catch(() => null) : null;
+          if (cursorDiagnostics && lastCursorDiagnosticsSignature === cursorDiagnostics.signature && lastSignature !== null) {
+            await stream.writeSSE({
+              data: JSON.stringify({
+                type: "diagnostics",
+                cursorDiagnostics,
+                cursorRowsChanged: false
+              })
+            });
+            return;
+          }
           let parsed;
           if (isJsonlLiveProvider) {
             const allLines = [];
@@ -10136,13 +11644,25 @@ async function startServer(baseDir, opts) {
             lastLiveState = await readClaudeSessionState(sessionId);
           }
           const signature = JSON.stringify(replay.scenes);
+          if (cursorDiagnostics) {
+            lastCursorDiagnosticsSignature = cursorDiagnostics.signature;
+          }
           if (signature !== lastSignature) {
             lastSignature = signature;
             await stream.writeSSE({
               data: JSON.stringify({
                 type: "session",
                 session: replay,
-                state: lastLiveState
+                state: lastLiveState,
+                ...cursorDiagnostics ? { cursorDiagnostics, cursorRowsChanged: true } : {}
+              })
+            });
+          } else if (cursorDiagnostics) {
+            await stream.writeSSE({
+              data: JSON.stringify({
+                type: "diagnostics",
+                cursorDiagnostics,
+                cursorRowsChanged: true
               })
             });
           }
@@ -10243,8 +11763,8 @@ async function startServer(baseDir, opts) {
     try {
       const target = await loadSessionFromDisk(baseDir, slug);
       target.meta.title = normalizeTitle(body.title);
-      const targetDir = join17(baseDir, slug);
-      await writeFile6(join17(targetDir, "replay.json"), JSON.stringify(target), "utf-8");
+      const targetDir = join18(baseDir, slug);
+      await writeFile6(join18(targetDir, "replay.json"), JSON.stringify(target), "utf-8");
       await generateOutput(target, targetDir);
       const updatedReplays = await refreshReplaysCache();
       if (updatedReplays) await syncSourcesCacheWithReplays(updatedReplays);
@@ -10258,7 +11778,7 @@ async function startServer(baseDir, opts) {
     if (!slug) return c.json({ error: "invalid slug" }, 400);
     try {
       const { rm } = await import("fs/promises");
-      await rm(join17(baseDir, slug), { recursive: true });
+      await rm(join18(baseDir, slug), { recursive: true });
       const updatedReplays = await refreshReplaysCache();
       if (updatedReplays) await syncSourcesCacheWithReplays(updatedReplays);
       return c.json({ ok: true });
@@ -10292,6 +11812,36 @@ async function startServer(baseDir, opts) {
   app.get("/api/sources/enrichment-status", async (c) => {
     return c.json(sourcesEnrichmentStatus);
   });
+  app.post("/api/sources/enrich", async (c) => {
+    const hints = enrichmentHintsFromBody(await c.req.json().catch(() => void 0));
+    const cached = await readFileCache(sourcesCacheKey);
+    if (!cached?.data?.length) {
+      return c.json({ ok: false, message: "No sources cache available" }, 404);
+    }
+    const cursorProvider2 = getProvider("cursor");
+    if (!cursorProvider2) return c.json({ ok: false, message: "Cursor provider unavailable" }, 404);
+    const home = homedir16();
+    let cursorSessions = lastDiscoveredMergedSessions.filter(
+      (session) => session.provider === "cursor"
+    );
+    if (cursorSessions.length === 0) {
+      cursorSessions = normalizeSessionProjectsForHome(
+        mergeSameSessions(await cursorProvider2.discover()),
+        home
+      );
+      lastDiscoveredMergedSessions = [
+        ...lastDiscoveredMergedSessions.filter((session) => session.provider !== "cursor"),
+        ...cursorSessions
+      ];
+    }
+    const wasRunning = sourcesEnrichmentStatus.running;
+    enrichCursorStatsInBackground(cursorSessions, cached.data, hints);
+    return c.json({
+      ok: true,
+      running: sourcesEnrichmentStatus.running,
+      queued: wasRunning
+    });
+  });
   app.get("/api/sources", async (c) => {
     try {
       const providers2 = getAllProviders();
@@ -10301,11 +11851,12 @@ async function startServer(baseDir, opts) {
         allSessions.push(...sessions);
       }
       const merged = mergeSameSessions(allSessions);
+      lastDiscoveredMergedSessions = normalizeSessionProjectsForHome(merged, homedir16());
       const previous = await readFileCache(sourcesCacheKey);
       const result = await buildSourcesResult(
         merged,
         baseDir,
-        homedir15(),
+        homedir16(),
         previous?.data || [],
         cleanupPeriodDays
       );
@@ -10335,11 +11886,12 @@ async function startServer(baseDir, opts) {
           }
         }
         const merged = mergeSameSessions(allSessions);
+        lastDiscoveredMergedSessions = normalizeSessionProjectsForHome(merged, homedir16());
         const previous = await readFileCache(sourcesCacheKey);
         const result = await buildSourcesResult(
           merged,
           baseDir,
-          homedir15(),
+          homedir16(),
           previous?.data || [],
           cleanupPeriodDays
         );
@@ -10374,7 +11926,7 @@ async function startServer(baseDir, opts) {
         return c.json({ error: "title must be a string" }, 400);
       }
       const parsed = await provider.parse(resolved.value.paths, resolved.value.sessionInfo);
-      const home = homedir15();
+      const home = homedir16();
       const rawProject = body.sessionProject || parsed.cwd;
       const project = rawProject.startsWith(home) ? `~${rawProject.slice(home.length)}` : rawProject;
       const replay = transformToReplay(parsed, body.provider, project, {
@@ -10392,7 +11944,7 @@ async function startServer(baseDir, opts) {
       }
       const rawSlug = replay.meta.slug || replay.meta.sessionId.slice(0, 8);
       const slug = rawSlug.replace(/[^a-zA-Z0-9_-]/g, "-");
-      const outputDir = join17(baseDir, slug);
+      const outputDir = join18(baseDir, slug);
       await generateOutput(replay, outputDir);
       const updatedReplays = await refreshReplaysCache();
       if (updatedReplays) await syncSourcesCacheWithReplays(updatedReplays);
@@ -10415,7 +11967,7 @@ async function startServer(baseDir, opts) {
   });
   app.post("/api/regenerate-all", async (c) => {
     const replaysDir = baseDir;
-    const { readdir: readdir11, readFile: readF } = await import("fs/promises");
+    const { readdir: readdir12, readFile: readF } = await import("fs/promises");
     const results = [];
     const allProviders = getAllProviders();
     const allSessions = [];
@@ -10428,14 +11980,14 @@ async function startServer(baseDir, opts) {
     }
     let entries;
     try {
-      entries = await readdir11(replaysDir);
+      entries = await readdir12(replaysDir);
     } catch {
       return c.json({ error: "No replays directory" }, 404);
     }
     for (const slug of entries) {
       if (slug.startsWith(".") || slug === "cache") continue;
       try {
-        const replayPath = join17(replaysDir, slug, "replay.json");
+        const replayPath = join18(replaysDir, slug, "replay.json");
         const raw = await readF(replayPath, "utf-8").catch(() => null);
         if (!raw) continue;
         const oldReplay = JSON.parse(raw);
@@ -10457,7 +12009,7 @@ async function startServer(baseDir, opts) {
         }
         const paths = [...sessionInfo.filePaths, ...sessionInfo.toolPaths || []];
         const parsed = await provider.parse(paths, sessionInfo);
-        const home = homedir15();
+        const home = homedir16();
         const project = sessionInfo.project.startsWith(home) ? `~${sessionInfo.project.slice(home.length)}` : sessionInfo.project;
         const replay = transformToReplay(parsed, providerName, project, {
           generator: {
@@ -10467,7 +12019,7 @@ async function startServer(baseDir, opts) {
           }
         });
         if (oldReplay.meta?.title) replay.meta.title = oldReplay.meta.title;
-        const outputDir = join17(replaysDir, slug);
+        const outputDir = join18(replaysDir, slug);
         await generateOutput(replay, outputDir);
         results.push({ slug, status: "regenerated", scenes: replay.scenes.length });
       } catch (err) {
@@ -10483,7 +12035,8 @@ async function startServer(baseDir, opts) {
     });
   });
   app.post("/api/scan/start", async (c) => {
-    startBackgroundScan();
+    const hints = enrichmentHintsFromBody(await c.req.json().catch(() => void 0));
+    startBackgroundScan(hints);
     return c.json({ ok: true, message: "Background scan started" });
   });
   app.get("/api/scan/status", async (c) => {
@@ -10596,7 +12149,7 @@ async function startServer(baseDir, opts) {
   app.get("/api/gh-status", (c) => {
     return c.json(checkPublishStatus());
   });
-  const cloudApiBaseUrl = getApiUrl().replace(/\/$/, "");
+  const cloudApiBaseUrl = getApiUrl();
   function readLocalAuthSession() {
     const exact = loadAuthToken(cloudApiBaseUrl);
     if (exact) {
@@ -10611,7 +12164,7 @@ async function startServer(baseDir, opts) {
       return {
         token: fallback.token,
         user: fallback.user,
-        targetApi: fallback.origin.replace(/\/$/, "")
+        targetApi: fallback.origin
       };
     }
     return null;
@@ -10628,7 +12181,7 @@ async function startServer(baseDir, opts) {
     if (exact) candidates.push({ token: exact.token, apiUrl: cloudApiBaseUrl });
     const fallback = loadAnyAuthToken();
     if (fallback) {
-      const fallbackApi = fallback.origin.replace(/\/$/, "");
+      const fallbackApi = fallback.origin;
       if (fallbackApi !== cloudApiBaseUrl) {
         candidates.push({ token: fallback.token, apiUrl: fallbackApi });
       }
@@ -10880,7 +12433,7 @@ async function startServer(baseDir, opts) {
     });
   });
   app.get("/api/system-checks", async (c) => {
-    const exec = promisify2(execFile2);
+    const exec = promisify3(execFile3);
     const TOOL_CHECK_TIMEOUT_MS = 3e3;
     const CHECK_TIMEOUT_MARKER = "__check_timeout__";
     const CHECK_TIMEOUT_DETAIL = "check timeout";
@@ -10901,7 +12454,8 @@ async function startServer(baseDir, opts) {
       }
     };
     async function checkCli(name, label, purpose, cmd, versionArgs = ["--version"], extraCheck) {
-      const whichResult = await runCommand("which", [cmd]);
+      const locator = process.platform === "win32" ? "where" : "which";
+      const whichResult = await runCommand(locator, [cmd]);
       if (!whichResult.ok) {
         if (whichResult.timedOut) {
           return { name, label, purpose, installed: false, detail: CHECK_TIMEOUT_DETAIL };
@@ -10972,7 +12526,7 @@ async function startServer(baseDir, opts) {
   app.get("/api/gist-info", async (c) => {
     const result = requireSlug(c.req.query("slug"));
     if ("error" in result) return c.json({ error: result.error }, 400);
-    const targetDir = join17(baseDir, result.slug);
+    const targetDir = join18(baseDir, result.slug);
     const gist = await loadSavedGistInfo(targetDir);
     if (!gist) return c.json({ gist: null });
     return c.json({ gist });
@@ -10980,7 +12534,7 @@ async function startServer(baseDir, opts) {
   app.delete("/api/gist-info", async (c) => {
     const result = requireSlug(c.req.query("slug"));
     if ("error" in result) return c.json({ error: result.error }, 400);
-    const metaPath = join17(baseDir, result.slug, ".vibe-replay-gist.json");
+    const metaPath = join18(baseDir, result.slug, ".vibe-replay-gist.json");
     await unlink2(metaPath).catch(() => {
     });
     return c.json({ ok: true });
@@ -10988,7 +12542,7 @@ async function startServer(baseDir, opts) {
   app.get("/api/cloud-info", async (c) => {
     const result = requireSlug(c.req.query("slug"));
     if ("error" in result) return c.json({ error: result.error }, 400);
-    const targetDir = join17(baseDir, result.slug);
+    const targetDir = join18(baseDir, result.slug);
     const cloud = await loadSavedCloudInfo(targetDir);
     if (!cloud) return c.json({ cloud: null });
     return c.json({ cloud });
@@ -10996,10 +12550,10 @@ async function startServer(baseDir, opts) {
   app.post("/api/cloud-info", async (c) => {
     const result = requireSlug(c.req.query("slug"));
     if ("error" in result) return c.json({ error: result.error }, 400);
-    const targetDir = join17(baseDir, result.slug);
+    const targetDir = join18(baseDir, result.slug);
     const body = await c.req.json();
     if (!body.id || !body.url) return c.json({ error: "Missing id/url" }, 400);
-    const metaPath = join17(targetDir, ".vibe-replay-cloud.json");
+    const metaPath = join18(targetDir, ".vibe-replay-cloud.json");
     await writeFile6(
       metaPath,
       JSON.stringify(
@@ -11019,7 +12573,7 @@ async function startServer(baseDir, opts) {
   app.delete("/api/cloud-info", async (c) => {
     const result = requireSlug(c.req.query("slug"));
     if ("error" in result) return c.json({ error: result.error }, 400);
-    const metaPath = join17(baseDir, result.slug, ".vibe-replay-cloud.json");
+    const metaPath = join18(baseDir, result.slug, ".vibe-replay-cloud.json");
     await unlink2(metaPath).catch(() => {
     });
     return c.json({ ok: true });
@@ -11027,13 +12581,13 @@ async function startServer(baseDir, opts) {
   app.post("/api/publish/gist", async (c) => {
     const result = requireSlug(c.req.query("slug"));
     if ("error" in result) return c.json({ error: result.error }, 400);
-    const targetDir = join17(baseDir, result.slug);
+    const targetDir = join18(baseDir, result.slug);
     try {
       const rawSession = await loadSessionFromDisk(baseDir, result.slug);
       const overlaysData = await loadOverlays(baseDir, result.slug);
       const targetSession = sessionWithEffectiveContent(rawSession, overlaysData);
-      const replayPath = join17(targetDir, "replay.json");
-      const originalContent = await readFile17(replayPath, "utf-8");
+      const replayPath = join18(targetDir, "replay.json");
+      const originalContent = await readFile19(replayPath, "utf-8");
       await writeFile6(replayPath, JSON.stringify(targetSession), "utf-8");
       try {
         const title = targetSession.meta.title || targetSession.meta.slug;
@@ -11052,7 +12606,7 @@ async function startServer(baseDir, opts) {
   app.post("/api/publish/cloud", async (c) => {
     const result = requireSlug(c.req.query("slug"));
     if ("error" in result) return c.json({ error: result.error }, 400);
-    const targetDir = join17(baseDir, result.slug);
+    const targetDir = join18(baseDir, result.slug);
     try {
       const body = await c.req.json().catch(() => ({}));
       const cloudResult = await publishCloudWithOverlays(targetDir, {
@@ -11066,13 +12620,13 @@ async function startServer(baseDir, opts) {
   app.post("/api/export/html", async (c) => {
     const result = requireSlug(c.req.query("slug"));
     if ("error" in result) return c.json({ error: result.error }, 400);
-    const targetDir = join17(baseDir, result.slug);
+    const targetDir = join18(baseDir, result.slug);
     try {
       const rawSession = await loadSessionFromDisk(baseDir, result.slug);
       const overlaysData = await loadOverlays(baseDir, result.slug);
       const targetSession = sessionWithEffectiveContent(rawSession, overlaysData);
-      const replayPath = join17(targetDir, "replay.json");
-      const originalContent = await readFile17(replayPath, "utf-8");
+      const replayPath = join18(targetDir, "replay.json");
+      const originalContent = await readFile19(replayPath, "utf-8");
       try {
         const outputPath = await generateOutput(targetSession, targetDir);
         return c.json({ path: outputPath });
@@ -11086,23 +12640,23 @@ async function startServer(baseDir, opts) {
   app.get("/api/export/github/status", async (c) => {
     const result = requireSlug(c.req.query("slug"));
     if ("error" in result) return c.json({ error: result.error }, 400);
-    const targetDir = join17(baseDir, result.slug);
+    const targetDir = join18(baseDir, result.slug);
     try {
-      const svgPath = join17(targetDir, "session-preview.svg");
-      const mdPath = join17(targetDir, "github-summary.md");
-      const gifPath = join17(targetDir, "session-preview.gif");
+      const svgPath = join18(targetDir, "session-preview.svg");
+      const mdPath = join18(targetDir, "github-summary.md");
+      const gifPath = join18(targetDir, "session-preview.gif");
       const [svgContent, markdown, gifBuf] = await Promise.all([
-        readFile17(svgPath, "utf-8").catch(() => null),
-        readFile17(mdPath, "utf-8").catch(() => null),
-        readFile17(gifPath).catch(() => null)
+        readFile19(svgPath, "utf-8").catch(() => null),
+        readFile19(mdPath, "utf-8").catch(() => null),
+        readFile19(gifPath).catch(() => null)
       ]);
       if (!svgContent && !markdown && !gifBuf) return c.json({ exists: false });
       const gist = await loadSavedGistInfo(targetDir);
       const gifContent = gifBuf ? gifBuf.toString("base64") : null;
       const [gifMtime, svgMtime, mdMtime] = await Promise.all([
-        stat9(gifPath).then((s) => s.mtime.toISOString()).catch(() => null),
-        stat9(svgPath).then((s) => s.mtime.toISOString()).catch(() => null),
-        stat9(mdPath).then((s) => s.mtime.toISOString()).catch(() => null)
+        stat10(gifPath).then((s) => s.mtime.toISOString()).catch(() => null),
+        stat10(svgPath).then((s) => s.mtime.toISOString()).catch(() => null),
+        stat10(mdPath).then((s) => s.mtime.toISOString()).catch(() => null)
       ]);
       return c.json({
         exists: true,
@@ -11124,7 +12678,7 @@ async function startServer(baseDir, opts) {
   app.post("/api/export/github", async (c) => {
     const result = requireSlug(c.req.query("slug"));
     if ("error" in result) return c.json({ error: result.error }, 400);
-    const targetDir = join17(baseDir, result.slug);
+    const targetDir = join18(baseDir, result.slug);
     try {
       const rawSession = await loadSessionFromDisk(baseDir, result.slug);
       const overlaysData = await loadOverlays(baseDir, result.slug);
@@ -11132,14 +12686,14 @@ async function startServer(baseDir, opts) {
       const gist = await loadSavedGistInfo(targetDir);
       const replayUrl = gist?.viewerUrl || void 0;
       const svgContent = generateGitHubSvg(targetSession, { replayUrl });
-      const svgFilePath = join17(targetDir, "session-preview.svg");
+      const svgFilePath = join18(targetDir, "session-preview.svg");
       await writeFile6(svgFilePath, svgContent, "utf-8");
       let gifContent = null;
       let gifFilePath = null;
       let gifWarning;
       try {
         const gifBuffer = await generateGitHubGif(targetSession, { replayUrl });
-        gifFilePath = join17(targetDir, "session-preview.gif");
+        gifFilePath = join18(targetDir, "session-preview.gif");
         await writeFile6(gifFilePath, gifBuffer);
         gifContent = gifBuffer.toString("base64");
       } catch (err) {
@@ -11150,7 +12704,7 @@ async function startServer(baseDir, opts) {
         svgPath: "./session-preview.svg",
         gifPath: gifContent ? "./session-preview.gif" : void 0
       });
-      const mdFilePath = join17(targetDir, "github-summary.md");
+      const mdFilePath = join18(targetDir, "github-summary.md");
       await writeFile6(mdFilePath, markdown, "utf-8");
       const findings = scanForSecrets(JSON.stringify(targetSession));
       const warnings = findings.map((f) => `[${f.rule}] ${f.match}`);
@@ -11395,24 +12949,370 @@ async function startDashboard(baseDir, opts) {
   await startServer(baseDir, { openDashboard: true, externalViewerUrl: opts?.externalViewerUrl });
 }
 
+// src/session-query.ts
+init_utils();
+var HIGH_TOOL_DENSITY_THRESHOLD = 20;
+async function queryLocalSessions(sessions, options = {}) {
+  const limit = normalizeLimit(options.limit);
+  const terms = splitTerms(options.query);
+  const filtered = filterScoredSessionInfos(sessions, options).slice(0, limit);
+  const matches = filtered.map(({ session, query }) => sessionInfoToMatch(session, terms, query));
+  if (!options.scan && !options.brief) return matches;
+  const scanned = await Promise.all(
+    filtered.map(async ({ session }) => {
+      try {
+        return await scanSession(scanInputFromSession(session));
+      } catch {
+        return void 0;
+      }
+    })
+  );
+  return matches.map((match, index) => {
+    const scan = scanned[index];
+    const summary = scan ? scanSummary(scan) : void 0;
+    return {
+      ...match,
+      ...summary ? { scan: summary } : {},
+      ...options.brief ? { brief: buildSessionBrief(match, summary) } : {}
+    };
+  });
+}
+function filterScoredSessionInfos(sessions, options = {}) {
+  const terms = splitTerms(options.query);
+  const projectTerm = normalizeSearch(options.project);
+  const provider = normalizeSearch(options.provider);
+  const wideMatch = Boolean(options.any);
+  const filtered = [...sessions].map((session) => ({
+    session,
+    query: scoreSession(session, terms)
+  })).filter(({ session, query }) => {
+    if (provider && normalizeSearch(session.provider) !== provider) return false;
+    if (projectTerm && !sessionProjectHaystack(session).includes(projectTerm)) return false;
+    if (terms.length > 0) {
+      if (wideMatch) return query.matchedTerms.length > 0;
+      if (query.matchedTerms.length !== terms.length) return false;
+    }
+    return true;
+  }).sort((a, b) => {
+    if (wideMatch || terms.length > 0) {
+      const scoreDelta = b.query.score - a.query.score;
+      if (scoreDelta) return scoreDelta;
+    }
+    return b.session.timestamp.localeCompare(a.session.timestamp);
+  });
+  return options.dedupe ? dedupeSimilarScoredSessions(filtered) : filtered;
+}
+function scanInputFromSession(session) {
+  return {
+    sessionId: session.sessionId,
+    provider: session.provider,
+    project: shortenPath(session.project),
+    slug: session.slug,
+    filePaths: session.filePaths,
+    toolPaths: session.toolPaths,
+    sourceFilePath: session.filePath,
+    sourceFileSize: session.fileSize,
+    sourceLineCount: session.lineCount,
+    workspacePath: session.workspacePath,
+    hasSqlite: session.hasSqlite,
+    timestamp: session.timestamp,
+    title: session.title,
+    firstPrompt: session.firstPrompt
+  };
+}
+function formatSessionQueryText(matches) {
+  if (matches.length === 0) return "No matching sessions found.";
+  return matches.map((match, index) => {
+    const title = match.title || previewPrompt(match.firstPrompt) || match.slug;
+    const lines = [
+      `${index + 1}. ${title}`,
+      `   ${match.provider} | ${match.timestamp} | ${match.project}`,
+      `   session: ${match.sessionId}`,
+      `   file: ${match.filePath}`
+    ];
+    if (match.gitBranch) lines.push(`   branch: ${match.gitBranch}`);
+    if (match.model) lines.push(`   model: ${match.model}`);
+    if (match.matchedTerms?.length) {
+      const quality = match.matchQuality ? `${match.matchQuality}, ` : "";
+      lines.push(
+        `   matched: ${quality}${match.matchedTerms.length}/${(match.matchedTerms.length || 0) + (match.unmatchedTerms?.length || 0)} terms (${match.matchedTerms.join(", ")})`
+      );
+    }
+    if (match.unmatchedTerms?.length) {
+      lines.push(`   unmatched: ${match.unmatchedTerms.join(", ")}`);
+    }
+    if (match.whyMatched?.length) lines.push(`   why: ${match.whyMatched.join("; ")}`);
+    if (match.firstPrompt) lines.push(`   first prompt: ${previewPrompt(match.firstPrompt)}`);
+    if (match.scan) lines.push(`   efficiency: ${formatScanSummary(match.scan)}`);
+    if (match.brief) {
+      lines.push(`   brief: ${match.brief.summary}`);
+      if (match.brief.signals.length > 0) {
+        lines.push(`   signals: ${match.brief.signals.join("; ")}`);
+      }
+      lines.push(`   next: ${match.brief.suggestedNextAction}`);
+    }
+    return lines.join("\n");
+  }).join("\n\n");
+}
+function sessionInfoToMatch(session, terms = [], precomputedScore) {
+  const query = precomputedScore || scoreSession(session, terms);
+  return {
+    provider: session.provider,
+    sessionId: session.sessionId,
+    slug: session.slug,
+    title: cleanPromptText(session.title || "") || void 0,
+    project: shortenPath(session.project),
+    cwd: shortenPath(session.cwd),
+    timestamp: session.timestamp,
+    gitBranch: session.gitBranch,
+    model: session.model,
+    firstPrompt: cleanPromptText(session.firstPrompt),
+    prompts: session.prompts?.map(cleanPromptText).filter(Boolean),
+    filePath: session.filePath,
+    filePaths: session.filePaths,
+    toolPaths: session.toolPaths,
+    promptCount: session.promptCount,
+    toolCallCount: session.toolCallCount,
+    editCount: session.editCountEst,
+    durationMs: session.durationMsEst,
+    hasPR: session.hasPR,
+    score: query.score,
+    matchedTerms: query.matchedTerms,
+    unmatchedTerms: query.unmatchedTerms,
+    matchQuality: query.matchQuality,
+    whyMatched: query.whyMatched
+  };
+}
+function scanSummary(scan) {
+  const promptCount = scan.promptCount;
+  return {
+    promptCount,
+    toolCallCount: scan.toolCallCount,
+    editCount: scan.editCount,
+    filesModified: scan.filesModified.slice(0, 20),
+    durationMs: scan.durationMs,
+    costEstimate: scan.costEstimate,
+    apiErrorCount: scan.apiErrorCount,
+    compactionCount: scan.compactionCount,
+    subAgentCount: scan.subAgentCount,
+    toolCallsPerPrompt: ratio(scan.toolCallCount, promptCount),
+    editsPerPrompt: ratio(scan.editCount, promptCount),
+    medianTurnDurationMs: median(scan.turnDurations),
+    dataQualityNotes: scan.dataQualityNotes
+  };
+}
+function formatScanSummary(scan) {
+  const parts = [
+    `${scan.promptCount} prompts`,
+    `${scan.toolCallCount} tools`,
+    `${scan.editCount} edits`
+  ];
+  if (scan.durationMs) parts.push(formatDuration2(scan.durationMs));
+  if (scan.costEstimate) parts.push(`$${scan.costEstimate.toFixed(2)}`);
+  if (scan.toolCallsPerPrompt !== void 0) {
+    parts.push(`${scan.toolCallsPerPrompt.toFixed(1)} tools/prompt`);
+  }
+  if (scan.apiErrorCount > 0) parts.push(`${scan.apiErrorCount} API errors`);
+  if (scan.compactionCount > 0) parts.push(`${scan.compactionCount} compactions`);
+  return parts.join(", ");
+}
+function scoreSession(session, terms) {
+  if (terms.length === 0) {
+    return { score: 0, matchedTerms: [], unmatchedTerms: [], whyMatched: [] };
+  }
+  const fields = [
+    { name: "title", value: session.title, weight: 8 },
+    { name: "first prompt", value: session.firstPrompt, weight: 7 },
+    { name: "prompts", value: (session.prompts || []).join(" "), weight: 5 },
+    { name: "project", value: session.project, weight: 4 },
+    { name: "branch", value: session.gitBranch, weight: 4 },
+    { name: "model", value: session.model, weight: 2 },
+    { name: "provider", value: session.provider, weight: 2 },
+    { name: "slug", value: session.slug, weight: 2 },
+    { name: "files", value: (session.fsDetectedFiles || []).join(" "), weight: 3 }
+  ].map((field) => ({ ...field, normalized: normalizeSearch(field.value) }));
+  const matchedTerms = [];
+  const unmatchedTerms = [];
+  const whyMatched = [];
+  let score = 0;
+  for (const term of terms) {
+    const hits = fields.filter((field) => textMatchesTerm(field.normalized, term));
+    if (hits.length === 0) {
+      unmatchedTerms.push(term);
+      continue;
+    }
+    matchedTerms.push(term);
+    const best = hits.sort((a, b) => b.weight - a.weight)[0];
+    score += best.weight;
+    whyMatched.push(`${term} in ${best.name}`);
+  }
+  if (matchedTerms.length === terms.length && terms.length > 1) score += 5;
+  if (session.hasPR && terms.some((term) => ["pr", "review", "pull", "merge"].includes(term))) {
+    score += 2;
+  }
+  if (session.promptCount && session.promptCount > 10) score += 1;
+  return {
+    score,
+    matchedTerms,
+    unmatchedTerms,
+    matchQuality: matchQuality(matchedTerms.length, terms.length),
+    whyMatched
+  };
+}
+function matchQuality(matchedTermCount, queryTermCount) {
+  if (queryTermCount === 0 || matchedTermCount === 0) return void 0;
+  if (matchedTermCount === queryTermCount) return "all-terms";
+  if (matchedTermCount >= 2) return "strong";
+  return "weak";
+}
+function buildSessionBrief(match, scan) {
+  const text = normalizeSearch(
+    [match.title, match.firstPrompt, match.project, match.gitBranch].filter(Boolean).join(" ")
+  );
+  const taskType = classifyTaskType(text, match, scan);
+  const signals = sessionSignals(match, scan);
+  return {
+    taskType,
+    summary: briefSummary(taskType, match, scan),
+    signals,
+    suggestedNextAction: suggestedNextAction(taskType, signals, scan)
+  };
+}
+function classifyTaskType(text, match, scan) {
+  if (/(review|pr|pull request|merge|ai review)/i.test(text) || match.hasPR) return "PR/review";
+  if (/(latest main|branch|current feature|what.*working)/i.test(text)) {
+    return "context recovery";
+  }
+  if (/(skill|dev space|devspaces)/i.test(text)) return "skill workflow";
+  if (/(auth|oauth|login)/i.test(text)) return "auth/debugging";
+  if (/(ci|test|lint|build|e2e)/i.test(text)) return "CI/test";
+  if ((scan?.editCount || 0) > 0 || (match.editCount || 0) > 0) return "implementation";
+  return "research";
+}
+function sessionSignals(match, scan) {
+  const signals = [];
+  const promptCount = scan?.promptCount ?? match.promptCount ?? 0;
+  const toolCount = scan?.toolCallCount ?? match.toolCallCount ?? 0;
+  const toolsPerPrompt = scan?.toolCallsPerPrompt ?? ratio(toolCount, promptCount);
+  if (toolsPerPrompt !== void 0 && toolsPerPrompt >= HIGH_TOOL_DENSITY_THRESHOLD) {
+    signals.push(`high tool density (${toolsPerPrompt.toFixed(1)} tools/prompt)`);
+  }
+  if (promptCount >= 40) signals.push(`long conversation (${promptCount} prompts)`);
+  if ((scan?.editCount ?? match.editCount ?? 0) >= 50) {
+    signals.push(`heavy editing (${scan?.editCount ?? match.editCount} edits)`);
+  }
+  if ((scan?.filesModified?.length || 0) >= 10) {
+    signals.push(`broad file surface (${scan?.filesModified.length} files in scan summary)`);
+  }
+  if ((scan?.apiErrorCount || 0) > 0) signals.push(`${scan?.apiErrorCount} API errors`);
+  if ((scan?.compactionCount || 0) > 0) signals.push(`${scan?.compactionCount} compactions`);
+  if ((scan?.subAgentCount || 0) > 0) signals.push(`${scan?.subAgentCount} sub-agents`);
+  if (match.matchedTerms?.length) {
+    const quality = match.matchQuality ? `${match.matchQuality} match` : "matched";
+    signals.push(`${quality}: ${match.matchedTerms.join(", ")}`);
+  }
+  if (match.unmatchedTerms?.length) {
+    signals.push(`unmatched: ${match.unmatchedTerms.join(", ")}`);
+  }
+  return signals;
+}
+function briefSummary(taskType, match, scan) {
+  const title = previewPrompt(match.title || match.firstPrompt || match.slug);
+  if (!scan) return `${taskType} session: ${title}`;
+  return `${taskType} session with ${plural(scan.promptCount, "prompt")}, ${plural(scan.toolCallCount, "tool")}, and ${plural(scan.editCount, "edit")}: ${title}`;
+}
+function suggestedNextAction(taskType, signals, scan) {
+  if (!scan) return "Run again with --scan or --brief before doing a retro.";
+  if (signals.some((signal) => signal.includes("high tool density") || signal.includes("long"))) {
+    return "Generate a replay or inspect chapters; raw metrics suggest a dense session.";
+  }
+  if (taskType === "PR/review")
+    return "Inspect PR links/review comments or generate a PR-focused replay.";
+  if (taskType === "context recovery")
+    return "Use this as evidence for a session-start snapshot feature.";
+  return "Use filePaths for deeper transcript/replay inspection if this is the right candidate.";
+}
+function splitTerms(query) {
+  return normalizeSearch(query).split(/\s+/).map((term) => term.trim()).filter(Boolean);
+}
+function textMatchesTerm(text, term) {
+  if (!term) return false;
+  if (/^[a-z0-9]{1,3}$/.test(term)) {
+    return text.split(/[^a-z0-9]+/).filter(Boolean).includes(term);
+  }
+  return text.includes(term);
+}
+function dedupeSimilarScoredSessions(scoredSessions) {
+  const seen = /* @__PURE__ */ new Set();
+  const deduped = [];
+  for (const scored of scoredSessions) {
+    const { session } = scored;
+    const key = duplicateSessionKey(session);
+    if (key && seen.has(key)) continue;
+    if (key) seen.add(key);
+    deduped.push(scored);
+  }
+  return deduped;
+}
+function duplicateSessionKey(session) {
+  const prompt = normalizeSearch(cleanPromptText(session.firstPrompt));
+  if (prompt.length >= 60) return `prompt:${prompt.slice(0, 240)}`;
+  const title = normalizeSearch(cleanPromptText(session.title || ""));
+  if (title.length >= 60) return `title:${title.slice(0, 240)}`;
+  return void 0;
+}
+function sessionProjectHaystack(session) {
+  return normalizeSearch(
+    [session.project, session.cwd, session.workspacePath].filter(Boolean).join(" ")
+  );
+}
+function normalizeSearch(value) {
+  return (value || "").toLowerCase().replace(/\s+/g, " ").trim();
+}
+function plural(count, label) {
+  return `${count} ${label}${count === 1 ? "" : "s"}`;
+}
+function normalizeLimit(limit) {
+  if (!Number.isFinite(limit) || !limit || limit <= 0) return 10;
+  return Math.min(Math.floor(limit), 100);
+}
+function ratio(value, denominator) {
+  if (denominator <= 0) return void 0;
+  return Math.round(value / denominator * 10) / 10;
+}
+function median(values) {
+  if (!values?.length) return void 0;
+  const sorted = [...values].sort((a, b) => a - b);
+  const mid = Math.floor(sorted.length / 2);
+  if (sorted.length % 2 === 1) return sorted[mid];
+  return Math.round((sorted[mid - 1] + sorted[mid]) / 2);
+}
+function formatDuration2(ms) {
+  const minutes = Math.round(ms / 6e4);
+  if (minutes < 60) return `${minutes}m`;
+  const hours = Math.floor(minutes / 60);
+  const remainder = minutes % 60;
+  return remainder ? `${hours}h ${remainder}m` : `${hours}h`;
+}
+
 // src/index.ts
 init_utils();
 init_version();
 async function runGitHubExport(replay, outputDir) {
-  const { join: join18 } = await import("path");
+  const { join: join19 } = await import("path");
   const { writeFile: writeFile7 } = await import("fs/promises");
   const savedGist = await loadSavedGistInfo(outputDir);
   const replayUrl = savedGist?.viewerUrl;
   const svgSpinner = ora("Generating animated SVG...").start();
   const svgContent = generateGitHubSvg(replay, { replayUrl });
-  const svgFilePath = join18(outputDir, "session-preview.svg");
+  const svgFilePath = join19(outputDir, "session-preview.svg");
   await writeFile7(svgFilePath, svgContent, "utf-8");
   svgSpinner.succeed(`SVG: ${svgFilePath}`);
   let gifGenerated = false;
   const gifSpinner = ora("Generating animated GIF...").start();
   try {
     const gifBuffer = await generateGitHubGif(replay, { replayUrl });
-    const gifFilePath = join18(outputDir, "session-preview.gif");
+    const gifFilePath = join19(outputDir, "session-preview.gif");
     await writeFile7(gifFilePath, gifBuffer);
     const gifSizeKB = Math.round(gifBuffer.length / 1024);
     gifSpinner.succeed(`GIF: ${gifFilePath} (${gifSizeKB} KB)`);
@@ -11426,7 +13326,7 @@ async function runGitHubExport(replay, outputDir) {
     svgPath: "./session-preview.svg",
     gifPath: gifGenerated ? "./session-preview.gif" : void 0
   });
-  const mdFilePath = join18(outputDir, "github-summary.md");
+  const mdFilePath = join19(outputDir, "github-summary.md");
   await writeFile7(mdFilePath, markdown, "utf-8");
   mdSpinner.succeed(`Markdown: ${mdFilePath}`);
   const redactionsSpinner = ora("Generating redaction report...").start();
@@ -11442,7 +13342,7 @@ async function runGitHubExport(replay, outputDir) {
       "leftoverFindings: regex matches in the final markdown \u2014 review these before sharing."
     ]
   };
-  const redactionsPath = join18(outputDir, "redactions.json");
+  const redactionsPath = join19(outputDir, "redactions.json");
   await writeFile7(redactionsPath, `${JSON.stringify(redactionsReport, null, 2)}
 `, "utf-8");
   const leftoverNote = leftoverFindings.length > 0 ? chalk2.yellow(`(${leftoverFindings.length} leftover finding(s) \u2014 review)`) : chalk2.dim("(no leftover findings)");
@@ -11451,12 +13351,16 @@ async function runGitHubExport(replay, outputDir) {
     markdown,
     outputDir,
     svgPath: svgFilePath,
-    gifPath: gifGenerated ? join18(outputDir, "session-preview.gif") : void 0,
+    gifPath: gifGenerated ? join19(outputDir, "session-preview.gif") : void 0,
     mdPath: mdFilePath,
     redactionsPath
   };
 }
 var DEV_MENU_ENABLED = process.env.VIBE_REPLAY_DEV_MENU === "1";
+function getDevViewerOpts() {
+  if (!DEV_MENU_ENABLED) return void 0;
+  return { externalViewerUrl: `http://localhost:${process.env.VIBE_VIEWER_PORT || "5173"}` };
+}
 var SESSION_DISCOVERY_CACHE_KEY = "session-discovery-v3";
 function normalizePromptTitle(value) {
   return normalizeTitle(cleanPromptText(value || "")) || "";
@@ -11475,6 +13379,35 @@ function suggestedReplayTitle(replayTitle, replaySlug, sessionInfo) {
   if (firstPromptTitle) return firstPromptTitle;
   return replayCandidate || slug || replaySlug;
 }
+function formatParseWarningSummary(warnings) {
+  if (!warnings?.length) return [];
+  return warnings.map((warning) => {
+    const label = warning.kind === "malformed-json" ? "malformed JSONL line" : warning.kind === "missing-image" ? "image file" : warning.kind === "unreadable-source" ? "unreadable source" : "item";
+    const plural2 = warning.count === 1 ? label : `${label}s`;
+    const location = warning.firstLine ? ` first at line ${warning.firstLine}` : "";
+    const source = warning.source ? ` in ${warning.source}` : "";
+    const sample = warning.sample ? ` Sample: ${warning.sample}` : "";
+    return `${warning.count} ${plural2} skipped${source}${location}.${sample}`;
+  });
+}
+function printParseWarnings(warnings) {
+  const lines = formatParseWarningSummary(warnings);
+  if (lines.length === 0) return;
+  const total = warnings?.reduce((sum, warning) => sum + warning.count, 0) ?? 0;
+  process.stderr.write(
+    `${chalk2.yellow(`  \u26A0 ${total} parser warning${total === 1 ? "" : "s"} detected`)}
+`
+  );
+  for (const line of lines.slice(0, 4)) {
+    process.stderr.write(`${chalk2.dim("    - ")}${chalk2.yellow(line)}
+`);
+  }
+  if (lines.length > 4) {
+    process.stderr.write(chalk2.dim(`    ... ${lines.length - 4} more warning group(s)
+`));
+  }
+  process.stderr.write("\n");
+}
 async function discoverAllSessions() {
   const providers2 = getAllProviders();
   const allSessions = [];
@@ -11495,27 +13428,15 @@ program.name("vibe-replay").description("AI Coding Session Replay & Sharing Tool
 ).action(async (opts) => {
   console.log(chalk2.bold.cyan("\n  vibe-replay") + chalk2.dim(` v${CLI_VERSION}
 `));
-  if (process.platform === "win32") {
-    console.log(chalk2.yellow("  \u26A0 Windows is not supported yet.\n"));
-    console.log(chalk2.dim("  We're working on it! Follow progress and updates:"));
-    console.log(
-      chalk2.dim("  \u2192 ") + chalk2.white("https://github.com/tuo-lei/vibe-replay/issues/26")
-    );
-    console.log(chalk2.dim("  \u2192 ") + chalk2.white("https://vibe-replay.com\n"));
-    process.exit(1);
-  }
   const { join: pathJoin } = await import("path");
-  const { homedir: homedir16 } = await import("os");
-  const replayBaseDir = pathJoin(homedir16(), ".vibe-replay");
+  const { homedir: homedir17 } = await import("os");
+  const replayBaseDir = pathJoin(homedir17(), ".vibe-replay");
   void discoverAllSessions().then(async (sessions) => {
     await writeFileCache(SESSION_DISCOVERY_CACHE_KEY, sessions);
   }).catch(() => {
   });
   if (opts.dashboard) {
-    await startDashboard(
-      replayBaseDir,
-      DEV_MENU_ENABLED ? { externalViewerUrl: `http://localhost:${process.env.VIBE_VIEWER_PORT || "5173"}` } : void 0
-    );
+    await startDashboard(replayBaseDir, getDevViewerOpts());
     return;
   }
   if ((opts.open || opts.github) && !opts.session) {
@@ -11547,21 +13468,18 @@ program.name("vibe-replay").description("AI Coding Session Replay & Sharing Tool
       ]
     });
     if (topChoice === "dashboard") {
-      await startDashboard(
-        replayBaseDir,
-        DEV_MENU_ENABLED ? { externalViewerUrl: `http://localhost:${process.env.VIBE_VIEWER_PORT || "5173"}` } : void 0
-      );
+      await startDashboard(replayBaseDir, getDevViewerOpts());
       return;
     }
     if (topChoice === "replays") {
-      const { readdir: readdir11, readFile: readFile18 } = await import("fs/promises");
+      const { readdir: readdir12, readFile: readFile20 } = await import("fs/promises");
       const replayEntries = [];
       try {
-        const entries = await readdir11(replayBaseDir);
+        const entries = await readdir12(replayBaseDir);
         for (const slug2 of entries) {
           if (slug2.startsWith(".") || slug2 === "cache") continue;
           try {
-            const raw = await readFile18(pathJoin(replayBaseDir, slug2, "replay.json"), "utf-8");
+            const raw = await readFile20(pathJoin(replayBaseDir, slug2, "replay.json"), "utf-8");
             const replay2 = JSON.parse(raw);
             const title = replay2.meta?.title || slug2;
             const provider2 = replay2.meta?.provider || "";
@@ -11574,7 +13492,7 @@ program.name("vibe-replay").description("AI Coding Session Replay & Sharing Tool
               minute: "2-digit",
               hour12: false
             }) : "";
-            const providerBadge = provider2 === "claude-code" ? chalk2.hex("#D97706")("claude") : provider2 === "claude-desktop" ? chalk2.hex("#C084FC")("desktop") : provider2 === "claude-cowork" ? chalk2.hex("#F472B6")("cowork") : provider2 === "cursor" ? chalk2.hex("#0096FF")("cursor") : chalk2.yellow(provider2);
+            const providerBadge = provider2 === "claude-code" ? chalk2.hex("#D97706")("claude") : provider2 === "claude-desktop" ? chalk2.hex("#C084FC")("desktop") : provider2 === "claude-cowork" ? chalk2.hex("#F472B6")("cowork") : provider2 === "cursor" ? chalk2.hex("#0096FF")("cursor") : provider2 === "codex" ? chalk2.hex("#B392F0")("codex") : chalk2.yellow(provider2);
             replayEntries.push({
               name: `${providerBadge} ${chalk2.dim(`[${time}]`)} ${chalk2.white(title)} ${chalk2.dim(`(${scenes} scenes)`)}`,
               value: slug2,
@@ -11695,7 +13613,8 @@ program.name("vibe-replay").description("AI Coding Session Replay & Sharing Tool
     }
     const info = displayedSessions.find((s) => s.filePath === chosen);
     sessionInfo = info;
-    sessionPaths = info ? [...info.filePaths, ...info.toolPaths || []] : [chosen];
+    const sourcePaths = info ? info.filePaths.length > 0 ? info.filePaths : [info.filePath] : [chosen];
+    sessionPaths = [...sourcePaths, ...info?.toolPaths || []];
     providerName = info?.provider || opts.provider;
   }
   const provider = getProvider(providerName);
@@ -11746,10 +13665,10 @@ program.name("vibe-replay").description("AI Coding Session Replay & Sharing Tool
       replay.meta.title = normalizedUserTitle;
     }
   }
-  const { join: join18 } = await import("path");
+  const { join: join19 } = await import("path");
   const rawSlug = replay.meta.slug || replay.meta.sessionId.slice(0, 8);
   const slug = rawSlug.replace(/[^a-zA-Z0-9_-]/g, "-");
-  const outputDir = join18(home, ".vibe-replay", slug);
+  const outputDir = join19(home, ".vibe-replay", slug);
   const genSpinner = ora("Generating replay...").start();
   const outputPath = await generateOutput(replay, outputDir);
   const { stat: fsStat } = await import("fs/promises");
@@ -11787,6 +13706,7 @@ program.name("vibe-replay").description("AI Coding Session Replay & Sharing Tool
       console.log(chalk2.dim("  Continuing \u2014 user confirmed findings are safe.\n"));
     }
   }
+  printParseWarnings(replay.meta.parseWarnings);
   if (opts.open) {
     await publishLocal(outputPath);
     console.log();
@@ -11840,9 +13760,9 @@ ${chalk2.bold.green("  Done!")}
   if (target === "local") {
     await publishLocal(outputPath);
   } else if (target === "editor") {
-    await startServer(join18(home, ".vibe-replay"), {
+    await startServer(join19(home, ".vibe-replay"), {
       openSlug: slug,
-      externalViewerUrl: DEV_MENU_ENABLED ? `http://localhost:${process.env.VIBE_VIEWER_PORT || "5173"}` : void 0
+      ...getDevViewerOpts()
     });
     return;
   } else if (target === "cloud") {
@@ -11944,8 +13864,36 @@ ${chalk2.bold.green("  Done!")}
   console.log(chalk2.dim("  File: ") + chalk2.white(outputPath));
   console.log();
 });
+program.command("sessions").description("Search local AI coding sessions (agent-friendly)").option("-q, --query <text>", "Search title, prompt, project, branch, model, or slug").option("--project <text>", "Filter by project path substring").option("-p, --provider <name>", "Filter by provider (claude-code, cursor, codex, ...)").option("-l, --limit <number>", "Maximum sessions to return", (value) => Number(value), 10).option("--scan", "Run richer per-session scan for efficiency metrics").option("--any", "Match any query term instead of requiring all terms").option("--brief", "Include scan-backed session briefs and match evidence").option("--dedupe", "Collapse near-duplicate sessions with the same long prompt/title").option("--json", "Print machine-readable JSON").action(async (opts) => {
+  const discoverSpinner = opts.json ? void 0 : ora("Discovering local sessions...").start();
+  try {
+    const sessions = mergeSameSessions2(await discoverAllSessions());
+    discoverSpinner?.succeed(`Found ${sessions.length} sessions`);
+    const scanSpinner = opts.scan && !opts.json ? ora("Scanning matching sessions...").start() : void 0;
+    const matches = await queryLocalSessions(sessions, opts);
+    scanSpinner?.succeed(`Prepared ${matches.length} session result(s)`);
+    if (opts.json) {
+      console.log(JSON.stringify({ sessions: matches }, null, 2));
+    } else {
+      console.log();
+      console.log(formatSessionQueryText(matches));
+      console.log();
+    }
+  } catch (err) {
+    discoverSpinner?.fail("Session search failed");
+    const message = err instanceof Error ? err.message : String(err);
+    if (opts.json) {
+      console.error(message);
+    } else {
+      console.error(chalk2.red(`
+  \u2717 ${message}
+`));
+    }
+    process.exit(1);
+  }
+});
 var authCmd = program.command("auth").description("Manage authentication");
-authCmd.command("login").description("Log in to vibe-replay with GitHub").option("--api-url <url>", "API base URL", "https://vibe-replay.com").action(async (opts) => {
+authCmd.command("login").description("Log in to vibe-replay with GitHub").option("--api-url <url>", "API base URL", DEFAULT_API_URL).action(async (opts) => {
   const crypto = await import("crypto");
   const apiUrl = opts.apiUrl.replace(/\/$/, "");
   const parsed = new URL(apiUrl);
@@ -12037,7 +13985,7 @@ authCmd.command("login").description("Log in to vibe-replay with GitHub").option
     5 * 60 * 1e3
   );
 });
-authCmd.command("logout").description("Log out of vibe-replay").option("--api-url <url>", "API base URL", "https://vibe-replay.com").action(async (opts) => {
+authCmd.command("logout").description("Log out of vibe-replay").option("--api-url <url>", "API base URL", DEFAULT_API_URL).action(async (opts) => {
   const apiUrl = opts.apiUrl.replace(/\/$/, "");
   const auth = loadAuthToken(apiUrl);
   if (!auth) {
@@ -12047,7 +13995,7 @@ authCmd.command("logout").description("Log out of vibe-replay").option("--api-ur
   removeAuthTokenSync(apiUrl);
   console.log(chalk2.bold.green("\n  \u2713 Logged out successfully\n"));
 });
-authCmd.command("status").description("Show current authentication status").option("--api-url <url>", "API base URL", "https://vibe-replay.com").action(async (opts) => {
+authCmd.command("status").description("Show current authentication status").option("--api-url <url>", "API base URL", DEFAULT_API_URL).action(async (opts) => {
   const apiUrl = opts.apiUrl.replace(/\/$/, "");
   const auth = loadAuthToken(apiUrl);
   if (!auth) {
@@ -12071,9 +14019,9 @@ authCmd.command("status").description("Show current authentication status").opti
 var VISIBILITIES = ["public", "unlisted", "private"];
 program.command("share").description("Share an existing replay via cloud (unlisted link, expires in 7 days)").argument("[path]", "Path to replay directory or replay.json").option("--visibility <type>", `Visibility: ${VISIBILITIES.join(", ")}`, "unlisted").option("--api-url <url>", `API base URL (default: ${DEFAULT_API_URL})`).action(async (pathArg, opts) => {
   const { existsSync: existsSync2, statSync } = await import("fs");
-  const { readFile: readFile18, readdir: readdir11 } = await import("fs/promises");
-  const { join: join18, dirname: dirname6, resolve: resolve3 } = await import("path");
-  const { homedir: homedir16 } = await import("os");
+  const { readFile: readFile20, readdir: readdir12 } = await import("fs/promises");
+  const { join: join19, dirname: dirname6, resolve: resolve3 } = await import("path");
+  const { homedir: homedir17 } = await import("os");
   if (opts.apiUrl) {
     process.env.VIBE_REPLAY_API_URL = opts.apiUrl.replace(/\/$/, "");
   }
@@ -12102,14 +14050,14 @@ program.command("share").description("Share an existing replay via cloud (unlist
     const s = statSync(abs);
     outputDir = s.isDirectory() ? abs : dirname6(abs);
   } else {
-    const replayBaseDir = join18(homedir16(), ".vibe-replay");
-    const entries = await readdir11(replayBaseDir).catch(() => []);
+    const replayBaseDir = join19(homedir17(), ".vibe-replay");
+    const entries = await readdir12(replayBaseDir).catch(() => []);
     const replays = [];
     for (const slug of entries) {
       if (slug.startsWith(".") || slug === "cache") continue;
-      const jsonPath2 = join18(replayBaseDir, slug, "replay.json");
+      const jsonPath2 = join19(replayBaseDir, slug, "replay.json");
       try {
-        const raw = await readFile18(jsonPath2, "utf-8");
+        const raw = await readFile20(jsonPath2, "utf-8");
         const replay = JSON.parse(raw);
         const title = replay.meta?.title || slug;
         const startTime = replay.meta?.startTime || "";
@@ -12122,7 +14070,7 @@ program.command("share").description("Share an existing replay via cloud (unlist
         }) : "";
         replays.push({
           name: time ? `${chalk2.dim(`[${time}]`)} ${chalk2.white(title)}` : chalk2.white(title),
-          value: join18(replayBaseDir, slug),
+          value: join19(replayBaseDir, slug),
           time: startTime
         });
       } catch {
@@ -12138,7 +14086,7 @@ program.command("share").description("Share an existing replay via cloud (unlist
       choices: replays
     });
   }
-  const jsonPath = join18(outputDir, "replay.json");
+  const jsonPath = join19(outputDir, "replay.json");
   if (!existsSync2(jsonPath)) {
     console.error(chalk2.red(`
   \u2717 No replay.json found in ${outputDir}
@@ -12162,13 +14110,9 @@ program.command("share").description("Share an existing replay via cloud (unlist
 });
 var LIVE_STALENESS_WARNING_MS = 5 * 6e4;
 program.command("live").description("Watch a running AI coding session live in the browser").option("-p, --provider <name>", "Provider name (default: auto-detect)").option("-s, --session <sessionId>", "Specific session ID to watch").action(async (opts) => {
-  if (process.platform === "win32") {
-    console.log(chalk2.yellow("\n  \u26A0 Windows is not supported yet.\n"));
-    process.exit(1);
-  }
   const { join: pathJoin } = await import("path");
-  const { homedir: homedir16 } = await import("os");
-  const replayBaseDir = pathJoin(homedir16(), ".vibe-replay");
+  const { homedir: homedir17 } = await import("os");
+  const replayBaseDir = pathJoin(homedir17(), ".vibe-replay");
   console.log(chalk2.bold.cyan("\n  vibe-replay live") + chalk2.dim(` v${CLI_VERSION}
 `));
   let target = null;
@@ -12227,7 +14171,7 @@ program.command("live").description("Watch a running AI coding session live in t
     openLive: { provider: target.provider, sessionId: target.sessionId }
   });
 });
-program.command("login", { hidden: true }).description("Log in to vibe-replay (alias for auth login)").option("--api-url <url>", "API base URL", "https://vibe-replay.com").action(async () => {
+program.command("login", { hidden: true }).description("Log in to vibe-replay (alias for auth login)").option("--api-url <url>", "API base URL", DEFAULT_API_URL).action(async () => {
   await authCmd.commands.find((c) => c.name() === "login")?.parseAsync(["login", ...process.argv.slice(3)], { from: "user" });
 });
 program.parse();
@@ -12256,7 +14200,7 @@ function formatSessionChoices(sessions, cleanupPeriodDays) {
       });
       const sizeKB = Math.round(s.fileSize / 1024);
       const prompt = s.firstPrompt.replace(/\n/g, " ").slice(0, 50);
-      const providerBadge = s.provider === "claude-code" ? chalk2.hex("#D97706")("claude") : s.provider === "claude-desktop" ? chalk2.hex("#C084FC")("desktop") : s.provider === "claude-cowork" ? chalk2.hex("#F472B6")("cowork") : s.provider === "cursor" ? chalk2.hex("#0096FF")("cursor") : chalk2.yellow(s.provider);
+      const providerBadge = s.provider === "claude-code" ? chalk2.hex("#D97706")("claude") : s.provider === "claude-desktop" ? chalk2.hex("#C084FC")("desktop") : s.provider === "claude-cowork" ? chalk2.hex("#F472B6")("cowork") : s.provider === "cursor" ? chalk2.hex("#0096FF")("cursor") : s.provider === "codex" ? chalk2.hex("#B392F0")("codex") : chalk2.yellow(s.provider);
       const titleStr = s.title ? chalk2.white(` "${s.title}"`) : "";
       const fileCount = s.filePaths.length > 1 ? chalk2.dim(` [${s.filePaths.length} parts]`) : "";
       const sqliteBadge = s.hasSqlite ? chalk2.green(" db") : "";