vibe-replay 0.2.2 → 0.2.3

package/dist/index.js

@@ -75,13 +75,13 @@ var init_utils = __esm({
 });
 
 // src/overlays.ts
-import { readFile as readFile14 } from "fs/promises";
-import { join as join13, resolve } from "path";
+import { readFile as readFile16 } from "fs/promises";
+import { join as join16, resolve } from "path";
 async function loadOverlays(baseDir, slug) {
-  const dirs = [join13(baseDir, slug), resolve("./vibe-replay", slug)];
+  const dirs = [join16(baseDir, slug), resolve("./vibe-replay", slug)];
   for (const dir of dirs) {
     try {
-      const raw = await readFile14(join13(dir, "overlays.json"), "utf-8");
+      const raw = await readFile16(join16(dir, "overlays.json"), "utf-8");
       const parsed = JSON.parse(raw);
       if (parsed && typeof parsed === "object" && Array.isArray(parsed.overlays)) {
         return parsed;
@@ -140,9 +140,9 @@ __export(cloud_exports, {
   saveAuthTokenSync: () => saveAuthTokenSync
 });
 import { existsSync, mkdirSync, readFileSync as readFileSync2, rmSync, writeFileSync } from "fs";
-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";
+import { mkdir as mkdir3, readFile as readFile17, unlink, writeFile as writeFile3 } from "fs/promises";
+import { homedir as homedir14 } from "os";
+import { basename as basename7, dirname as dirname3, join as join17 } from "path";
 function authOrigin(url) {
   try {
     return new URL(url).origin;
@@ -243,8 +243,8 @@ async function publishCloud(outputDir, opts) {
   if (!auth) {
     throw new Error("Not logged in. Run `vibe-replay auth login` first.");
   }
-  const jsonPath = join14(outputDir, "replay.json");
-  const content = await readFile15(jsonPath, "utf-8");
+  const jsonPath = join17(outputDir, "replay.json");
+  const content = await readFile17(jsonPath, "utf-8");
   const replay = JSON.parse(content);
   const sizeBytes = Buffer.byteLength(content, "utf-8");
   const MAX_SIZE = 10 * 1024 * 1024;
@@ -285,14 +285,14 @@ async function publishCloud(outputDir, opts) {
   return data;
 }
 async function publishCloudWithOverlays(outputDir, opts) {
-  const slug = basename5(outputDir);
+  const slug = basename7(outputDir);
   const baseDir = dirname3(outputDir);
   const overlays = await loadOverlays(baseDir, slug);
   if (overlays.overlays.length === 0) {
     return publishCloud(outputDir, opts);
   }
-  const replayPath = join14(outputDir, "replay.json");
-  const originalContent = await readFile15(replayPath, "utf-8");
+  const replayPath = join17(outputDir, "replay.json");
+  const originalContent = await readFile17(replayPath, "utf-8");
   const session = JSON.parse(originalContent);
   const merged = sessionWithEffectiveContent(session, overlays);
   await writeFile3(replayPath, JSON.stringify(merged), "utf-8");
@@ -304,7 +304,7 @@ async function publishCloudWithOverlays(outputDir, opts) {
 }
 async function loadSavedCloudInfo(outputDir) {
   try {
-    const raw = await readFile15(join14(outputDir, CLOUD_META_FILE), "utf-8");
+    const raw = await readFile17(join17(outputDir, CLOUD_META_FILE), "utf-8");
     const parsed = JSON.parse(raw);
     if (!parsed?.id || !parsed?.url) return void 0;
     return parsed;
@@ -313,7 +313,7 @@ async function loadSavedCloudInfo(outputDir) {
   }
 }
 async function saveCloudInfo(outputDir, info) {
-  await writeFile3(join14(outputDir, CLOUD_META_FILE), JSON.stringify(info, null, 2), "utf-8");
+  await writeFile3(join17(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({
@@ -322,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 = join14(homedir12(), ".config", "vibe-replay");
-    AUTH_FILE = join14(AUTH_DIR, "auth.json");
+    AUTH_DIR = join17(homedir14(), ".config", "vibe-replay");
+    AUTH_FILE = join17(AUTH_DIR, "auth.json");
   }
 });
 
@@ -338,7 +338,7 @@ var init_src = __esm({
 
 // src/machine-id.ts
 import { execSync } from "child_process";
-import { createHash as createHash3 } from "crypto";
+import { createHash as createHash4 } from "crypto";
 import { readFileSync as readFileSync3 } from "fs";
 import { hostname, platform } from "os";
 function getRawMachineId() {
@@ -379,7 +379,7 @@ function getRawMachineId() {
 function getMachineId() {
   if (cachedId) return cachedId;
   const raw = getRawMachineId();
-  cachedId = createHash3("sha256").update(raw).digest("hex").slice(0, 32);
+  cachedId = createHash4("sha256").update(raw).digest("hex").slice(0, 32);
   return cachedId;
 }
 function getMachineName() {
@@ -406,12 +406,12 @@ __export(insights_exports, {
   scanResultToInsight: () => scanResultToInsight,
   writeInsightsStore: () => writeInsightsStore
 });
-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";
+import { mkdir as mkdir4, readFile as readFile19, rename, writeFile as writeFile5 } from "fs/promises";
+import { homedir as homedir15 } from "os";
+import { dirname as dirname4, join as join19 } from "path";
 async function readInsightsStore() {
   try {
-    const raw = await readFile17(STORE_PATH, "utf-8");
+    const raw = await readFile19(STORE_PATH, "utf-8");
     const parsed = JSON.parse(raw);
     return migrateInsightsStore(parsed);
   } catch {
@@ -607,8 +607,8 @@ var init_insights = __esm({
     init_machine_id();
     init_utils();
     init_version();
-    INSIGHTS_DIR = join16(homedir13(), ".vibe-replay", "insights");
-    STORE_PATH = join16(INSIGHTS_DIR, "store.json");
+    INSIGHTS_DIR = join19(homedir15(), ".vibe-replay", "insights");
+    STORE_PATH = join19(INSIGHTS_DIR, "store.json");
   }
 });
 
@@ -2063,11 +2063,13 @@ async function parseClaudeCodeLines(lines, options = {}) {
     }
     if (!obj.message) continue;
     const { role, content: msgContent, id: msgId } = obj.message;
-    if (obj.isApiErrorMessage && obj.timestamp) {
+    if ((obj.isApiErrorMessage || obj.apiErrorStatus !== void 0) && obj.timestamp) {
       const text = extractMessageText(msgContent);
-      const errorType = inferApiErrorMessageType(text);
+      const statusCode = apiErrorStatusCode(obj.apiErrorStatus);
+      const errorType = errorTypeFromStatus(obj.apiErrorStatus) || inferApiErrorMessageType(text);
       apiErrors.push({
         timestamp: obj.timestamp,
+        ...statusCode ? { statusCode } : {},
         ...errorType ? { errorType } : {}
       });
     }
@@ -2107,7 +2109,7 @@ async function parseClaudeCodeLines(lines, options = {}) {
       continue;
     }
     if (role === "user" && Array.isArray(msgContent)) {
-      const isToolSearchResponse = !!obj.sourceToolAssistantUUID;
+      const isToolSearchResponse = !!obj.sourceToolAssistantUUID || !!obj.sourceToolUseID || obj.origin === "tool_result";
       const textParts = [];
       const userImages = [];
       for (const block of msgContent) {
@@ -2146,6 +2148,8 @@ async function parseClaudeCodeLines(lines, options = {}) {
     }
     if (role === "assistant" && msgId && Array.isArray(msgContent)) {
       if (!model && obj.message.model) model = obj.message.model;
+      if (obj.attributionMcpServer) mcpServersUsed.add(obj.attributionMcpServer);
+      if (obj.attributionSkill) skillsUsed.add(obj.attributionSkill);
       const usage = obj.message.usage;
       if (usage && msgId) {
         usageByMsgId.set(msgId, { ...usage, model: obj.message.model });
@@ -2194,10 +2198,10 @@ async function parseClaudeCodeLines(lines, options = {}) {
         const agentId = agentMapping.get(block.id);
         const subAgent = agentId ? subAgentData.get(agentId) : void 0;
         const resultTs = toolResultTimestamps.get(block.id);
-        let toolDurationMs;
+        let toolDurationMs2;
         if (resultTs && prevToolEndTs) {
           const diff = Date.parse(resultTs) - Date.parse(prevToolEndTs);
-          if (diff > 0 && diff < 36e5) toolDurationMs = diff;
+          if (diff > 0 && diff < 36e5) toolDurationMs2 = diff;
         }
         if (resultTs) prevToolEndTs = resultTs;
         return {
@@ -2208,7 +2212,7 @@ async function parseClaudeCodeLines(lines, options = {}) {
           // SubAgentParsed.scenes widens Scene.type to string during parsing;
           // the final attached shape matches SubAgent after scanSubAgent post-processing.
           ...subAgent ? { _subAgent: subAgent } : {},
-          ...toolDurationMs ? { _durationMs: toolDurationMs } : {}
+          ...toolDurationMs2 ? { _durationMs: toolDurationMs2 } : {}
         };
       }
       return block;
@@ -2335,6 +2339,22 @@ function inferApiErrorMessageType(text) {
   if (lower.includes("api error")) return "api_error";
   return void 0;
 }
+function apiErrorStatusCode(status) {
+  if (typeof status === "number" && Number.isFinite(status)) return status;
+  if (typeof status !== "string") return void 0;
+  const match = status.match(/\b(\d{3})\b/);
+  return match ? Number(match[1]) : void 0;
+}
+function errorTypeFromStatus(status) {
+  if (typeof status !== "string") return void 0;
+  const lower = status.toLowerCase();
+  if (lower.includes("rate")) return "rate_limit_error";
+  if (lower.includes("overload")) return "overloaded_error";
+  if (lower.includes("error")) {
+    return lower.replace(/[^a-z0-9_]+/g, "_").replace(/^_+|_+$/g, "").replace(/_\d+$/, "");
+  }
+  return void 0;
+}
 function extractImages(block) {
   if (block.type !== "tool_result") return [];
   const { content } = block;
@@ -2433,12 +2453,12 @@ function buildTurnStats(finalTurns, usageByMsgId, turnDurations) {
     } else if (group.startTimestamp && group.endTimestamp) {
       durationMs = estimateActiveDuration([group.startTimestamp, group.endTimestamp]);
     }
-    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);
+    const stat12 = { turnIndex: i };
+    if (turnModel) stat12.model = turnModel;
+    if (durationMs !== void 0) stat12.durationMs = durationMs;
+    if (turnTokens) stat12.tokenUsage = turnTokens;
+    if (maxContextTokens > 0) stat12.contextTokens = maxContextTokens;
+    stats.push(stat12);
   }
   return stats;
 }
@@ -3901,31 +3921,31 @@ function buildCodexTurnStats(turns, snapshots, taskDurations, model) {
   const usable = snapshots.filter((s) => s.last);
   return userTurns.map((turn, i) => {
     const usage = usable[i]?.last;
-    const stat11 = { turnIndex: i };
-    if (model) stat11.model = model;
+    const stat12 = { turnIndex: i };
+    if (model) stat12.model = model;
     if (usage) {
       const input = usage.input_tokens || 0;
       const cached = usage.cached_input_tokens || 0;
-      stat11.tokenUsage = {
+      stat12.tokenUsage = {
         inputTokens: Math.max(0, input - cached),
         outputTokens: usage.output_tokens || 0,
         cacheCreationTokens: 0,
         cacheReadTokens: cached
       };
-      stat11.contextTokens = input;
+      stat12.contextTokens = input;
     }
     const nextUser = userTurns[i + 1]?.timestamp;
     const taskDuration = taskDurations[i];
     if (typeof taskDuration === "number" && taskDuration > 0) {
-      stat11.durationMs = taskDuration;
+      stat12.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) stat11.durationMs = diff;
+        if (diff > 0 && diff < 12 * 60 * 60 * 1e3) stat12.durationMs = diff;
       }
     }
-    return stat11;
+    return stat12;
   });
 }
 function pushUnique(items, value) {
@@ -3970,15 +3990,15 @@ var codexProvider = {
 // src/providers/cursor/discover.ts
 init_utils();
 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";
+import { homedir as homedir11 } from "os";
+import { basename as basename3, join as join12 } from "path";
 
 // src/providers/cursor/sqlite-reader.ts
-import { createHash } from "crypto";
+import { createHash as createHash2 } from "crypto";
 import { execFile } from "child_process";
 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, posix } from "path";
+import { homedir as homedir9 } from "os";
+import { basename as basename2, dirname as dirname2, join as join10, posix } from "path";
 import { promisify } from "util";
 init_utils();
 
@@ -4051,16 +4071,11 @@ function looksLikeInternalPlanningBody(text) {
   );
 }
 
-// src/providers/cursor/sqlite-reader.ts
+// src/providers/cursor/sqlite-io.ts
+import { createHash } from "crypto";
+import { homedir as homedir8 } from "os";
+import { join as join9 } from "path";
 var CURSOR_CHATS_DIR = join9(homedir8(), ".cursor", "chats");
-var SESSION_ID_RE = /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i;
-var MIN_STORE_DB_SIZE = 8192;
-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;
   return async () => {
@@ -4073,115 +4088,419 @@ function createRetryableInit(factory) {
     return promise;
   };
 }
-var getSqlJs = createRetryableInit(async () => {
-  const mod = await import("sql.js");
-  return mod.default();
-});
-var cachedGlobalStateDb = null;
-function closeCachedSqlJsDb() {
-  if (cachedGlobalStateDb?.backend !== "sqljs") return;
+function workspaceHash(absolutePath) {
+  return createHash("md5").update(absolutePath).digest("hex");
+}
+
+// src/providers/cursor/tool-mapping.ts
+function parseJson(raw) {
+  if (typeof raw !== "string") return null;
   try {
-    cachedGlobalStateDb.db.close();
+    return JSON.parse(raw);
   } catch {
+    return null;
   }
 }
-var cachedStoreDbIndex = null;
-var resolvedProjectRootCache = /* @__PURE__ */ new Map();
-var GLOBAL_STATE_DISCOVERY_CACHE_PREFIX = "cursor-global-state-discovery-v4";
-function workspaceHash(absolutePath) {
-  return createHash("md5").update(absolutePath).digest("hex");
+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",
+    Grep: "Grep",
+    ripgrep_raw_search: "Grep",
+    ripgrep: "Grep",
+    rg: "Grep",
+    grep: "Grep",
+    grep_search: "Grep",
+    Glob: "Glob",
+    glob_file_search: "Glob",
+    file_search: "Glob",
+    list_dir: "Glob",
+    list_dir_v2: "Glob",
+    LS: "Glob",
+    StrReplace: "Edit",
+    EditFile: "Edit",
+    edit: "Edit",
+    // Cursor SDK lowercase tool name
+    edit_file_v2: "Edit",
+    edit_file: "Edit",
+    search_replace: "Edit",
+    ApplyPatch: "Edit",
+    apply_patch: "Edit",
+    MultiEdit: "MultiEdit",
+    multi_edit: "MultiEdit",
+    Write: "Write",
+    WriteFile: "Write",
+    write: "Write",
+    Delete: "Delete",
+    delete_file: "Delete",
+    Task: "Agent",
+    task_v2: "Agent",
+    todo_write: "TodoWrite",
+    ask_question: "AskQuestion",
+    semantic_search_full: "SemanticSearch",
+    codebase_search: "SemanticSearch",
+    web_search: "WebSearch",
+    WebFetch: "WebFetch",
+    web_fetch: "WebFetch",
+    create_plan: "Plan"
+  };
+  if (mapping[name]) return mapping[name];
+  if (name.startsWith("mcp-cursor-ide-browser-cursor-ide-browser-browser_")) return "Browser";
+  if (name.startsWith("chrome-devtools-")) return "Browser";
+  return name;
 }
-function globalStateDbCandidates() {
-  const candidates = [
-    join9(
-      homedir8(),
-      "Library",
-      "Application Support",
-      "Cursor",
-      "User",
-      "globalStorage",
-      "state.vscdb"
-    ),
-    join9(homedir8(), ".config", "Cursor", "User", "globalStorage", "state.vscdb")
-  ];
-  const appData = process.env.APPDATA;
-  if (appData) {
-    candidates.push(join9(appData, "Cursor", "User", "globalStorage", "state.vscdb"));
+function parseDiffStringSnippet(diffString) {
+  const oldLines = [];
+  const newLines = [];
+  for (const line of diffString.split("\n")) {
+    if (line.startsWith("@@") || line.startsWith("*** ") || line.startsWith("---") || line.startsWith("+++")) {
+      continue;
+    }
+    if (line.startsWith("-")) {
+      oldLines.push(line.slice(1));
+    } else if (line.startsWith("+")) {
+      newLines.push(line.slice(1));
+    } else if (line.startsWith(" ")) {
+      const shared = line.slice(1);
+      oldLines.push(shared);
+      newLines.push(shared);
+    }
   }
-  return [...new Set(candidates)];
+  return { oldText: oldLines.join("\n"), newText: newLines.join("\n") };
 }
-async function findGlobalStateDb() {
-  for (const candidate of globalStateDbCandidates()) {
-    const s = await stat5(candidate).catch(() => null);
-    if (s?.isFile() && s.size >= MIN_STORE_DB_SIZE) return candidate;
+function inferEditStringsFromResult(resultText) {
+  if (!resultText.trim()) return {};
+  const parsed = parseJson(resultText);
+  if (!parsed || typeof parsed !== "object") return {};
+  const out = {};
+  if (typeof parsed.contentsAfterEdit === "string" && parsed.contentsAfterEdit.trim()) {
+    out.new_string = parsed.contentsAfterEdit;
   }
-  return null;
+  const chunks = parsed.diff && typeof parsed.diff === "object" && Array.isArray(parsed.diff.chunks) ? parsed.diff.chunks : [];
+  const oldParts = [];
+  const newParts = [];
+  for (const chunk of chunks) {
+    if (!chunk || typeof chunk !== "object") continue;
+    if (typeof chunk.diffString !== "string" || !chunk.diffString.trim()) continue;
+    const parsedSnippet = parseDiffStringSnippet(chunk.diffString);
+    if (parsedSnippet.oldText) oldParts.push(parsedSnippet.oldText);
+    if (parsedSnippet.newText) newParts.push(parsedSnippet.newText);
+  }
+  if (oldParts.length > 0) out.old_string = oldParts.join("\n");
+  if (!out.new_string && newParts.length > 0) out.new_string = newParts.join("\n");
+  return out;
 }
-async function globalStateWalFingerprint(dbPath) {
-  const walStat = await stat5(`${dbPath}-wal`).catch(() => null);
+function parseApplyPatchArgs(rawPatch) {
+  const fileMatch = rawPatch.match(/^\*\*\*\s+(?:Update|Add|Delete)\s+File:\s+(.+)$/m);
+  const oldLines = [];
+  const newLines = [];
+  for (const line of rawPatch.split("\n")) {
+    if (line.startsWith("*** ") || line.startsWith("@@") || line.startsWith("---") || line.startsWith("+++")) {
+      continue;
+    }
+    if (line.startsWith("-")) {
+      oldLines.push(line.slice(1));
+    } else if (line.startsWith("+")) {
+      newLines.push(line.slice(1));
+    } else if (line.startsWith(" ")) {
+      const shared = line.slice(1);
+      oldLines.push(shared);
+      newLines.push(shared);
+    }
+  }
   return {
-    walSize: walStat?.isFile() ? walStat.size : 0,
-    walMtimeMs: walStat?.isFile() ? walStat.mtimeMs : 0
+    ...fileMatch?.[1] ? { file_path: fileMatch[1].trim() } : {},
+    old_string: oldLines.join("\n"),
+    new_string: newLines.join("\n"),
+    patch: rawPatch
   };
 }
-function sqlString(value) {
-  return `'${value.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";
-  const toolResult = `json_extract(${value}, '$.toolFormerData.result')`;
-  const truncatedToolResult = [
-    "CASE",
-    `WHEN json_type(${value}, '$.toolFormerData.result') = 'text'`,
-    `THEN substr(${toolResult}, 1, ${MAX_CURSOR_GLOBAL_STATE_TOOL_RESULT_CHARS})`,
-    `ELSE ${toolResult}`,
-    "END"
-  ].join(" ");
-  return [
-    "key",
-    `json_extract(${value}, '$.type') AS type`,
-    `json_extract(${value}, '$.text') AS text`,
-    `json_extract(${value}, '$.thinking') AS thinking`,
-    `json_extract(${value}, '$.createdAt') AS createdAt`,
-    `json_extract(${value}, '$.lastUpdatedAt') AS lastUpdatedAt`,
-    `json_extract(${value}, '$.timingInfo') AS timingInfo`,
-    `json_extract(${value}, '$.thinkingDurationMs') AS thinkingDurationMs`,
-    `json_extract(${value}, '$.tokenCount') AS tokenCount`,
-    `json_extract(${value}, '$.modelInfo') AS modelInfo`,
-    `json_extract(${value}, '$.modelName') AS modelName`,
-    `json_extract(${value}, '$.modelConfig') AS modelConfig`,
-    `json_extract(${value}, '$.toolFormerData.name') AS toolName`,
-    `json_extract(${value}, '$.toolFormerData.params') AS toolParams`,
-    `${truncatedToolResult} AS toolResult`,
-    `length(${toolResult}) AS toolResultLength`,
-    `json_extract(${value}, '$.toolFormerData.toolCallId') AS toolCallId`,
-    `json_extract(${value}, '$.pullRequests') AS pullRequests`,
-    `json_extract(${value}, '$.errorDetails') AS errorDetails`,
-    `json_extract(${value}, '$.retryAttempt') AS retryAttempt`,
-    `json_extract(${value}, '$.relevantFiles') AS relevantFiles`,
-    `json_extract(${value}, '$.recentlyViewedFiles') AS recentlyViewedFiles`
-  ].join(", ");
+function mapEditLikeArgs(argsObj, resultText) {
+  const mapped = {
+    file_path: argsObj.file_path ?? argsObj.path ?? argsObj.relativeWorkspacePath ?? "",
+    old_string: argsObj.old_string ?? argsObj.oldStr ?? "",
+    new_string: argsObj.new_string ?? argsObj.newStr ?? argsObj.streamingContent ?? argsObj.content ?? ""
+  };
+  if (!mapped.old_string || !mapped.new_string) {
+    const inferred = inferEditStringsFromResult(resultText);
+    if (!mapped.old_string && inferred.old_string) mapped.old_string = inferred.old_string;
+    if (!mapped.new_string && inferred.new_string) mapped.new_string = inferred.new_string;
+  }
+  return mapped;
 }
-function replayableGlobalStateBubblePredicateSql(valueExpr) {
-  const nonEmptyText = (path) => `(json_type(${valueExpr}, ${sqlString(path)}) = 'text' AND length(trim(COALESCE(json_extract(${valueExpr}, ${sqlString(
-    path
-  )}), ''))) > 0)`;
+function mapToolArgs(toolName, args, resultText = "") {
+  const argsObj = args && typeof args === "object" && !Array.isArray(args) ? args : null;
+  if (toolName === "ApplyPatch" || toolName === "apply_patch") {
+    const rawPatch = typeof args === "string" ? args : typeof argsObj?.patch === "string" ? argsObj.patch : typeof argsObj?.input === "string" ? argsObj.input : typeof argsObj?.content === "string" ? argsObj.content : typeof argsObj?.contents === "string" ? argsObj.contents : "";
+    if (rawPatch) return parseApplyPatchArgs(rawPatch);
+    if (argsObj && (argsObj.path || argsObj.file_path || argsObj.relativeWorkspacePath)) {
+      return mapEditLikeArgs(argsObj, resultText);
+    }
+    return argsObj || {};
+  }
+  if (typeof args === "string") {
+    return { raw: args };
+  }
+  if (!argsObj) return {};
+  if (toolName === "Shell" && argsObj.command) {
+    return {
+      command: argsObj.command,
+      ...argsObj.description ? { description: argsObj.description } : {}
+    };
+  }
+  if (toolName === "StrReplace" && (argsObj.path || argsObj.file_path || argsObj.relativeWorkspacePath)) {
+    return mapEditLikeArgs(argsObj, resultText);
+  }
+  if (toolName === "EditFile" && (argsObj.path || argsObj.file_path || argsObj.relativeWorkspacePath)) {
+    return mapEditLikeArgs(argsObj, resultText);
+  }
+  if (toolName === "Edit" && (argsObj.path || argsObj.file_path || argsObj.relativeWorkspacePath)) {
+    return mapEditLikeArgs(argsObj, resultText);
+  }
+  if ((toolName === "MultiEdit" || toolName === "multi_edit") && (argsObj.path || argsObj.file_path || argsObj.relativeWorkspacePath)) {
+    return {
+      file_path: argsObj.file_path ?? argsObj.path ?? argsObj.relativeWorkspacePath,
+      edits: Array.isArray(argsObj.edits) ? argsObj.edits : []
+    };
+  }
+  if ((toolName === "Write" || toolName === "WriteFile") && (argsObj.path || argsObj.relativeWorkspacePath || argsObj.targetFile || argsObj.file_path)) {
+    const codeValue = typeof argsObj.code === "string" ? argsObj.code : argsObj.code && typeof argsObj.code === "object" && typeof argsObj.code.code === "string" ? argsObj.code.code : "";
+    return {
+      file_path: argsObj.file_path ?? argsObj.path ?? argsObj.relativeWorkspacePath ?? argsObj.targetFile,
+      content: argsObj.contents ?? argsObj.content ?? codeValue
+    };
+  }
+  if ((toolName === "Read" || toolName === "ReadFile") && argsObj.path) {
+    return { file_path: argsObj.path };
+  }
+  if (toolName === "run_terminal_command_v2" && argsObj.command) {
+    return {
+      command: argsObj.command,
+      ...argsObj.commandDescription ? { description: argsObj.commandDescription } : {},
+      ...argsObj.cwd ? { cwd: argsObj.cwd } : {}
+    };
+  }
+  if (toolName === "run_terminal_cmd" && argsObj.command) {
+    return {
+      command: argsObj.command,
+      ...argsObj.cwd ? { cwd: argsObj.cwd } : {},
+      ...argsObj.requireUserApproval !== void 0 ? { requireUserApproval: Boolean(argsObj.requireUserApproval) } : {}
+    };
+  }
+  if (toolName === "read_file_v2" && argsObj.targetFile) {
+    return { file_path: argsObj.targetFile };
+  }
+  if (toolName === "read_file" && argsObj.targetFile) {
+    return { file_path: argsObj.targetFile };
+  }
+  if (toolName === "edit_file_v2" && argsObj.relativeWorkspacePath) {
+    return {
+      file_path: argsObj.relativeWorkspacePath,
+      new_string: argsObj.streamingContent ?? ""
+    };
+  }
+  if (toolName === "edit_file" || toolName === "search_replace") {
+    return mapEditLikeArgs(argsObj, resultText);
+  }
+  if (toolName === "write" && (argsObj.relativeWorkspacePath || argsObj.path || argsObj.targetFile)) {
+    const codeValue = typeof argsObj.code === "string" ? argsObj.code : argsObj.code && typeof argsObj.code === "object" && typeof argsObj.code.code === "string" ? argsObj.code.code : "";
+    return {
+      file_path: argsObj.relativeWorkspacePath ?? argsObj.path ?? argsObj.targetFile,
+      content: argsObj.content ?? argsObj.contents ?? codeValue
+    };
+  }
+  if ((toolName === "Delete" || toolName === "delete_file") && (argsObj.relativeWorkspacePath || argsObj.path || argsObj.file_path || argsObj.targetFile)) {
+    return {
+      file_path: argsObj.file_path ?? argsObj.path ?? argsObj.relativeWorkspacePath ?? argsObj.targetFile
+    };
+  }
+  if (toolName === "list_dir" || toolName === "list_dir_v2" || toolName === "LS") {
+    return {
+      path: argsObj.targetDirectory ?? argsObj.target_directory ?? ""
+    };
+  }
+  if (toolName === "glob_file_search") {
+    return {
+      pattern: argsObj.globPattern ?? "",
+      path: argsObj.targetDirectory ?? ""
+    };
+  }
+  if (toolName === "file_search") {
+    return {
+      pattern: argsObj.pattern ?? argsObj.query ?? argsObj.searchTerm ?? "",
+      path: argsObj.path ?? argsObj.targetDirectory ?? ""
+    };
+  }
+  if (toolName === "ripgrep_raw_search") {
+    return {
+      pattern: argsObj.pattern ?? "",
+      path: argsObj.path ?? "",
+      ...argsObj.glob ? { glob: argsObj.glob } : {},
+      ...argsObj.caseInsensitive !== void 0 ? { case_insensitive: Boolean(argsObj.caseInsensitive) } : {}
+    };
+  }
+  if (toolName === "ripgrep") {
+    return {
+      pattern: argsObj.pattern ?? argsObj.query ?? "",
+      path: argsObj.path ?? argsObj.targetDirectory ?? "",
+      ...argsObj.glob ? { glob: argsObj.glob } : {}
+    };
+  }
+  if (toolName === "web_search" && argsObj.searchTerm) {
+    return { search_term: argsObj.searchTerm };
+  }
+  if (toolName === "codebase_search") {
+    return {
+      query: argsObj.query ?? "",
+      path: argsObj.repositoryInfo && typeof argsObj.repositoryInfo === "object" && typeof argsObj.repositoryInfo.relativeWorkspacePath === "string" ? argsObj.repositoryInfo.relativeWorkspacePath : "",
+      ...argsObj.includePattern ? { includePattern: argsObj.includePattern } : {}
+    };
+  }
+  if (toolName === "task_v2" || toolName === "Task") {
+    return {
+      ...argsObj.description ? { description: argsObj.description } : {},
+      ...argsObj.prompt ? { prompt: argsObj.prompt } : {},
+      ...argsObj.subagentType ? { subagent_type: argsObj.subagentType } : {}
+    };
+  }
+  if (toolName.startsWith("mcp-") && Array.isArray(argsObj.tools) && argsObj.tools.length > 0) {
+    const first = argsObj.tools[0] || {};
+    const parsedParameters = typeof first.parameters === "string" ? parseJson(first.parameters) ?? first.parameters : first.parameters;
+    return {
+      ...first.serverName ? { server: first.serverName } : {},
+      ...first.name ? { tool_name: first.name } : {},
+      ...parsedParameters !== void 0 ? { arguments: parsedParameters } : {}
+    };
+  }
+  return argsObj;
+}
+
+// src/providers/cursor/sqlite-reader.ts
+var SESSION_ID_RE = /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i;
+var MIN_STORE_DB_SIZE = 8192;
+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 CURSOR_AGENTKV_BLOB_PREFIX = "agentKv:blob:";
+var execFileAsync = promisify(execFile);
+var getSqlJs = createRetryableInit(async () => {
+  const mod = await import("sql.js");
+  return mod.default();
+});
+var cachedGlobalStateDb = null;
+function closeCachedSqlJsDb() {
+  if (cachedGlobalStateDb?.backend !== "sqljs") return;
+  try {
+    cachedGlobalStateDb.db.close();
+  } catch {
+  }
+}
+var cachedStoreDbIndex = null;
+var resolvedProjectRootCache = /* @__PURE__ */ new Map();
+var GLOBAL_STATE_DISCOVERY_CACHE_PREFIX = "cursor-global-state-discovery-v4";
+function globalStateDbCandidates() {
+  const candidates = [
+    join10(
+      homedir9(),
+      "Library",
+      "Application Support",
+      "Cursor",
+      "User",
+      "globalStorage",
+      "state.vscdb"
+    ),
+    join10(homedir9(), ".config", "Cursor", "User", "globalStorage", "state.vscdb")
+  ];
+  const appData = process.env.APPDATA;
+  if (appData) {
+    candidates.push(join10(appData, "Cursor", "User", "globalStorage", "state.vscdb"));
+  }
+  return [...new Set(candidates)];
+}
+async function findGlobalStateDb() {
+  for (const candidate of globalStateDbCandidates()) {
+    const s = await stat5(candidate).catch(() => null);
+    if (s?.isFile() && s.size >= MIN_STORE_DB_SIZE) return candidate;
+  }
+  return null;
+}
+async function globalStateWalFingerprint(dbPath) {
+  const walStat = await stat5(`${dbPath}-wal`).catch(() => null);
+  return {
+    walSize: walStat?.isFile() ? walStat.size : 0,
+    walMtimeMs: walStat?.isFile() ? walStat.mtimeMs : 0
+  };
+}
+function sqlString(value) {
+  return `'${value.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";
+  const toolResult = `json_extract(${value}, '$.toolFormerData.result')`;
+  const truncatedToolResult = [
+    "CASE",
+    `WHEN json_type(${value}, '$.toolFormerData.result') = 'text'`,
+    `THEN substr(${toolResult}, 1, ${MAX_CURSOR_GLOBAL_STATE_TOOL_RESULT_CHARS})`,
+    `ELSE ${toolResult}`,
+    "END"
+  ].join(" ");
+  return [
+    "key",
+    `json_extract(${value}, '$.type') AS type`,
+    `json_extract(${value}, '$.text') AS text`,
+    `json_extract(${value}, '$.thinking') AS thinking`,
+    `json_extract(${value}, '$.createdAt') AS createdAt`,
+    `json_extract(${value}, '$.lastUpdatedAt') AS lastUpdatedAt`,
+    `json_extract(${value}, '$.timingInfo') AS timingInfo`,
+    `json_extract(${value}, '$.thinkingDurationMs') AS thinkingDurationMs`,
+    `json_extract(${value}, '$.tokenCount') AS tokenCount`,
+    `json_extract(${value}, '$.modelInfo') AS modelInfo`,
+    `json_extract(${value}, '$.modelName') AS modelName`,
+    `json_extract(${value}, '$.modelConfig') AS modelConfig`,
+    `json_extract(${value}, '$.toolFormerData.name') AS toolName`,
+    `json_extract(${value}, '$.toolFormerData.params') AS toolParams`,
+    `${truncatedToolResult} AS toolResult`,
+    `length(${toolResult}) AS toolResultLength`,
+    `json_extract(${value}, '$.toolFormerData.toolCallId') AS toolCallId`,
+    `json_extract(${value}, '$.pullRequests') AS pullRequests`,
+    `json_extract(${value}, '$.errorDetails') AS errorDetails`,
+    `json_extract(${value}, '$.retryAttempt') AS retryAttempt`,
+    `json_extract(${value}, '$.relevantFiles') AS relevantFiles`,
+    `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"),
@@ -4270,6 +4589,22 @@ async function queryGlobalStateRows(globalStateDb, sql) {
   }
   return sqlJsRows(globalStateDb.db, sql);
 }
+async function queryCursorDiskKvRowsByKeys(db, keys) {
+  if (keys.length === 0) return [];
+  const uniqueKeys = [...new Set(keys)];
+  const rows = [];
+  for (let i = 0; i < uniqueKeys.length; i += GLOBAL_STATE_BUBBLE_KEY_CHUNK_SIZE) {
+    const chunk = uniqueKeys.slice(i, i + GLOBAL_STATE_BUBBLE_KEY_CHUNK_SIZE);
+    const chunkRows = await queryGlobalStateRows(
+      db,
+      `SELECT key, value FROM cursorDiskKV WHERE key IN (${chunk.map(sqlString).join(",")})`
+    );
+    for (const row of chunkRows) {
+      if ("key" in row && "value" in row) rows.push({ key: row.key, value: row.value });
+    }
+  }
+  return rows;
+}
 async function queryGlobalStateTextValue(globalStateDb, key) {
   if (globalStateDb.backend === "sqlite-cli") {
     const value = await querySqliteCliText(
@@ -4343,7 +4678,7 @@ async function buildStoreDbIndex() {
     return index;
   }
   for (const wsHash of workspaceDirs) {
-    const wsDir = join9(CURSOR_CHATS_DIR, wsHash);
+    const wsDir = join10(CURSOR_CHATS_DIR, wsHash);
     const wsStat = await stat5(wsDir).catch(() => null);
     if (!wsStat?.isDirectory()) continue;
     let sessions;
@@ -4354,7 +4689,7 @@ async function buildStoreDbIndex() {
     }
     for (const sessionId of sessions) {
       if (!SESSION_ID_RE.test(sessionId)) continue;
-      const dbPath = join9(wsDir, sessionId, "store.db");
+      const dbPath = join10(wsDir, sessionId, "store.db");
       const dbStat = await stat5(dbPath).catch(() => null);
       if (!dbStat?.isFile() || dbStat.size < MIN_STORE_DB_SIZE) continue;
       index.set(sessionId, {
@@ -4410,7 +4745,7 @@ 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 || "");
+  const composer = parseJson2(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 : ""
@@ -4519,7 +4854,7 @@ function valueToString(value) {
   if (value == null) return "";
   return String(value);
 }
-function parseJson(raw) {
+function parseJson2(raw) {
   if (typeof raw !== "string") return null;
   try {
     return JSON.parse(raw);
@@ -4529,7 +4864,7 @@ function parseJson(raw) {
 }
 function parseJsonColumn(value) {
   if (typeof value !== "string") return value;
-  return parseJson(value) ?? value;
+  return parseJson2(value) ?? value;
 }
 function optionalJsonColumn(value) {
   if (value === null || value === void 0 || value === "") return void 0;
@@ -4592,6 +4927,19 @@ function toIsoTimestamp(value) {
   }
   return void 0;
 }
+function cursorComposerSidecarMetadata(composer) {
+  const conversationCheckpointLastUpdatedAt = toIsoTimestamp(
+    composer.conversationCheckpointLastUpdatedAt
+  );
+  const restrictAgentModeSwitching = typeof composer.restrictAgentModeSwitching === "boolean" ? composer.restrictAgentModeSwitching : void 0;
+  const glassMetaParentAgent = valueToString(composer.glassMetaParentAgent);
+  const metadata = {
+    ...conversationCheckpointLastUpdatedAt ? { conversationCheckpointLastUpdatedAt } : {},
+    ...restrictAgentModeSwitching !== void 0 ? { restrictAgentModeSwitching } : {},
+    ...glassMetaParentAgent ? { glassMetaParentAgent } : {}
+  };
+  return Object.keys(metadata).length > 0 ? metadata : void 0;
+}
 function maxIsoTimestamp(values) {
   let maxMs;
   for (const value of values) {
@@ -4697,7 +5045,7 @@ function tokenUsageFromCursorTokenCount(value) {
 }
 function hashWorkspacePaths(paths) {
   const normalized = [...new Set(paths.filter(Boolean))].sort().join("\n");
-  return createHash("sha1").update(normalized).digest("hex").slice(0, 16);
+  return createHash2("sha1").update(normalized).digest("hex").slice(0, 16);
 }
 async function resolveProjectRootFromPath(rawPath) {
   const candidate = rawPath.replaceAll("\\\\", "/").replace(/\\n.*$/, "").replace(/["']+$/g, "").replace(/[),]+$/g, "");
@@ -4713,7 +5061,7 @@ async function resolveProjectRootFromPath(rawPath) {
       const dirStat = await stat5(current).catch(() => null);
       if (dirStat?.isDirectory()) {
         if (!deepestExisting) deepestExisting = current;
-        const gitStat = await stat5(join9(current, ".git")).catch(() => null);
+        const gitStat = await stat5(join10(current, ".git")).catch(() => null);
         if (gitStat) return current;
       }
       const parent = dirname2(current);
@@ -4818,7 +5166,7 @@ function canUseComposerProjectHintDirectly(pathValue) {
 }
 function hasReplayableRootBlob(data) {
   if (!(data instanceof Uint8Array) || data.length === 0) return false;
-  return extractChildBlobIds(data).length > 0;
+  return extractChildBlobIds(data).length > 0 || extractAgentKvBlobIds(valueToString(data)).length > 0;
 }
 function buildHashToProjectMap(decodedWorkspacePaths) {
   const map = /* @__PURE__ */ new Map();
@@ -4973,7 +5321,7 @@ async function discoverGlobalStateOnlySessions(knownSessionIds, decodedWorkspace
       const sessionId = key.startsWith("composerData:") ? key.slice("composerData:".length) : "";
       if (!SESSION_ID_RE.test(sessionId)) continue;
       const rawComposer = row.value === void 0 ? "" : valueToString(row.value);
-      const composer = rawComposer ? parseJson(rawComposer) : null;
+      const composer = rawComposer ? parseJson2(rawComposer) : null;
       if (rawComposer && !composer) continue;
       const headerCount = composer ? countComposerConversationHeaders(composer) : toNonNegativeInt(row.headerCount);
       if (headerCount === 0) continue;
@@ -5003,22 +5351,99 @@ async function discoverGlobalStateOnlySessions(knownSessionIds, decodedWorkspace
       };
       discoveredSessions.push(sessionInfo);
     }
-  } catch {
+  } catch {
+  }
+  await writeFileCache(cacheKey, {
+    dbPath,
+    size: globalStateDb.size,
+    mtimeMs: globalStateDb.mtimeMs,
+    walSize: globalStateDb.walSize,
+    walMtimeMs: globalStateDb.walMtimeMs,
+    decodedPathsHash,
+    sessions: discoveredSessions,
+    sessionIds: [...sessionIds]
+  });
+  return {
+    sessions: finalizeGlobalStateDiscovery(discoveredSessions, knownSessionIds),
+    sessionIds
+  };
+}
+function extractAgentKvBlobIds(value) {
+  if (typeof value !== "string" || !value.includes(CURSOR_AGENTKV_BLOB_PREFIX)) return [];
+  const ids = [];
+  const seen = /* @__PURE__ */ new Set();
+  const re = /agentKv:blob:([a-f0-9]{64})/gi;
+  let match;
+  while (match = re.exec(value)) {
+    const id = match[1].toLowerCase();
+    if (seen.has(id)) continue;
+    seen.add(id);
+    ids.push(id);
+  }
+  return ids;
+}
+function agentKvBlobMessageToCursorMessage(message) {
+  if (!message || typeof message !== "object") return void 0;
+  if (!["system", "user", "assistant", "tool"].includes(message.role)) return void 0;
+  const content = typeof message.content === "string" ? message.content : "";
+  if (message.role === "assistant") {
+    const toolMessage = message;
+    if (toolMessage.toolCallId && toolMessage.toolName) {
+      return {
+        role: "assistant",
+        content: [
+          {
+            type: "tool-call",
+            toolCallId: toolMessage.toolCallId,
+            toolName: toolMessage.toolName,
+            args: toolMessage.args || {}
+          }
+        ]
+      };
+    }
+  }
+  if (message.role === "tool") {
+    const toolMessage = message;
+    return {
+      role: "tool",
+      content: [
+        {
+          type: "tool-result",
+          toolCallId: toolMessage.toolCallId || "agentkv-tool-result",
+          toolName: toolMessage.toolName || "CursorAgentKv",
+          result: content
+        }
+      ]
+    };
+  }
+  return { role: message.role, content };
+}
+function appendAgentKvBlobMessages(messages, blobRows) {
+  let appended = 0;
+  let pendingToolCallId = "";
+  let pendingToolName = "CursorAgentKv";
+  for (const row of blobRows) {
+    const raw = valueToString(row.value);
+    const parsed = parseJson2(raw);
+    if (!parsed) continue;
+    const toolCallId = parsed.toolCallId || parsed.tool_call_id || (parsed.role === "assistant" ? raw.match(/(?:toolCallId|tool_call_id)["'\s:=]+([A-Za-z0-9_-]+)/i)?.[1] : void 0);
+    if (toolCallId) pendingToolCallId = toolCallId;
+    const toolName = parsed.toolName || parsed.tool_name || (parsed.role === "assistant" ? raw.match(/(?:toolName|tool_name)["'\s:=]+([A-Za-z0-9_-]+)/i)?.[1] : void 0);
+    if (toolName) pendingToolName = toolName;
+    const message = agentKvBlobMessageToCursorMessage({
+      ...parsed,
+      ...pendingToolCallId && parsed.role === "assistant" && toolCallId ? { toolCallId: pendingToolCallId, toolName: pendingToolName } : {},
+      ...parsed.role === "tool" ? { toolCallId: pendingToolCallId, toolName: pendingToolName } : {}
+    });
+    if (!message) continue;
+    messages.push(message);
+    appended++;
+    if (parsed.role === "tool") {
+      pendingToolCallId = "";
+      pendingToolName = "CursorAgentKv";
+    }
   }
-  await writeFileCache(cacheKey, {
-    dbPath,
-    size: globalStateDb.size,
-    mtimeMs: globalStateDb.mtimeMs,
-    walSize: globalStateDb.walSize,
-    walMtimeMs: globalStateDb.walMtimeMs,
-    decodedPathsHash,
-    sessions: discoveredSessions,
-    sessionIds: [...sessionIds]
-  });
-  return {
-    sessions: finalizeGlobalStateDiscovery(discoveredSessions, knownSessionIds),
-    sessionIds
-  };
+  return appended;
 }
 function extractChildBlobIds(data) {
   const ids = [];
@@ -5078,7 +5503,8 @@ async function parseCursorStoreDb(sessionId, workspacePath = "") {
     if (!rootRows.length || !rootRows[0].values.length) return null;
     const rootData = rootRows[0].values[0][0];
     const childIds = extractChildBlobIds(rootData);
-    if (childIds.length === 0) return null;
+    const agentKvBlobIds = extractAgentKvBlobIds(new TextDecoder().decode(rootData));
+    if (childIds.length === 0 && agentKvBlobIds.length === 0) return null;
     const messages = [];
     const stmt = db.prepare("SELECT data FROM blobs WHERE id = ?");
     for (const cid of childIds) {
@@ -5097,6 +5523,24 @@ async function parseCursorStoreDb(sessionId, workspacePath = "") {
       }
     }
     stmt.free();
+    if (agentKvBlobIds.length > 0) {
+      try {
+        const agentKvStmt = db.prepare("SELECT key, value FROM cursorDiskKV WHERE key = ?");
+        try {
+          for (const id of agentKvBlobIds) {
+            agentKvStmt.bind([`${CURSOR_AGENTKV_BLOB_PREFIX}${id}`]);
+            if (agentKvStmt.step()) {
+              const row = agentKvStmt.getAsObject();
+              appendAgentKvBlobMessages(messages, [{ key: row.key, value: row.value }]);
+            }
+            agentKvStmt.reset();
+          }
+        } finally {
+          agentKvStmt.free();
+        }
+      } catch {
+      }
+    }
     return buildCursorStoreResult(sessionId, workspacePath, metaJson, messages);
   } finally {
     db.close();
@@ -5115,8 +5559,10 @@ async function parseCursorStoreDbWithSqliteCli(dbPath, sessionId, workspacePath)
   );
   const rootDataHex = typeof rootRows[0]?.dataHex === "string" ? rootRows[0].dataHex : "";
   if (!rootDataHex) return null;
-  const childIds = extractChildBlobIds(Buffer.from(rootDataHex, "hex"));
-  if (childIds.length === 0) return null;
+  const rootData = Buffer.from(rootDataHex, "hex");
+  const childIds = extractChildBlobIds(rootData);
+  const agentKvBlobIds = extractAgentKvBlobIds(rootData.toString("utf-8"));
+  if (childIds.length === 0 && agentKvBlobIds.length === 0) return null;
   const blobHexById = /* @__PURE__ */ new Map();
   const chunkSize = 200;
   for (let i = 0; i < childIds.length; i += chunkSize) {
@@ -5141,13 +5587,27 @@ async function parseCursorStoreDbWithSqliteCli(dbPath, sessionId, workspacePath)
     } catch {
     }
   }
+  if (agentKvBlobIds.length > 0) {
+    try {
+      const rows = await querySqliteCli(
+        dbPath,
+        `SELECT key, value FROM cursorDiskKV WHERE key IN (${agentKvBlobIds.map((id) => sqlString(`${CURSOR_AGENTKV_BLOB_PREFIX}${id}`)).join(",")})`
+      );
+      const rowsByKey = new Map(rows.map((row) => [valueToString(row.key), row]));
+      appendAgentKvBlobMessages(
+        messages,
+        agentKvBlobIds.map((id) => rowsByKey.get(`${CURSOR_AGENTKV_BLOB_PREFIX}${id}`)).filter((row) => Boolean(row))
+      );
+    } catch {
+    }
+  }
   return buildCursorStoreResult(sessionId, workspacePath, metaJson, messages);
 }
 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((stat11) => (stat11.durationMs || 0) > 0);
+  const hasDurationStats = turnStats.some((stat12) => (stat12.durationMs || 0) > 0);
   const notes = [];
   if (hasDurationStats) {
     notes.push("Per-turn duration is estimated from Cursor tool execution metadata.");
@@ -5160,7 +5620,7 @@ function buildCursorStoreResult(sessionId, workspacePath, metaJson, messages) {
     slug,
     title,
     cwd: workspacePath,
-    model: normalizeCursorModelName(metaJson.lastUsedModel) || turnStats.find((stat11) => typeof stat11.model === "string" && stat11.model)?.model,
+    model: normalizeCursorModelName(metaJson.lastUsedModel) || turnStats.find((stat12) => typeof stat12.model === "string" && stat12.model)?.model,
     startTime: metaJson.createdAt ? new Date(metaJson.createdAt).toISOString() : void 0,
     ...totalDurationMs !== void 0 ? { totalDurationMs } : {},
     ...turnStats.length > 0 ? { turnStats } : {},
@@ -5196,7 +5656,7 @@ function normalizeAssistantTurnText(raw, hasToolContext) {
 }
 function extractToolResultText2(value) {
   if (typeof value === "string") {
-    const parsed = parseJson(value);
+    const parsed = parseJson2(value);
     if (!parsed) return value;
     return extractToolResultText2(parsed);
   }
@@ -5214,7 +5674,7 @@ function extractToolResultText2(value) {
   if (typeof obj.contents === "string" && obj.contents.trim()) return obj.contents;
   if (typeof obj.markdown === "string" && obj.markdown.trim()) return obj.markdown;
   if (typeof obj.result === "string" && obj.result.trim()) {
-    const nested = parseJson(obj.result);
+    const nested = parseJson2(obj.result);
     if (nested) {
       const nestedText = extractToolResultText2(nested);
       if (nestedText.trim()) return nestedText;
@@ -5230,7 +5690,7 @@ function extractToolResultText2(value) {
 function hasToolError(value) {
   if (!value) return false;
   if (typeof value === "string") {
-    const parsed = parseJson(value);
+    const parsed = parseJson2(value);
     if (!parsed) return false;
     return hasToolError(parsed);
   }
@@ -5252,7 +5712,7 @@ function hasToolError(value) {
 function extractToolExecutionTimeMs(value) {
   if (!value) return void 0;
   if (typeof value === "string") {
-    const parsed = parseJson(value);
+    const parsed = parseJson2(value);
     return parsed ? extractToolExecutionTimeMs(parsed) : toPositiveMs(value);
   }
   if (Array.isArray(value)) {
@@ -5277,7 +5737,7 @@ function extractToolExecutionTimeMs(value) {
 function parseToolFormerBlock(bubbleId, toolFormerData) {
   const name = typeof toolFormerData.name === "string" ? toolFormerData.name : "";
   if (!name) return null;
-  const parsedParams = parseJson(toolFormerData.params);
+  const parsedParams = parseJson2(toolFormerData.params);
   const paramsRaw = parsedParams ?? toolFormerData.params ?? {};
   const result = extractToolResultText2(toolFormerData.result);
   return {
@@ -5370,9 +5830,9 @@ function extractCursorApiErrors(entries) {
   for (const entry of entries) {
     const rawDetails = entry.bubble.errorDetails;
     if (!rawDetails) continue;
-    const details = typeof rawDetails === "string" ? parseJson(rawDetails) ?? { message: rawDetails } : typeof rawDetails === "object" ? rawDetails : null;
+    const details = typeof rawDetails === "string" ? parseJson2(rawDetails) ?? { message: rawDetails } : typeof rawDetails === "object" ? rawDetails : null;
     if (!details) continue;
-    const nestedError = typeof details.error === "string" ? parseJson(details.error) : typeof details.error === "object" ? details.error : void 0;
+    const nestedError = typeof details.error === "string" ? parseJson2(details.error) : typeof details.error === "object" ? details.error : void 0;
     const statusCode = toNonNegativeInt(details.statusCode) || toNonNegativeInt(details.status) || toNonNegativeInt(nestedError?.statusCode) || toNonNegativeInt(nestedError?.status) || void 0;
     const errorType = typeof nestedError?.error === "string" && nestedError.error || typeof nestedError?.type === "string" && nestedError.type || typeof details.type === "string" && details.type || void 0;
     const retryAttempt = toNonNegativeInt(details.retryAttempt) || toNonNegativeInt(entry.bubble.retryAttempt) || void 0;
@@ -5422,7 +5882,7 @@ function addUniqueContextFile(files, seen, value) {
   files.push(file);
 }
 function addContextFilesFromAttachedFolderResult(files, seen, value) {
-  const parsed = typeof value === "string" ? parseJson(value) : value && typeof value === "object" ? value : void 0;
+  const parsed = typeof value === "string" ? parseJson2(value) : value && typeof value === "object" ? value : void 0;
   if (!parsed) return;
   const directory = normalizeCursorContextFile(parsed.directoryRelativeWorkspacePath) || normalizeCursorContextFile(parsed.directoryPath);
   if (Array.isArray(parsed.files)) {
@@ -5486,6 +5946,19 @@ function extractCursorContextSummary(entries, requestContexts) {
     hasCursorRules
   };
 }
+async function loadAgentKvBlobMessages(globalStateDb, agentKvBlobIds) {
+  const messages = [];
+  const rows = await queryCursorDiskKvRowsByKeys(
+    globalStateDb,
+    agentKvBlobIds.map((id) => `${CURSOR_AGENTKV_BLOB_PREFIX}${id}`)
+  );
+  const rowsByKey = new Map(rows.map((row) => [valueToString(row.key), row]));
+  appendAgentKvBlobMessages(
+    messages,
+    agentKvBlobIds.map((id) => rowsByKey.get(`${CURSOR_AGENTKV_BLOB_PREFIX}${id}`)).filter((row) => Boolean(row))
+  );
+  return messages;
+}
 function buildBubbleProjectHintData(entries) {
   return entries.map((entry) => {
     const bubble = entry.bubble;
@@ -5507,7 +5980,7 @@ async function loadCursorRequestContexts(globalStateDb, sessionId) {
   const contexts = [];
   for (const row of rows) {
     const raw = valueToString(row.value);
-    const parsed = parseJson(raw);
+    const parsed = parseJson2(raw);
     if (parsed) contexts.push(parsed);
   }
   return contexts;
@@ -5549,13 +6022,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((stat11) => stat11.durationMs !== void 0) === true);
+  const preferEnrichmentDuration = enrichment.dataSource === "global-state" && (enrichment.totalDurationMs !== void 0 || enrichment.turnStats?.some((stat12) => stat12.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, stat11) => sum + (stat11.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, stat12) => sum + (stat12.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(
@@ -5599,11 +6072,25 @@ function mergeCursorParseResults(primary, enrichment) {
 }
 function mergeCursorSidecars(primary, enrichment) {
   if (!primary && !enrichment) return void 0;
-  const merged = {
-    ...primary?.requestContextCount ?? enrichment?.requestContextCount ? { requestContextCount: primary?.requestContextCount ?? enrichment?.requestContextCount } : {},
-    ...primary?.checkpointCount ?? enrichment?.checkpointCount ? { checkpointCount: primary?.checkpointCount ?? enrichment?.checkpointCount } : {},
-    ...(primary?.hasWorkspaceRules ?? enrichment?.hasWorkspaceRules) !== void 0 ? { hasWorkspaceRules: primary?.hasWorkspaceRules ?? enrichment?.hasWorkspaceRules } : {}
-  };
+  const merged = {};
+  if (primary?.requestContextCount ?? enrichment?.requestContextCount) {
+    merged.requestContextCount = primary?.requestContextCount ?? enrichment?.requestContextCount;
+  }
+  if (primary?.checkpointCount ?? enrichment?.checkpointCount) {
+    merged.checkpointCount = primary?.checkpointCount ?? enrichment?.checkpointCount;
+  }
+  if ((primary?.hasWorkspaceRules ?? enrichment?.hasWorkspaceRules) !== void 0) {
+    merged.hasWorkspaceRules = primary?.hasWorkspaceRules ?? enrichment?.hasWorkspaceRules;
+  }
+  if (primary?.conversationCheckpointLastUpdatedAt || enrichment?.conversationCheckpointLastUpdatedAt) {
+    merged.conversationCheckpointLastUpdatedAt = primary?.conversationCheckpointLastUpdatedAt ?? enrichment?.conversationCheckpointLastUpdatedAt;
+  }
+  if (primary?.restrictAgentModeSwitching !== void 0 || enrichment?.restrictAgentModeSwitching !== void 0) {
+    merged.restrictAgentModeSwitching = primary?.restrictAgentModeSwitching ?? enrichment?.restrictAgentModeSwitching;
+  }
+  if (primary?.glassMetaParentAgent || enrichment?.glassMetaParentAgent) {
+    merged.glassMetaParentAgent = primary?.glassMetaParentAgent ?? enrichment?.glassMetaParentAgent;
+  }
   return Object.keys(merged).length > 0 ? merged : void 0;
 }
 function normalizeCursorModelName(model) {
@@ -5625,11 +6112,11 @@ function mergeTurnStats(primary, enrichment, options) {
   if (!primary?.length) return enrichment;
   if (!enrichment?.length) return primary;
   const maxTurnIndex = Math.max(
-    ...primary.map((stat11) => stat11.turnIndex),
-    ...enrichment.map((stat11) => stat11.turnIndex)
+    ...primary.map((stat12) => stat12.turnIndex),
+    ...enrichment.map((stat12) => stat12.turnIndex)
   );
-  const primaryByIndex = new Map(primary.map((stat11) => [stat11.turnIndex, stat11]));
-  const enrichmentByIndex = new Map(enrichment.map((stat11) => [stat11.turnIndex, stat11]));
+  const primaryByIndex = new Map(primary.map((stat12) => [stat12.turnIndex, stat12]));
+  const enrichmentByIndex = new Map(enrichment.map((stat12) => [stat12.turnIndex, stat12]));
   const merged = [];
   for (let turnIndex = 0; turnIndex <= maxTurnIndex; turnIndex++) {
     const current = primaryByIndex.get(turnIndex);
@@ -5723,17 +6210,17 @@ function applyGlobalStateWallClockDurations(entries, turnStats) {
   if (durationsByTurn.size === 0) {
     return {
       turnStats,
-      totalDurationMs: turnStats.reduce((sum, stat11) => sum + (stat11.durationMs || 0), 0) || void 0,
+      totalDurationMs: turnStats.reduce((sum, stat12) => sum + (stat12.durationMs || 0), 0) || void 0,
       usedWallClock: false
     };
   }
-  const mergedTurnStats = turnStats.map((stat11) => {
-    const wallClockDuration = durationsByTurn.get(stat11.turnIndex);
-    return wallClockDuration !== void 0 ? { ...stat11, durationMs: wallClockDuration } : stat11;
+  const mergedTurnStats = turnStats.map((stat12) => {
+    const wallClockDuration = durationsByTurn.get(stat12.turnIndex);
+    return wallClockDuration !== void 0 ? { ...stat12, durationMs: wallClockDuration } : stat12;
   });
   return {
     turnStats: mergedTurnStats,
-    totalDurationMs: mergedTurnStats.reduce((sum, stat11) => sum + (stat11.durationMs || 0), 0) || void 0,
+    totalDurationMs: mergedTurnStats.reduce((sum, stat12) => sum + (stat12.durationMs || 0), 0) || void 0,
     usedWallClock: true
   };
 }
@@ -5779,15 +6266,15 @@ function buildGlobalStateMetrics(entries, fallbackModel, sessionTokenUsage) {
       current.durationMs = (current.durationMs || 0) + bubbleDurationMs;
     }
   }
-  for (const stat11 of turnStats) {
-    if (stat11.tokenUsage && !hasAnyTokens(stat11.tokenUsage)) {
-      delete stat11.tokenUsage;
+  for (const stat12 of turnStats) {
+    if (stat12.tokenUsage && !hasAnyTokens(stat12.tokenUsage)) {
+      delete stat12.tokenUsage;
     }
-    if ((stat11.durationMs || 0) <= 0) {
-      delete stat11.durationMs;
+    if ((stat12.durationMs || 0) <= 0) {
+      delete stat12.durationMs;
     }
-    if ((stat11.contextTokens || 0) <= 0) {
-      delete stat11.contextTokens;
+    if ((stat12.contextTokens || 0) <= 0) {
+      delete stat12.contextTokens;
     }
   }
   const {
@@ -5839,10 +6326,11 @@ async function parseCursorGlobalStateDb(sessionId, globalStateDb, preferredWorks
       `composerData:${sessionId}`
     );
     if (!rawComposer) return null;
-    const composer = parseJson(rawComposer);
+    const composer = parseJson2(rawComposer);
     if (!composer) return null;
     const entries = [];
     const bubbleEntries = [];
+    const agentKvBlobIds = extractAgentKvBlobIds(rawComposer);
     const addBubble = (bubble) => {
       bubbleEntries.push({
         bubble,
@@ -5878,6 +6366,20 @@ async function parseCursorGlobalStateDb(sessionId, globalStateDb, preferredWorks
         if (item && typeof item === "object") addBubble(item);
       }
     }
+    if (agentKvBlobIds.length > 0) {
+      const { turns: agentKvTurns } = messagesToTurns(
+        await loadAgentKvBlobMessages(resolvedGlobalStateDb, agentKvBlobIds)
+      );
+      for (const turn of agentKvTurns) {
+        const bubble = {
+          type: turn.role === "user" ? 1 : 2,
+          text: turn.blocks.filter(
+            (block) => block.type === "text"
+          ).map((block) => block.text).join("\n")
+        };
+        entries.push({ turn, bubble });
+      }
+    }
     const turns = entries.map((entry) => entry.turn);
     if (turns.length === 0) return null;
     const inferredProject = preferredWorkspacePath || await inferProjectFromComposerData(
@@ -5892,6 +6394,7 @@ ${buildBubbleProjectHintData(bubbleEntries)}`,
     const startTime = toIsoTimestamp(composer.createdAt);
     const endTime = maxIsoTimestamp([
       composer.lastUpdatedAt,
+      composer.conversationCheckpointLastUpdatedAt,
       ...turns.map((turn) => turn.timestamp).filter(Boolean)
     ]);
     const sessionTokenUsage = tokenUsageFromCursorTokenCount(composer.tokenCount);
@@ -5919,7 +6422,7 @@ ${buildBubbleProjectHintData(bubbleEntries)}`,
     }
     const hasDetailedTurnStats = Boolean(
       metrics.turnStats?.some(
-        (stat11) => !!stat11.durationMs || !!stat11.contextTokens || !!stat11.tokenUsage
+        (stat12) => !!stat12.durationMs || !!stat12.contextTokens || !!stat12.tokenUsage
       )
     );
     if (!hasDetailedTurnStats) {
@@ -5933,10 +6436,21 @@ ${buildBubbleProjectHintData(bubbleEntries)}`,
         "Context files are inferred from Cursor relevantFiles and request-context sidecars."
       );
     }
-    const cursorSidecars = contextSummary.requestContextCount || checkpointCount > 0 || contextSummary.hasCursorRules ? {
+    const composerSidecarMetadata = cursorComposerSidecarMetadata(composer);
+    if (composerSidecarMetadata?.conversationCheckpointLastUpdatedAt) {
+      notes.push("Cursor composerData reports a conversation checkpoint timestamp.");
+    }
+    if (composerSidecarMetadata?.restrictAgentModeSwitching !== void 0) {
+      notes.push("Cursor composerData reports agent mode switching restrictions.");
+    }
+    if (composerSidecarMetadata?.glassMetaParentAgent) {
+      notes.push("Cursor composerData links this session to a Glass parent agent.");
+    }
+    const cursorSidecars = contextSummary.requestContextCount || checkpointCount > 0 || contextSummary.hasCursorRules || composerSidecarMetadata ? {
       ...contextSummary.requestContextCount ? { requestContextCount: contextSummary.requestContextCount } : {},
       ...checkpointCount > 0 ? { checkpointCount } : {},
-      ...contextSummary.hasCursorRules ? { hasWorkspaceRules: true } : {}
+      ...contextSummary.hasCursorRules ? { hasWorkspaceRules: true } : {},
+      ...composerSidecarMetadata
     } : void 0;
     return {
       sessionId,
@@ -5959,419 +6473,136 @@ ${buildBubbleProjectHintData(bubbleEntries)}`,
       turns,
       dataSource: "global-state",
       dataSourceInfo: {
-        primary: "global-state",
-        sources: ["cursor/user/globalStorage/state.vscdb"],
-        notes
-      }
-    };
-  } catch {
-    return null;
-  }
-}
-function buildToolResultMap(messages) {
-  const map = /* @__PURE__ */ new Map();
-  for (const msg of messages) {
-    if (msg.role !== "tool" || !Array.isArray(msg.content)) continue;
-    for (const block of msg.content) {
-      if (block.type === "tool-result" && block.toolCallId) {
-        const resultText = extractToolResultText2(block.result);
-        const topLevelResult = msg.providerOptions?.cursor?.highLevelToolCallResult;
-        const combinedSource = topLevelResult || block.result;
-        map.set(block.toolCallId, {
-          result: resultText,
-          ...hasToolError(combinedSource) ? { isError: true } : {},
-          ...extractToolExecutionTimeMs(combinedSource) !== void 0 ? { executionTimeMs: extractToolExecutionTimeMs(combinedSource) } : {}
-        });
-      }
-    }
-  }
-  return map;
-}
-function messagesToTurns(messages) {
-  const toolResults = buildToolResultMap(messages);
-  const turns = [];
-  for (const msg of messages) {
-    if (msg.role === "system" || msg.role === "tool") continue;
-    if (msg.role === "user") {
-      const blocks = parseUserContent(msg.content);
-      if (blocks.length > 0) {
-        turns.push({ role: "user", blocks });
-      }
-      continue;
-    }
-    if (msg.role === "assistant") {
-      const blocks = parseAssistantContent(msg.content, toolResults);
-      if (blocks.length > 0) {
-        turns.push({
-          role: "assistant",
-          blocks,
-          model: extractModel(msg)
-        });
-      }
-    }
-  }
-  const turnStats = buildStoreTurnStats(turns);
-  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)>/;
-function isSystemContextText(text) {
-  return CURSOR_SYSTEM_CONTEXT_RE.test(text.trim());
-}
-function parseUserContent(content) {
-  if (!content) return [];
-  if (typeof content === "string") {
-    if (isSystemContextText(content)) return [];
-    const cleaned = sanitizeCursorUserText(content);
-    if (isSystemContextText(cleaned)) return [];
-    return cleaned ? [{ type: "text", text: cleaned }] : [];
-  }
-  const blocks = [];
-  for (const b of content) {
-    if (b.type === "text" && b.text) {
-      if (isSystemContextText(b.text)) continue;
-      const cleaned = sanitizeCursorUserText(b.text);
-      if (isSystemContextText(cleaned)) continue;
-      if (cleaned) blocks.push({ type: "text", text: cleaned });
-    }
-  }
-  return blocks;
-}
-function parseAssistantContent(content, toolResults) {
-  if (!content) return [];
-  if (typeof content === "string") {
-    const cleaned = sanitizeCursorAssistantText(content, false);
-    return cleaned ? [{ type: "text", text: cleaned }] : [];
-  }
-  const blocks = [];
-  const hasToolCalls = content.some((block) => block.type === "tool-call");
-  for (const b of content) {
-    if (b.type === "reasoning" && b.text?.trim()) {
-      const thinking = sanitizeCursorReasoningText(b.text);
-      if (thinking) blocks.push({ type: "thinking", thinking });
-    } else if (b.type === "text" && b.text?.trim()) {
-      const text = sanitizeCursorAssistantText(b.text, hasToolCalls);
-      if (text) blocks.push({ type: "text", text });
-    } else if (b.type === "tool-call" && b.toolCallId && b.toolName) {
-      const result = toolResults.get(b.toolCallId);
-      const toolBlock = {
-        type: "tool_use",
-        id: b.toolCallId,
-        name: mapCursorToolName(b.toolName),
-        input: mapToolArgs(b.toolName, b.args || {}, result?.result || ""),
-        _result: result?.result || "",
-        ...result?.isError ? { _isError: true } : {},
-        ...result?.executionTimeMs ? { _durationMs: result.executionTimeMs } : {}
-      };
-      blocks.push(toolBlock);
-    }
-  }
-  return blocks;
-}
-function buildStoreTurnStats(turns) {
-  const turnStats = [];
-  let currentTurnIndex = -1;
-  for (const turn of turns) {
-    if (turn.role === "user") {
-      currentTurnIndex++;
-      turnStats.push({ turnIndex: currentTurnIndex });
-      continue;
-    }
-    if (currentTurnIndex < 0) continue;
-    const current = turnStats[currentTurnIndex];
-    if (!current.model && turn.model) current.model = turn.model;
-    for (const block of turn.blocks) {
-      if (block.type !== "tool_use") continue;
-      const ms = toPositiveMs(block._durationMs);
-      if (ms !== void 0) {
-        current.durationMs = (current.durationMs || 0) + ms;
-      }
-    }
-  }
-  return turnStats;
-}
-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",
-    Grep: "Grep",
-    ripgrep_raw_search: "Grep",
-    ripgrep: "Grep",
-    rg: "Grep",
-    grep: "Grep",
-    grep_search: "Grep",
-    Glob: "Glob",
-    glob_file_search: "Glob",
-    file_search: "Glob",
-    list_dir: "Glob",
-    list_dir_v2: "Glob",
-    LS: "Glob",
-    StrReplace: "Edit",
-    EditFile: "Edit",
-    edit: "Edit",
-    // Cursor SDK lowercase tool name
-    edit_file_v2: "Edit",
-    edit_file: "Edit",
-    search_replace: "Edit",
-    ApplyPatch: "Edit",
-    apply_patch: "Edit",
-    MultiEdit: "MultiEdit",
-    multi_edit: "MultiEdit",
-    Write: "Write",
-    WriteFile: "Write",
-    write: "Write",
-    Delete: "Delete",
-    delete_file: "Delete",
-    Task: "Agent",
-    task_v2: "Agent",
-    todo_write: "TodoWrite",
-    ask_question: "AskQuestion",
-    semantic_search_full: "SemanticSearch",
-    codebase_search: "SemanticSearch",
-    web_search: "WebSearch",
-    WebFetch: "WebFetch",
-    web_fetch: "WebFetch",
-    create_plan: "Plan"
-  };
-  if (mapping[name]) return mapping[name];
-  if (name.startsWith("mcp-cursor-ide-browser-cursor-ide-browser-browser_")) return "Browser";
-  if (name.startsWith("chrome-devtools-")) return "Browser";
-  return name;
-}
-function parseDiffStringSnippet(diffString) {
-  const oldLines = [];
-  const newLines = [];
-  for (const line of diffString.split("\n")) {
-    if (line.startsWith("@@") || line.startsWith("*** ") || line.startsWith("---") || line.startsWith("+++")) {
-      continue;
-    }
-    if (line.startsWith("-")) {
-      oldLines.push(line.slice(1));
-    } else if (line.startsWith("+")) {
-      newLines.push(line.slice(1));
-    } else if (line.startsWith(" ")) {
-      const shared = line.slice(1);
-      oldLines.push(shared);
-      newLines.push(shared);
-    }
+        primary: "global-state",
+        sources: ["cursor/user/globalStorage/state.vscdb"],
+        notes
+      }
+    };
+  } catch {
+    return null;
   }
-  return { oldText: oldLines.join("\n"), newText: newLines.join("\n") };
 }
-function inferEditStringsFromResult(resultText) {
-  if (!resultText.trim()) return {};
-  const parsed = parseJson(resultText);
-  if (!parsed || typeof parsed !== "object") return {};
-  const out = {};
-  if (typeof parsed.contentsAfterEdit === "string" && parsed.contentsAfterEdit.trim()) {
-    out.new_string = parsed.contentsAfterEdit;
-  }
-  const chunks = parsed.diff && typeof parsed.diff === "object" && Array.isArray(parsed.diff.chunks) ? parsed.diff.chunks : [];
-  const oldParts = [];
-  const newParts = [];
-  for (const chunk of chunks) {
-    if (!chunk || typeof chunk !== "object") continue;
-    if (typeof chunk.diffString !== "string" || !chunk.diffString.trim()) continue;
-    const parsedSnippet = parseDiffStringSnippet(chunk.diffString);
-    if (parsedSnippet.oldText) oldParts.push(parsedSnippet.oldText);
-    if (parsedSnippet.newText) newParts.push(parsedSnippet.newText);
+function buildToolResultMap(messages) {
+  const map = /* @__PURE__ */ new Map();
+  for (const msg of messages) {
+    if (msg.role !== "tool" || !Array.isArray(msg.content)) continue;
+    for (const block of msg.content) {
+      if (block.type === "tool-result" && block.toolCallId) {
+        const resultText = extractToolResultText2(block.result);
+        const topLevelResult = msg.providerOptions?.cursor?.highLevelToolCallResult;
+        const combinedSource = topLevelResult || block.result;
+        map.set(block.toolCallId, {
+          result: resultText,
+          ...hasToolError(combinedSource) ? { isError: true } : {},
+          ...extractToolExecutionTimeMs(combinedSource) !== void 0 ? { executionTimeMs: extractToolExecutionTimeMs(combinedSource) } : {}
+        });
+      }
+    }
   }
-  if (oldParts.length > 0) out.old_string = oldParts.join("\n");
-  if (!out.new_string && newParts.length > 0) out.new_string = newParts.join("\n");
-  return out;
+  return map;
 }
-function parseApplyPatchArgs(rawPatch) {
-  const fileMatch = rawPatch.match(/^\*\*\*\s+(?:Update|Add|Delete)\s+File:\s+(.+)$/m);
-  const oldLines = [];
-  const newLines = [];
-  for (const line of rawPatch.split("\n")) {
-    if (line.startsWith("*** ") || line.startsWith("@@") || line.startsWith("---") || line.startsWith("+++")) {
+function messagesToTurns(messages) {
+  const toolResults = buildToolResultMap(messages);
+  const turns = [];
+  for (const msg of messages) {
+    if (msg.role === "system" || msg.role === "tool") continue;
+    if (msg.role === "user") {
+      const blocks = parseUserContent(msg.content);
+      if (blocks.length > 0) {
+        turns.push({ role: "user", blocks });
+      }
       continue;
     }
-    if (line.startsWith("-")) {
-      oldLines.push(line.slice(1));
-    } else if (line.startsWith("+")) {
-      newLines.push(line.slice(1));
-    } else if (line.startsWith(" ")) {
-      const shared = line.slice(1);
-      oldLines.push(shared);
-      newLines.push(shared);
+    if (msg.role === "assistant") {
+      const blocks = parseAssistantContent(msg.content, toolResults);
+      if (blocks.length > 0) {
+        turns.push({
+          role: "assistant",
+          blocks,
+          model: extractModel(msg)
+        });
+      }
     }
   }
-  return {
-    ...fileMatch?.[1] ? { file_path: fileMatch[1].trim() } : {},
-    old_string: oldLines.join("\n"),
-    new_string: newLines.join("\n"),
-    patch: rawPatch
-  };
+  const turnStats = buildStoreTurnStats(turns);
+  const totalDurationMs = turnStats.length > 0 ? turnStats.reduce((sum, stat12) => sum + (stat12.durationMs || 0), 0) || void 0 : void 0;
+  return { turns, turnStats, totalDurationMs };
 }
-function mapEditLikeArgs(argsObj, resultText) {
-  const mapped = {
-    file_path: argsObj.file_path ?? argsObj.path ?? argsObj.relativeWorkspacePath ?? "",
-    old_string: argsObj.old_string ?? argsObj.oldStr ?? "",
-    new_string: argsObj.new_string ?? argsObj.newStr ?? argsObj.streamingContent ?? argsObj.content ?? ""
-  };
-  if (!mapped.old_string || !mapped.new_string) {
-    const inferred = inferEditStringsFromResult(resultText);
-    if (!mapped.old_string && inferred.old_string) mapped.old_string = inferred.old_string;
-    if (!mapped.new_string && inferred.new_string) mapped.new_string = inferred.new_string;
-  }
-  return mapped;
+var CURSOR_SYSTEM_CONTEXT_RE = /^<(?:user_info|system_reminder|agent_transcripts|rules|git_status)>/;
+function isSystemContextText(text) {
+  return CURSOR_SYSTEM_CONTEXT_RE.test(text.trim());
 }
-function mapToolArgs(toolName, args, resultText = "") {
-  const argsObj = args && typeof args === "object" && !Array.isArray(args) ? args : null;
-  if (toolName === "ApplyPatch" || toolName === "apply_patch") {
-    const rawPatch = typeof args === "string" ? args : typeof argsObj?.patch === "string" ? argsObj.patch : typeof argsObj?.input === "string" ? argsObj.input : typeof argsObj?.content === "string" ? argsObj.content : typeof argsObj?.contents === "string" ? argsObj.contents : "";
-    if (rawPatch) return parseApplyPatchArgs(rawPatch);
-    if (argsObj && (argsObj.path || argsObj.file_path || argsObj.relativeWorkspacePath)) {
-      return mapEditLikeArgs(argsObj, resultText);
-    }
-    return argsObj || {};
-  }
-  if (typeof args === "string") {
-    return { raw: args };
-  }
-  if (!argsObj) return {};
-  if (toolName === "Shell" && argsObj.command) {
-    return {
-      command: argsObj.command,
-      ...argsObj.description ? { description: argsObj.description } : {}
-    };
-  }
-  if (toolName === "StrReplace" && (argsObj.path || argsObj.file_path || argsObj.relativeWorkspacePath)) {
-    return mapEditLikeArgs(argsObj, resultText);
-  }
-  if (toolName === "EditFile" && (argsObj.path || argsObj.file_path || argsObj.relativeWorkspacePath)) {
-    return mapEditLikeArgs(argsObj, resultText);
-  }
-  if (toolName === "Edit" && (argsObj.path || argsObj.file_path || argsObj.relativeWorkspacePath)) {
-    return mapEditLikeArgs(argsObj, resultText);
-  }
-  if ((toolName === "MultiEdit" || toolName === "multi_edit") && (argsObj.path || argsObj.file_path || argsObj.relativeWorkspacePath)) {
-    return {
-      file_path: argsObj.file_path ?? argsObj.path ?? argsObj.relativeWorkspacePath,
-      edits: Array.isArray(argsObj.edits) ? argsObj.edits : []
-    };
-  }
-  if ((toolName === "Write" || toolName === "WriteFile") && (argsObj.path || argsObj.relativeWorkspacePath || argsObj.targetFile || argsObj.file_path)) {
-    const codeValue = typeof argsObj.code === "string" ? argsObj.code : argsObj.code && typeof argsObj.code === "object" && typeof argsObj.code.code === "string" ? argsObj.code.code : "";
-    return {
-      file_path: argsObj.file_path ?? argsObj.path ?? argsObj.relativeWorkspacePath ?? argsObj.targetFile,
-      content: argsObj.contents ?? argsObj.content ?? codeValue
-    };
-  }
-  if ((toolName === "Read" || toolName === "ReadFile") && argsObj.path) {
-    return { file_path: argsObj.path };
-  }
-  if (toolName === "run_terminal_command_v2" && argsObj.command) {
-    return {
-      command: argsObj.command,
-      ...argsObj.commandDescription ? { description: argsObj.commandDescription } : {},
-      ...argsObj.cwd ? { cwd: argsObj.cwd } : {}
-    };
-  }
-  if (toolName === "run_terminal_cmd" && argsObj.command) {
-    return {
-      command: argsObj.command,
-      ...argsObj.cwd ? { cwd: argsObj.cwd } : {},
-      ...argsObj.requireUserApproval !== void 0 ? { requireUserApproval: Boolean(argsObj.requireUserApproval) } : {}
-    };
-  }
-  if (toolName === "read_file_v2" && argsObj.targetFile) {
-    return { file_path: argsObj.targetFile };
-  }
-  if (toolName === "read_file" && argsObj.targetFile) {
-    return { file_path: argsObj.targetFile };
-  }
-  if (toolName === "edit_file_v2" && argsObj.relativeWorkspacePath) {
-    return {
-      file_path: argsObj.relativeWorkspacePath,
-      new_string: argsObj.streamingContent ?? ""
-    };
-  }
-  if (toolName === "edit_file" || toolName === "search_replace") {
-    return mapEditLikeArgs(argsObj, resultText);
-  }
-  if (toolName === "write" && (argsObj.relativeWorkspacePath || argsObj.path || argsObj.targetFile)) {
-    const codeValue = typeof argsObj.code === "string" ? argsObj.code : argsObj.code && typeof argsObj.code === "object" && typeof argsObj.code.code === "string" ? argsObj.code.code : "";
-    return {
-      file_path: argsObj.relativeWorkspacePath ?? argsObj.path ?? argsObj.targetFile,
-      content: argsObj.content ?? argsObj.contents ?? codeValue
-    };
-  }
-  if ((toolName === "Delete" || toolName === "delete_file") && (argsObj.relativeWorkspacePath || argsObj.path || argsObj.file_path || argsObj.targetFile)) {
-    return {
-      file_path: argsObj.file_path ?? argsObj.path ?? argsObj.relativeWorkspacePath ?? argsObj.targetFile
-    };
-  }
-  if (toolName === "list_dir" || toolName === "list_dir_v2" || toolName === "LS") {
-    return {
-      path: argsObj.targetDirectory ?? argsObj.target_directory ?? ""
-    };
-  }
-  if (toolName === "glob_file_search") {
-    return {
-      pattern: argsObj.globPattern ?? "",
-      path: argsObj.targetDirectory ?? ""
-    };
-  }
-  if (toolName === "file_search") {
-    return {
-      pattern: argsObj.pattern ?? argsObj.query ?? argsObj.searchTerm ?? "",
-      path: argsObj.path ?? argsObj.targetDirectory ?? ""
-    };
-  }
-  if (toolName === "ripgrep_raw_search") {
-    return {
-      pattern: argsObj.pattern ?? "",
-      path: argsObj.path ?? "",
-      ...argsObj.glob ? { glob: argsObj.glob } : {},
-      ...argsObj.caseInsensitive !== void 0 ? { case_insensitive: Boolean(argsObj.caseInsensitive) } : {}
-    };
-  }
-  if (toolName === "ripgrep") {
-    return {
-      pattern: argsObj.pattern ?? argsObj.query ?? "",
-      path: argsObj.path ?? argsObj.targetDirectory ?? "",
-      ...argsObj.glob ? { glob: argsObj.glob } : {}
-    };
+function parseUserContent(content) {
+  if (!content) return [];
+  if (typeof content === "string") {
+    if (isSystemContextText(content)) return [];
+    const cleaned = sanitizeCursorUserText(content);
+    if (isSystemContextText(cleaned)) return [];
+    return cleaned ? [{ type: "text", text: cleaned }] : [];
   }
-  if (toolName === "web_search" && argsObj.searchTerm) {
-    return { search_term: argsObj.searchTerm };
+  const blocks = [];
+  for (const b of content) {
+    if (b.type === "text" && b.text) {
+      if (isSystemContextText(b.text)) continue;
+      const cleaned = sanitizeCursorUserText(b.text);
+      if (isSystemContextText(cleaned)) continue;
+      if (cleaned) blocks.push({ type: "text", text: cleaned });
+    }
   }
-  if (toolName === "codebase_search") {
-    return {
-      query: argsObj.query ?? "",
-      path: argsObj.repositoryInfo && typeof argsObj.repositoryInfo === "object" && typeof argsObj.repositoryInfo.relativeWorkspacePath === "string" ? argsObj.repositoryInfo.relativeWorkspacePath : "",
-      ...argsObj.includePattern ? { includePattern: argsObj.includePattern } : {}
-    };
+  return blocks;
+}
+function parseAssistantContent(content, toolResults) {
+  if (!content) return [];
+  if (typeof content === "string") {
+    const cleaned = sanitizeCursorAssistantText(content, false);
+    return cleaned ? [{ type: "text", text: cleaned }] : [];
   }
-  if (toolName === "task_v2" || toolName === "Task") {
-    return {
-      ...argsObj.description ? { description: argsObj.description } : {},
-      ...argsObj.prompt ? { prompt: argsObj.prompt } : {},
-      ...argsObj.subagentType ? { subagent_type: argsObj.subagentType } : {}
-    };
+  const blocks = [];
+  const hasToolCalls = content.some((block) => block.type === "tool-call");
+  for (const b of content) {
+    if (b.type === "reasoning" && b.text?.trim()) {
+      const thinking = sanitizeCursorReasoningText(b.text);
+      if (thinking) blocks.push({ type: "thinking", thinking });
+    } else if (b.type === "text" && b.text?.trim()) {
+      const text = sanitizeCursorAssistantText(b.text, hasToolCalls);
+      if (text) blocks.push({ type: "text", text });
+    } else if (b.type === "tool-call" && b.toolCallId && b.toolName) {
+      const result = toolResults.get(b.toolCallId);
+      const toolBlock = {
+        type: "tool_use",
+        id: b.toolCallId,
+        name: mapCursorToolName(b.toolName),
+        input: mapToolArgs(b.toolName, b.args || {}, result?.result || ""),
+        _result: result?.result || "",
+        ...result?.isError ? { _isError: true } : {},
+        ...result?.executionTimeMs ? { _durationMs: result.executionTimeMs } : {}
+      };
+      blocks.push(toolBlock);
+    }
   }
-  if (toolName.startsWith("mcp-") && Array.isArray(argsObj.tools) && argsObj.tools.length > 0) {
-    const first = argsObj.tools[0] || {};
-    const parsedParameters = typeof first.parameters === "string" ? parseJson(first.parameters) ?? first.parameters : first.parameters;
-    return {
-      ...first.serverName ? { server: first.serverName } : {},
-      ...first.name ? { tool_name: first.name } : {},
-      ...parsedParameters !== void 0 ? { arguments: parsedParameters } : {}
-    };
+  return blocks;
+}
+function buildStoreTurnStats(turns) {
+  const turnStats = [];
+  let currentTurnIndex = -1;
+  for (const turn of turns) {
+    if (turn.role === "user") {
+      currentTurnIndex++;
+      turnStats.push({ turnIndex: currentTurnIndex });
+      continue;
+    }
+    if (currentTurnIndex < 0) continue;
+    const current = turnStats[currentTurnIndex];
+    if (!current.model && turn.model) current.model = turn.model;
+    for (const block of turn.blocks) {
+      if (block.type !== "tool_use") continue;
+      const ms = toPositiveMs(block._durationMs);
+      if (ms !== void 0) {
+        current.durationMs = (current.durationMs || 0) + ms;
+      }
+    }
   }
-  return argsObj;
+  return turnStats;
 }
 function extractModel(msg) {
   if (!Array.isArray(msg.content)) return void 0;
@@ -6385,10 +6616,10 @@ function extractModel(msg) {
 // 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 { homedir as homedir10 } from "os";
+import { join as join11 } from "path";
 import { promisify as promisify2 } from "util";
-var CURSOR_PROJECTS_ROOT = join10(homedir9(), ".cursor", "projects");
+var CURSOR_PROJECTS_ROOT = join11(homedir10(), ".cursor", "projects");
 var SDK_STORE_SUBDIR = "sdk-agent-store";
 var SDK_INDEX_DB_BASENAME = "index.db";
 var MIN_INDEX_DB_SIZE = 1024;
@@ -6742,12 +6973,12 @@ async function listSdkIndexDbPaths(projectsRoot) {
   const perProjectPaths = await Promise.all(
     projects.map(async (project) => {
       const out = [];
-      const sdkRoot = join10(projectsRoot, project, SDK_STORE_SUBDIR);
+      const sdkRoot = join11(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 dbPath = join11(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);
@@ -6782,7 +7013,7 @@ function safeJsonStringify(value) {
 }
 
 // src/providers/cursor/discover.ts
-var CURSOR_DIR = join11(homedir10(), ".cursor", "projects");
+var CURSOR_DIR = join12(homedir11(), ".cursor", "projects");
 var PROJECT_DISCOVERY_CONCURRENCY = 6;
 var TRANSCRIPT_INFO_CONCURRENCY = 6;
 var ENTRY_STAT_CONCURRENCY = 32;
@@ -6821,14 +7052,14 @@ async function discoverCursorSessions() {
   return sessions;
 }
 async function discoverProjectSessions(projDir) {
-  const transcriptsDir = join11(CURSOR_DIR, projDir, "agent-transcripts");
+  const transcriptsDir = join12(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"));
+  const toolEntries = await collectToolEntries(join12(CURSOR_DIR, projDir, "agent-tools"));
   toolEntries.sort((a, b) => a.mtimeMs - b.mtimeMs);
   const jobs = [];
   let toolStart = 0;
@@ -6927,7 +7158,7 @@ async function resolveEncodedProjectParts(parts, idx, current) {
   );
   for (let end = idx + 1; end <= parts.length; end++) {
     const candidate = parts.slice(idx, end).join("-");
-    const candidatePath = join11(current, candidate);
+    const candidatePath = join12(current, candidate);
     if (!dirNames.has(candidate)) {
       if (process.platform !== "win32") continue;
       const candidateStat = await stat7(candidatePath).catch(() => null);
@@ -7017,7 +7248,7 @@ async function collectTranscriptEntries(transcriptsDir) {
     return [];
   }
   const transcripts = await mapLimit(entries, ENTRY_STAT_CONCURRENCY, async (entry) => {
-    const entryPath = join11(transcriptsDir, entry);
+    const entryPath = join12(transcriptsDir, entry);
     const entryStat = await stat7(entryPath).catch(() => null);
     if (!entryStat) return null;
     if (entry.endsWith(".jsonl") && entryStat.isFile()) {
@@ -7028,7 +7259,7 @@ async function collectTranscriptEntries(transcriptsDir) {
       };
     }
     if (!entryStat.isDirectory()) return null;
-    const innerPath = join11(entryPath, `${entry}.jsonl`);
+    const innerPath = join12(entryPath, `${entry}.jsonl`);
     const innerStat = await stat7(innerPath).catch(() => null);
     if (!innerStat?.isFile()) return null;
     return {
@@ -7050,7 +7281,7 @@ async function collectToolEntries(toolDir) {
   }
   const toolFiles = entries.filter((entry) => entry.endsWith(".txt"));
   const tools = await mapLimit(toolFiles, ENTRY_STAT_CONCURRENCY, async (entry) => {
-    const entryPath = join11(toolDir, entry);
+    const entryPath = join12(toolDir, entry);
     const entryStat = await stat7(entryPath).catch(() => null);
     if (!entryStat?.isFile()) return null;
     return { path: entryPath, mtimeMs: entryStat.mtimeMs };
@@ -7076,8 +7307,8 @@ async function mapLimit(items, concurrency, worker) {
 
 // src/providers/cursor/parser.ts
 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";
+import { homedir as homedir12 } from "os";
+import { basename as basename4, extname as extname2, join as join13 } 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;
@@ -7433,7 +7664,7 @@ function normalizeImagePlaceholderLines(text) {
 }
 function resolveImagePath(pathValue) {
   if (pathValue.startsWith("~/") || pathValue.startsWith("~\\")) {
-    return join12(homedir11(), pathValue.slice(2));
+    return join13(homedir12(), pathValue.slice(2));
   }
   return pathValue;
 }
@@ -7596,203 +7827,840 @@ function mergeJsonlSupplementsIntoCursorTurns(primaryTurns, jsonlTurns) {
   const withThinking = mergeJsonlThinkingIntoCursorTurns(primaryTurns, jsonlTurns);
   return mergeJsonlUserImagesIntoCursorTurns(withThinking, jsonlTurns);
 }
-async function sortByMtime(paths) {
-  const entries = [];
-  for (const path of paths) {
-    const st = await stat8(path).catch(() => null);
-    if (!st?.isFile()) continue;
-    entries.push({ path, mtimeMs: st.mtimeMs });
+async function sortByMtime(paths) {
+  const entries = [];
+  for (const path of paths) {
+    const st = await stat8(path).catch(() => null);
+    if (!st?.isFile()) continue;
+    entries.push({ path, mtimeMs: st.mtimeMs });
+  }
+  entries.sort((a, b) => a.mtimeMs - b.mtimeMs);
+  return entries.map((e) => e.path);
+}
+async function inferToolPaths(transcriptPaths) {
+  const toolPaths = [];
+  const seen = /* @__PURE__ */ new Set();
+  const projects = /* @__PURE__ */ new Map();
+  for (const transcriptPath of transcriptPaths) {
+    const projectRoot = getCursorProjectRoot(transcriptPath);
+    if (!projectRoot) continue;
+    if (!projects.has(projectRoot)) projects.set(projectRoot, /* @__PURE__ */ new Set());
+    projects.get(projectRoot)?.add(transcriptPath);
+  }
+  for (const [projectRoot, selectedPaths] of projects.entries()) {
+    const transcriptsDir = join13(projectRoot, "agent-transcripts");
+    const toolDir = join13(projectRoot, "agent-tools");
+    const transcriptEntries = await collectTranscriptEntries2(transcriptsDir);
+    const toolEntries = await collectToolEntries2(toolDir);
+    if (transcriptEntries.length === 0 || toolEntries.length === 0) continue;
+    transcriptEntries.sort((a, b) => a.mtimeMs - b.mtimeMs);
+    toolEntries.sort((a, b) => a.mtimeMs - b.mtimeMs);
+    for (let i = 0; i < transcriptEntries.length; i++) {
+      const transcript = transcriptEntries[i];
+      if (!selectedPaths.has(transcript.path)) continue;
+      const prevMtimeMs = i === 0 ? Number.NEGATIVE_INFINITY : transcriptEntries[i - 1].mtimeMs;
+      for (const tool of toolEntries) {
+        if (tool.mtimeMs <= prevMtimeMs || tool.mtimeMs > transcript.mtimeMs) continue;
+        if (seen.has(tool.path)) continue;
+        seen.add(tool.path);
+        toolPaths.push(tool.path);
+      }
+    }
+  }
+  return sortByMtime(toolPaths);
+}
+async function collectTranscriptEntries2(transcriptsDir) {
+  let entries;
+  try {
+    entries = await readdir9(transcriptsDir);
+  } catch {
+    return [];
+  }
+  const transcripts = [];
+  for (const entry of entries) {
+    const entryPath = join13(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 = join13(entryPath, `${entry}.jsonl`);
+    const nestedStat = await stat8(nested).catch(() => null);
+    if (!nestedStat?.isFile()) continue;
+    transcripts.push({ path: nested, mtimeMs: nestedStat.mtimeMs });
+  }
+  return transcripts;
+}
+async function collectToolEntries2(toolDir) {
+  let entries;
+  try {
+    entries = await readdir9(toolDir);
+  } catch {
+    return [];
+  }
+  const tools = [];
+  for (const entry of entries) {
+    if (!entry.endsWith(".txt")) continue;
+    const entryPath = join13(toolDir, entry);
+    const st = await stat8(entryPath).catch(() => null);
+    if (!st?.isFile()) continue;
+    tools.push({ path: entryPath, mtimeMs: st.mtimeMs });
+  }
+  return tools;
+}
+function getCursorProjectRoot(transcriptPath) {
+  const parts = transcriptPath.split(/[/\\]agent-transcripts[/\\]/);
+  if (parts.length < 2) return null;
+  return parts[0];
+}
+async function loadToolEvents(toolPaths) {
+  const events = [];
+  for (const path of toolPaths) {
+    const content = await readFile13(path, "utf-8").catch(() => "");
+    const result = content.trim();
+    if (!result) continue;
+    const st = await stat8(path).catch(() => null);
+    const id = basename4(path, extname2(path));
+    events.push({
+      id,
+      name: inferToolName(result),
+      input: { source: basename4(path) },
+      result,
+      timestamp: st ? new Date(st.mtimeMs).toISOString() : void 0
+    });
+  }
+  return events;
+}
+function inferToolName(result) {
+  const firstLine = result.split("\n", 1)[0] || "";
+  if (result.startsWith("diff --git")) return "Diff";
+  if (firstLine.startsWith("http://") || firstLine.startsWith("https://")) return "WebFetch";
+  if (firstLine.startsWith("{") || firstLine.startsWith("[")) return "API";
+  if (/\$ |\bCommand\b|^\w+(\s+\w+){0,3}\s+-/.test(firstLine)) return "Bash";
+  return "ToolOutput";
+}
+function attachToolEvents(turns, tools) {
+  const markerBlocks = [];
+  for (const turn of turns) {
+    if (turn.role !== "assistant") continue;
+    for (let bi = 0; bi < turn.blocks.length; bi++) {
+      const block = turn.blocks[bi];
+      if (block.type === "tool_use" && block._isPendingMarker) {
+        markerBlocks.push({ block, turn, blockIndex: bi });
+      }
+    }
+  }
+  const paired = Math.min(markerBlocks.length, tools.length);
+  for (let i = 0; i < paired; i++) {
+    const marker = markerBlocks[i];
+    const tool = tools[i];
+    marker.block.name = tool.name;
+    marker.block.input = {
+      ...marker.block.input,
+      ...tool.input
+    };
+    marker.block._result = tool.result;
+    const durationMs = durationBetween(marker.turn.timestamp, tool.timestamp);
+    if (durationMs !== void 0) marker.block._durationMs = durationMs;
+    marker.block._isPendingMarker = void 0;
+    if (!marker.turn.timestamp && tool.timestamp) {
+      marker.turn.timestamp = tool.timestamp;
+    }
+  }
+  for (let i = paired; i < markerBlocks.length; i++) {
+    const { turn, blockIndex, block } = markerBlocks[i];
+    const markerText = typeof block.input?.marker === "string" ? block.input.marker : "";
+    const thinkingBlock = {
+      type: "thinking",
+      thinking: block.name || markerText
+    };
+    turn.blocks[blockIndex] = thinkingBlock;
+  }
+  for (let i = paired; i < tools.length; i++) {
+    const tool = tools[i];
+    turns.push({
+      role: "assistant",
+      timestamp: tool.timestamp,
+      blocks: [toToolUseBlock(tool)]
+    });
+  }
+}
+function toToolUseBlock(tool) {
+  return {
+    type: "tool_use",
+    id: tool.id,
+    name: tool.name,
+    input: tool.input,
+    _result: tool.result
+  };
+}
+function durationBetween(start, end) {
+  if (!start || !end) return void 0;
+  const startMs = Date.parse(start);
+  const endMs = Date.parse(end);
+  if (!Number.isFinite(startMs) || !Number.isFinite(endMs) || endMs <= startMs) return void 0;
+  return Math.round(endMs - startMs);
+}
+function splitToolMarker(text) {
+  const trimmed = text.trim();
+  const single = trimmed.match(/^\*\*([^*\n]{2,120})\*\*$/);
+  if (single) return { markerName: single[1].trim() };
+  const trailing = trimmed.match(/^([\s\S]*?)\n+\*\*([^*\n]{2,120})\*\*$/);
+  if (trailing) {
+    const textBody = trailing[1].trim();
+    return {
+      markerName: trailing[2].trim(),
+      ...textBody ? { textBody } : {}
+    };
+  }
+  return void 0;
+}
+
+// src/providers/cursor/index.ts
+var cursorProvider = {
+  name: "cursor",
+  displayName: "Cursor",
+  discover: discoverCursorSessions,
+  parse: (filePaths, sessionInfo) => parseCursorSession(filePaths, sessionInfo)
+};
+
+// src/providers/pi/discover.ts
+import { createReadStream as createReadStream4 } from "fs";
+import { readdir as readdir10, stat as stat9 } from "fs/promises";
+import { basename as basename5, join as join15 } from "path";
+import { createInterface as createInterface4 } from "readline";
+
+// src/providers/pi/config.ts
+import { readFile as readFile14 } from "fs/promises";
+import { homedir as homedir13 } from "os";
+import { join as join14 } from "path";
+function getPiAgentDir() {
+  return process.env.PI_CODING_AGENT_DIR || join14(homedir13(), ".pi", "agent");
+}
+function getPiSessionsDir() {
+  return process.env.PI_CODING_AGENT_SESSION_DIR || join14(getPiAgentDir(), "sessions");
+}
+async function readPiModelContextWindows() {
+  const result = /* @__PURE__ */ new Map();
+  let raw;
+  try {
+    raw = await readFile14(join14(getPiAgentDir(), "models.json"), "utf-8");
+  } catch {
+    return result;
   }
-  entries.sort((a, b) => a.mtimeMs - b.mtimeMs);
-  return entries.map((e) => e.path);
+  let parsed;
+  try {
+    parsed = JSON.parse(raw);
+  } catch {
+    return result;
+  }
+  collectModelContextWindows(parsed, result);
+  return result;
 }
-async function inferToolPaths(transcriptPaths) {
-  const toolPaths = [];
-  const seen = /* @__PURE__ */ new Set();
-  const projects = /* @__PURE__ */ new Map();
-  for (const transcriptPath of transcriptPaths) {
-    const projectRoot = getCursorProjectRoot(transcriptPath);
-    if (!projectRoot) continue;
-    if (!projects.has(projectRoot)) projects.set(projectRoot, /* @__PURE__ */ new Set());
-    projects.get(projectRoot)?.add(transcriptPath);
+function collectModelContextWindows(value, result) {
+  if (!value || typeof value !== "object") return;
+  if (Array.isArray(value)) {
+    for (const item of value) collectModelContextWindows(item, result);
+    return;
   }
-  for (const [projectRoot, selectedPaths] of projects.entries()) {
-    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;
-    transcriptEntries.sort((a, b) => a.mtimeMs - b.mtimeMs);
-    toolEntries.sort((a, b) => a.mtimeMs - b.mtimeMs);
-    for (let i = 0; i < transcriptEntries.length; i++) {
-      const transcript = transcriptEntries[i];
-      if (!selectedPaths.has(transcript.path)) continue;
-      const prevMtimeMs = i === 0 ? Number.NEGATIVE_INFINITY : transcriptEntries[i - 1].mtimeMs;
-      for (const tool of toolEntries) {
-        if (tool.mtimeMs <= prevMtimeMs || tool.mtimeMs > transcript.mtimeMs) continue;
-        if (seen.has(tool.path)) continue;
-        seen.add(tool.path);
-        toolPaths.push(tool.path);
-      }
-    }
+  const obj = value;
+  if (typeof obj.id === "string" && typeof obj.contextWindow === "number") {
+    result.set(obj.id, obj.contextWindow);
   }
-  return sortByMtime(toolPaths);
+  for (const nested of Object.values(obj)) collectModelContextWindows(nested, result);
 }
-async function collectTranscriptEntries2(transcriptsDir) {
-  let entries;
+
+// src/providers/pi/discover.ts
+var PROMPT_SCAN_LIMIT = 2;
+async function discoverPiSessions() {
+  const sessionsRoot = getPiSessionsDir();
+  const sessions = [];
+  let projectDirs;
   try {
-    entries = await readdir9(transcriptsDir);
+    projectDirs = await readdir10(sessionsRoot);
   } catch {
-    return [];
+    return sessions;
   }
-  const transcripts = [];
-  for (const entry of entries) {
-    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 });
+  for (const projectDir of projectDirs) {
+    const projectPath = join15(sessionsRoot, projectDir);
+    const projectStat = await stat9(projectPath).catch(() => null);
+    if (!projectStat?.isDirectory()) continue;
+    let files;
+    try {
+      files = await readdir10(projectPath);
+    } catch {
       continue;
     }
-    if (!st.isDirectory()) continue;
-    const nested = join12(entryPath, `${entry}.jsonl`);
-    const nestedStat = await stat8(nested).catch(() => null);
-    if (!nestedStat?.isFile()) continue;
-    transcripts.push({ path: nested, mtimeMs: nestedStat.mtimeMs });
+    for (const file of files) {
+      if (!file.endsWith(".jsonl")) continue;
+      const filePath = join15(projectPath, file);
+      const fileStat = await stat9(filePath).catch(() => null);
+      if (!fileStat) continue;
+      const info = await extractPiSessionInfo(filePath, fileStat.size, projectDir);
+      if (info) sessions.push(info);
+    }
   }
-  return transcripts;
+  sessions.sort((a, b) => b.timestamp.localeCompare(a.timestamp));
+  return sessions;
 }
-async function collectToolEntries2(toolDir) {
-  let entries;
+async function extractPiSessionInfo(filePath, fileSize, encodedProjectDir) {
+  let header;
+  let timestamp = "";
+  let lineCount = 0;
+  let promptCount = 0;
+  let toolCallCount = 0;
+  let editCountEst = 0;
+  let model;
+  let title;
+  const prompts = [];
+  const input = createReadStream4(filePath, { encoding: "utf-8" });
+  const rl = createInterface4({ input, crlfDelay: Number.POSITIVE_INFINITY });
   try {
-    entries = await readdir9(toolDir);
+    for await (const rawLine of rl) {
+      const line = rawLine.trim();
+      if (!line) continue;
+      lineCount++;
+      let entry;
+      try {
+        entry = JSON.parse(line);
+      } catch {
+        continue;
+      }
+      if (typeof entry.timestamp === "string" && entry.timestamp) {
+        timestamp = entry.timestamp;
+      }
+      if (!header) {
+        if (entry.type !== "session" || typeof entry.id !== "string") return null;
+        header = entry;
+        if (typeof entry.timestamp === "string" && entry.timestamp) timestamp = entry.timestamp;
+        continue;
+      }
+      if (entry.type === "session_info") {
+        const name = typeof entry.name === "string" ? entry.name.trim() : "";
+        title = name || void 0;
+        continue;
+      }
+      if (entry.type === "model_change" && typeof entry.modelId === "string") {
+        model = entry.modelId;
+        continue;
+      }
+      if (entry.type !== "message") continue;
+      const message = entry.message;
+      if (!message || typeof message !== "object") continue;
+      if (message.role === "user") {
+        const text = extractText(message.content).trim();
+        if (text) {
+          promptCount++;
+          if (prompts.length < PROMPT_SCAN_LIMIT) {
+            prompts.push(cleanPromptText(text).slice(0, 200));
+          }
+        }
+      } else if (message.role === "assistant") {
+        if (!model && typeof message.model === "string") model = message.model;
+        if (Array.isArray(message.content)) {
+          for (const block of message.content) {
+            if (block?.type !== "toolCall") continue;
+            toolCallCount++;
+            if (isEditTool2(block.name)) editCountEst++;
+          }
+        }
+      }
+    }
   } catch {
-    return [];
+    return null;
+  } finally {
+    rl.close();
   }
-  const tools = [];
-  for (const entry of entries) {
-    if (!entry.endsWith(".txt")) continue;
-    const entryPath = join12(toolDir, entry);
-    const st = await stat8(entryPath).catch(() => null);
-    if (!st?.isFile()) continue;
-    tools.push({ path: entryPath, mtimeMs: st.mtimeMs });
+  if (!header || prompts.length === 0) return null;
+  const cwd = header.cwd || decodeProjectDir3(encodedProjectDir);
+  const slug = basename5(filePath, ".jsonl").replace(/^\d{4}-\d{2}-\d{2}T[^_]+_/, "");
+  const fallbackTimestamp = timestamp || header.timestamp || (/* @__PURE__ */ new Date()).toISOString();
+  return {
+    provider: "pi",
+    sessionId: header.id,
+    slug,
+    title,
+    project: cwd,
+    cwd,
+    version: String(header.version || 1),
+    timestamp: fallbackTimestamp,
+    lineCount,
+    fileSize,
+    filePath,
+    filePaths: [filePath],
+    firstPrompt: prompts[0] || "(pi session)",
+    prompts,
+    promptCount,
+    toolCallCount,
+    model,
+    editCountEst
+  };
+}
+function decodeProjectDir3(encoded) {
+  if (encoded.startsWith("--") && encoded.endsWith("--")) {
+    return `/${encoded.slice(2, -2).replace(/-/g, "/")}`;
   }
-  return tools;
+  return encoded;
 }
-function getCursorProjectRoot(transcriptPath) {
-  const parts = transcriptPath.split(/[/\\]agent-transcripts[/\\]/);
-  if (parts.length < 2) return null;
-  return parts[0];
+function extractText(content) {
+  if (typeof content === "string") return content;
+  if (!Array.isArray(content)) return "";
+  return content.filter((block) => block?.type === "text").map((block) => block.text || "").join("\n");
 }
-async function loadToolEvents(toolPaths) {
-  const events = [];
-  for (const path of toolPaths) {
-    const content = await readFile13(path, "utf-8").catch(() => "");
-    const result = content.trim();
-    if (!result) continue;
-    const st = await stat8(path).catch(() => null);
-    const id = basename4(path, extname2(path));
-    events.push({
-      id,
-      name: inferToolName(result),
-      input: { source: basename4(path) },
-      result,
-      timestamp: st ? new Date(st.mtimeMs).toISOString() : void 0
+function isEditTool2(name) {
+  return name === "edit" || name === "write" || name === "Edit" || name === "Write";
+}
+
+// src/providers/pi/parser.ts
+init_utils();
+import { readFile as readFile15 } from "fs/promises";
+import { basename as basename6 } from "path";
+async function parsePiSession(filePaths, sessionInfo) {
+  const paths = Array.isArray(filePaths) ? filePaths : [filePaths];
+  const allLines = [];
+  for (const fp of paths) {
+    const content = await readFile15(fp, "utf-8");
+    allLines.push(...content.split("\n"));
+  }
+  return parsePiLines(allLines, {
+    sourcePath: paths[0],
+    sessionInfo,
+    sessionsDir: getPiSessionsDir(),
+    modelContextWindows: await readPiModelContextWindows()
+  });
+}
+function parsePiLines(lines, options = {}) {
+  let header;
+  const entries = [];
+  const byId = /* @__PURE__ */ new Map();
+  const parseWarnings = [];
+  for (let lineIndex = 0; lineIndex < lines.length; lineIndex++) {
+    const line = lines[lineIndex];
+    if (!line.trim()) continue;
+    let entry;
+    try {
+      entry = JSON.parse(line);
+    } catch {
+      addParseWarning(parseWarnings, {
+        kind: "malformed-json",
+        source: "pi JSONL",
+        firstLine: lineIndex + 1,
+        message: "Skipped malformed JSONL line",
+        sample: line
+      });
+      continue;
+    }
+    if (entry.type === "session") {
+      if (!header && typeof entry.id === "string") {
+        header = entry;
+      }
+      continue;
+    }
+    entries.push(entry);
+    if (entry.id) byId.set(entry.id, entry);
+  }
+  const branchSelection = selectActiveBranch(entries, byId);
+  const branchEntries = branchSelection.entries;
+  const toolResults = collectToolResults(branchEntries);
+  const turns = [];
+  const usageByMessageId = /* @__PURE__ */ new Map();
+  const allTimestamps = [];
+  const compactions = [];
+  const apiErrors = [];
+  let title = options.sessionInfo?.title;
+  let model = options.sessionInfo?.model;
+  let currentModel = model;
+  let firstTimestamp;
+  let lastTimestamp;
+  for (const entry of branchEntries) {
+    if (entry.timestamp) {
+      allTimestamps.push(entry.timestamp);
+      if (!firstTimestamp || entry.timestamp < firstTimestamp) firstTimestamp = entry.timestamp;
+      if (!lastTimestamp || entry.timestamp > lastTimestamp) lastTimestamp = entry.timestamp;
+    }
+    if (entry.type === "session_info") {
+      const sessionInfoEntry = entry;
+      const name = typeof sessionInfoEntry.name === "string" ? sessionInfoEntry.name.trim() : "";
+      title = name || title;
+      continue;
+    }
+    if (entry.type === "model_change") {
+      const nextModel = entry.modelId;
+      if (typeof nextModel === "string" && nextModel) {
+        currentModel = nextModel;
+        model = model || nextModel;
+      }
+      continue;
+    }
+    if (entry.type === "compaction") {
+      const compaction = entry;
+      const summary = typeof compaction.summary === "string" ? compaction.summary : "";
+      if (summary) {
+        turns.push({
+          role: "user",
+          subtype: "compaction-summary",
+          timestamp: entry.timestamp,
+          blocks: [{ type: "text", text: summary }]
+        });
+      }
+      compactions.push({
+        timestamp: entry.timestamp || lastTimestamp || (/* @__PURE__ */ new Date()).toISOString(),
+        trigger: "pi",
+        ...typeof compaction.tokensBefore === "number" ? { preTokens: compaction.tokensBefore } : {}
+      });
+      continue;
+    }
+    if (entry.type === "branch_summary") {
+      const summary = entry.summary;
+      if (typeof summary === "string" && summary.trim()) {
+        turns.push({
+          role: "user",
+          subtype: "context-injection",
+          timestamp: entry.timestamp,
+          blocks: [{ type: "text", text: `Branch summary:
+${summary}` }]
+        });
+      }
+      continue;
+    }
+    if (entry.type === "custom_message") {
+      const custom = entry;
+      const text = extractText2(custom.content).trim();
+      if (text && custom.display !== false) {
+        const customType = typeof custom.customType === "string" ? custom.customType : "custom";
+        turns.push({
+          role: "user",
+          subtype: "context-injection",
+          timestamp: entry.timestamp,
+          blocks: [{ type: "text", text: `[${customType}]
+${text}` }]
+        });
+      }
+      continue;
+    }
+    if (entry.type !== "message") continue;
+    const messageEntry = entry;
+    const message = messageEntry.message;
+    if (!message) continue;
+    if (message.role === "user") {
+      const blocks = buildUserBlocks(message.content);
+      if (blocks.length > 0) {
+        turns.push({ role: "user", timestamp: entry.timestamp, blocks });
+      }
+      continue;
+    }
+    if (message.role === "assistant") {
+      const blocks = buildAssistantBlocks(message.content, toolResults, entry.timestamp);
+      if (message.errorMessage) {
+        blocks.push({ type: "text", text: message.errorMessage });
+        apiErrors.push({
+          timestamp: entry.timestamp || (/* @__PURE__ */ new Date()).toISOString(),
+          ...parseApiErrorMessage(message.errorMessage)
+        });
+      }
+      if (blocks.length > 0) {
+        const msgModel = message.model || currentModel;
+        if (msgModel) model = model || msgModel;
+        if (message.usage && entry.id) {
+          const usage = normalizeUsage(message.usage);
+          usageByMessageId.set(entry.id, {
+            usage,
+            model: msgModel,
+            contextTokens: usage.inputTokens + usage.cacheCreationTokens + usage.cacheReadTokens
+          });
+        }
+        turns.push({
+          role: "assistant",
+          messageId: entry.id,
+          model: msgModel,
+          timestamp: entry.timestamp,
+          blocks,
+          ...message.stopReason === "length" ? { stopReason: "max_tokens" } : {}
+        });
+      }
+      continue;
+    }
+    if (message.role === "bashExecution") {
+      const block = buildBashExecutionBlock(message, entry.id || `bash-${turns.length}`);
+      turns.push({ role: "assistant", timestamp: entry.timestamp, blocks: [block] });
+    }
+  }
+  const tokenUsage = aggregateUsage([...usageByMessageId.values()].map((value) => value.usage));
+  const tokenUsageByModel = aggregateUsageByModel(usageByMessageId);
+  const turnStats = buildTurnStats2(turns, usageByMessageId);
+  const sessionId = header?.id || options.sessionInfo?.sessionId || "pi-session";
+  const sourcePath = options.sourcePath || options.sessionInfo?.filePath || "";
+  const slug = options.sessionInfo?.slug || basename6(sourcePath || sessionId, ".jsonl");
+  const cwd = header?.cwd || options.sessionInfo?.cwd || options.sessionInfo?.project || "";
+  return {
+    sessionId,
+    slug,
+    title,
+    cwd,
+    model,
+    startTime: firstTimestamp || header?.timestamp,
+    endTime: lastTimestamp,
+    totalDurationMs: estimateActiveDuration2(allTimestamps),
+    turns,
+    tokenUsage,
+    ...tokenUsageByModel ? { tokenUsageByModel } : {},
+    ...turnStats.length > 0 ? { turnStats } : {},
+    ...compactions.length > 0 ? { compactions } : {},
+    ...apiErrors.length > 0 ? { apiErrors } : {},
+    dataSource: "jsonl",
+    dataSourceInfo: {
+      primary: "jsonl",
+      sources: [shortenPath(options.sessionsDir || getPiSessionsDir())],
+      ...branchSelection.abandonedEntries > 0 ? { notes: [`${branchSelection.abandonedEntries} off-branch Pi entries were omitted.`] } : {}
+    },
+    ...model ? contextLimitForModel(model, options.modelContextWindows) : {},
+    ...parseWarnings.length > 0 ? { parseWarnings } : {}
+  };
+}
+function parseApiErrorMessage(message) {
+  const status = message.match(/\b(\d{3})\b/);
+  const errorType = message.match(/"([a-z][a-z0-9_]*error[a-z0-9_]*)"/i);
+  return {
+    ...status ? { statusCode: Number(status[1]) } : {},
+    ...errorType ? { errorType: errorType[1] } : {}
+  };
+}
+function contextLimitForModel(model, modelContextWindows) {
+  const contextLimit = modelContextWindows?.get(model);
+  return contextLimit ? { contextLimit } : {};
+}
+function selectActiveBranch(entries, byId) {
+  if (entries.length === 0) return { entries: [], abandonedEntries: 0 };
+  if (byId.size === 0) return { entries, abandonedEntries: 0 };
+  const leaf = entries.toReversed().find((entry) => entry.id && byId.has(entry.id));
+  if (!leaf?.id) return { entries, abandonedEntries: 0 };
+  const branchIds = /* @__PURE__ */ new Set();
+  const branch = [];
+  const seen = /* @__PURE__ */ new Set();
+  let current = leaf;
+  while (current) {
+    if (!current.id || seen.has(current.id)) break;
+    seen.add(current.id);
+    branchIds.add(current.id);
+    branch.unshift(current);
+    const parentId = current.parentId;
+    current = typeof parentId === "string" ? byId.get(parentId) : void 0;
+  }
+  if (branch.length === 0) return { entries, abandonedEntries: 0 };
+  const idlessEntries = entries.filter((entry) => !entry.id);
+  if (idlessEntries.length === 0) {
+    return { entries: branch, abandonedEntries: Math.max(0, entries.length - branch.length) };
+  }
+  const selected = new Set(branch);
+  const branchWithIdless = entries.filter((entry) => selected.has(entry) || !entry.id);
+  return {
+    entries: branchWithIdless,
+    abandonedEntries: entries.filter((entry) => entry.id && !branchIds.has(entry.id)).length
+  };
+}
+function collectToolResults(entries) {
+  const results = /* @__PURE__ */ new Map();
+  for (const entry of entries) {
+    if (entry.type !== "message") continue;
+    const message = entry.message;
+    if (message?.role !== "toolResult" || typeof message.toolCallId !== "string") continue;
+    const { text, images } = extractTextAndImages(message.content);
+    results.set(message.toolCallId, {
+      text,
+      images,
+      isError: message.isError,
+      timestamp: entry.timestamp
     });
   }
-  return events;
+  return results;
 }
-function inferToolName(result) {
-  const firstLine = result.split("\n", 1)[0] || "";
-  if (result.startsWith("diff --git")) return "Diff";
-  if (firstLine.startsWith("http://") || firstLine.startsWith("https://")) return "WebFetch";
-  if (firstLine.startsWith("{") || firstLine.startsWith("[")) return "API";
-  if (/\$ |\bCommand\b|^\w+(\s+\w+){0,3}\s+-/.test(firstLine)) return "Bash";
-  return "ToolOutput";
+function buildUserBlocks(content) {
+  const { text, images } = extractTextAndImages(content);
+  const blocks = [];
+  if (text.trim()) blocks.push({ type: "text", text });
+  if (images.length > 0) blocks.push({ type: "_user_images", images });
+  return blocks;
 }
-function attachToolEvents(turns, tools) {
-  const markerBlocks = [];
-  for (const turn of turns) {
-    if (turn.role !== "assistant") continue;
-    for (let bi = 0; bi < turn.blocks.length; bi++) {
-      const block = turn.blocks[bi];
-      if (block.type === "tool_use" && block._isPendingMarker) {
-        markerBlocks.push({ block, turn, blockIndex: bi });
-      }
+function buildAssistantBlocks(content, toolResults, assistantTimestamp) {
+  if (!Array.isArray(content)) return [];
+  const blocks = [];
+  for (const block of content) {
+    if (block.type === "thinking" && block.thinking?.trim()) {
+      blocks.push({ type: "thinking", thinking: block.thinking });
+    } else if (block.type === "text" && block.text?.trim()) {
+      blocks.push({ type: "text", text: block.text });
+    } else if (block.type === "toolCall") {
+      const result = toolResults.get(block.id);
+      blocks.push({
+        type: "tool_use",
+        id: block.id,
+        name: mapToolName(block.name),
+        input: normalizeToolInput2(block.name, block.arguments || {}),
+        _result: result?.text || "",
+        ...result?.images.length ? { _images: result.images } : {},
+        ...result?.isError ? { _isError: true } : {},
+        ...assistantTimestamp && result?.timestamp ? { _durationMs: toolDurationMs(assistantTimestamp, result.timestamp) } : {}
+      });
     }
   }
-  const paired = Math.min(markerBlocks.length, tools.length);
-  for (let i = 0; i < paired; i++) {
-    const marker = markerBlocks[i];
-    const tool = tools[i];
-    marker.block.name = tool.name;
-    marker.block.input = {
-      ...marker.block.input,
-      ...tool.input
-    };
-    marker.block._result = tool.result;
-    const durationMs = durationBetween(marker.turn.timestamp, tool.timestamp);
-    if (durationMs !== void 0) marker.block._durationMs = durationMs;
-    marker.block._isPendingMarker = void 0;
-    if (!marker.turn.timestamp && tool.timestamp) {
-      marker.turn.timestamp = tool.timestamp;
-    }
+  return blocks;
+}
+function toolDurationMs(start, end) {
+  const duration = Date.parse(end) - Date.parse(start);
+  return duration > 0 && duration < 60 * 6e4 ? duration : void 0;
+}
+function buildBashExecutionBlock(message, fallbackId) {
+  const outputParts = [message.output || ""];
+  if (message.cancelled) outputParts.push("\n(command cancelled)");
+  if (message.truncated && message.fullOutputPath) {
+    outputParts.push(`
+[Output truncated. Full output: ${message.fullOutputPath}]`);
   }
-  for (let i = paired; i < markerBlocks.length; i++) {
-    const { turn, blockIndex, block } = markerBlocks[i];
-    const markerText = typeof block.input?.marker === "string" ? block.input.marker : "";
-    const thinkingBlock = {
-      type: "thinking",
-      thinking: block.name || markerText
+  return {
+    type: "tool_use",
+    id: fallbackId,
+    name: "Bash",
+    input: { command: message.command || "" },
+    _result: outputParts.join(""),
+    ...message.exitCode !== void 0 && message.exitCode !== 0 ? { _isError: true } : {}
+  };
+}
+function extractTextAndImages(content) {
+  if (typeof content === "string") return { text: content, images: [] };
+  if (!Array.isArray(content)) return { text: "", images: [] };
+  const text = [];
+  const images = [];
+  for (const block of content) {
+    if (block.type === "text") {
+      text.push(block.text || "");
+    } else if (block.type === "image" && block.data) {
+      images.push(`data:${block.mimeType || "image/png"};base64,${block.data}`);
+    }
+  }
+  return { text: text.join("\n"), images };
+}
+function extractText2(content) {
+  return extractTextAndImages(content).text;
+}
+function mapToolName(name) {
+  const normalized = name.toLowerCase();
+  if (normalized === "bash") return "Bash";
+  if (normalized === "read") return "Read";
+  if (normalized === "write") return "Write";
+  if (normalized === "edit") return "Edit";
+  if (normalized === "grep") return "Grep";
+  if (normalized === "find") return "Find";
+  if (normalized === "ls") return "LS";
+  return name;
+}
+function normalizeToolInput2(name, input) {
+  const normalized = name.toLowerCase();
+  if (normalized === "write") {
+    return {
+      ...input,
+      ...typeof input.path === "string" ? { file_path: input.path } : {}
     };
-    turn.blocks[blockIndex] = thinkingBlock;
   }
-  for (let i = paired; i < tools.length; i++) {
-    const tool = tools[i];
-    turns.push({
-      role: "assistant",
-      timestamp: tool.timestamp,
-      blocks: [toToolUseBlock(tool)]
-    });
+  if (normalized === "edit") {
+    const firstEdit = Array.isArray(input.edits) ? input.edits[0] : void 0;
+    const edit = firstEdit && typeof firstEdit === "object" ? firstEdit : input;
+    return {
+      ...input,
+      ...typeof input.path === "string" ? { file_path: input.path } : {},
+      ...typeof edit.oldText === "string" ? { old_string: edit.oldText } : {},
+      ...typeof edit.newText === "string" ? { new_string: edit.newText } : {}
+    };
   }
+  return input;
 }
-function toToolUseBlock(tool) {
+function normalizeUsage(usage) {
   return {
-    type: "tool_use",
-    id: tool.id,
-    name: tool.name,
-    input: tool.input,
-    _result: tool.result
+    inputTokens: usage.input || 0,
+    outputTokens: usage.output || 0,
+    cacheCreationTokens: usage.cacheWrite || 0,
+    cacheReadTokens: usage.cacheRead || 0
   };
 }
-function durationBetween(start, end) {
-  if (!start || !end) return void 0;
-  const startMs = Date.parse(start);
-  const endMs = Date.parse(end);
-  if (!Number.isFinite(startMs) || !Number.isFinite(endMs) || endMs <= startMs) return void 0;
-  return Math.round(endMs - startMs);
+function aggregateUsage(usages) {
+  if (usages.length === 0) return void 0;
+  return usages.reduce(
+    (total, usage) => ({
+      inputTokens: total.inputTokens + usage.inputTokens,
+      outputTokens: total.outputTokens + usage.outputTokens,
+      cacheCreationTokens: total.cacheCreationTokens + usage.cacheCreationTokens,
+      cacheReadTokens: total.cacheReadTokens + usage.cacheReadTokens
+    }),
+    { inputTokens: 0, outputTokens: 0, cacheCreationTokens: 0, cacheReadTokens: 0 }
+  );
 }
-function splitToolMarker(text) {
-  const trimmed = text.trim();
-  const single = trimmed.match(/^\*\*([^*\n]{2,120})\*\*$/);
-  if (single) return { markerName: single[1].trim() };
-  const trailing = trimmed.match(/^([\s\S]*?)\n+\*\*([^*\n]{2,120})\*\*$/);
-  if (trailing) {
-    const textBody = trailing[1].trim();
-    return {
-      markerName: trailing[2].trim(),
-      ...textBody ? { textBody } : {}
-    };
+function aggregateUsageByModel(usageByMessageId) {
+  if (usageByMessageId.size === 0) return void 0;
+  const result = {};
+  for (const { usage, model } of usageByMessageId.values()) {
+    const key = model || "unknown";
+    result[key] = aggregateUsage(
+      [result[key], usage].filter((value) => !!value)
+    );
   }
-  return void 0;
+  return result;
+}
+function buildTurnStats2(turns, usageByMessageId) {
+  const stats = [];
+  let current;
+  let turnIndex = -1;
+  for (const turn of turns) {
+    if (turn.role === "user" && !turn.subtype) {
+      if (current && current.messageIds.length > 0)
+        stats.push(buildTurnStat(current, usageByMessageId));
+      turnIndex++;
+      current = { turnIndex, messageIds: [] };
+    } else if (turn.role === "assistant" && turn.messageId && current) {
+      current.messageIds.push(turn.messageId);
+    }
+  }
+  if (current && current.messageIds.length > 0)
+    stats.push(buildTurnStat(current, usageByMessageId));
+  return stats;
+}
+function buildTurnStat(turn, usageByMessageId) {
+  const usages = [];
+  let model;
+  let contextTokens = 0;
+  for (const messageId of turn.messageIds) {
+    const item = usageByMessageId.get(messageId);
+    if (!item) continue;
+    usages.push(item.usage);
+    model = model || item.model;
+    contextTokens = Math.max(contextTokens, item.contextTokens || 0);
+  }
+  const tokenUsage = aggregateUsage(usages);
+  return {
+    turnIndex: turn.turnIndex,
+    ...model ? { model } : {},
+    ...tokenUsage ? { tokenUsage } : {},
+    ...contextTokens ? { contextTokens } : {}
+  };
+}
+function estimateActiveDuration2(timestamps) {
+  if (timestamps.length < 2) return void 0;
+  const sorted = timestamps.map((timestamp) => Date.parse(timestamp)).filter((timestamp) => !Number.isNaN(timestamp)).sort((a, b) => a - b);
+  if (sorted.length < 2) return void 0;
+  let total = 0;
+  for (let i = 1; i < sorted.length; i++) {
+    const gap = sorted[i] - sorted[i - 1];
+    if (gap > 0 && gap < 30 * 6e4) total += gap;
+  }
+  return total || void 0;
 }
 
-// src/providers/cursor/index.ts
-var cursorProvider = {
-  name: "cursor",
-  displayName: "Cursor",
-  discover: discoverCursorSessions,
-  parse: (filePaths, sessionInfo) => parseCursorSession(filePaths, sessionInfo)
+// src/providers/pi/index.ts
+var piProvider = {
+  name: "pi",
+  displayName: "Pi",
+  discover: discoverPiSessions,
+  parse: parsePiSession
 };
 
 // src/providers/index.ts
@@ -7801,9 +8669,17 @@ var providers = [
   claudeDesktopProvider,
   claudeCodeProvider,
   codexProvider,
-  cursorProvider
+  cursorProvider,
+  piProvider
+];
+var PROVIDER_PRIORITY = [
+  "claude-cowork",
+  "claude-desktop",
+  "claude-code",
+  "codex",
+  "cursor",
+  "pi"
 ];
-var PROVIDER_PRIORITY = ["claude-cowork", "claude-desktop", "claude-code", "codex", "cursor"];
 function getAllProviders() {
   return providers;
 }
@@ -7832,9 +8708,9 @@ init_cloud();
 
 // src/publishers/gist.ts
 init_cloud();
-import { createHash as createHash2 } from "crypto";
-import { readFile as readFile16, writeFile as writeFile4 } from "fs/promises";
-import { join as join15 } from "path";
+import { createHash as createHash3 } from "crypto";
+import { readFile as readFile18, writeFile as writeFile4 } from "fs/promises";
+import { join as join18 } from "path";
 var GIST_META_FILE = ".vibe-replay-gist.json";
 function checkPublishStatus() {
   const auth = loadAuthToken();
@@ -7846,8 +8722,8 @@ async function publishGist(outputDir, title, opts) {
   if (!auth) {
     throw new Error("Not logged in. Run `vibe-replay auth login` first.");
   }
-  const jsonPath = join15(outputDir, "replay.json");
-  const content = await readFile16(jsonPath, "utf-8");
+  const jsonPath = join18(outputDir, "replay.json");
+  const content = await readFile18(jsonPath, "utf-8");
   const overwrite = opts?.overwrite;
   const filename = overwrite?.filename || `${sanitizeFilename(title)}.json`;
   const description = `vibe-replay: ${title}`;
@@ -7898,7 +8774,7 @@ async function publishGist(outputDir, title, opts) {
     viewerUrl = data.viewerUrl;
     mode = "created";
   }
-  const contentHash = createHash2("sha256").update(content).digest("hex").slice(0, 16);
+  const contentHash = createHash3("sha256").update(content).digest("hex").slice(0, 16);
   await saveGistInfo(outputDir, {
     gistId,
     filename,
@@ -7911,7 +8787,7 @@ async function publishGist(outputDir, title, opts) {
 }
 async function loadSavedGistInfo(outputDir) {
   try {
-    const raw = await readFile16(join15(outputDir, GIST_META_FILE), "utf-8");
+    const raw = await readFile18(join18(outputDir, GIST_META_FILE), "utf-8");
     const parsed = JSON.parse(raw);
     if (!parsed?.gistId || !parsed?.filename) return void 0;
     return parsed;
@@ -7920,7 +8796,7 @@ async function loadSavedGistInfo(outputDir) {
   }
 }
 async function saveGistInfo(outputDir, info) {
-  await writeFile4(join15(outputDir, GIST_META_FILE), JSON.stringify(info, null, 2), "utf-8");
+  await writeFile4(join18(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);
@@ -8032,19 +8908,19 @@ function scanForSecrets(content) {
 
 // src/server.ts
 import { execFile as execFile3 } from "child_process";
-import { createHash as createHash4 } from "crypto";
+import { createHash as createHash5 } from "crypto";
 import { watch as fsWatch } from "fs";
 import {
-  mkdir as mkdir5,
+  mkdir as mkdir6,
   open as fsOpen,
-  readdir as readdir11,
-  readFile as readFile19,
-  stat as stat10,
+  readdir as readdir12,
+  readFile as readFile22,
+  stat as stat11,
   unlink as unlink2,
-  writeFile as writeFile6
+  writeFile as writeFile7
 } from "fs/promises";
-import { homedir as homedir16 } from "os";
-import { basename as basename6, dirname as dirname5, join as join18, resolve as resolve2 } from "path";
+import { homedir as homedir19 } from "os";
+import { join as join22, resolve as resolve3 } from "path";
 import { promisify as promisify3 } from "util";
 import { serve } from "@hono/node-server";
 import chalk from "chalk";
@@ -8300,7 +9176,7 @@ async function executeFeedback(prompt, tool) {
   return runOpencode(prompt, tool.command);
 }
 function runClaude(prompt, cmd) {
-  return new Promise((resolve3, reject) => {
+  return new Promise((resolve4, reject) => {
     const proc = spawnTool(cmd, ["-p", "--output-format", "json"], {
       env: { ...process.env, NO_COLOR: "1" },
       timeout: 6e5,
@@ -8314,9 +9190,9 @@ function runClaude(prompt, cmd) {
       if (code === 0) {
         try {
           const parsed = JSON.parse(stdout);
-          resolve3(parsed.result || stdout);
+          resolve4(parsed.result || stdout);
         } catch {
-          resolve3(stdout);
+          resolve4(stdout);
         }
       } else {
         reject(new Error(`claude exited ${code}: ${stderr.slice(0, 500)}`));
@@ -8328,7 +9204,7 @@ function runClaude(prompt, cmd) {
   });
 }
 function runOpencode(prompt, cmd) {
-  return new Promise((resolve3, reject) => {
+  return new Promise((resolve4, reject) => {
     const proc = spawnTool(cmd, ["run"], {
       env: { ...process.env, NO_COLOR: "1", TERM: "dumb" },
       timeout: 6e5,
@@ -8340,7 +9216,7 @@ function runOpencode(prompt, cmd) {
     proc.stderr.on("data", (d) => stderr += d.toString());
     proc.on("close", (code) => {
       if (code === 0) {
-        resolve3(stripAnsi(stdout));
+        resolve4(stripAnsi(stdout));
       } else {
         reject(new Error(`opencode exited ${code}: ${stripAnsi(stderr).slice(0, 500)}`));
       }
@@ -8351,7 +9227,7 @@ function runOpencode(prompt, cmd) {
   });
 }
 function runAgent(prompt, cmd) {
-  return new Promise((resolve3, reject) => {
+  return new Promise((resolve4, reject) => {
     const proc = spawnTool(cmd, ["-p", "--output-format", "json", "--mode", "ask", "--trust"], {
       env: { ...process.env, NO_COLOR: "1" },
       timeout: 6e5,
@@ -8365,9 +9241,9 @@ function runAgent(prompt, cmd) {
       if (code === 0) {
         try {
           const parsed = JSON.parse(stdout);
-          resolve3(typeof parsed.result === "string" ? parsed.result : stdout);
+          resolve4(typeof parsed.result === "string" ? parsed.result : stdout);
         } catch {
-          resolve3(stdout);
+          resolve4(stdout);
         }
       } else {
         reject(new Error(`agent exited ${code}: ${stderr.slice(0, 500)}`));
@@ -8955,40 +9831,210 @@ async function generateToneAdjustment(session, tool, opts) {
   }
   if (allOverlays.length === 0 && totalSkipped === 0) return null;
   return {
-    overlays: allOverlays,
-    stats: { adjusted: allOverlays.length, skipped: totalSkipped }
+    overlays: allOverlays,
+    stats: { adjusted: allOverlays.length, skipped: totalSkipped }
+  };
+}
+function stripAnsi(str) {
+  return str.replace(/\x1B\[[0-9;]*[a-zA-Z]/g, "").replace(/\x1B\][^\x07]*\x07/g, "");
+}
+function locateCommand(cmd) {
+  return new Promise((resolve4, reject) => {
+    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) {
+        resolve4(null);
+        return;
+      }
+      const first = out.split(/\r?\n/).find((line) => line.trim());
+      resolve4(first ? first.trim() : null);
+    });
+    proc.on("error", reject);
+  });
+}
+
+// src/server.ts
+init_insights();
+init_overlays();
+init_cloud();
+
+// src/server-persistence.ts
+import { mkdir as mkdir5, readFile as readFile20, writeFile as writeFile6 } from "fs/promises";
+import { join as join20, resolve as resolve2 } from "path";
+async function loadAnnotations(baseDir, slug) {
+  const dirs = [join20(baseDir, slug), resolve2("./vibe-replay", slug)];
+  for (const dir of dirs) {
+    try {
+      const raw = await readFile20(join20(dir, "annotations.json"), "utf-8");
+      const anns = JSON.parse(raw);
+      if (Array.isArray(anns)) return anns;
+    } catch {
+    }
+  }
+  return [];
+}
+async function saveAnnotations(baseDir, slug, annotations) {
+  await mkdir5(join20(baseDir, slug), { recursive: true });
+  const annPath = join20(baseDir, slug, "annotations.json");
+  await writeFile6(annPath, JSON.stringify(annotations, null, 2), "utf-8");
+}
+async function saveOverlays(baseDir, slug, overlays) {
+  await mkdir5(join20(baseDir, slug), { recursive: true });
+  const overlayPath = join20(baseDir, slug, "overlays.json");
+  await writeFile6(overlayPath, JSON.stringify(overlays, null, 2), "utf-8");
+}
+
+// src/server-routes/session-assets.ts
+init_overlays();
+
+// src/server-core.ts
+import { homedir as homedir16 } from "os";
+import { basename as basename8 } from "path";
+function safeSlug(raw) {
+  if (!raw) return null;
+  const clean = basename8(raw);
+  if (!clean || clean !== raw || clean === "." || clean === "..") return null;
+  return clean;
+}
+function requireSlug(raw) {
+  const slug = safeSlug(raw);
+  if (!slug) return { error: "slug parameter is required" };
+  return { slug };
+}
+function getErrorMessage(err) {
+  if (err instanceof Error) return err.message;
+  if (typeof err === "string") return err;
+  return "Unknown error";
+}
+function normalizeProjectPath(project) {
+  const home = homedir16();
+  return project.startsWith(home) ? `~${project.slice(home.length)}` : project;
+}
+var MAX_INSIGHTS_SYNC_DAYS_PER_REQUEST = 90;
+function chunkItems(items, maxItems) {
+  if (maxItems <= 0) return [items.slice()];
+  const chunks = [];
+  for (let i = 0; i < items.length; i += maxItems) {
+    chunks.push(items.slice(i, i + maxItems));
+  }
+  return chunks;
+}
+function buildInsightsSyncBatches(days, existingDates, today, maxDaysPerBatch = MAX_INSIGHTS_SYNC_DAYS_PER_REQUEST) {
+  const existing = new Set(existingDates);
+  const pending = days.filter((day) => !existing.has(day.date) || day.date === today);
+  return chunkItems(pending, maxDaysPerBatch);
+}
+function toStringArray(value) {
+  if (value === void 0) return [];
+  if (!Array.isArray(value)) return null;
+  if (value.some((item) => typeof item !== "string")) return null;
+  return value;
+}
+function resolveGenerateInputs(body, discoveredSessions) {
+  const filePaths = toStringArray(body.filePaths);
+  if (!filePaths) {
+    return { ok: false, error: "filePaths must be an array of strings" };
+  }
+  const toolPaths = toStringArray(body.toolPaths);
+  if (!toolPaths) {
+    return { ok: false, error: "toolPaths must be an array of strings" };
+  }
+  const requestedSessionSlug = typeof body.sessionSlug === "string" ? safeSlug(body.sessionSlug) : null;
+  const requestedSessionProject = typeof body.sessionProject === "string" ? normalizeProjectPath(body.sessionProject) : void 0;
+  let sessionInfo;
+  if (requestedSessionSlug) {
+    const slugMatches = discoveredSessions.filter((s) => s.slug === requestedSessionSlug);
+    if (requestedSessionProject) {
+      sessionInfo = slugMatches.find(
+        (s) => normalizeProjectPath(s.project) === requestedSessionProject
+      );
+    }
+    sessionInfo = sessionInfo || slugMatches[0];
+  }
+  if (!sessionInfo && typeof body.sessionId === "string" && body.sessionId) {
+    sessionInfo = discoveredSessions.find((s) => s.sessionId === body.sessionId);
+  }
+  const fallbackFilePaths = sessionInfo?.filePaths || [];
+  const fallbackToolPaths = sessionInfo?.toolPaths || [];
+  const paths = [
+    ...filePaths.length > 0 ? filePaths : fallbackFilePaths,
+    ...toolPaths.length > 0 ? toolPaths : fallbackToolPaths
+  ];
+  const hasCursorSessionFallback = body.provider === "cursor" && Boolean(sessionInfo?.sessionId);
+  if (paths.length === 0 && !hasCursorSessionFallback) {
+    return {
+      ok: false,
+      error: "filePaths is required (or provide a resolvable Cursor sessionSlug for SQLite/global-state sessions)"
+    };
+  }
+  return {
+    ok: true,
+    value: {
+      paths,
+      sessionInfo
+    }
   };
 }
-function stripAnsi(str) {
-  return str.replace(/\x1B\[[0-9;]*[a-zA-Z]/g, "").replace(/\x1B\][^\x07]*\x07/g, "");
-}
-function locateCommand(cmd) {
-  return new Promise((resolve3, reject) => {
-    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(null);
-        return;
-      }
-      const first = out.split(/\r?\n/).find((line) => line.trim());
-      resolve3(first ? first.trim() : null);
-    });
-    proc.on("error", reject);
+
+// src/server-routes/session-assets.ts
+function registerSessionAssetRoutes(app, deps) {
+  const { baseDir } = deps;
+  app.get("/api/annotations", async (c) => {
+    const result = requireSlug(c.req.query("slug"));
+    if ("error" in result) return c.json({ error: result.error }, 400);
+    const anns = await loadAnnotations(baseDir, result.slug);
+    return c.json(anns);
+  });
+  app.post("/api/annotations", async (c) => {
+    const result = requireSlug(c.req.query("slug"));
+    if ("error" in result) return c.json({ error: result.error }, 400);
+    let body;
+    try {
+      body = await c.req.json();
+    } catch {
+      return c.json({ error: "invalid JSON body" }, 400);
+    }
+    try {
+      await saveAnnotations(baseDir, result.slug, body);
+    } catch (err) {
+      return c.json({ error: `Failed to save annotations: ${getErrorMessage(err)}` }, 500);
+    }
+    return c.json({ ok: true });
+  });
+  app.get("/api/overlays", async (c) => {
+    const result = requireSlug(c.req.query("slug"));
+    if ("error" in result) return c.json({ error: result.error }, 400);
+    const overlays = await loadOverlays(baseDir, result.slug);
+    return c.json(overlays);
+  });
+  app.post("/api/overlays", async (c) => {
+    const result = requireSlug(c.req.query("slug"));
+    if ("error" in result) return c.json({ error: result.error }, 400);
+    let body;
+    try {
+      body = await c.req.json();
+    } catch {
+      return c.json({ error: "invalid JSON body" }, 400);
+    }
+    if (!body || !Array.isArray(body.overlays)) {
+      return c.json({ error: "invalid overlays shape" }, 400);
+    }
+    try {
+      await saveOverlays(baseDir, result.slug, body);
+    } catch (err) {
+      return c.json({ error: `Failed to save overlays: ${getErrorMessage(err)}` }, 500);
+    }
+    return c.json({ ok: true });
   });
 }
 
-// src/server.ts
-init_insights();
-init_overlays();
-init_cloud();
-
 // src/scanner.ts
-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";
+import { readdir as readdir11, readFile as readFile21, stat as stat10 } from "fs/promises";
+import { homedir as homedir17 } from "os";
+import { join as join21 } from "path";
 
 // src/pricing.ts
 var MODEL_PRICING = {
@@ -9168,6 +10214,12 @@ async function scanSession(input) {
     } catch {
     }
   }
+  if (input.provider === "pi") {
+    try {
+      return await scanPiSession(input);
+    } catch {
+    }
+  }
   let startTime;
   let endTime;
   let model;
@@ -9193,7 +10245,7 @@ async function scanSession(input) {
   for (const filePath of input.filePaths) {
     let content;
     try {
-      content = await readFile18(filePath, "utf-8");
+      content = await readFile21(filePath, "utf-8");
     } catch {
       continue;
     }
@@ -9315,15 +10367,15 @@ async function scanSession(input) {
   if (input.filePaths.length > 0) {
     const mainFile = input.filePaths[0];
     const sessionDir = mainFile.replace(/\.jsonl$/, "");
-    const subagentsDir = join17(sessionDir, "subagents");
+    const subagentsDir = join21(sessionDir, "subagents");
     try {
-      const files = await readdir10(subagentsDir);
+      const files = await readdir11(subagentsDir);
       const jsonlFiles = files.filter((f) => f.endsWith(".jsonl"));
       subAgentCount = jsonlFiles.length;
       for (const saFile of jsonlFiles) {
         let saContent;
         try {
-          saContent = await readFile18(join17(subagentsDir, saFile), "utf-8");
+          saContent = await readFile21(join21(subagentsDir, saFile), "utf-8");
         } catch {
           continue;
         }
@@ -9444,6 +10496,25 @@ async function scanCodexSession(input) {
   const parsed = await parseCodexSession(input.filePaths, sessionInfo);
   return buildScanResultFromParsed(input, parsed);
 }
+async function scanPiSession(input) {
+  const sessionInfo = {
+    provider: "pi",
+    sessionId: input.sessionId,
+    slug: input.slug,
+    title: input.title,
+    project: input.project,
+    cwd: input.workspacePath || input.project,
+    version: "",
+    timestamp: input.timestamp || (/* @__PURE__ */ new Date()).toISOString(),
+    lineCount: 0,
+    fileSize: 0,
+    filePath: input.filePaths[0] || "",
+    filePaths: input.filePaths,
+    firstPrompt: input.firstPrompt || input.title || "(pi session)"
+  };
+  const parsed = await parsePiSession(input.filePaths, sessionInfo);
+  return buildScanResultFromParsed(input, parsed);
+}
 async function scanCursorSession(input) {
   if (input.deferRichCursorParse && input.hasSqlite) {
     return buildLightweightCursorScanResult(input);
@@ -9616,7 +10687,7 @@ async function getFileMeta(filePaths) {
   let maxMtime = 0;
   for (const fp of filePaths) {
     try {
-      const s = await stat9(fp);
+      const s = await stat10(fp);
       totalSize += s.size;
       if (s.mtimeMs > maxMtime) maxMtime = s.mtimeMs;
     } catch {
@@ -9969,33 +11040,33 @@ function buildAggregateDataQuality(scans) {
   }
   return notes.length > 0 ? { notes } : void 0;
 }
-var CLAUDE_DIR2 = join17(homedir14(), ".claude", "projects");
+var CLAUDE_DIR2 = join21(homedir17(), ".claude", "projects");
 function encodeProjectDir(project) {
   let resolved = project;
   if (resolved.startsWith("~/")) {
-    resolved = join17(homedir14(), resolved.slice(2));
+    resolved = join21(homedir17(), resolved.slice(2));
   } else if (resolved === "~") {
-    resolved = homedir14();
+    resolved = homedir17();
   }
   return resolved.replace(/\//g, "-");
 }
 async function readProjectMemory(project) {
   const encoded = encodeProjectDir(project);
-  const projectDir = join17(CLAUDE_DIR2, encoded);
-  const memoryDir = join17(projectDir, "memory");
+  const projectDir = join21(CLAUDE_DIR2, encoded);
+  const memoryDir = join21(projectDir, "memory");
   const memoryFiles = [];
   let claudeMd;
   try {
-    const content = await readFile18(join17(projectDir, "CLAUDE.md"), "utf-8");
+    const content = await readFile21(join21(projectDir, "CLAUDE.md"), "utf-8");
     if (content.trim()) claudeMd = content.slice(0, 5e3);
   } catch {
   }
   try {
-    const files = await readdir10(memoryDir);
+    const files = await readdir11(memoryDir);
     for (const file of files) {
       if (!file.endsWith(".md") || file === "MEMORY.md") continue;
       try {
-        const content = await readFile18(join17(memoryDir, file), "utf-8");
+        const content = await readFile21(join21(memoryDir, file), "utf-8");
         const fm = parseFrontmatter(content);
         memoryFiles.push({
           name: fm.name || file.replace(/\.md$/, ""),
@@ -10036,7 +11107,7 @@ function extractMetaText(content) {
 }
 
 // src/transform.ts
-import { homedir as homedir15 } from "os";
+import { homedir as homedir18 } from "os";
 
 // src/utils/tokenEstimate.ts
 function estimateTokens(s) {
@@ -10046,7 +11117,7 @@ function estimateTokens(s) {
 }
 
 // src/transform.ts
-var HOME = homedir15();
+var HOME = homedir18();
 function redactPath(s) {
   if (!HOME) return s;
   return s.replaceAll(HOME, "~");
@@ -10482,108 +11553,23 @@ function redactSecrets(s) {
 // src/server.ts
 init_utils();
 init_version();
-function safeSlug(raw) {
-  if (!raw) return null;
-  const clean = basename6(raw);
-  if (!clean || clean !== raw || clean === "." || clean === "..") return null;
-  return clean;
-}
-function requireSlug(raw) {
-  const slug = safeSlug(raw);
-  if (!slug) return { error: "slug parameter is required" };
-  return { slug };
-}
-function getErrorMessage(err) {
-  if (err instanceof Error) return err.message;
-  if (typeof err === "string") return err;
-  return "Unknown error";
-}
-function normalizeProjectPath(project) {
-  const home = homedir16();
-  return project.startsWith(home) ? `~${project.slice(home.length)}` : project;
-}
-var MAX_INSIGHTS_SYNC_DAYS_PER_REQUEST = 90;
-function chunkItems(items, maxItems) {
-  if (maxItems <= 0) return [items.slice()];
-  const chunks = [];
-  for (let i = 0; i < items.length; i += maxItems) {
-    chunks.push(items.slice(i, i + maxItems));
-  }
-  return chunks;
-}
-function buildInsightsSyncBatches(days, existingDates, today, maxDaysPerBatch = MAX_INSIGHTS_SYNC_DAYS_PER_REQUEST) {
-  const existing = new Set(existingDates);
-  const pending = days.filter((day) => !existing.has(day.date) || day.date === today);
-  return chunkItems(pending, maxDaysPerBatch);
-}
-function toStringArray(value) {
-  if (value === void 0) return [];
-  if (!Array.isArray(value)) return null;
-  if (value.some((item) => typeof item !== "string")) return null;
-  return value;
-}
-function resolveGenerateInputs(body, discoveredSessions) {
-  const filePaths = toStringArray(body.filePaths);
-  if (!filePaths) {
-    return { ok: false, error: "filePaths must be an array of strings" };
-  }
-  const toolPaths = toStringArray(body.toolPaths);
-  if (!toolPaths) {
-    return { ok: false, error: "toolPaths must be an array of strings" };
-  }
-  const requestedSessionSlug = typeof body.sessionSlug === "string" ? safeSlug(body.sessionSlug) : null;
-  const requestedSessionProject = typeof body.sessionProject === "string" ? normalizeProjectPath(body.sessionProject) : void 0;
-  let sessionInfo;
-  if (requestedSessionSlug) {
-    const slugMatches = discoveredSessions.filter((s) => s.slug === requestedSessionSlug);
-    if (requestedSessionProject) {
-      sessionInfo = slugMatches.find(
-        (s) => normalizeProjectPath(s.project) === requestedSessionProject
-      );
-    }
-    sessionInfo = sessionInfo || slugMatches[0];
-  }
-  if (!sessionInfo && typeof body.sessionId === "string" && body.sessionId) {
-    sessionInfo = discoveredSessions.find((s) => s.sessionId === body.sessionId);
-  }
-  const fallbackFilePaths = sessionInfo?.filePaths || [];
-  const fallbackToolPaths = sessionInfo?.toolPaths || [];
-  const paths = [
-    ...filePaths.length > 0 ? filePaths : fallbackFilePaths,
-    ...toolPaths.length > 0 ? toolPaths : fallbackToolPaths
-  ];
-  const hasCursorSessionFallback = body.provider === "cursor" && Boolean(sessionInfo?.sessionId);
-  if (paths.length === 0 && !hasCursorSessionFallback) {
-    return {
-      ok: false,
-      error: "filePaths is required (or provide a resolvable Cursor sessionSlug for SQLite/global-state sessions)"
-    };
-  }
-  return {
-    ok: true,
-    value: {
-      paths,
-      sessionInfo
-    }
-  };
-}
 var ARCHIVE_DIR = ".archive";
 async function getArchivedSlugs(baseDir) {
   try {
-    const entries = await readdir11(join18(baseDir, ARCHIVE_DIR));
+    const entries = await readdir12(join22(baseDir, ARCHIVE_DIR));
     return new Set(entries);
   } catch {
     return /* @__PURE__ */ new Set();
   }
 }
 async function archiveSlug(baseDir, slug) {
-  const dir = join18(baseDir, ARCHIVE_DIR);
-  await mkdir5(dir, { recursive: true });
-  await writeFile6(join18(dir, slug), "");
+  const dir = join22(baseDir, ARCHIVE_DIR);
+  await mkdir6(dir, { recursive: true });
+  await writeFile7(join22(dir, slug), "");
 }
 async function unarchiveSlug(baseDir, slug) {
   try {
-    await unlink2(join18(baseDir, ARCHIVE_DIR, slug));
+    await unlink2(join22(baseDir, ARCHIVE_DIR, slug));
   } catch {
   }
 }
@@ -10591,29 +11577,22 @@ async function scanSessionsFromDir(baseDir) {
   const results = [];
   let entries;
   try {
-    entries = await readdir11(baseDir);
+    entries = await readdir12(baseDir);
   } catch {
     return results;
   }
   for (const entry of entries) {
-    const replayPath = join18(baseDir, entry, "replay.json");
+    const replayPath = join22(baseDir, entry, "replay.json");
     try {
-      const raw = await readFile19(replayPath, "utf-8");
+      const raw = await readFile22(replayPath, "utf-8");
       const session = JSON.parse(raw);
-      const annotationsPath = join18(baseDir, entry, "annotations.json");
-      let annotationCount = 0;
-      try {
-        const annRaw = await readFile19(annotationsPath, "utf-8");
-        const anns = JSON.parse(annRaw);
-        annotationCount = Array.isArray(anns) ? anns.length : 0;
-      } catch {
-      }
+      const annotationCount = (await loadAnnotations(baseDir, entry)).length;
       let gist;
       try {
-        gist = await loadSavedGistInfo(join18(baseDir, entry));
+        gist = await loadSavedGistInfo(join22(baseDir, entry));
       } catch {
       }
-      const cloudInfo = await loadSavedCloudInfo(join18(baseDir, entry));
+      const cloudInfo = await loadSavedCloudInfo(join22(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;
@@ -10641,8 +11620,8 @@ async function scanSessionsFromDir(baseDir) {
           let outdated = false;
           if (gist?.contentHash) {
             try {
-              const content = await readFile19(replayPath, "utf-8");
-              const currentHash = createHash4("sha256").update(content).digest("hex").slice(0, 16);
+              const content = await readFile22(replayPath, "utf-8");
+              const currentHash = createHash5("sha256").update(content).digest("hex").slice(0, 16);
               outdated = currentHash !== gist?.contentHash;
             } catch {
             }
@@ -10668,7 +11647,7 @@ async function scanSessionsFromDir(baseDir) {
 }
 async function scanSessions(baseDir) {
   const dirs = [baseDir];
-  const cwdLocal = resolve2("./vibe-replay");
+  const cwdLocal = resolve3("./vibe-replay");
   if (cwdLocal !== baseDir) {
     dirs.push(cwdLocal);
   }
@@ -10687,25 +11666,19 @@ async function scanSessions(baseDir) {
   return allResults;
 }
 async function loadSessionFromDisk(baseDir, slug) {
-  let replayPath = join18(baseDir, slug, "replay.json");
+  let replayPath = join22(baseDir, slug, "replay.json");
   try {
-    await stat10(replayPath);
+    await stat11(replayPath);
   } catch {
-    const fallback = resolve2("./vibe-replay", slug, "replay.json");
-    await stat10(fallback);
+    const fallback = resolve3("./vibe-replay", slug, "replay.json");
+    await stat11(fallback);
     replayPath = fallback;
   }
-  const raw = await readFile19(replayPath, "utf-8");
+  const raw = await readFile22(replayPath, "utf-8");
   const session = JSON.parse(raw);
-  const sessionDir = dirname5(replayPath);
-  const annotationsPath = join18(sessionDir, "annotations.json");
-  try {
-    const annRaw = await readFile19(annotationsPath, "utf-8");
-    const anns = JSON.parse(annRaw);
-    if (Array.isArray(anns) && anns.length > 0) {
-      session.annotations = anns;
-    }
-  } catch {
+  const annotations = await loadAnnotations(baseDir, slug);
+  if (annotations.length > 0) {
+    session.annotations = annotations;
   }
   return session;
 }
@@ -10873,13 +11846,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 === "~" ? home : p.startsWith("~/") || p.startsWith("~\\") ? join18(home, p.slice(2)) : p;
+    const resolved = p === "~" ? home : p.startsWith("~/") || p.startsWith("~\\") ? join22(home, p.slice(2)) : p;
     try {
-      const s = await stat10(resolved);
+      const s = await stat11(resolved);
       projectExistsMap.set(p, s.isDirectory());
       if (s.isDirectory()) {
         try {
-          await stat10(join18(resolved, ".git"));
+          await stat11(join22(resolved, ".git"));
           projectIsGitMap.set(p, true);
         } catch {
           projectIsGitMap.set(p, false);
@@ -10959,10 +11932,10 @@ async function buildSourcesResult(merged, baseDir, home, previousSources = [], c
   });
 }
 async function readClaudeSessionState(sessionId) {
-  const sessionsDir = join18(homedir16(), ".claude", "sessions");
+  const sessionsDir = join22(homedir19(), ".claude", "sessions");
   let files;
   try {
-    files = await readdir11(sessionsDir);
+    files = await readdir12(sessionsDir);
   } catch {
     return "stopped";
   }
@@ -10970,7 +11943,7 @@ async function readClaudeSessionState(sessionId) {
     if (!file.endsWith(".json")) continue;
     let data;
     try {
-      const content = await readFile19(join18(sessionsDir, file), "utf-8");
+      const content = await readFile22(join22(sessionsDir, file), "utf-8");
       data = JSON.parse(content);
     } catch {
       continue;
@@ -11019,32 +11992,12 @@ function mergeSameSessions(sessions) {
   result.sort((a, b) => b.timestamp.localeCompare(a.timestamp));
   return result;
 }
-async function loadAnnotations(baseDir, slug) {
-  const dirs = [join18(baseDir, slug), resolve2("./vibe-replay", slug)];
-  for (const dir of dirs) {
-    try {
-      const raw = await readFile19(join18(dir, "annotations.json"), "utf-8");
-      const anns = JSON.parse(raw);
-      if (Array.isArray(anns)) return anns;
-    } catch {
-    }
-  }
-  return [];
-}
-async function saveAnnotations(baseDir, slug, annotations) {
-  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 = join18(baseDir, slug, "overlays.json");
-  await writeFile6(overlayPath, JSON.stringify(overlays, null, 2), "utf-8");
-}
 async function startServer(baseDir, opts) {
-  await mkdir5(baseDir, { recursive: true });
+  await mkdir6(baseDir, { recursive: true });
   const isDevMode = !!opts?.externalViewerUrl;
   const viewerHtml = isDevMode ? "" : await loadViewerHtml();
   const cleanupPeriodDays = await getClaudeCodeCleanupPeriod();
-  const cacheKeySuffix = createHash4("sha1").update(baseDir).digest("hex").slice(0, 12);
+  const cacheKeySuffix = createHash5("sha1").update(baseDir).digest("hex").slice(0, 12);
   const sourcesCacheKey = `dashboard-sources-v4-${cacheKeySuffix}`;
   const replaysCacheKey = `dashboard-replays-v1-${cacheKeySuffix}`;
   const scanResultsCacheKey = `dashboard-scan-results-v1-${cacheKeySuffix}`;
@@ -11384,7 +12337,7 @@ async function startServer(baseDir, opts) {
           allSessions.push(...sessions);
         }
         const merged = mergeSameSessions(allSessions);
-        const home = homedir16();
+        const home = homedir19();
         for (const s of merged) {
           if (s.project.startsWith(home)) {
             s.project = `~${s.project.slice(home.length)}`;
@@ -11498,7 +12451,7 @@ async function startServer(baseDir, opts) {
         await sendError(`Session not found: ${sessionId}`);
         return;
       }
-      const home = homedir16();
+      const home = homedir19();
       const projectFor = (info) => info.project.startsWith(home) ? `~${info.project.slice(home.length)}` : info.project;
       const watchers = [];
       const watchedPaths = /* @__PURE__ */ new Set();
@@ -11511,7 +12464,8 @@ async function startServer(baseDir, opts) {
       const isClaudeProvider = providerName === "claude-code";
       const isCursorProvider = providerName === "cursor";
       const isCodexProvider = providerName === "codex";
-      const isJsonlLiveProvider = isClaudeProvider || isCodexProvider;
+      const isPiProvider = providerName === "pi";
+      const isJsonlLiveProvider = isClaudeProvider || isCodexProvider || isPiProvider;
       let lastLiveState = isClaudeProvider ? "busy" : "unknown";
       let cursorDbWatchAttached = false;
       const cursorDbWatchedSessionIds = /* @__PURE__ */ new Set();
@@ -11565,13 +12519,13 @@ async function startServer(baseDir, opts) {
         const cached = jsonlTail.get(filePath);
         let size;
         try {
-          size = (await stat10(filePath)).size;
+          size = (await stat11(filePath)).size;
         } catch {
           jsonlTail.delete(filePath);
           return cached?.lines ?? [];
         }
         if (!cached || size < cached.offset) {
-          const content = await readFile19(filePath);
+          const content = await readFile22(filePath);
           const { lines, partial } = splitDecodedLines(content);
           jsonlTail.set(filePath, { offset: content.length, partial, lines });
           return lines;
@@ -11629,7 +12583,7 @@ async function startServer(baseDir, opts) {
               const lines = await tailReadJsonl(fp);
               allLines.push(...lines);
             }
-            parsed = isClaudeProvider ? await parseClaudeCodeLines(allLines, { subagentsSourcePath: paths[0] }) : parseCodexLines(allLines, info, paths);
+            parsed = isClaudeProvider ? await parseClaudeCodeLines(allLines, { subagentsSourcePath: paths[0] }) : isCodexProvider ? parseCodexLines(allLines, info, paths) : parsePiLines(allLines, { sourcePath: paths[0], sessionInfo: info });
           } else {
             parsed = await provider.parse(paths, info);
           }
@@ -11717,7 +12671,7 @@ async function startServer(baseDir, opts) {
         if (aborted) return;
         scheduleRebuild(0);
       }, RESOLVE_REFRESH_INTERVAL_MS);
-      await new Promise((resolve3) => {
+      await new Promise((resolve4) => {
         stream.onAbort(() => {
           aborted = true;
           if (pendingTimer) clearTimeout(pendingTimer);
@@ -11731,7 +12685,7 @@ async function startServer(baseDir, opts) {
             } catch {
             }
           }
-          resolve3();
+          resolve4();
         });
       });
     });
@@ -11763,8 +12717,8 @@ async function startServer(baseDir, opts) {
     try {
       const target = await loadSessionFromDisk(baseDir, slug);
       target.meta.title = normalizeTitle(body.title);
-      const targetDir = join18(baseDir, slug);
-      await writeFile6(join18(targetDir, "replay.json"), JSON.stringify(target), "utf-8");
+      const targetDir = join22(baseDir, slug);
+      await writeFile7(join22(targetDir, "replay.json"), JSON.stringify(target), "utf-8");
       await generateOutput(target, targetDir);
       const updatedReplays = await refreshReplaysCache();
       if (updatedReplays) await syncSourcesCacheWithReplays(updatedReplays);
@@ -11778,7 +12732,7 @@ async function startServer(baseDir, opts) {
     if (!slug) return c.json({ error: "invalid slug" }, 400);
     try {
       const { rm } = await import("fs/promises");
-      await rm(join18(baseDir, slug), { recursive: true });
+      await rm(join22(baseDir, slug), { recursive: true });
       const updatedReplays = await refreshReplaysCache();
       if (updatedReplays) await syncSourcesCacheWithReplays(updatedReplays);
       return c.json({ ok: true });
@@ -11820,7 +12774,7 @@ async function startServer(baseDir, opts) {
     }
     const cursorProvider2 = getProvider("cursor");
     if (!cursorProvider2) return c.json({ ok: false, message: "Cursor provider unavailable" }, 404);
-    const home = homedir16();
+    const home = homedir19();
     let cursorSessions = lastDiscoveredMergedSessions.filter(
       (session) => session.provider === "cursor"
     );
@@ -11851,12 +12805,12 @@ async function startServer(baseDir, opts) {
         allSessions.push(...sessions);
       }
       const merged = mergeSameSessions(allSessions);
-      lastDiscoveredMergedSessions = normalizeSessionProjectsForHome(merged, homedir16());
+      lastDiscoveredMergedSessions = normalizeSessionProjectsForHome(merged, homedir19());
       const previous = await readFileCache(sourcesCacheKey);
       const result = await buildSourcesResult(
         merged,
         baseDir,
-        homedir16(),
+        homedir19(),
         previous?.data || [],
         cleanupPeriodDays
       );
@@ -11886,12 +12840,12 @@ async function startServer(baseDir, opts) {
           }
         }
         const merged = mergeSameSessions(allSessions);
-        lastDiscoveredMergedSessions = normalizeSessionProjectsForHome(merged, homedir16());
+        lastDiscoveredMergedSessions = normalizeSessionProjectsForHome(merged, homedir19());
         const previous = await readFileCache(sourcesCacheKey);
         const result = await buildSourcesResult(
           merged,
           baseDir,
-          homedir16(),
+          homedir19(),
           previous?.data || [],
           cleanupPeriodDays
         );
@@ -11926,7 +12880,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 = homedir16();
+      const home = homedir19();
       const rawProject = body.sessionProject || parsed.cwd;
       const project = rawProject.startsWith(home) ? `~${rawProject.slice(home.length)}` : rawProject;
       const replay = transformToReplay(parsed, body.provider, project, {
@@ -11944,7 +12898,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 = join18(baseDir, slug);
+      const outputDir = join22(baseDir, slug);
       await generateOutput(replay, outputDir);
       const updatedReplays = await refreshReplaysCache();
       if (updatedReplays) await syncSourcesCacheWithReplays(updatedReplays);
@@ -11967,7 +12921,7 @@ async function startServer(baseDir, opts) {
   });
   app.post("/api/regenerate-all", async (c) => {
     const replaysDir = baseDir;
-    const { readdir: readdir12, readFile: readF } = await import("fs/promises");
+    const { readdir: readdir13, readFile: readF } = await import("fs/promises");
     const results = [];
     const allProviders = getAllProviders();
     const allSessions = [];
@@ -11980,14 +12934,14 @@ async function startServer(baseDir, opts) {
     }
     let entries;
     try {
-      entries = await readdir12(replaysDir);
+      entries = await readdir13(replaysDir);
     } catch {
       return c.json({ error: "No replays directory" }, 404);
     }
     for (const slug of entries) {
       if (slug.startsWith(".") || slug === "cache") continue;
       try {
-        const replayPath = join18(replaysDir, slug, "replay.json");
+        const replayPath = join22(replaysDir, slug, "replay.json");
         const raw = await readF(replayPath, "utf-8").catch(() => null);
         if (!raw) continue;
         const oldReplay = JSON.parse(raw);
@@ -12009,7 +12963,7 @@ async function startServer(baseDir, opts) {
         }
         const paths = [...sessionInfo.filePaths, ...sessionInfo.toolPaths || []];
         const parsed = await provider.parse(paths, sessionInfo);
-        const home = homedir16();
+        const home = homedir19();
         const project = sessionInfo.project.startsWith(home) ? `~${sessionInfo.project.slice(home.length)}` : sessionInfo.project;
         const replay = transformToReplay(parsed, providerName, project, {
           generator: {
@@ -12019,7 +12973,7 @@ async function startServer(baseDir, opts) {
           }
         });
         if (oldReplay.meta?.title) replay.meta.title = oldReplay.meta.title;
-        const outputDir = join18(replaysDir, slug);
+        const outputDir = join22(replaysDir, slug);
         await generateOutput(replay, outputDir);
         results.push({ slug, status: "regenerated", scenes: replay.scenes.length });
       } catch (err) {
@@ -12124,28 +13078,7 @@ async function startServer(baseDir, opts) {
     if (!memory) return c.json({ memoryFiles: [], claudeMd: null });
     return c.json(memory);
   });
-  app.get("/api/annotations", async (c) => {
-    const result = requireSlug(c.req.query("slug"));
-    if ("error" in result) return c.json({ error: result.error }, 400);
-    const anns = await loadAnnotations(baseDir, result.slug);
-    return c.json(anns);
-  });
-  app.post("/api/annotations", async (c) => {
-    const result = requireSlug(c.req.query("slug"));
-    if ("error" in result) return c.json({ error: result.error }, 400);
-    let body;
-    try {
-      body = await c.req.json();
-    } catch {
-      return c.json({ error: "invalid JSON body" }, 400);
-    }
-    try {
-      await saveAnnotations(baseDir, result.slug, body);
-    } catch (err) {
-      return c.json({ error: `Failed to save annotations: ${getErrorMessage(err)}` }, 500);
-    }
-    return c.json({ ok: true });
-  });
+  registerSessionAssetRoutes(app, { baseDir });
   app.get("/api/gh-status", (c) => {
     return c.json(checkPublishStatus());
   });
@@ -12526,7 +13459,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 = join18(baseDir, result.slug);
+    const targetDir = join22(baseDir, result.slug);
     const gist = await loadSavedGistInfo(targetDir);
     if (!gist) return c.json({ gist: null });
     return c.json({ gist });
@@ -12534,7 +13467,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 = join18(baseDir, result.slug, ".vibe-replay-gist.json");
+    const metaPath = join22(baseDir, result.slug, ".vibe-replay-gist.json");
     await unlink2(metaPath).catch(() => {
     });
     return c.json({ ok: true });
@@ -12542,7 +13475,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 = join18(baseDir, result.slug);
+    const targetDir = join22(baseDir, result.slug);
     const cloud = await loadSavedCloudInfo(targetDir);
     if (!cloud) return c.json({ cloud: null });
     return c.json({ cloud });
@@ -12550,11 +13483,11 @@ 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 = join18(baseDir, result.slug);
+    const targetDir = join22(baseDir, result.slug);
     const body = await c.req.json();
     if (!body.id || !body.url) return c.json({ error: "Missing id/url" }, 400);
-    const metaPath = join18(targetDir, ".vibe-replay-cloud.json");
-    await writeFile6(
+    const metaPath = join22(targetDir, ".vibe-replay-cloud.json");
+    await writeFile7(
       metaPath,
       JSON.stringify(
         {
@@ -12573,7 +13506,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 = join18(baseDir, result.slug, ".vibe-replay-cloud.json");
+    const metaPath = join22(baseDir, result.slug, ".vibe-replay-cloud.json");
     await unlink2(metaPath).catch(() => {
     });
     return c.json({ ok: true });
@@ -12581,14 +13514,14 @@ 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 = join18(baseDir, result.slug);
+    const targetDir = join22(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 = join18(targetDir, "replay.json");
-      const originalContent = await readFile19(replayPath, "utf-8");
-      await writeFile6(replayPath, JSON.stringify(targetSession), "utf-8");
+      const replayPath = join22(targetDir, "replay.json");
+      const originalContent = await readFile22(replayPath, "utf-8");
+      await writeFile7(replayPath, JSON.stringify(targetSession), "utf-8");
       try {
         const title = targetSession.meta.title || targetSession.meta.slug;
         const savedGist = await loadSavedGistInfo(targetDir);
@@ -12597,7 +13530,7 @@ async function startServer(baseDir, opts) {
         });
         return c.json(gistResult);
       } finally {
-        await writeFile6(replayPath, originalContent, "utf-8");
+        await writeFile7(replayPath, originalContent, "utf-8");
       }
     } catch (err) {
       return c.json({ error: getErrorMessage(err) }, 500);
@@ -12606,7 +13539,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 = join18(baseDir, result.slug);
+    const targetDir = join22(baseDir, result.slug);
     try {
       const body = await c.req.json().catch(() => ({}));
       const cloudResult = await publishCloudWithOverlays(targetDir, {
@@ -12620,18 +13553,18 @@ 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 = join18(baseDir, result.slug);
+    const targetDir = join22(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 = join18(targetDir, "replay.json");
-      const originalContent = await readFile19(replayPath, "utf-8");
+      const replayPath = join22(targetDir, "replay.json");
+      const originalContent = await readFile22(replayPath, "utf-8");
       try {
         const outputPath = await generateOutput(targetSession, targetDir);
         return c.json({ path: outputPath });
       } finally {
-        await writeFile6(replayPath, originalContent, "utf-8");
+        await writeFile7(replayPath, originalContent, "utf-8");
       }
     } catch (err) {
       return c.json({ error: getErrorMessage(err) }, 500);
@@ -12640,23 +13573,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 = join18(baseDir, result.slug);
+    const targetDir = join22(baseDir, result.slug);
     try {
-      const svgPath = join18(targetDir, "session-preview.svg");
-      const mdPath = join18(targetDir, "github-summary.md");
-      const gifPath = join18(targetDir, "session-preview.gif");
+      const svgPath = join22(targetDir, "session-preview.svg");
+      const mdPath = join22(targetDir, "github-summary.md");
+      const gifPath = join22(targetDir, "session-preview.gif");
       const [svgContent, markdown, gifBuf] = await Promise.all([
-        readFile19(svgPath, "utf-8").catch(() => null),
-        readFile19(mdPath, "utf-8").catch(() => null),
-        readFile19(gifPath).catch(() => null)
+        readFile22(svgPath, "utf-8").catch(() => null),
+        readFile22(mdPath, "utf-8").catch(() => null),
+        readFile22(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([
-        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)
+        stat11(gifPath).then((s) => s.mtime.toISOString()).catch(() => null),
+        stat11(svgPath).then((s) => s.mtime.toISOString()).catch(() => null),
+        stat11(mdPath).then((s) => s.mtime.toISOString()).catch(() => null)
       ]);
       return c.json({
         exists: true,
@@ -12678,7 +13611,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 = join18(baseDir, result.slug);
+    const targetDir = join22(baseDir, result.slug);
     try {
       const rawSession = await loadSessionFromDisk(baseDir, result.slug);
       const overlaysData = await loadOverlays(baseDir, result.slug);
@@ -12686,15 +13619,15 @@ async function startServer(baseDir, opts) {
       const gist = await loadSavedGistInfo(targetDir);
       const replayUrl = gist?.viewerUrl || void 0;
       const svgContent = generateGitHubSvg(targetSession, { replayUrl });
-      const svgFilePath = join18(targetDir, "session-preview.svg");
-      await writeFile6(svgFilePath, svgContent, "utf-8");
+      const svgFilePath = join22(targetDir, "session-preview.svg");
+      await writeFile7(svgFilePath, svgContent, "utf-8");
       let gifContent = null;
       let gifFilePath = null;
       let gifWarning;
       try {
         const gifBuffer = await generateGitHubGif(targetSession, { replayUrl });
-        gifFilePath = join18(targetDir, "session-preview.gif");
-        await writeFile6(gifFilePath, gifBuffer);
+        gifFilePath = join22(targetDir, "session-preview.gif");
+        await writeFile7(gifFilePath, gifBuffer);
         gifContent = gifBuffer.toString("base64");
       } catch (err) {
         gifWarning = `GIF generation failed: ${err instanceof Error ? err.message : String(err)}`;
@@ -12704,8 +13637,8 @@ async function startServer(baseDir, opts) {
         svgPath: "./session-preview.svg",
         gifPath: gifContent ? "./session-preview.gif" : void 0
       });
-      const mdFilePath = join18(targetDir, "github-summary.md");
-      await writeFile6(mdFilePath, markdown, "utf-8");
+      const mdFilePath = join22(targetDir, "github-summary.md");
+      await writeFile7(mdFilePath, markdown, "utf-8");
       const findings = scanForSecrets(JSON.stringify(targetSession));
       const warnings = findings.map((f) => `[${f.rule}] ${f.match}`);
       const now = (/* @__PURE__ */ new Date()).toISOString();
@@ -12785,31 +13718,6 @@ async function startServer(baseDir, opts) {
       return c.json({ error: getErrorMessage(err) }, 500);
     }
   });
-  app.get("/api/overlays", async (c) => {
-    const result = requireSlug(c.req.query("slug"));
-    if ("error" in result) return c.json({ error: result.error }, 400);
-    const overlays = await loadOverlays(baseDir, result.slug);
-    return c.json(overlays);
-  });
-  app.post("/api/overlays", async (c) => {
-    const result = requireSlug(c.req.query("slug"));
-    if ("error" in result) return c.json({ error: result.error }, 400);
-    let body;
-    try {
-      body = await c.req.json();
-    } catch {
-      return c.json({ error: "invalid JSON body" }, 400);
-    }
-    if (!body || !Array.isArray(body.overlays)) {
-      return c.json({ error: "invalid overlays shape" }, 400);
-    }
-    try {
-      await saveOverlays(baseDir, result.slug, body);
-    } catch (err) {
-      return c.json({ error: `Failed to save overlays: ${getErrorMessage(err)}` }, 500);
-    }
-    return c.json({ ok: true });
-  });
   function fixOriginalValues(overlays, originalSession) {
     for (const overlay of overlays) {
       const scene = originalSession.scenes[overlay.sceneIndex];
@@ -12937,10 +13845,10 @@ async function startServer(baseDir, opts) {
       }
     }
   );
-  await new Promise((resolve3) => {
+  await new Promise((resolve4) => {
     process.on("SIGINT", () => {
       console.log(chalk.dim("\n  Server stopped.\n"));
-      resolve3();
+      resolve4();
       process.exit(0);
     });
   });
@@ -13299,21 +14207,21 @@ function formatDuration2(ms) {
 init_utils();
 init_version();
 async function runGitHubExport(replay, outputDir) {
-  const { join: join19 } = await import("path");
-  const { writeFile: writeFile7 } = await import("fs/promises");
+  const { join: join23 } = await import("path");
+  const { writeFile: writeFile8 } = 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 = join19(outputDir, "session-preview.svg");
-  await writeFile7(svgFilePath, svgContent, "utf-8");
+  const svgFilePath = join23(outputDir, "session-preview.svg");
+  await writeFile8(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 = join19(outputDir, "session-preview.gif");
-    await writeFile7(gifFilePath, gifBuffer);
+    const gifFilePath = join23(outputDir, "session-preview.gif");
+    await writeFile8(gifFilePath, gifBuffer);
     const gifSizeKB = Math.round(gifBuffer.length / 1024);
     gifSpinner.succeed(`GIF: ${gifFilePath} (${gifSizeKB} KB)`);
     gifGenerated = true;
@@ -13326,8 +14234,8 @@ async function runGitHubExport(replay, outputDir) {
     svgPath: "./session-preview.svg",
     gifPath: gifGenerated ? "./session-preview.gif" : void 0
   });
-  const mdFilePath = join19(outputDir, "github-summary.md");
-  await writeFile7(mdFilePath, markdown, "utf-8");
+  const mdFilePath = join23(outputDir, "github-summary.md");
+  await writeFile8(mdFilePath, markdown, "utf-8");
   mdSpinner.succeed(`Markdown: ${mdFilePath}`);
   const redactionsSpinner = ora("Generating redaction report...").start();
   const alreadyRedactedCount = (markdown.match(/\[REDACTED\]/g) || []).length;
@@ -13342,8 +14250,8 @@ async function runGitHubExport(replay, outputDir) {
       "leftoverFindings: regex matches in the final markdown \u2014 review these before sharing."
     ]
   };
-  const redactionsPath = join19(outputDir, "redactions.json");
-  await writeFile7(redactionsPath, `${JSON.stringify(redactionsReport, null, 2)}
+  const redactionsPath = join23(outputDir, "redactions.json");
+  await writeFile8(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)");
   redactionsSpinner.succeed(`Redactions: ${redactionsPath} ${leftoverNote}`);
@@ -13351,7 +14259,7 @@ async function runGitHubExport(replay, outputDir) {
     markdown,
     outputDir,
     svgPath: svgFilePath,
-    gifPath: gifGenerated ? join19(outputDir, "session-preview.gif") : void 0,
+    gifPath: gifGenerated ? join23(outputDir, "session-preview.gif") : void 0,
     mdPath: mdFilePath,
     redactionsPath
   };
@@ -13429,8 +14337,8 @@ program.name("vibe-replay").description("AI Coding Session Replay & Sharing Tool
   console.log(chalk2.bold.cyan("\n  vibe-replay") + chalk2.dim(` v${CLI_VERSION}
 `));
   const { join: pathJoin } = await import("path");
-  const { homedir: homedir17 } = await import("os");
-  const replayBaseDir = pathJoin(homedir17(), ".vibe-replay");
+  const { homedir: homedir20 } = await import("os");
+  const replayBaseDir = pathJoin(homedir20(), ".vibe-replay");
   void discoverAllSessions().then(async (sessions) => {
     await writeFileCache(SESSION_DISCOVERY_CACHE_KEY, sessions);
   }).catch(() => {
@@ -13472,14 +14380,14 @@ program.name("vibe-replay").description("AI Coding Session Replay & Sharing Tool
       return;
     }
     if (topChoice === "replays") {
-      const { readdir: readdir12, readFile: readFile20 } = await import("fs/promises");
+      const { readdir: readdir13, readFile: readFile23 } = await import("fs/promises");
       const replayEntries = [];
       try {
-        const entries = await readdir12(replayBaseDir);
+        const entries = await readdir13(replayBaseDir);
         for (const slug2 of entries) {
           if (slug2.startsWith(".") || slug2 === "cache") continue;
           try {
-            const raw = await readFile20(pathJoin(replayBaseDir, slug2, "replay.json"), "utf-8");
+            const raw = await readFile23(pathJoin(replayBaseDir, slug2, "replay.json"), "utf-8");
             const replay2 = JSON.parse(raw);
             const title = replay2.meta?.title || slug2;
             const provider2 = replay2.meta?.provider || "";
@@ -13492,7 +14400,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") : provider2 === "codex" ? chalk2.hex("#B392F0")("codex") : 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") : provider2 === "pi" ? chalk2.hex("#14B8A6")("pi") : chalk2.yellow(provider2);
             replayEntries.push({
               name: `${providerBadge} ${chalk2.dim(`[${time}]`)} ${chalk2.white(title)} ${chalk2.dim(`(${scenes} scenes)`)}`,
               value: slug2,
@@ -13665,10 +14573,10 @@ program.name("vibe-replay").description("AI Coding Session Replay & Sharing Tool
       replay.meta.title = normalizedUserTitle;
     }
   }
-  const { join: join19 } = await import("path");
+  const { join: join23 } = 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 = join19(home, ".vibe-replay", slug);
+  const outputDir = join23(home, ".vibe-replay", slug);
   const genSpinner = ora("Generating replay...").start();
   const outputPath = await generateOutput(replay, outputDir);
   const { stat: fsStat } = await import("fs/promises");
@@ -13760,7 +14668,7 @@ ${chalk2.bold.green("  Done!")}
   if (target === "local") {
     await publishLocal(outputPath);
   } else if (target === "editor") {
-    await startServer(join19(home, ".vibe-replay"), {
+    await startServer(join23(home, ".vibe-replay"), {
       openSlug: slug,
       ...getDevViewerOpts()
     });
@@ -13864,13 +14772,17 @@ ${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) => {
+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-filter <name>",
+  "Filter by provider (claude-code, cursor, codex, pi, ...)"
+).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, command) => {
   const discoverSpinner = opts.json ? void 0 : ora("Discovering local sessions...").start();
   try {
+    const queryOptions = normalizeSessionsCommandOptions(opts, command);
     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);
+    const matches = await queryLocalSessions(sessions, queryOptions);
     scanSpinner?.succeed(`Prepared ${matches.length} session result(s)`);
     if (opts.json) {
       console.log(JSON.stringify({ sessions: matches }, null, 2));
@@ -14019,9 +14931,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: readFile20, readdir: readdir12 } = await import("fs/promises");
-  const { join: join19, dirname: dirname6, resolve: resolve3 } = await import("path");
-  const { homedir: homedir17 } = await import("os");
+  const { readFile: readFile23, readdir: readdir13 } = await import("fs/promises");
+  const { join: join23, dirname: dirname5, resolve: resolve4 } = await import("path");
+  const { homedir: homedir20 } = await import("os");
   if (opts.apiUrl) {
     process.env.VIBE_REPLAY_API_URL = opts.apiUrl.replace(/\/$/, "");
   }
@@ -14040,7 +14952,7 @@ program.command("share").description("Share an existing replay via cloud (unlist
   }
   let outputDir;
   if (pathArg) {
-    const abs = resolve3(pathArg);
+    const abs = resolve4(pathArg);
     if (!existsSync2(abs)) {
       console.error(chalk2.red(`
   \u2717 Path not found: ${abs}
@@ -14048,16 +14960,16 @@ program.command("share").description("Share an existing replay via cloud (unlist
       process.exit(1);
     }
     const s = statSync(abs);
-    outputDir = s.isDirectory() ? abs : dirname6(abs);
+    outputDir = s.isDirectory() ? abs : dirname5(abs);
   } else {
-    const replayBaseDir = join19(homedir17(), ".vibe-replay");
-    const entries = await readdir12(replayBaseDir).catch(() => []);
+    const replayBaseDir = join23(homedir20(), ".vibe-replay");
+    const entries = await readdir13(replayBaseDir).catch(() => []);
     const replays = [];
     for (const slug of entries) {
       if (slug.startsWith(".") || slug === "cache") continue;
-      const jsonPath2 = join19(replayBaseDir, slug, "replay.json");
+      const jsonPath2 = join23(replayBaseDir, slug, "replay.json");
       try {
-        const raw = await readFile20(jsonPath2, "utf-8");
+        const raw = await readFile23(jsonPath2, "utf-8");
         const replay = JSON.parse(raw);
         const title = replay.meta?.title || slug;
         const startTime = replay.meta?.startTime || "";
@@ -14070,7 +14982,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: join19(replayBaseDir, slug),
+          value: join23(replayBaseDir, slug),
           time: startTime
         });
       } catch {
@@ -14086,7 +14998,7 @@ program.command("share").description("Share an existing replay via cloud (unlist
       choices: replays
     });
   }
-  const jsonPath = join19(outputDir, "replay.json");
+  const jsonPath = join23(outputDir, "replay.json");
   if (!existsSync2(jsonPath)) {
     console.error(chalk2.red(`
   \u2717 No replay.json found in ${outputDir}
@@ -14109,15 +15021,15 @@ 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) => {
+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, command) => {
   const { join: pathJoin } = await import("path");
-  const { homedir: homedir17 } = await import("os");
-  const replayBaseDir = pathJoin(homedir17(), ".vibe-replay");
+  const { homedir: homedir20 } = await import("os");
+  const replayBaseDir = pathJoin(homedir20(), ".vibe-replay");
   console.log(chalk2.bold.cyan("\n  vibe-replay live") + chalk2.dim(` v${CLI_VERSION}
 `));
   let target = null;
   if (opts.session) {
-    const providerHint = opts.provider;
+    const providerHint = normalizeCommandProviderOption(opts.provider, command);
     const providers2 = providerHint ? [getProvider(providerHint)].filter((p) => !!p) : getAllProviders();
     for (const provider of providers2) {
       try {
@@ -14139,7 +15051,8 @@ program.command("live").description("Watch a running AI coding session live in t
     const ora2 = (await import("ora")).default;
     const spinner = ora2("Finding the most recent session...").start();
     const all = [];
-    const providers2 = opts.provider ? [getProvider(opts.provider)].filter((p) => !!p) : getAllProviders();
+    const providerHint = normalizeCommandProviderOption(opts.provider, command);
+    const providers2 = providerHint ? [getProvider(providerHint)].filter((p) => !!p) : getAllProviders();
     for (const provider of providers2) {
       try {
         const sessions = await provider.discover();
@@ -14175,6 +15088,24 @@ program.command("login", { hidden: true }).description("Log in to vibe-replay (a
   await authCmd.commands.find((c) => c.name() === "login")?.parseAsync(["login", ...process.argv.slice(3)], { from: "user" });
 });
 program.parse();
+function normalizeSessionsCommandOptions(opts, command) {
+  const provider = opts.providerFilter || normalizeCommandProviderOption(opts.provider, command);
+  return {
+    ...opts,
+    ...provider ? { provider } : {}
+  };
+}
+function normalizeCommandProviderOption(provider, command) {
+  if (command.getOptionValueSource("provider") === "cli") {
+    return provider;
+  }
+  const parent = command.parent;
+  if (parent?.getOptionValueSource("provider") === "cli") {
+    const parentProvider = parent.opts().provider;
+    return parentProvider;
+  }
+  return void 0;
+}
 function formatSessionChoices(sessions, cleanupPeriodDays) {
   const merged = mergeSameSessions2(sessions);
   const byProject = /* @__PURE__ */ new Map();
@@ -14200,7 +15131,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") : s.provider === "codex" ? chalk2.hex("#B392F0")("codex") : 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") : s.provider === "pi" ? chalk2.hex("#14B8A6")("pi") : 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") : "";