codesesh 0.5.0 → 0.6.1

package/dist/{chunk-FZNZAMTZ.js → chunk-SQYHWMQV.js}

@@ -11,38 +11,38 @@ import { basename } from "path";
 import { existsSync as existsSync2, mkdirSync, readFileSync as readFileSync2, writeFileSync } from "fs";
 import { homedir as homedir2 } from "os";
 import { join as join2 } from "path";
-import { existsSync as existsSync4, statSync as statSync2 } from "fs";
-import { join as join4 } from "path";
-import { mkdirSync as mkdirSync2 } from "fs";
-import { dirname as dirname2 } from "path";
+import { existsSync as existsSync5, statSync as statSync2 } from "fs";
+import { join as join5 } from "path";
+import { existsSync as existsSync4, mkdirSync as mkdirSync2 } from "fs";
+import { basename as basename3, dirname as dirname2, join as join4 } from "path";
 import { createRequire } from "module";
 import { createHash } from "crypto";
-import { existsSync as existsSync5, readFileSync as readFileSync4, readdirSync as readdirSync2, statSync as statSync3 } from "fs";
-import { join as join5, basename as basename3, dirname as dirname3 } from "path";
+import { existsSync as existsSync6, readFileSync as readFileSync4, readdirSync as readdirSync2, statSync as statSync3 } from "fs";
+import { join as join6, basename as basename4, dirname as dirname3 } from "path";
 import {
   closeSync,
-  existsSync as existsSync6,
+  existsSync as existsSync7,
   openSync,
   readFileSync as readFileSync5,
   readSync,
   readdirSync as readdirSync3,
   statSync as statSync4
 } from "fs";
-import { join as join6, basename as basename4 } from "path";
-import { existsSync as existsSync7, readdirSync as readdirSync4, readFileSync as readFileSync6, statSync as statSync5 } from "fs";
-import { join as join7, normalize } from "path";
+import { join as join7, basename as basename5 } from "path";
+import { existsSync as existsSync8, readdirSync as readdirSync4, readFileSync as readFileSync6, statSync as statSync5 } from "fs";
+import { join as join8, normalize } from "path";
 import { resolve, sep } from "path";
 import { availableParallelism } from "os";
 import { Worker } from "worker_threads";
-import { existsSync as existsSync8, readFileSync as readFileSync7 } from "fs";
+import { existsSync as existsSync9, readFileSync as readFileSync7 } from "fs";
 import { spawnSync } from "child_process";
 import { homedir as homedir3 } from "os";
 import * as path from "path";
-import { existsSync as existsSync9, rmSync, unlinkSync } from "fs";
-import { join as join8 } from "path";
+import { existsSync as existsSync10, rmSync, unlinkSync } from "fs";
+import { join as join9 } from "path";
 import { homedir as homedir4 } from "os";
 import { homedir as homedir5, platform as platform2 } from "os";
-import { join as join9 } from "path";
+import { join as join10 } from "path";
 var registrations = [];
 function registerAgent(reg) {
   registrations.push(reg);
@@ -64,6 +64,18 @@ function getAgentInfoMap(sessionsByAgent) {
 function getAgentByName(name) {
   return registrations.find((r) => r.name === name);
 }
+function parsedSession(session) {
+  return { status: "parsed", data: session };
+}
+function skippedSession(reason) {
+  return { status: "skipped", reason };
+}
+function filteredSession(reason) {
+  return { status: "filtered", reason };
+}
+function getParsedSession(result) {
+  return result.status === "parsed" ? result.data : null;
+}
 function matchesScanWindow(activityTime, options) {
   if (options?.from != null && activityTime < options.from) return false;
   if (options?.to != null && activityTime > options.to) return false;
@@ -134,10 +146,68 @@ function readJsonlFile(filePath) {
   const content = readFileSync(filePath, "utf-8");
   return parseJsonlLines(content);
 }
+var INTERNAL_TAGS = [
+  "command-message",
+  "command-name",
+  "local-command-stdout",
+  "system-reminder"
+];
+var INTERNAL_EVENT_TYPES = /* @__PURE__ */ new Set([
+  "progress",
+  "file history snapshot",
+  "file-history snapshot",
+  "file_history snapshot",
+  "queue operation",
+  "queue-operation",
+  "queue_operation",
+  "last prompt",
+  "last-prompt",
+  "last_prompt"
+]);
+function blockTagPattern(tag) {
+  return new RegExp(`<${tag}\\b[^>]*>[\\s\\S]*?<\\/${tag}>`, "gi");
+}
+function blockTagLinePattern(tag) {
+  return new RegExp(
+    `(^|\\r?\\n)[ \\t]*<${tag}\\b[^>]*>[\\s\\S]*?<\\/${tag}>[ \\t]*(?:\\r?\\n|$)`,
+    "gi"
+  );
+}
+function openBlockTagPattern(tag) {
+  return new RegExp(`\\n*<${tag}\\b[^>]*>[\\s\\S]*$`, "gi");
+}
+function looseTagPattern(tag) {
+  return new RegExp(`<\\/?${tag}\\b[^>]*>`, "gi");
+}
+function isInternalEventType(value) {
+  if (typeof value !== "string") return false;
+  const normalized = value.trim().toLowerCase().replace(/[_-]+/g, " ");
+  return INTERNAL_EVENT_TYPES.has(normalized);
+}
+function cleanDisplayText(text) {
+  let cleaned = text;
+  for (const tag of INTERNAL_TAGS) {
+    cleaned = cleaned.replace(blockTagLinePattern(tag), "$1");
+    cleaned = cleaned.replace(blockTagPattern(tag), "");
+    cleaned = cleaned.replace(openBlockTagPattern(tag), "");
+  }
+  for (const tag of INTERNAL_TAGS) {
+    cleaned = cleaned.replace(looseTagPattern(tag), "");
+  }
+  cleaned = cleaned.replace(/[ \t]+(?=\r?\n|$)/g, "").replace(/(?:\r?\n)+$/g, "");
+  return cleaned.trim() ? cleaned : null;
+}
+function firstVisibleLine(text) {
+  const cleaned = cleanDisplayText(text);
+  if (!cleaned) return null;
+  return cleaned.split("\n").find((line) => line.trim())?.trim() ?? null;
+}
 var TITLE_MAX_LENGTH = 100;
 var UNTITLED_SESSION = "Untitled Session";
 function normalizeTitleText(text) {
-  const cleaned = text.replace(/\s+/g, " ").trim();
+  const visible = cleanDisplayText(text)?.split("\n").find((line) => line.trim())?.trim() ?? null;
+  if (!visible) return null;
+  const cleaned = visible.replace(/\s+/g, " ").trim();
   if (!cleaned) return null;
   return cleaned.slice(0, TITLE_MAX_LENGTH);
 }
@@ -157,6 +227,83 @@ function resolveSessionTitle(explicit, message, directory) {
   }
   return UNTITLED_SESSION;
 }
+function parsed(data) {
+  return { status: "parsed", data };
+}
+function skipped(reason) {
+  return reason ? { status: "skipped", reason } : { status: "skipped" };
+}
+function filtered(reason) {
+  return reason ? { status: "filtered", reason } : { status: "filtered" };
+}
+function isInternalEventType2(value) {
+  return isInternalEventType(value);
+}
+function cleanInternalText(text) {
+  return cleanDisplayText(text) ?? "";
+}
+function cleanUnknown(value) {
+  if (typeof value === "string") return cleanInternalText(value);
+  if (Array.isArray(value)) return value.map(cleanUnknown);
+  if (!value || typeof value !== "object") return value;
+  const cleaned = {};
+  for (const [key, child] of Object.entries(value)) {
+    cleaned[key] = cleanUnknown(child);
+  }
+  return cleaned;
+}
+function cleanMessagePart(part) {
+  const next = { ...part };
+  if (typeof next.text === "string") {
+    next.text = cleanInternalText(next.text);
+    if (!next.text && (next.type === "text" || next.type === "reasoning" || next.type === "plan")) {
+      return null;
+    }
+  }
+  if (typeof next.title === "string") {
+    const title = cleanInternalText(next.title);
+    if (title) next.title = title;
+    else delete next.title;
+  }
+  if (next.input !== void 0) {
+    next.input = cleanUnknown(next.input);
+  }
+  if (next.output !== void 0) {
+    next.output = cleanUnknown(next.output);
+  }
+  if (next.state !== void 0) {
+    next.state = cleanUnknown(next.state);
+  }
+  return next;
+}
+function cleanMessageParts(parts) {
+  return parts.flatMap((part) => {
+    const cleaned = cleanMessagePart(part);
+    return cleaned ? [cleaned] : [];
+  });
+}
+function cleanParsedMessage(message) {
+  const parts = cleanMessageParts(message.parts);
+  if (parts.length === 0) return null;
+  return { ...message, parts };
+}
+function cleanParsedMessages(messages) {
+  return messages.flatMap((message) => {
+    const cleaned = cleanParsedMessage(message);
+    return cleaned ? [cleaned] : [];
+  });
+}
+function firstUserMessageTitle(messages) {
+  for (const message of messages) {
+    if (message.role !== "user") continue;
+    for (const part of message.parts) {
+      if (part.type !== "text" || typeof part.text !== "string") continue;
+      const title = normalizeTitleText(cleanInternalText(part.text));
+      if (title) return title;
+    }
+  }
+  return null;
+}
 var PerfTracer = class {
   rootMarkers = [];
   activeStack = [];
@@ -564,10 +711,6 @@ function parseTimestampMs(data) {
     return 0;
   }
 }
-function normalizeTitleText2(text) {
-  const line = text.split("\n").find((l) => l.trim());
-  return line?.trim().slice(0, 80) || "";
-}
 var ClaudeCodeAgent = class extends BaseAgent {
   name = "claudecode";
   displayName = "Claude Code";
@@ -608,7 +751,7 @@ var ClaudeCodeAgent = class extends BaseAgent {
         try {
           if (!matchesScanWindow(statSync(file).mtimeMs, options)) continue;
           const parseMarker = perf.start(`parseSessionHead:${basename2(file)}`);
-          const head = this.parseSessionHead(file, projectDir);
+          const head = getParsedSession(this.parseSessionHeadResult(file, projectDir));
           perf.end(parseMarker);
           if (head) {
             heads.push(head);
@@ -671,7 +814,8 @@ var ClaudeCodeAgent = class extends BaseAgent {
       } catch {
       }
     }
-    for (const msg of messages) {
+    const cleanedMessages = cleanParsedMessages(messages);
+    for (const msg of cleanedMessages) {
       totalCost += msg.cost ?? 0;
       totalInputTokens += msg.tokens?.input ?? 0;
       totalOutputTokens += msg.tokens?.output ?? 0;
@@ -687,7 +831,7 @@ var ClaudeCodeAgent = class extends BaseAgent {
       time_created: meta.createdAt,
       time_updated: meta.updatedAt,
       stats: {
-        message_count: messages.length,
+        message_count: cleanedMessages.length,
         total_input_tokens: totalInputTokens,
         total_output_tokens: totalOutputTokens,
         total_cost: totalCost,
@@ -695,7 +839,7 @@ var ClaudeCodeAgent = class extends BaseAgent {
         total_cache_read_tokens: totalCacheRead,
         total_cache_create_tokens: totalCacheCreate
       },
-      messages
+      messages: cleanedMessages
     };
   }
   /**
@@ -762,7 +906,7 @@ var ClaudeCodeAgent = class extends BaseAgent {
         try {
           const sessionId = basename2(file, ".jsonl");
           if (changedIds.includes(sessionId)) {
-            const head = this.parseSessionHead(file, projectDir);
+            const head = getParsedSession(this.parseSessionHeadResult(file, projectDir));
             if (head) {
               sessionMap.set(head.id, head);
               this.sessionMetaMap.set(head.id, {
@@ -786,7 +930,7 @@ var ClaudeCodeAgent = class extends BaseAgent {
         try {
           const sessionId = basename2(file, ".jsonl");
           if (!sessionMap.has(sessionId)) {
-            const head = this.parseSessionHead(file, projectDir);
+            const head = getParsedSession(this.parseSessionHeadResult(file, projectDir));
             if (head) {
               sessionMap.set(head.id, head);
               this.sessionMetaMap.set(head.id, {
@@ -847,15 +991,18 @@ var ClaudeCodeAgent = class extends BaseAgent {
     return map;
   }
   parseSessionHead(filePath, projectDir) {
+    return getParsedSession(this.parseSessionHeadResult(filePath, projectDir));
+  }
+  parseSessionHeadResult(filePath, projectDir) {
     const content = readFileSync3(filePath, "utf-8");
     const lines = content.split("\n").filter((l) => l.trim());
-    if (lines.length === 0) return null;
+    if (lines.length === 0) return skippedSession("empty file");
     const sessionId = basename2(filePath, ".jsonl");
     let firstRecord;
     try {
       firstRecord = JSON.parse(lines[0]);
     } catch {
-      return null;
+      return skippedSession("malformed first record");
     }
     const createdAt = parseTimestampMs(firstRecord) || statSync(filePath).mtimeMs;
     const index = this.loadSessionsIndex(projectDir);
@@ -874,6 +1021,7 @@ var ClaudeCodeAgent = class extends BaseAgent {
     for (const line of lines) {
       try {
         const data = JSON.parse(line);
+        if (isInternalEventType(data["type"])) continue;
         const ts = parseTimestampMs(data);
         if (ts > updatedAt) updatedAt = ts;
         if (!cwd && data["cwd"] && typeof data["cwd"] === "string") {
@@ -924,7 +1072,8 @@ var ClaudeCodeAgent = class extends BaseAgent {
     const directoryTitle = basenameTitle(directory) || basenameTitle(projectDir);
     const title = resolveSessionTitle(explicitTitle, messageTitle, directoryTitle);
     const hasModelUsage = Object.keys(modelUsageMap).length > 0;
-    return {
+    if (messageCount === 0) return filteredSession("no visible messages");
+    return parsedSession({
       id: sessionId,
       slug: `claudecode/${sessionId}`,
       title,
@@ -941,23 +1090,26 @@ var ClaudeCodeAgent = class extends BaseAgent {
         total_cache_create_tokens: totalCacheCreateTokens
       },
       model_usage: hasModelUsage ? modelUsageMap : void 0
-    };
+    });
   }
   extractTitle(lines) {
     for (const line of lines.slice(0, 20)) {
       try {
         const data = JSON.parse(line);
+        if (isInternalEventType(data["type"])) continue;
         const msg = data["message"];
         if (!msg || typeof msg !== "object") continue;
         if (msg["role"] !== "user") continue;
         const content = msg["content"];
         if (!content) continue;
         if (typeof content === "string") {
-          return normalizeTitleText2(content);
+          const title = normalizeTitleText(content);
+          if (title) return title;
         }
         if (Array.isArray(content)) {
           const texts = content.filter((item) => typeof item === "object" && item !== null && "text" in item).map((item) => String(item["text"] ?? "")).join(" ");
-          return normalizeTitleText2(texts);
+          const title = normalizeTitleText(texts);
+          if (title) return title;
         }
       } catch {
       }
@@ -968,6 +1120,7 @@ var ClaudeCodeAgent = class extends BaseAgent {
   convertRecord(data, messages, pendingToolCalls, ignoredToolCallIds, assistantUuidToToolCalls, assistantState) {
     if (data["isMeta"] === true) return;
     const msgType = String(data["type"] ?? "");
+    if (isInternalEventType(msgType)) return;
     if (msgType === "assistant") {
       this.convertAssistantRecord(
         data,
@@ -1004,8 +1157,8 @@ var ClaudeCodeAgent = class extends BaseAgent {
         const part = item;
         const partType = String(part["type"] ?? "");
         if (partType === "thinking") {
-          const text = String(part["thinking"] ?? "");
-          if (text.trim()) {
+          const text = cleanInternalText(String(part["thinking"] ?? ""));
+          if (text) {
             currentAssistantIndex = this.appendAssistantReasoning(
               messages,
               { messageId: uuid, msg, timestampMs, text },
@@ -1015,8 +1168,8 @@ var ClaudeCodeAgent = class extends BaseAgent {
           continue;
         }
         if (partType === "text") {
-          const text = String(part["text"] ?? "");
-          if (text.trim()) {
+          const text = cleanInternalText(String(part["text"] ?? ""));
+          if (text) {
             currentAssistantIndex = this.appendAssistantText(
               messages,
               { messageId: uuid, msg, timestampMs, text },
@@ -1252,7 +1405,8 @@ var ClaudeCodeAgent = class extends BaseAgent {
   // --- User content normalization ---
   normalizeUserTextParts(content, timestampMs) {
     if (typeof content === "string") {
-      return content.trim() ? [this.buildTextPart(content, timestampMs)] : [];
+      const text = cleanInternalText(content);
+      return text ? [this.buildTextPart(text, timestampMs)] : [];
     }
     if (!Array.isArray(content)) return [];
     const parts = [];
@@ -1260,17 +1414,19 @@ var ClaudeCodeAgent = class extends BaseAgent {
       if (typeof item === "object" && item !== null) {
         const ci = item;
         if (ci["type"] === "tool_result") continue;
-        const text = String(ci["text"] ?? "");
-        if (text.trim()) parts.push(this.buildTextPart(text, timestampMs));
-      } else if (typeof item === "string" && item.trim()) {
-        parts.push(this.buildTextPart(item, timestampMs));
+        const text = cleanInternalText(String(ci["text"] ?? ""));
+        if (text) parts.push(this.buildTextPart(text, timestampMs));
+      } else if (typeof item === "string") {
+        const text = cleanInternalText(item);
+        if (text) parts.push(this.buildTextPart(text, timestampMs));
       }
     }
     return parts;
   }
   normalizeClaudeToolOutput(content, timestampMs) {
     if (typeof content === "string") {
-      return content.trim() ? [this.buildTextPart(content, timestampMs)] : [];
+      const text2 = cleanInternalText(content);
+      return text2 ? [this.buildTextPart(text2, timestampMs)] : [];
     }
     if (content === null || content === void 0) return [];
     if (Array.isArray(content)) {
@@ -1280,15 +1436,17 @@ var ClaudeCodeAgent = class extends BaseAgent {
           const text2 = String(
             item["text"] ?? item["content"] ?? ""
           );
-          if (text2.trim()) parts.push(this.buildTextPart(text2, timestampMs));
-        } else if (typeof item === "string" && item.trim()) {
-          parts.push(this.buildTextPart(item, timestampMs));
+          const cleaned = cleanInternalText(text2);
+          if (cleaned) parts.push(this.buildTextPart(cleaned, timestampMs));
+        } else if (typeof item === "string") {
+          const text2 = cleanInternalText(item);
+          if (text2) parts.push(this.buildTextPart(text2, timestampMs));
         }
       }
       return parts;
     }
-    const text = String(content);
-    return text.trim() ? [this.buildTextPart(text, timestampMs)] : [];
+    const text = cleanInternalText(String(content));
+    return text ? [this.buildTextPart(text, timestampMs)] : [];
   }
   // --- Tool backfill ---
   backfillToolOutput(messages, pendingToolCalls, callId, outputParts, stateUpdates) {
@@ -1368,6 +1526,98 @@ try {
   DatabaseConstructor = typeof mod === "function" ? mod : mod.default;
 } catch {
 }
+function quoteIdentifier(value) {
+  return `"${value.replaceAll('"', '""')}"`;
+}
+function quoteSqlString(value) {
+  return `'${value.replaceAll("'", "''")}'`;
+}
+function isInMemoryPath(dbPath) {
+  return dbPath === ":memory:" || dbPath.startsWith("file::memory:") || dbPath.includes("mode=memory");
+}
+function getUserVersion(db) {
+  const row = db.prepare("PRAGMA user_version").get();
+  return Number(row?.user_version ?? 0);
+}
+function setUserVersion(db, version) {
+  db.exec(`PRAGMA user_version = ${Math.trunc(version)}`);
+}
+function tableExists(db, tableName) {
+  const row = db.prepare(
+    `
+        SELECT 1 AS value
+        FROM sqlite_master
+        WHERE name = ? AND type IN ('table', 'view')
+        LIMIT 1
+      `
+  ).get(tableName);
+  return row !== void 0;
+}
+function columnExists(db, tableName, columnName) {
+  if (!tableExists(db, tableName)) {
+    return false;
+  }
+  const rows = db.prepare(`PRAGMA table_info(${quoteIdentifier(tableName)})`).all();
+  return rows.some((row) => String(row.name) === columnName);
+}
+function tableHasRows(db, tableName) {
+  if (!tableExists(db, tableName)) {
+    return false;
+  }
+  const row = db.prepare(`SELECT 1 AS value FROM ${quoteIdentifier(tableName)} LIMIT 1`).get();
+  return row !== void 0;
+}
+function backupDatabase(db, dbPath, label) {
+  if (isInMemoryPath(dbPath)) {
+    return null;
+  }
+  const timestamp = new Date(Date.now()).toISOString().replaceAll(":", "").replaceAll(".", "-");
+  let backupPath = join4(dirname2(dbPath), `${basename3(dbPath)}.${timestamp}.${label}.bak`);
+  for (let counter = 1; existsSync4(backupPath); counter += 1) {
+    backupPath = join4(dirname2(dbPath), `${basename3(dbPath)}.${timestamp}.${label}.${counter}.bak`);
+  }
+  db.exec(`VACUUM INTO ${quoteSqlString(backupPath)}`);
+  return backupPath;
+}
+function backupDatabaseIfPopulated(db, dbPath, label, tables) {
+  if (!tables.some((table) => tableHasRows(db, table))) {
+    return null;
+  }
+  return backupDatabase(db, dbPath, label);
+}
+function runSchemaMigrations(db, options) {
+  const backups = [];
+  let currentVersion = options.currentVersion;
+  for (const migration of options.migrations) {
+    if (migration.version <= currentVersion) {
+      continue;
+    }
+    if (migration.version > options.targetVersion) {
+      break;
+    }
+    if (migration.destructive) {
+      const backupPath = backupDatabaseIfPopulated(
+        db,
+        options.dbPath,
+        options.backupLabel,
+        options.backupTables
+      );
+      if (backupPath) {
+        backups.push(backupPath);
+      }
+    }
+    const apply = db.transaction(() => {
+      migration.migrate(db);
+      setUserVersion(db, migration.version);
+    });
+    apply();
+    currentVersion = migration.version;
+  }
+  if (currentVersion < options.targetVersion) {
+    setUserVersion(db, options.targetVersion);
+  }
+  return backups;
+}
 function openDbReadOnly(dbPath) {
   if (!DatabaseConstructor) return null;
   try {
@@ -1382,9 +1632,12 @@ function openDb(dbPath) {
   try {
     mkdirSync2(dirname2(dbPath), { recursive: true });
     const db = DatabaseConstructor(dbPath);
-    db.pragma("journal_mode = WAL");
-    db.pragma("synchronous = NORMAL");
-    db.pragma("foreign_keys = ON");
+    try {
+      db.pragma("journal_mode = WAL");
+      db.pragma("synchronous = NORMAL");
+      db.pragma("foreign_keys = ON");
+    } catch {
+    }
     return db;
   } catch {
     return null;
@@ -1402,7 +1655,7 @@ var OpenCodeAgent = class extends BaseAgent {
   findDbPath() {
     if (!isSqliteAvailable()) return null;
     const roots = resolveProviderRoots();
-    return firstExisting(join4(roots.opencodeRoot, "opencode.db"), "data/opencode/opencode.db");
+    return firstExisting(join5(roots.opencodeRoot, "opencode.db"), "data/opencode/opencode.db");
   }
   isAvailable() {
     this.dbPath = this.findDbPath();
@@ -1414,7 +1667,9 @@ var OpenCodeAgent = class extends BaseAgent {
     if (!db) return [];
     try {
       const cutoffTime = options?.from ?? Date.now() - 3650 * 24 * 60 * 60 * 1e3;
-      const hasMessageTable = db.prepare("SELECT name FROM sqlite_master WHERE type = 'table' AND name = 'message'").get();
+      const hasMessageTable = Boolean(
+        db.prepare("SELECT name FROM sqlite_master WHERE type = 'table' AND name = 'message'").get()
+      );
       let rows;
       if (hasMessageTable) {
         rows = db.prepare(`
@@ -1440,31 +1695,12 @@ var OpenCodeAgent = class extends BaseAgent {
       }
       const heads = [];
       for (const row of rows) {
-        const id = String(row.id ?? "");
-        const title = String(row.title ?? "").trim() || "Untitled";
-        const timeCreated = Number(row.time_created ?? 0);
-        const timeUpdated = Number(row.time_updated ?? timeCreated);
-        const slug = `opencode/${id}`;
-        const directory = String(row.directory ?? "");
-        const stats = hasMessageTable ? this.readSessionStats(db, id) : null;
-        heads.push({
-          id,
-          slug,
-          title,
-          directory,
-          time_created: timeCreated,
-          time_updated: timeUpdated,
-          stats: {
-            message_count: stats?.message_count ?? Number(row.message_count ?? 0),
-            total_input_tokens: stats?.total_input_tokens ?? 0,
-            total_output_tokens: stats?.total_output_tokens ?? 0,
-            total_cost: stats?.total_cost ?? 0,
-            cost_source: stats?.cost_source
-          }
-        });
+        const head = getParsedSession(this.parseSessionHeadRow(db, row, hasMessageTable));
+        if (!head) continue;
+        heads.push(head);
         if (this.dbPath) {
-          this.sessionMetaMap.set(id, {
-            id,
+          this.sessionMetaMap.set(head.id, {
+            id: head.id,
             sourcePath: this.dbPath
           });
         }
@@ -1476,6 +1712,31 @@ var OpenCodeAgent = class extends BaseAgent {
       db.close();
     }
   }
+  parseSessionHeadRow(db, row, hasMessageTable) {
+    const id = String(row.id ?? "");
+    if (!id) return skippedSession("missing session id");
+    const timeCreated = Number(row.time_created ?? 0);
+    const timeUpdated = Number(row.time_updated ?? timeCreated);
+    const stats = hasMessageTable ? this.readSessionStats(db, id) : null;
+    const messageCount = stats?.message_count ?? Number(row.message_count ?? 0);
+    if (hasMessageTable && messageCount === 0) return filteredSession("no visible messages");
+    const messageTitle = hasMessageTable ? this.readFirstUserTitle(db, id) : null;
+    return parsedSession({
+      id,
+      slug: `opencode/${id}`,
+      title: resolveSessionTitle(String(row.title ?? ""), messageTitle, null),
+      directory: String(row.directory ?? ""),
+      time_created: timeCreated,
+      time_updated: timeUpdated,
+      stats: {
+        message_count: messageCount,
+        total_input_tokens: stats?.total_input_tokens ?? 0,
+        total_output_tokens: stats?.total_output_tokens ?? 0,
+        total_cost: stats?.total_cost ?? 0,
+        cost_source: stats?.cost_source
+      }
+    });
+  }
   getSessionMetaMap() {
     return this.sessionMetaMap;
   }
@@ -1490,7 +1751,7 @@ var OpenCodeAgent = class extends BaseAgent {
     if (!this.dbPath) {
       this.dbPath = this.findDbPath();
     }
-    if (!this.dbPath || !existsSync4(this.dbPath)) {
+    if (!this.dbPath || !existsSync5(this.dbPath)) {
       return { hasChanges: false, timestamp: Date.now() };
     }
     try {
@@ -1512,15 +1773,70 @@ var OpenCodeAgent = class extends BaseAgent {
   incrementalScan(_cachedSessions, _changedIds) {
     return this.scan();
   }
+  readMessageParts(db, messageId) {
+    const partRows = db.prepare("SELECT * FROM part WHERE message_id = ? ORDER BY time_created ASC").all(messageId);
+    const parts = [];
+    for (const partRow of partRows) {
+      const partData = JSON.parse(String(partRow.data ?? "{}"));
+      const partType = String(partData.type ?? "");
+      if (isInternalEventType(partType)) continue;
+      if (partType === "text" || partType === "reasoning") {
+        const text = cleanInternalText(String(partData.text ?? ""));
+        if (text) {
+          parts.push({
+            type: partType,
+            text,
+            time_created: Number(partRow.time_created ?? 0)
+          });
+        }
+      } else if (partType === "tool") {
+        parts.push({
+          type: "tool",
+          tool: String(partData.tool ?? ""),
+          callID: String(partData.callID ?? ""),
+          title: cleanInternalText(String(partData.title ?? "")),
+          state: partData.state ?? {},
+          time_created: Number(partRow.time_created ?? 0)
+        });
+      }
+    }
+    return parts;
+  }
+  readFirstUserTitle(db, sessionId) {
+    const rows = db.prepare(
+      "SELECT id, data, time_created FROM message WHERE session_id = ? ORDER BY time_created ASC"
+    ).all(sessionId);
+    for (const row of rows) {
+      const msgData = JSON.parse(String(row.data ?? "{}"));
+      if (isInternalEventType(msgData.type)) continue;
+      if (String(msgData.role ?? "") !== "user") continue;
+      const parts = this.readMessageParts(db, row.id);
+      const title = firstUserMessageTitle([
+        {
+          id: String(row.id ?? ""),
+          role: "user",
+          agent: null,
+          time_created: Number(row.time_created ?? 0),
+          parts
+        }
+      ]);
+      if (title) return title;
+    }
+    return null;
+  }
   readSessionStats(db, sessionId) {
     try {
-      const rows = db.prepare("SELECT data FROM message WHERE session_id = ? ORDER BY time_created ASC").all(sessionId);
+      const rows = db.prepare("SELECT id, data FROM message WHERE session_id = ? ORDER BY time_created ASC").all(sessionId);
       let totalCost = 0;
       let totalInputTokens = 0;
       let totalOutputTokens = 0;
       let hasEstimatedCost = false;
+      let messageCount = 0;
       for (const row of rows) {
         const msgData = JSON.parse(String(row.data ?? "{}"));
+        if (isInternalEventType(msgData.type)) continue;
+        const parts = this.readMessageParts(db, row.id);
+        if (parts.length === 0) continue;
         const cost = Number(msgData.cost ?? 0);
         const tokens = msgData.tokens;
         const inputTokens = Number(tokens?.input ?? 0);
@@ -1531,9 +1847,10 @@ var OpenCodeAgent = class extends BaseAgent {
         totalCost += cost || estimatedCost || 0;
         totalInputTokens += inputTokens;
         totalOutputTokens += outputTokens;
+        messageCount++;
       }
       return {
-        message_count: rows.length,
+        message_count: messageCount,
         total_input_tokens: totalInputTokens,
         total_output_tokens: totalOutputTokens,
         total_cost: totalCost,
@@ -1560,7 +1877,6 @@ var OpenCodeAgent = class extends BaseAgent {
         throw new Error(`Session not found: ${sessionId}`);
       }
       const id = String(sessionRow.id ?? sessionId);
-      const title = String(sessionRow.title ?? "Untitled");
       const slug = `opencode/${id}`;
       const directory = String(sessionRow.directory ?? "");
       const timeCreated = Number(sessionRow.time_created ?? 0);
@@ -1573,7 +1889,7 @@ var OpenCodeAgent = class extends BaseAgent {
       const msgRows = db.prepare("SELECT * FROM message WHERE session_id = ? ORDER BY time_created ASC").all(sessionId);
       for (const msgRow of msgRows) {
         const msgData = JSON.parse(String(msgRow.data ?? "{}"));
-        const parts = [];
+        if (isInternalEventType(msgData.type)) continue;
         const cost = Number(msgData.cost ?? 0);
         const tokens = msgData.tokens;
         const inputTokens = Number(tokens?.input ?? 0);
@@ -1581,31 +1897,8 @@ var OpenCodeAgent = class extends BaseAgent {
         const model = msgData.modelID ?? null;
         const estimatedCost = cost > 0 ? null : estimateTokenCost(model, { input: inputTokens, output: outputTokens });
         const resolvedCost = cost || estimatedCost || 0;
-        if (estimatedCost !== null) hasEstimatedCost = true;
-        totalCost += resolvedCost;
-        totalInputTokens += inputTokens;
-        totalOutputTokens += outputTokens;
-        const partRows = db.prepare("SELECT * FROM part WHERE message_id = ? ORDER BY time_created ASC").all(msgRow.id);
-        for (const partRow of partRows) {
-          const partData = JSON.parse(String(partRow.data ?? "{}"));
-          const partType = String(partData.type ?? "");
-          if (partType === "text" || partType === "reasoning") {
-            parts.push({
-              type: partType,
-              text: partData.text ?? "",
-              time_created: Number(partRow.time_created ?? 0)
-            });
-          } else if (partType === "tool") {
-            parts.push({
-              type: "tool",
-              tool: String(partData.tool ?? ""),
-              callID: String(partData.callID ?? ""),
-              title: String(partData.title ?? ""),
-              state: partData.state ?? {},
-              time_created: Number(partRow.time_created ?? 0)
-            });
-          }
-        }
+        const parts = this.readMessageParts(db, msgRow.id);
+        if (parts.length === 0) continue;
         messages.push({
           id: String(msgRow.id ?? ""),
           role: String(msgData.role ?? "assistant"),
@@ -1620,6 +1913,18 @@ var OpenCodeAgent = class extends BaseAgent {
           parts
         });
       }
+      const cleanedMessages = cleanParsedMessages(messages);
+      const title = resolveSessionTitle(
+        String(sessionRow.title ?? ""),
+        firstUserMessageTitle(cleanedMessages),
+        null
+      );
+      for (const message of cleanedMessages) {
+        totalCost += message.cost ?? 0;
+        totalInputTokens += message.tokens?.input ?? 0;
+        totalOutputTokens += message.tokens?.output ?? 0;
+        if (message.cost_source === "estimated") hasEstimatedCost = true;
+      }
       return {
         id,
         title,
@@ -1630,13 +1935,13 @@ var OpenCodeAgent = class extends BaseAgent {
         time_updated: timeUpdated,
         summary_files: sessionRow.summary_files ?? void 0,
         stats: {
-          message_count: messages.length,
+          message_count: cleanedMessages.length,
           total_input_tokens: totalInputTokens,
           total_output_tokens: totalOutputTokens,
           total_cost: totalCost,
           cost_source: totalCost > 0 ? hasEstimatedCost ? "estimated" : "recorded" : void 0
         },
-        messages
+        messages: cleanedMessages
       };
     } finally {
       db.close();
@@ -1667,36 +1972,74 @@ function normalizeToolArguments(raw) {
 }
 function normalizeToolOutputParts(content, timestampMs) {
   if (typeof content === "string") {
-    return content.trim() ? [{ type: "text", text: content, time_created: timestampMs }] : [];
+    const text2 = cleanInternalText(content);
+    return text2 ? [{ type: "text", text: text2, time_created: timestampMs }] : [];
   }
   if (Array.isArray(content)) {
     const parts = [];
     for (const item of content) {
       if (typeof item === "object" && item !== null && "text" in item) {
         const text2 = String(item.text ?? "");
-        if (text2.trim()) parts.push({ type: "text", text: text2, time_created: timestampMs });
-      } else if (typeof item === "string" && item.trim()) {
-        parts.push({ type: "text", text: item, time_created: timestampMs });
+        const cleaned = cleanInternalText(text2);
+        if (cleaned) parts.push({ type: "text", text: cleaned, time_created: timestampMs });
+      } else if (typeof item === "string") {
+        const text2 = cleanInternalText(item);
+        if (text2) parts.push({ type: "text", text: text2, time_created: timestampMs });
       }
     }
     return parts;
   }
   if (content == null) return [];
-  const text = String(content);
-  return text.trim() ? [{ type: "text", text, time_created: timestampMs }] : [];
+  const text = cleanInternalText(String(content));
+  return text ? [{ type: "text", text, time_created: timestampMs }] : [];
 }
 function normalizeWireToolOutputParts(returnValue, timestampMs) {
   if (returnValue == null) return [];
   if (typeof returnValue === "string") {
-    return returnValue.trim() ? [{ type: "text", text: returnValue, time_created: timestampMs }] : [];
+    const text2 = cleanInternalText(returnValue);
+    return text2 ? [{ type: "text", text: text2, time_created: timestampMs }] : [];
   }
   if (typeof returnValue === "object") {
-    return [
-      { type: "text", text: JSON.stringify(returnValue, null, 2), time_created: timestampMs }
-    ];
+    const text2 = cleanInternalText(JSON.stringify(returnValue, null, 2));
+    return text2 ? [{ type: "text", text: text2, time_created: timestampMs }] : [];
+  }
+  const text = cleanInternalText(String(returnValue));
+  return text ? [{ type: "text", text, time_created: timestampMs }] : [];
+}
+function kimiContentText(content) {
+  if (typeof content === "string") return content;
+  if (!Array.isArray(content)) return "";
+  return content.map((item) => {
+    if (typeof item === "string") return item;
+    if (typeof item === "object" && item !== null) {
+      const record = item;
+      return String(record.text ?? record.content ?? "");
+    }
+    return "";
+  }).join(" ");
+}
+function extractFirstUserTitle(contextFile, wireFile) {
+  if (contextFile && existsSync6(contextFile)) {
+    const content = readFileSync4(contextFile, "utf-8");
+    for (const record of parseJsonlLines(content)) {
+      if (record.role !== "user") continue;
+      const title = normalizeTitleText(kimiContentText(record.content));
+      if (title) return title;
+    }
   }
-  const text = String(returnValue);
-  return text.trim() ? [{ type: "text", text, time_created: timestampMs }] : [];
+  if (wireFile && existsSync6(wireFile)) {
+    const content = readFileSync4(wireFile, "utf-8");
+    for (const record of parseJsonlLines(content)) {
+      const message = record.message ?? {};
+      if (message.type !== "TurnBegin") continue;
+      const payload = message.payload ?? {};
+      const userInput = payload.user_input;
+      if (!Array.isArray(userInput)) continue;
+      const title = normalizeTitleText(kimiContentText(userInput));
+      if (title) return title;
+    }
+  }
+  return null;
 }
 var KimiAgent = class extends BaseAgent {
   name = "kimi";
@@ -1707,18 +2050,18 @@ var KimiAgent = class extends BaseAgent {
   defaultModel = null;
   findBasePath() {
     const roots = resolveProviderRoots();
-    return firstExisting(join5(roots.kimiRoot, "sessions"), "data/kimi");
+    return firstExisting(join6(roots.kimiRoot, "sessions"), "data/kimi");
   }
   /** Parse kimi.json and build md5(project_path) → cwd mapping */
   loadKimiConfig() {
     const roots = resolveProviderRoots();
-    const configPath = join5(roots.kimiRoot, "kimi.json");
-    const tomlPath = join5(roots.kimiRoot, "config.toml");
-    if (existsSync5(tomlPath)) {
+    const configPath = join6(roots.kimiRoot, "kimi.json");
+    const tomlPath = join6(roots.kimiRoot, "config.toml");
+    if (existsSync6(tomlPath)) {
       const configText = readFileSync4(tomlPath, "utf-8");
       this.defaultModel = configText.match(/^default_model\s*=\s*"([^"]+)"/m)?.[1] ?? null;
     }
-    if (!existsSync5(configPath)) return;
+    if (!existsSync6(configPath)) return;
     try {
       const raw = JSON.parse(readFileSync4(configPath, "utf-8"));
       const workDirs = raw?.work_dirs;
@@ -1749,12 +2092,12 @@ var KimiAgent = class extends BaseAgent {
     try {
       for (const hashEntry of readdirSync2(this.basePath, { withFileTypes: true })) {
         if (!hashEntry.isDirectory()) continue;
-        const hashPath = join5(this.basePath, hashEntry.name);
+        const hashPath = join6(this.basePath, hashEntry.name);
         try {
           for (const sessionEntry of readdirSync2(hashPath, { withFileTypes: true })) {
             if (!sessionEntry.isDirectory()) continue;
-            const sessionPath = join5(hashPath, sessionEntry.name);
-            if (existsSync5(join5(sessionPath, "metadata.json")) || existsSync5(join5(sessionPath, "state.json"))) {
+            const sessionPath = join6(hashPath, sessionEntry.name);
+            if (existsSync6(join6(sessionPath, "metadata.json")) || existsSync6(join6(sessionPath, "state.json"))) {
               dirs.push(sessionPath);
             }
           }
@@ -1767,42 +2110,50 @@ var KimiAgent = class extends BaseAgent {
   }
   /** Parse session directory, preferring state.json over metadata.json */
   parseSessionDir(sessionDir) {
+    return getParsedSession(this.parseSessionDirResult(sessionDir));
+  }
+  parseSessionDirResult(sessionDir) {
     try {
-      const sessionId = basename3(sessionDir);
-      const projectHash = basename3(dirname3(sessionDir));
-      const contextFile = join5(sessionDir, "context.jsonl");
-      const wireFile = join5(sessionDir, "wire.jsonl");
-      if (!existsSync5(contextFile) && !existsSync5(wireFile)) return null;
-      const statePath = join5(sessionDir, "state.json");
-      const metaPath = join5(sessionDir, "metadata.json");
+      const sessionId = basename4(sessionDir);
+      const projectHash = basename4(dirname3(sessionDir));
+      const contextFile = join6(sessionDir, "context.jsonl");
+      const wireFile = join6(sessionDir, "wire.jsonl");
+      if (!existsSync6(contextFile) && !existsSync6(wireFile)) {
+        return skippedSession("missing transcript");
+      }
+      const statePath = join6(sessionDir, "state.json");
+      const metaPath = join6(sessionDir, "metadata.json");
       let title = "";
       let wireMtime = null;
       let metaFile = "";
-      if (existsSync5(statePath)) {
+      if (existsSync6(statePath)) {
         const state = JSON.parse(readFileSync4(statePath, "utf-8"));
         title = String(state.custom_title ?? "");
         wireMtime = typeof state.wire_mtime === "number" ? state.wire_mtime : null;
         metaFile = statePath;
-      } else if (existsSync5(metaPath)) {
+      } else if (existsSync6(metaPath)) {
         const meta = JSON.parse(readFileSync4(metaPath, "utf-8"));
         title = String(meta.title ?? "");
         wireMtime = typeof meta.wire_mtime === "number" ? meta.wire_mtime : null;
         metaFile = metaPath;
       }
       const cwd = this.projectMap.get(projectHash) || "";
+      const existingContextFile = existsSync6(contextFile) ? contextFile : null;
+      const existingWireFile = existsSync6(wireFile) ? wireFile : null;
+      const messageTitle = extractFirstUserTitle(existingContextFile, existingWireFile);
       const createdAt = wireMtime !== null ? wireMtime * 1e3 : metaFile ? statSync3(metaFile).mtimeMs : statSync3(sessionDir).mtimeMs;
-      return {
+      return parsedSession({
         id: sessionId,
-        title: title || "Untitled Session",
+        title: resolveSessionTitle(title, messageTitle, null),
         sourcePath: sessionDir,
         cwd,
-        contextFile: existsSync5(contextFile) ? contextFile : null,
-        wireFile: existsSync5(wireFile) ? wireFile : null,
+        contextFile: existingContextFile,
+        wireFile: existingWireFile,
         createdAt,
         metaFile
-      };
+      });
     } catch {
-      return null;
+      return skippedSession("malformed metadata");
     }
   }
   scan(options) {
@@ -1814,8 +2165,8 @@ var KimiAgent = class extends BaseAgent {
     const heads = [];
     for (const dir of sessionDirs) {
       try {
-        const parseMarker = perf.start(`parseSessionDir:${basename3(dir)}`);
-        const meta = this.parseSessionDir(dir);
+        const parseMarker = perf.start(`parseSessionDir:${basename4(dir)}`);
+        const meta = getParsedSession(this.parseSessionDirResult(dir));
         perf.end(parseMarker);
         if (!meta) continue;
         if (!matchesScanWindow(meta.createdAt, options)) continue;
@@ -1850,7 +2201,7 @@ var KimiAgent = class extends BaseAgent {
     const cachedIds = new Set(cachedSessions.map((session) => session.id));
     const currentIds = /* @__PURE__ */ new Set();
     for (const dir of this.listSessionDirs()) {
-      const meta = this.parseSessionDir(dir);
+      const meta = getParsedSession(this.parseSessionDirResult(dir));
       if (!meta) continue;
       currentIds.add(meta.id);
       this.sessionMetaMap.set(meta.id, meta);
@@ -1897,7 +2248,7 @@ var KimiAgent = class extends BaseAgent {
     }
     for (const dir of this.listSessionDirs()) {
       try {
-        const meta = this.parseSessionDir(dir);
+        const meta = getParsedSession(this.parseSessionDirResult(dir));
         if (!meta) continue;
         if (changedIdSet.has(meta.id)) {
           this.sessionMetaMap.set(meta.id, meta);
@@ -1937,10 +2288,10 @@ var KimiAgent = class extends BaseAgent {
       seq++;
       try {
         const role = String(record.role ?? "");
-        if (role === "_checkpoint" || role === "_usage") continue;
+        if (role === "_checkpoint" || role === "_usage" || isInternalEventType(role)) continue;
         if (role === "user") {
-          const text = String(record.content ?? "");
-          if (text.trim()) {
+          const text = cleanInternalText(kimiContentText(record.content));
+          if (text) {
             messages.push(
               this.buildMessage({
                 messageId: `context-${seq}`,
@@ -1992,8 +2343,8 @@ var KimiAgent = class extends BaseAgent {
     return this.buildSessionData(meta, messages, stats);
   }
   getSessionDataFromWire(meta) {
-    const wirePath = meta.wireFile ?? join5(meta.sourcePath, "wire.jsonl");
-    if (!existsSync5(wirePath)) throw new Error("wire.jsonl is missing");
+    const wirePath = meta.wireFile ?? join6(meta.sourcePath, "wire.jsonl");
+    if (!existsSync6(wirePath)) throw new Error("wire.jsonl is missing");
     const content = readFileSync4(wirePath, "utf-8");
     const messages = [];
     const pendingToolCalls = /* @__PURE__ */ new Map();
@@ -2007,6 +2358,7 @@ var KimiAgent = class extends BaseAgent {
       try {
         const message = record.message ?? {};
         const msgType = String(message.type ?? "");
+        if (isInternalEventType(msgType)) continue;
         const payload = message.payload ?? {};
         const timestamp = Number(record.timestamp ?? 0);
         const timestampMs = Number.isFinite(timestamp) ? Math.floor(timestamp * 1e3) : 0;
@@ -2033,8 +2385,8 @@ var KimiAgent = class extends BaseAgent {
         if (msgType === "TurnBegin") {
           const userInput = payload.user_input;
           if (Array.isArray(userInput) && userInput.length > 0) {
-            const text = String(userInput[0]?.text ?? "");
-            if (text.trim()) {
+            const text = cleanInternalText(kimiContentText(userInput));
+            if (text) {
               messages.push(
                 this.buildMessage({
                   messageId: `wire-${seq}`,
@@ -2058,13 +2410,13 @@ var KimiAgent = class extends BaseAgent {
           const assistant = messages[currentAssistantIndex];
           const partType = String(payload.type ?? "");
           if (partType === "think") {
-            const text = String(payload.think ?? "");
-            if (text.trim()) {
+            const text = cleanInternalText(String(payload.think ?? ""));
+            if (text) {
               assistant.parts.push({ type: "reasoning", text, time_created: timestampMs });
             }
           } else if (partType === "text") {
-            const text = String(payload.text ?? "");
-            if (text.trim()) {
+            const text = cleanInternalText(String(payload.text ?? ""));
+            if (text) {
               assistant.parts.push({ type: "text", text, time_created: timestampMs });
             }
           }
@@ -2170,11 +2522,11 @@ var KimiAgent = class extends BaseAgent {
         const ci = item;
         const partType = String(ci.type ?? "");
         if (partType === "think") {
-          const text = String(ci.think ?? "");
-          if (text.trim()) parts.push({ type: "reasoning", text, time_created: fallbackTs });
+          const text = cleanInternalText(String(ci.think ?? ""));
+          if (text) parts.push({ type: "reasoning", text, time_created: fallbackTs });
         } else if (partType === "text") {
-          const text = String(ci.text ?? "");
-          if (text.trim()) parts.push({ type: "text", text, time_created: fallbackTs });
+          const text = cleanInternalText(String(ci.text ?? ""));
+          if (text) parts.push({ type: "text", text, time_created: fallbackTs });
         }
       }
     }
@@ -2244,12 +2596,12 @@ var KimiAgent = class extends BaseAgent {
     const existing = buffer.get(openCallId) ?? "";
     const combined = existing + argumentsPart;
     try {
-      const parsed = JSON.parse(combined);
+      const parsed2 = JSON.parse(combined);
       const location = pendingToolCalls.get(openCallId);
       if (!location) return;
       const msgPart = messages[location[0]]?.parts[location[1]];
       if (msgPart?.state) {
-        msgPart.state.arguments = parsed;
+        msgPart.state.arguments = parsed2;
       }
       buffer.delete(openCallId);
     } catch {
@@ -2275,8 +2627,8 @@ var KimiAgent = class extends BaseAgent {
       total_tokens: 0,
       message_count: 0
     };
-    const wirePath = join5(sessionDir, "wire.jsonl");
-    if (!existsSync5(wirePath)) return stats;
+    const wirePath = join6(sessionDir, "wire.jsonl");
+    if (!existsSync6(wirePath)) return stats;
     try {
       const content = readFileSync4(wirePath, "utf-8");
       for (const line of content.split("\n").filter((l) => l.trim())) {
@@ -2298,9 +2650,9 @@ var KimiAgent = class extends BaseAgent {
       }
     } catch {
     }
-    const contextPath = join5(sessionDir, "context.jsonl");
-    const rawPath = existsSync5(contextPath) ? contextPath : wirePath;
-    if (!existsSync5(rawPath)) return stats;
+    const contextPath = join6(sessionDir, "context.jsonl");
+    const rawPath = existsSync6(contextPath) ? contextPath : wirePath;
+    if (!existsSync6(rawPath)) return stats;
     try {
       const rawContent = readFileSync4(rawPath, "utf-8");
       for (const line of rawContent.split("\n").filter((l) => l.trim())) {
@@ -2321,8 +2673,9 @@ var KimiAgent = class extends BaseAgent {
     return stats;
   }
   buildSessionData(meta, messages, stats) {
-    stats.message_count = messages.length;
-    const totalCost = messages.reduce((sum, message) => sum + (message.cost ?? 0), 0);
+    const cleanedMessages = cleanParsedMessages(messages);
+    stats.message_count = cleanedMessages.length;
+    const totalCost = cleanedMessages.reduce((sum, message) => sum + (message.cost ?? 0), 0);
     if (totalCost > 0) {
       stats.total_cost = Number(totalCost.toFixed(8));
       stats.cost_source = "estimated";
@@ -2335,7 +2688,7 @@ var KimiAgent = class extends BaseAgent {
       time_created: meta.createdAt,
       time_updated: meta.createdAt,
       stats,
-      messages
+      messages: cleanedMessages
     };
   }
 };
@@ -2362,7 +2715,7 @@ var CODEX_TOOL_TITLE_MAP = {
 };
 var RECENT_SESSION_REVALIDATION_WINDOW_MS2 = 24 * 60 * 60 * 1e3;
 function extractSessionId(filename) {
-  const stem = basename4(filename, ".jsonl");
+  const stem = basename5(filename, ".jsonl");
   const parts = stem.split("-");
   if (parts.length >= 5) {
     return parts.slice(-5).join("-");
@@ -2385,10 +2738,6 @@ function extractCachedInputTokens(usage) {
   if (!usage) return 0;
   return Number(usage["cached_input_tokens"] ?? usage["cache_read_input_tokens"] ?? 0);
 }
-function normalizeTitleText3(text) {
-  const line = text.split("\n").find((l) => l.trim());
-  return line?.trim().slice(0, 80) || "";
-}
 function mapToolTitle2(name) {
   return CODEX_TOOL_TITLE_MAP[name] ?? name;
 }
@@ -2499,7 +2848,7 @@ var CodexAgent = class extends BaseAgent {
   // ---- BaseAgent implementation ----
   findBasePath() {
     const roots = resolveProviderRoots();
-    return firstExisting(join6(roots.codexRoot, "sessions"));
+    return firstExisting(join7(roots.codexRoot, "sessions"));
   }
   isAvailable() {
     this.basePath = this.findBasePath();
@@ -2523,8 +2872,8 @@ var CodexAgent = class extends BaseAgent {
     perf.end(listMarker);
     for (const file of files) {
       try {
-        const parseMarker = perf.start(`parseSessionHead:${basename4(file)}`);
-        const head = this.parseSessionHead(file, options);
+        const parseMarker = perf.start(`parseSessionHead:${basename5(file)}`);
+        const head = getParsedSession(this.parseSessionHeadResult(file, options));
         perf.end(parseMarker);
         if (head) {
           heads.push(head);
@@ -2660,7 +3009,7 @@ var CodexAgent = class extends BaseAgent {
   getSessionData(sessionId) {
     const meta = this.sessionMetaMap.get(sessionId);
     if (!meta) throw new Error(`Session not found: ${sessionId}`);
-    if (!existsSync6(meta.sourcePath)) throw new Error(`Session file missing: ${meta.sourcePath}`);
+    if (!existsSync7(meta.sourcePath)) throw new Error(`Session file missing: ${meta.sourcePath}`);
     const content = readFileSync5(meta.sourcePath, "utf-8");
     const messages = [];
     const pendingToolCalls = /* @__PURE__ */ new Map();
@@ -2765,6 +3114,7 @@ var CodexAgent = class extends BaseAgent {
     if (pendingPlan && currentAssistantIndex !== null) {
       messages[currentAssistantIndex].parts.push(pendingPlan);
     }
+    const cleanedMessages = cleanParsedMessages(messages);
     return {
       id: meta.id,
       title: meta.title,
@@ -2773,14 +3123,14 @@ var CodexAgent = class extends BaseAgent {
       time_created: meta.createdAt,
       time_updated: meta.updatedAt,
       stats: {
-        message_count: messages.length,
+        message_count: cleanedMessages.length,
         total_input_tokens: totalInputTokens,
         total_output_tokens: totalOutputTokens,
         total_cache_read_tokens: totalCacheReadTokens || void 0,
         total_cost: totalCost,
         cost_source: totalCost > 0 ? "estimated" : void 0
       },
-      messages
+      messages: cleanedMessages
     };
   }
   // ---- File listing ----
@@ -2796,7 +3146,7 @@ var CodexAgent = class extends BaseAgent {
     const files = [];
     try {
       for (const entry of readdirSync3(dir)) {
-        const fullPath = join6(dir, entry);
+        const fullPath = join7(dir, entry);
         const stat = statSync4(fullPath);
         if (stat.isDirectory()) {
           files.push(...this.walkDirForRolloutFiles(fullPath, options));
@@ -2813,8 +3163,8 @@ var CodexAgent = class extends BaseAgent {
   loadSessionIndex() {
     if (this.sessionIndexCache.size > 0) return;
     const roots = resolveProviderRoots();
-    const indexPath = join6(roots.codexRoot, "session_index.jsonl");
-    if (!existsSync6(indexPath)) return;
+    const indexPath = join7(roots.codexRoot, "session_index.jsonl");
+    if (!existsSync7(indexPath)) return;
     try {
       const content = readFileSync5(indexPath, "utf-8");
       for (const record of parseJsonlLines(content)) {
@@ -2843,18 +3193,21 @@ var CodexAgent = class extends BaseAgent {
     }
   }
   parseSessionHead(filePath, options) {
+    return getParsedSession(this.parseSessionHeadResult(filePath, options));
+  }
+  parseSessionHeadResult(filePath, options) {
     if (options?.fast) {
-      return this.parseFastSessionHead(filePath);
+      return this.parseFastSessionHeadResult(filePath);
     }
     const content = readFileSync5(filePath, "utf-8");
     const lines = content.split("\n").filter((l) => l.trim());
-    if (lines.length === 0) return null;
+    if (lines.length === 0) return skippedSession("empty file");
     const sessionId = extractSessionId(filePath);
     let firstRecord;
     try {
       firstRecord = JSON.parse(lines[0]);
     } catch {
-      return null;
+      return skippedSession("malformed first record");
     }
     const payload = firstRecord["payload"] ?? {};
     const createdAt = parseTimestampMs2(firstRecord) || parseTimestampMs2(payload) || statSync4(filePath).mtimeMs;
@@ -2877,14 +3230,18 @@ var CodexAgent = class extends BaseAgent {
     let scanPrevReasoning = 0;
     let scanPrevCachedInput = 0;
     const COUNTED_TYPES = /* @__PURE__ */ new Set(["message", "function_call", "function_call_output"]);
+    let hasNonInternalRecord = false;
     for (const line of lines) {
       try {
         const data = JSON.parse(line);
         const recordType = String(data["type"] ?? "");
+        const payload2 = data["payload"] ?? {};
+        const payloadType = String(payload2["type"] ?? "");
+        if (isInternalEventType2(recordType) || isInternalEventType2(payloadType)) continue;
+        hasNonInternalRecord = true;
         const recordTs = parseTimestampMs2(data) || parseTimestampMs2(data["payload"] ?? {});
         if (recordTs > updatedAt) updatedAt = recordTs;
         if (recordType === "session_meta" || recordType === "turn_context") {
-          const payload2 = data["payload"] ?? {};
           const nextModel = extractModelName(payload2["model"]);
           if (nextModel) {
             activeModel = nextModel;
@@ -2893,7 +3250,7 @@ var CodexAgent = class extends BaseAgent {
           continue;
         }
         if (recordType === "response_item") {
-          const p = data["payload"] ?? {};
+          const p = payload2;
           const pType = String(p["type"] ?? "");
           if (COUNTED_TYPES.has(pType)) {
             messageCount++;
@@ -2955,8 +3312,9 @@ var CodexAgent = class extends BaseAgent {
       } catch {
       }
     }
+    if (!hasNonInternalRecord) return filteredSession("internal events only");
     const directory = payload["cwd"] ? String(payload["cwd"]) : "";
-    return {
+    return parsedSession({
       id: sessionId,
       slug: `codex/${sessionId}`,
       title,
@@ -2972,18 +3330,21 @@ var CodexAgent = class extends BaseAgent {
         cost_source: totalCost > 0 ? "estimated" : void 0
       },
       model_usage: Object.keys(modelUsageMap).length > 0 ? modelUsageMap : void 0
-    };
+    });
   }
   parseFastSessionHead(filePath) {
+    return getParsedSession(this.parseFastSessionHeadResult(filePath));
+  }
+  parseFastSessionHeadResult(filePath) {
     const prefix = this.readFilePrefix(filePath);
     const lines = prefix.split("\n").filter((l) => l.trim());
-    if (lines.length === 0) return null;
+    if (lines.length === 0) return skippedSession("empty file");
     const sessionId = extractSessionId(filePath);
     let firstRecord;
     try {
       firstRecord = JSON.parse(lines[0]);
     } catch {
-      return null;
+      return skippedSession("malformed first record");
     }
     const payload = firstRecord["payload"] ?? {};
     const stat = statSync4(filePath);
@@ -2993,7 +3354,7 @@ var CodexAgent = class extends BaseAgent {
     const directory = payload["cwd"] ? String(payload["cwd"]) : "";
     const directoryTitle = basenameTitle(directory || null);
     const title = resolveSessionTitle(indexTitle, messageTitle, directoryTitle);
-    return {
+    return parsedSession({
       id: sessionId,
       slug: `codex/${sessionId}`,
       title,
@@ -3006,29 +3367,28 @@ var CodexAgent = class extends BaseAgent {
         total_output_tokens: 0,
         total_cost: 0
       }
-    };
+    });
   }
   extractTitleFromLines(lines) {
-    let userMessageCount = 0;
     for (const line of lines.slice(0, 20)) {
       try {
         const data = JSON.parse(line);
         const recordType = String(data["type"] ?? "");
-        if (recordType !== "response_item") continue;
+        if (recordType !== "response_item" || isInternalEventType2(recordType)) continue;
         const payload = data["payload"] ?? {};
         const pType = String(payload["type"] ?? "");
-        if (pType !== "message") continue;
+        if (pType !== "message" || isInternalEventType2(pType)) continue;
         if (String(payload["role"] ?? "") !== "user") continue;
-        userMessageCount++;
-        if (userMessageCount < 2) continue;
         const content = payload["content"];
+        let text = null;
         if (Array.isArray(content)) {
-          const texts = content.filter((item) => typeof item === "object" && item !== null && "text" in item).map((item) => String(item["text"] ?? "")).join(" ");
-          return normalizeTitleText3(texts);
-        }
-        if (typeof content === "string") {
-          return normalizeTitleText3(content);
+          text = content.filter((item) => typeof item === "object" && item !== null && "text" in item).map((item) => String(item["text"] ?? "")).join(" ");
+        } else if (typeof content === "string") {
+          text = content;
         }
+        if (!text || isDeveloperLikeUserMessage(text)) continue;
+        const title = normalizeTitleText(text);
+        if (title) return title;
       } catch {
       }
     }
@@ -3037,6 +3397,9 @@ var CodexAgent = class extends BaseAgent {
   // ---- Record conversion ----
   convertRecord(data, messages, pendingToolCalls, sessionId, currentAssistantIndex, latestAssistantTextIndex, pendingPlan) {
     const recordType = String(data["type"] ?? "");
+    if (isInternalEventType2(recordType)) {
+      return { currentAssistantIndex, latestAssistantTextIndex, pendingPlan };
+    }
     if (recordType === "session_meta" || recordType === "event_msg") {
       return { currentAssistantIndex, latestAssistantTextIndex, pendingPlan };
     }
@@ -3045,6 +3408,9 @@ var CodexAgent = class extends BaseAgent {
     }
     const payload = data["payload"] ?? {};
     const payloadType = String(payload["type"] ?? "");
+    if (isInternalEventType2(payloadType)) {
+      return { currentAssistantIndex, latestAssistantTextIndex, pendingPlan };
+    }
     const timestampMs = parseTimestampMs2(data) || parseTimestampMs2(payload);
     switch (payloadType) {
       case "message": {
@@ -3130,7 +3496,7 @@ var CodexAgent = class extends BaseAgent {
       };
       pendingPlan = planPart;
     }
-    const displayText = fullText.replace(PROPOSED_PLAN_PATTERN, "").trim();
+    const displayText = cleanInternalText(fullText.replace(PROPOSED_PLAN_PATTERN, ""));
     if (!displayText) {
       return { currentAssistantIndex, latestAssistantTextIndex, pendingPlan };
     }
@@ -3163,13 +3529,14 @@ var CodexAgent = class extends BaseAgent {
     const text = Array.isArray(content) ? content.map(
       (c) => typeof c === "object" && c !== null ? String(c["text"] ?? "") : String(c ?? "")
     ).join(" ") : String(content ?? "");
-    if (!text.trim()) {
+    const visibleText = cleanInternalText(text);
+    if (!visibleText) {
       return { currentAssistantIndex, latestAssistantTextIndex, pendingPlan };
     }
-    if (isDeveloperLikeUserMessage(text)) {
+    if (isDeveloperLikeUserMessage(visibleText)) {
       return { currentAssistantIndex, latestAssistantTextIndex, pendingPlan };
     }
-    if (text.trimStart().startsWith(PLAN_APPROVAL_PREFIX)) {
+    if (visibleText.trimStart().startsWith(PLAN_APPROVAL_PREFIX)) {
       if (pendingPlan && currentAssistantIndex !== null) {
         messages[currentAssistantIndex].parts.push(pendingPlan);
       }
@@ -3179,14 +3546,14 @@ var CodexAgent = class extends BaseAgent {
           messageId: "",
           role: "user",
           timestampMs,
-          parts: [{ type: "text", text: text.trim(), time_created: timestampMs }]
+          parts: [{ type: "text", text: visibleText, time_created: timestampMs }]
         })
       );
       currentAssistantIndex = null;
       latestAssistantTextIndex = null;
       return { currentAssistantIndex, latestAssistantTextIndex, pendingPlan };
     }
-    const subagentMatch = text.match(SUBAGENT_NOTIFICATION_PATTERN);
+    const subagentMatch = visibleText.match(SUBAGENT_NOTIFICATION_PATTERN);
     if (subagentMatch) {
       try {
         const notifPayload = JSON.parse(subagentMatch[1]);
@@ -3220,7 +3587,7 @@ var CodexAgent = class extends BaseAgent {
         messageId: "",
         role: "user",
         timestampMs,
-        parts: [{ type: "text", text: text.trim(), time_created: timestampMs }]
+        parts: [{ type: "text", text: visibleText, time_created: timestampMs }]
       })
     );
     currentAssistantIndex = null;
@@ -3329,8 +3696,8 @@ var CodexAgent = class extends BaseAgent {
     if (!callId) return;
     const location = pendingToolCalls.get(callId);
     if (!location) return;
-    const outputText = String(payload["output"] ?? "");
-    const outputParts = outputText.trim() ? [{ type: "text", text: outputText, time_created: timestampMs }] : [];
+    const outputText = cleanInternalText(String(payload["output"] ?? ""));
+    const outputParts = outputText ? [{ type: "text", text: outputText, time_created: timestampMs }] : [];
     const [msgIndex, partIndex] = location;
     const state = messages[msgIndex].parts[partIndex].state ?? (messages[msgIndex].parts[partIndex].state = {});
     if (outputParts.length > 0) {
@@ -3396,8 +3763,8 @@ var CodexAgent = class extends BaseAgent {
     if (!callId) return;
     const location = pendingToolCalls.get(callId);
     if (!location) return;
-    const outputText = String(payload["output"] ?? "");
-    const outputParts = outputText.trim() ? [{ type: "text", text: outputText, time_created: timestampMs }] : [];
+    const outputText = cleanInternalText(String(payload["output"] ?? ""));
+    const outputParts = outputText ? [{ type: "text", text: outputText, time_created: timestampMs }] : [];
     const [msgIndex, partIndex] = location;
     const state = messages[msgIndex].parts[partIndex].state ?? (messages[msgIndex].parts[partIndex].state = {});
     if (outputParts.length > 0) {
@@ -3436,7 +3803,8 @@ function mapToolTitle3(toolName) {
 function normalizeToolOutputParts2(output, timestampMs) {
   if (output == null) return [];
   if (typeof output === "string") {
-    return output.trim() ? [{ type: "text", text: output, time_created: timestampMs }] : [];
+    const text2 = cleanInternalText(output);
+    return text2 ? [{ type: "text", text: text2, time_created: timestampMs }] : [];
   }
   if (Array.isArray(output)) {
     const parts = [];
@@ -3445,15 +3813,17 @@ function normalizeToolOutputParts2(output, timestampMs) {
         const text2 = String(
           item.text ?? item.content ?? ""
         );
-        if (text2.trim()) parts.push({ type: "text", text: text2, time_created: timestampMs });
-      } else if (typeof item === "string" && item.trim()) {
-        parts.push({ type: "text", text: item, time_created: timestampMs });
+        const cleaned = cleanInternalText(text2);
+        if (cleaned) parts.push({ type: "text", text: cleaned, time_created: timestampMs });
+      } else if (typeof item === "string") {
+        const text2 = cleanInternalText(item);
+        if (text2) parts.push({ type: "text", text: text2, time_created: timestampMs });
       }
     }
     return parts;
   }
-  const text = String(output);
-  return text.trim() ? [{ type: "text", text, time_created: timestampMs }] : [];
+  const text = cleanInternalText(String(output));
+  return text ? [{ type: "text", text, time_created: timestampMs }] : [];
 }
 function extractTimestamp(msg) {
   if (msg.createdAt && typeof msg.createdAt === "number" && msg.createdAt > 0) {
@@ -3464,6 +3834,9 @@ function extractTimestamp(msg) {
   }
   return 0;
 }
+function isInternalBubble(bubble) {
+  return ["eventType", "kind", "subtype", "name"].some((key) => isInternalEventType(bubble[key]));
+}
 function buildToolState(action) {
   const state = {};
   if (action.input) {
@@ -3502,7 +3875,7 @@ function buildToolPart(action, timestampMs) {
 }
 function buildTerminalToolPart(action, timestampMs) {
   const command = String(action.input?.command ?? "");
-  const description = String(action.input?.commandDescription ?? "");
+  const description = cleanInternalText(String(action.input?.commandDescription ?? ""));
   return {
     type: "tool",
     tool: "bash",
@@ -3537,7 +3910,7 @@ var CursorAgent = class extends BaseAgent {
     if (!isSqliteAvailable()) return null;
     const dataPath = getCursorDataPath();
     if (!dataPath) return null;
-    return join7(dataPath, "globalStorage", "state.vscdb");
+    return join8(dataPath, "globalStorage", "state.vscdb");
   }
   /**
    * Build a map of composerId → workspace folder path by reading
@@ -3547,8 +3920,8 @@ var CursorAgent = class extends BaseAgent {
     const map = /* @__PURE__ */ new Map();
     const dataPath = getCursorDataPath();
     if (!dataPath) return map;
-    const wsStoragePath = join7(dataPath, "workspaceStorage");
-    if (!existsSync7(wsStoragePath)) return map;
+    const wsStoragePath = join8(dataPath, "workspaceStorage");
+    if (!existsSync8(wsStoragePath)) return map;
     let entryNames;
     try {
       entryNames = readdirSync4(wsStoragePath);
@@ -3556,14 +3929,14 @@ var CursorAgent = class extends BaseAgent {
       return map;
     }
     for (const name of entryNames) {
-      const wsDir = join7(wsStoragePath, name);
+      const wsDir = join8(wsStoragePath, name);
       try {
         if (!statSync5(wsDir).isDirectory()) continue;
       } catch {
         continue;
       }
-      const wsJsonPath = join7(wsDir, "workspace.json");
-      if (!existsSync7(wsJsonPath)) continue;
+      const wsJsonPath = join8(wsDir, "workspace.json");
+      if (!existsSync8(wsJsonPath)) continue;
       let workspacePath;
       try {
         const data = JSON.parse(readFileSync6(wsJsonPath, "utf-8"));
@@ -3573,19 +3946,19 @@ var CursorAgent = class extends BaseAgent {
       } catch {
         continue;
       }
-      const wsDbPath = join7(wsDir, "state.vscdb");
-      if (!existsSync7(wsDbPath)) continue;
+      const wsDbPath = join8(wsDir, "state.vscdb");
+      if (!existsSync8(wsDbPath)) continue;
       const wsDb = openDbReadOnly(wsDbPath);
       if (!wsDb) continue;
       try {
         const row = wsDb.prepare("SELECT value FROM ItemTable WHERE key = 'composer.composerData'").get();
         if (!row?.value) continue;
-        const parsed = JSON.parse(row.value);
+        const parsed2 = JSON.parse(row.value);
         let composers;
-        if (parsed !== null && typeof parsed === "object" && "allComposers" in parsed && Array.isArray(parsed["allComposers"])) {
-          composers = parsed.allComposers;
-        } else if (Array.isArray(parsed)) {
-          composers = parsed;
+        if (parsed2 !== null && typeof parsed2 === "object" && "allComposers" in parsed2 && Array.isArray(parsed2["allComposers"])) {
+          composers = parsed2.allComposers;
+        } else if (Array.isArray(parsed2)) {
+          composers = parsed2;
         } else {
           continue;
         }
@@ -3602,7 +3975,7 @@ var CursorAgent = class extends BaseAgent {
   }
   isAvailable() {
     this.dbPath = this.findDbPath();
-    return this.dbPath !== null && existsSync7(this.dbPath);
+    return this.dbPath !== null && existsSync8(this.dbPath);
   }
   scan(options) {
     if (!this.dbPath) return [];
@@ -3625,7 +3998,8 @@ var CursorAgent = class extends BaseAgent {
           const createdAt = composer.createdAt ?? 0;
           const updatedAt = composer.updatedAt ?? composer.lastUpdatedAt ?? composer.lastSendTime ?? createdAt;
           if (!matchesScanWindow(updatedAt, options)) continue;
-          const title = this.extractTitle(composer);
+          const fastTitle = this.extractTitle(composer);
+          const hasFastMessages = Array.isArray(composer.chatMessages);
           const fastMessageCount = composer.chatMessages?.length ?? 0;
           const hasSubagents = Array.isArray(composer.subagentInfos) && composer.subagentInfos.length > 0;
           if (options?.fast) {
@@ -3634,21 +4008,25 @@ var CursorAgent = class extends BaseAgent {
               input: composer.inputTokenCount ?? 0,
               output: composer.outputTokenCount ?? 0
             }) ?? 0;
-            heads.push({
-              id: composerId,
-              slug: `cursor/${composerId}`,
-              title,
-              directory: directory2,
-              time_created: createdAt,
-              time_updated: updatedAt || void 0,
-              stats: {
-                message_count: fastMessageCount,
-                total_input_tokens: composer.inputTokenCount ?? 0,
-                total_output_tokens: composer.outputTokenCount ?? 0,
-                total_cost: totalCost2,
-                cost_source: totalCost2 > 0 ? "estimated" : void 0
-              }
-            });
+            const head = getParsedSession(
+              hasFastMessages && fastMessageCount === 0 && !hasSubagents ? filteredSession("no visible messages") : parsedSession({
+                id: composerId,
+                slug: `cursor/${composerId}`,
+                title: fastTitle,
+                directory: directory2,
+                time_created: createdAt,
+                time_updated: updatedAt || void 0,
+                stats: {
+                  message_count: fastMessageCount,
+                  total_input_tokens: composer.inputTokenCount ?? 0,
+                  total_output_tokens: composer.outputTokenCount ?? 0,
+                  total_cost: totalCost2,
+                  cost_source: totalCost2 > 0 ? "estimated" : void 0
+                }
+              })
+            );
+            if (!head) continue;
+            heads.push(head);
             this.composerCache.set(composerId, composer);
             this.sessionMetaMap.set(composerId, {
               id: composerId,
@@ -3658,16 +4036,20 @@ var CursorAgent = class extends BaseAgent {
           }
           const requestId = this.extractRequestIdFromBubbles(db, composerId);
           const sessionId = requestId || composerId;
-          const messages = this.loadMessagesFromBubbles(
-            db,
-            composerId,
-            sessionId,
-            composer.modelConfig?.modelName ?? composer.model ?? null
+          const parsedMessages = cleanParsedMessages(
+            this.loadMessagesFromBubbles(
+              db,
+              composerId,
+              sessionId,
+              composer.modelConfig?.modelName ?? composer.model ?? null
+            )
           );
-          if (messages.length === 0 && !hasSubagents) {
-            continue;
-          }
+          const messages = getParsedSession(
+            parsedMessages.length === 0 && !hasSubagents ? filteredSession("no visible messages") : parsedSession(parsedMessages)
+          );
+          if (!messages) continue;
           const messageCount = messages.length;
+          const title = this.extractTitle(composer, messages);
           const directory = workspacePathMap.get(composerId) ?? "";
           const modelUsageMap = {};
           let totalCost = 0;
@@ -3735,7 +4117,7 @@ var CursorAgent = class extends BaseAgent {
     if (!this.dbPath) {
       this.dbPath = this.findDbPath();
     }
-    if (!this.dbPath || !existsSync7(this.dbPath)) {
+    if (!this.dbPath || !existsSync8(this.dbPath)) {
       return { hasChanges: false, timestamp: Date.now() };
     }
     try {
@@ -3785,7 +4167,6 @@ var CursorAgent = class extends BaseAgent {
         throw new Error(`Session not found: ${sessionId}`);
       }
       const composerId = composer.id || composer.composerId || "";
-      const title = this.extractTitle(composer);
       const createdAt = composer.createdAt ?? 0;
       const updatedAt = composer.updatedAt ?? createdAt;
       const messages = this.loadMessagesFromBubbles(
@@ -3794,10 +4175,13 @@ var CursorAgent = class extends BaseAgent {
         resolvedSessionId,
         composer.modelConfig?.modelName ?? composer.model ?? null
       );
+      this.appendSubagentMessages(db, composer, messages);
+      const cleanedMessages = cleanParsedMessages(messages);
+      const title = this.extractTitle(composer, cleanedMessages);
       let totalInputTokens = 0;
       let totalOutputTokens = 0;
       let totalCost = 0;
-      for (const msg of messages) {
+      for (const msg of cleanedMessages) {
         totalInputTokens += msg.tokens?.input ?? 0;
         totalOutputTokens += msg.tokens?.output ?? 0;
         totalCost += msg.cost ?? 0;
@@ -3810,7 +4194,6 @@ var CursorAgent = class extends BaseAgent {
           output: totalOutputTokens
         }) ?? 0;
       }
-      this.appendSubagentMessages(db, composer, messages);
       const cachedDir = this.composerCache.get(`__dir__${composerId}`);
       const directory = cachedDir?.directory ?? this.buildWorkspacePathMap().get(composerId) ?? "";
       return {
@@ -3821,13 +4204,13 @@ var CursorAgent = class extends BaseAgent {
         time_created: createdAt,
         time_updated: updatedAt || void 0,
         stats: {
-          message_count: messages.length,
+          message_count: cleanedMessages.length,
           total_input_tokens: totalInputTokens,
           total_output_tokens: totalOutputTokens,
           total_cost: totalCost,
           cost_source: totalCost > 0 ? "estimated" : void 0
         },
-        messages
+        messages: cleanedMessages
       };
     } finally {
       db.close();
@@ -3876,19 +4259,10 @@ var CursorAgent = class extends BaseAgent {
     return null;
   }
   /** Extract title from composer (like agent-dump) */
-  extractTitle(composer) {
-    if (composer.name && typeof composer.name === "string" && composer.name.trim()) {
-      return composer.name.trim();
-    }
-    if (composer.title && typeof composer.title === "string" && composer.title.trim()) {
-      return composer.title.trim();
-    }
-    if (composer.text && typeof composer.text === "string" && composer.text.trim()) {
-      const firstLine = composer.text.split("\n").find((l) => l.trim())?.trim().slice(0, 80);
-      if (firstLine) return firstLine;
-    }
-    const composerId = composer.composerId || composer.id || "";
-    return `Cursor Session ${composerId.slice(0, 8)}`;
+  extractTitle(composer, messages = []) {
+    const explicit = composer.name || composer.title;
+    const messageTitle = firstUserMessageTitle(messages) ?? composer.text;
+    return resolveSessionTitle(explicit, messageTitle, null);
   }
   /** Count messages from bubbles */
   countMessagesFromBubbles(db, composerId) {
@@ -3919,6 +4293,7 @@ var CursorAgent = class extends BaseAgent {
       for (const row of rows) {
         try {
           const bubble = JSON.parse(row.value);
+          if (isInternalBubble(bubble)) continue;
           const bubbleId = row.key.split(":").pop() || String(messageIndex);
           const role = bubble.type === 2 ? "assistant" : "user";
           let timestampMs = 0;
@@ -3935,7 +4310,7 @@ var CursorAgent = class extends BaseAgent {
           const inputTokens = bubble.tokenCount?.inputTokens ?? 0;
           const outputTokens = bubble.tokenCount?.outputTokens ?? 0;
           const parts = [];
-          const text = bubble.text?.trim();
+          const text = cleanInternalText(bubble.text ?? "");
           if (text) {
             parts.push({ type: "text", text, time_created: timestampMs });
           }
@@ -3993,10 +4368,10 @@ var CursorAgent = class extends BaseAgent {
     if (toolData.result !== void 0) {
       if (typeof toolData.result === "string") {
         try {
-          const parsed = JSON.parse(toolData.result);
-          state.output = parsed;
-          if (parsed.error || parsed.message || parsed.stderr) {
-            state.error = parsed.error || parsed.message || parsed.stderr;
+          const parsed2 = JSON.parse(toolData.result);
+          state.output = parsed2;
+          if (parsed2.error || parsed2.message || parsed2.stderr) {
+            state.error = parsed2.error || parsed2.message || parsed2.stderr;
             state.status = "error";
           }
         } catch {
@@ -4021,7 +4396,7 @@ var CursorAgent = class extends BaseAgent {
       type: "tool",
       tool: normalizedName,
       callID: toolData.toolCallId || "",
-      title: `Tool: ${toolName}`,
+      title: `Tool: ${normalizedName}`,
       state,
       time_created: timestampMs
     };
@@ -4056,12 +4431,13 @@ var CursorAgent = class extends BaseAgent {
         if (role !== "user" && role !== "assistant") continue;
         const timestampMs = extractTimestamp(chatMsg);
         const parts = [];
-        const text = chatMsg.text ?? "";
-        if (text.trim()) {
+        const text = cleanInternalText(chatMsg.text ?? "");
+        if (text) {
           parts.push({ type: "text", text, time_created: timestampMs });
         }
         if (role === "assistant" && Array.isArray(chatMsg.actions)) {
           for (const action of chatMsg.actions) {
+            if (isInternalEventType(action.type) || isInternalEventType(action.tool)) continue;
             const part = convertActionToPart(action, timestampMs);
             if (part) parts.push(part);
           }
@@ -4124,7 +4500,7 @@ function fallbackDisplayName(input) {
 }
 var realFs = {
   exists(path2) {
-    return existsSync8(path2);
+    return existsSync9(path2);
   },
   readText(path2) {
     try {
@@ -4401,27 +4777,206 @@ function hasEditedDocPath(value) {
   }
   return Object.values(record).some(hasEditedDocPath);
 }
-var CACHE_VERSION = 6;
+function toRecord(value) {
+  if (value && typeof value === "object" && !Array.isArray(value)) {
+    return value;
+  }
+  return {};
+}
+function toStringValue(value) {
+  return typeof value === "string" ? value : "";
+}
+function normalizeToolLabel(part) {
+  if (typeof part.title === "string" && part.title.trim()) {
+    return part.title.trim().replace(/^tool:\s*/i, "");
+  }
+  if (typeof part.tool === "string" && part.tool.trim()) return part.tool.trim();
+  return "tool";
+}
+function normalizeToolName(part) {
+  return normalizeToolLabel(part).trim().toLowerCase();
+}
+function looksLikeFilePath(value) {
+  const text = value.trim();
+  if (!text || text.length > 300) return false;
+  if (text.includes("\n")) return false;
+  if (/^[a-z]+:\/\//i.test(text)) return false;
+  if (/[<>{}]/.test(text)) return false;
+  if (text.startsWith("/")) return true;
+  if (text.startsWith("./") || text.startsWith("../") || text.startsWith("~/")) return true;
+  if (text.includes("/") || text.includes("\\")) return true;
+  return /^[A-Za-z0-9_.@-]+\.[A-Za-z0-9_-]+$/.test(text);
+}
+function shouldTreatAsPathKey(key) {
+  const normalized = key.trim().toLowerCase();
+  if (!normalized) return false;
+  if (normalized.includes("command") || normalized.includes("content") || normalized.includes("text") || normalized.includes("prompt") || normalized.includes("url") || normalized.includes("body") || normalized.includes("title") || normalized.includes("description") || normalized === "cwd" || normalized === "workdir" || normalized === "directory") {
+    return false;
+  }
+  return normalized === "path" || normalized === "paths" || normalized.includes("file") || normalized.includes("path");
+}
+function collectPathsFromValue(value, keyHint, paths, depth = 0) {
+  if (value == null || depth > 4) return;
+  if (typeof value === "string") {
+    if (shouldTreatAsPathKey(keyHint) && looksLikeFilePath(value)) {
+      paths.add(value.trim());
+    }
+    return;
+  }
+  if (Array.isArray(value)) {
+    for (const item of value) {
+      collectPathsFromValue(item, keyHint, paths, depth + 1);
+    }
+    return;
+  }
+  if (typeof value === "object") {
+    for (const [key, nested] of Object.entries(value)) {
+      collectPathsFromValue(nested, key, paths, depth + 1);
+    }
+  }
+}
+function extractPathsFromToolInput(inputValue) {
+  const paths = /* @__PURE__ */ new Set();
+  collectPathsFromValue(inputValue, "", paths);
+  return [...paths];
+}
+function getToolInputValue(part) {
+  return part.state?.arguments ?? part.state?.input ?? part.input ?? null;
+}
+function classifyToolKind(part) {
+  const toolName = normalizeToolName(part);
+  if (toolName === "read" || toolName === "readfile" || toolName === "read_file") return "read";
+  if (toolName === "edit" || toolName === "multiedit" || toolName === "apply_patch" || toolName === "notebookedit") {
+    return "edit";
+  }
+  if (toolName === "write" || toolName === "writefile" || toolName === "write_file" || toolName === "create_file") {
+    return "write";
+  }
+  if (toolName === "delete" || toolName === "delete_file") {
+    return "delete";
+  }
+  return null;
+}
+function normalizeCodexPatchEntry(entry) {
+  const record = toRecord(entry);
+  const type = toStringValue(record.type);
+  if (!type) return null;
+  return {
+    type,
+    path: toStringValue(record.path),
+    oldPath: toStringValue(record.old_path)
+  };
+}
+function getCodexPatchEntries(inputValue) {
+  const input = toRecord(inputValue);
+  const rawContent = Array.isArray(inputValue) ? inputValue : Array.isArray(input.content) ? input.content : [];
+  return rawContent.map((entry) => normalizeCodexPatchEntry(entry)).filter((entry) => entry != null);
+}
+function patchEntryKind(type) {
+  if (type === "write_file") return "write";
+  if (type === "delete_file") return "delete";
+  return "edit";
+}
+function extractFileActivityOccurrences(messages) {
+  const occurrences = [];
+  messages.forEach((message, messageIndex) => {
+    let toolIndex = 0;
+    for (const part of message.parts) {
+      if (part.type !== "tool") continue;
+      const inputValue = getToolInputValue(part);
+      const toolLabel = normalizeToolLabel(part);
+      const time = part.time_created ?? message.time_created;
+      const currentToolIndex = toolIndex;
+      toolIndex += 1;
+      const patchEntries = getCodexPatchEntries(inputValue);
+      if (patchEntries.length > 0) {
+        for (const entry of patchEntries) {
+          const path2 = (entry.path || entry.oldPath).trim();
+          if (!path2) continue;
+          occurrences.push({
+            path: path2,
+            kind: patchEntryKind(entry.type),
+            time,
+            tool_label: toolLabel,
+            message_index: messageIndex,
+            tool_index: currentToolIndex
+          });
+        }
+        continue;
+      }
+      const kind = classifyToolKind(part);
+      if (!kind) continue;
+      for (const path2 of extractPathsFromToolInput(inputValue)) {
+        occurrences.push({
+          path: path2,
+          kind,
+          time,
+          tool_label: toolLabel,
+          message_index: messageIndex,
+          tool_index: currentToolIndex
+        });
+      }
+    }
+  });
+  return occurrences;
+}
+function summarizeFileActivity(agentName, sessionId, projectIdentityKey, occurrences) {
+  const grouped = /* @__PURE__ */ new Map();
+  for (const occurrence of occurrences) {
+    const key = `${occurrence.kind}\0${occurrence.path}`;
+    const current = grouped.get(key);
+    if (current) {
+      current.count += 1;
+      current.latest_time = Math.max(current.latest_time, occurrence.time);
+      continue;
+    }
+    grouped.set(key, {
+      agent_name: agentName,
+      session_id: sessionId,
+      project_identity_key: projectIdentityKey,
+      path: occurrence.path,
+      kind: occurrence.kind,
+      count: 1,
+      latest_time: occurrence.time
+    });
+  }
+  return [...grouped.values()].sort((a, b) => {
+    if (b.latest_time !== a.latest_time) return b.latest_time - a.latest_time;
+    return a.path.localeCompare(b.path);
+  });
+}
+function extractSessionFileActivity(agentName, sessionId, projectIdentityKey, messages) {
+  return summarizeFileActivity(
+    agentName,
+    sessionId,
+    projectIdentityKey,
+    extractFileActivityOccurrences(messages)
+  );
+}
+var CACHE_SCHEMA_VERSION = 8;
 var CACHE_TTL = 7 * 24 * 60 * 60 * 1e3;
 var CACHE_FILENAME = "codesesh.db";
 var LEGACY_CACHE_FILENAME = "scan-cache.json";
+var SEARCH_INDEX_BULK_SYNC_THRESHOLD = 100;
+var ftsIntegrityCheckedPath = null;
 function getCacheDir2() {
-  return join8(homedir4(), ".cache", "codesesh");
+  return join9(homedir4(), ".cache", "codesesh");
 }
 function getCachePath2() {
-  return join8(getCacheDir2(), CACHE_FILENAME);
+  return join9(getCacheDir2(), CACHE_FILENAME);
 }
 function getLegacyCachePath() {
-  return join8(getCacheDir2(), LEGACY_CACHE_FILENAME);
+  return join9(getCacheDir2(), LEGACY_CACHE_FILENAME);
 }
 function hasCacheStorage() {
-  return existsSync9(getCachePath2());
+  return existsSync10(getCachePath2());
 }
 function withCacheDb(fn) {
-  const db = openDb(getCachePath2());
+  const cachePath = getCachePath2();
+  const db = openDb(cachePath);
   if (!db) return null;
   try {
-    ensureSchema(db);
+    ensureSchema(db, cachePath);
     return fn(db);
   } catch {
     return null;
@@ -4429,7 +4984,7 @@ function withCacheDb(fn) {
     db.close();
   }
 }
-function ensureSchema(db) {
+function createCacheTables(db) {
   db.exec(`
     CREATE TABLE IF NOT EXISTS cache_meta (
       key TEXT PRIMARY KEY,
@@ -4448,50 +5003,118 @@ function ensureSchema(db) {
       meta_json TEXT,
       PRIMARY KEY (agent_name, session_id)
     );
-
-    CREATE TABLE IF NOT EXISTS session_documents (
-      id INTEGER PRIMARY KEY AUTOINCREMENT,
+  `);
+}
+function createSessionTables(db) {
+  db.exec(`
+    CREATE TABLE IF NOT EXISTS sessions (
       agent_name TEXT NOT NULL,
       session_id TEXT NOT NULL,
+      sort_index INTEGER NOT NULL DEFAULT 0,
       slug TEXT NOT NULL,
       title TEXT NOT NULL,
+      source_path TEXT,
       directory TEXT NOT NULL,
-      project_identity_kind TEXT NOT NULL DEFAULT 'path',
-      project_identity_key TEXT NOT NULL DEFAULT '',
-      project_display_name TEXT NOT NULL DEFAULT '',
+      project_identity_kind TEXT NOT NULL,
+      project_identity_key TEXT NOT NULL,
+      project_display_name TEXT NOT NULL,
       time_created INTEGER NOT NULL,
       time_updated INTEGER,
       activity_time INTEGER NOT NULL,
-      content_text TEXT NOT NULL,
-      content_hash TEXT NOT NULL,
-      indexed_at INTEGER NOT NULL,
-      UNIQUE(agent_name, session_id)
+      message_count INTEGER NOT NULL,
+      total_input_tokens INTEGER NOT NULL,
+      total_output_tokens INTEGER NOT NULL,
+      total_cache_read_tokens INTEGER,
+      total_cache_create_tokens INTEGER,
+      total_cost REAL NOT NULL,
+      cost_source TEXT,
+      total_tokens INTEGER,
+      model_usage_json TEXT,
+      smart_tags_json TEXT,
+      smart_tags_source_updated_at INTEGER,
+      meta_json TEXT,
+      PRIMARY KEY (agent_name, session_id)
     );
 
-    CREATE TABLE IF NOT EXISTS project_sessions (
+    CREATE INDEX IF NOT EXISTS idx_sessions_agent_activity
+      ON sessions(agent_name, activity_time);
+
+    CREATE INDEX IF NOT EXISTS idx_sessions_project
+      ON sessions(project_identity_kind, project_identity_key, activity_time);
+
+    CREATE TABLE IF NOT EXISTS messages (
       agent_name TEXT NOT NULL,
       session_id TEXT NOT NULL,
-      identity_kind TEXT NOT NULL,
-      identity_key TEXT NOT NULL,
-      display_name TEXT NOT NULL,
-      directory TEXT NOT NULL,
-      activity_time INTEGER NOT NULL,
-      PRIMARY KEY (agent_name, session_id)
+      message_index INTEGER NOT NULL,
+      message_id TEXT NOT NULL,
+      role TEXT NOT NULL,
+      time_created INTEGER NOT NULL,
+      time_completed INTEGER,
+      agent TEXT,
+      mode TEXT,
+      model TEXT,
+      provider TEXT,
+      tokens_json TEXT,
+      cost REAL,
+      cost_source TEXT,
+      parts_json TEXT NOT NULL,
+      subagent_id TEXT,
+      nickname TEXT,
+      content_text TEXT NOT NULL,
+      tool_metadata_json TEXT,
+      PRIMARY KEY (agent_name, session_id, message_index),
+      FOREIGN KEY (agent_name, session_id)
+        REFERENCES sessions(agent_name, session_id)
+        ON DELETE CASCADE
     );
 
-    CREATE INDEX IF NOT EXISTS idx_project_sessions_identity
-      ON project_sessions(identity_kind, identity_key);
+    CREATE INDEX IF NOT EXISTS idx_messages_session
+      ON messages(agent_name, session_id, message_index);
+  `);
+}
+function createFileActivityTables(db) {
+  db.exec(`
+    CREATE TABLE IF NOT EXISTS session_file_activity (
+      agent_name TEXT NOT NULL,
+      session_id TEXT NOT NULL,
+      project_identity_key TEXT NOT NULL,
+      path TEXT NOT NULL,
+      kind TEXT NOT NULL,
+      count INTEGER NOT NULL,
+      latest_time INTEGER NOT NULL,
+      PRIMARY KEY (agent_name, session_id, project_identity_key, path, kind),
+      FOREIGN KEY (agent_name, session_id)
+        REFERENCES sessions(agent_name, session_id)
+        ON DELETE CASCADE
+    );
 
-    CREATE VIEW IF NOT EXISTS project_groups_v AS
-      SELECT
-        identity_kind,
-        identity_key,
-        MIN(display_name) AS display_name,
-        GROUP_CONCAT(DISTINCT agent_name) AS sources_csv,
-        COUNT(*) AS session_count,
-        MAX(activity_time) AS last_activity
-      FROM project_sessions
-      GROUP BY identity_kind, identity_key;
+    CREATE INDEX IF NOT EXISTS idx_file_activity_project_latest
+      ON session_file_activity(project_identity_key, latest_time);
+
+    CREATE INDEX IF NOT EXISTS idx_file_activity_path
+      ON session_file_activity(path);
+
+    CREATE INDEX IF NOT EXISTS idx_file_activity_kind
+      ON session_file_activity(kind);
+  `);
+}
+function createSearchTables(db) {
+  db.exec(`
+    CREATE TABLE IF NOT EXISTS session_documents (
+      id INTEGER PRIMARY KEY AUTOINCREMENT,
+      agent_name TEXT NOT NULL,
+      session_id TEXT NOT NULL,
+      slug TEXT NOT NULL,
+      title TEXT NOT NULL,
+      directory TEXT NOT NULL,
+      time_created INTEGER NOT NULL,
+      time_updated INTEGER,
+      activity_time INTEGER NOT NULL,
+      content_text TEXT NOT NULL,
+      content_hash TEXT NOT NULL,
+      indexed_at INTEGER NOT NULL,
+      UNIQUE(agent_name, session_id)
+    );
 
     CREATE VIRTUAL TABLE IF NOT EXISTS session_documents_fts USING fts5(
       title,
@@ -4499,7 +5122,11 @@ function ensureSchema(db) {
       content='session_documents',
       content_rowid='id'
     );
-
+  `);
+  createSearchTriggers(db);
+}
+function createSearchTriggers(db) {
+  db.exec(`
     CREATE TRIGGER IF NOT EXISTS session_documents_ai AFTER INSERT ON session_documents BEGIN
       INSERT INTO session_documents_fts(rowid, title, content_text)
       VALUES (new.id, new.title, new.content_text);
@@ -4517,33 +5144,686 @@ function ensureSchema(db) {
       VALUES (new.id, new.title, new.content_text);
     END;
   `);
-  const sessionDocumentColumns = new Set(
-    db.prepare("PRAGMA table_info(session_documents)").all().map(
-      (row) => String(row.name)
-    )
-  );
-  if (!sessionDocumentColumns.has("project_identity_kind")) {
+}
+function dropSearchTriggers(db) {
+  db.exec(`
+    DROP TRIGGER IF EXISTS session_documents_ai;
+    DROP TRIGGER IF EXISTS session_documents_ad;
+    DROP TRIGGER IF EXISTS session_documents_au;
+  `);
+}
+function ensureProjectColumns(db) {
+  if (!tableExists(db, "session_documents")) {
+    return;
+  }
+  if (!columnExists(db, "session_documents", "project_identity_kind")) {
+    db.exec(
+      "ALTER TABLE session_documents ADD COLUMN project_identity_kind TEXT NOT NULL DEFAULT 'path'"
+    );
+  }
+  if (!columnExists(db, "session_documents", "project_identity_key")) {
+    db.exec(
+      "ALTER TABLE session_documents ADD COLUMN project_identity_key TEXT NOT NULL DEFAULT ''"
+    );
+  }
+  if (!columnExists(db, "session_documents", "project_display_name")) {
+    db.exec(
+      "ALTER TABLE session_documents ADD COLUMN project_display_name TEXT NOT NULL DEFAULT ''"
+    );
+  }
+}
+function createProjectTables(db) {
+  ensureProjectColumns(db);
+  db.exec(`
+    CREATE TABLE IF NOT EXISTS project_sessions (
+      agent_name TEXT NOT NULL,
+      session_id TEXT NOT NULL,
+      identity_kind TEXT NOT NULL,
+      identity_key TEXT NOT NULL,
+      display_name TEXT NOT NULL,
+      directory TEXT NOT NULL,
+      activity_time INTEGER NOT NULL,
+      PRIMARY KEY (agent_name, session_id)
+    );
+
+    CREATE INDEX IF NOT EXISTS idx_project_sessions_identity
+      ON project_sessions(identity_kind, identity_key);
+  `);
+  createProjectGroupsView(db);
+}
+function createProjectGroupsView(db) {
+  if (!tableExists(db, "sessions")) {
     db.exec(`
-      ALTER TABLE session_documents ADD COLUMN project_identity_kind TEXT NOT NULL DEFAULT 'path';
-      ALTER TABLE session_documents ADD COLUMN project_identity_key TEXT NOT NULL DEFAULT '';
-      ALTER TABLE session_documents ADD COLUMN project_display_name TEXT NOT NULL DEFAULT '';
+      CREATE VIEW IF NOT EXISTS project_groups_v AS
+        SELECT
+          identity_kind,
+          identity_key,
+          MIN(display_name) AS display_name,
+          GROUP_CONCAT(DISTINCT agent_name) AS sources_csv,
+          COUNT(*) AS session_count,
+          MAX(activity_time) AS last_activity
+        FROM project_sessions
+        GROUP BY identity_kind, identity_key;
     `);
+    return;
+  }
+  db.exec(`
+    CREATE VIEW IF NOT EXISTS project_groups_v AS
+      SELECT
+        project_identity_kind AS identity_kind,
+        project_identity_key AS identity_key,
+        MIN(project_display_name) AS display_name,
+        GROUP_CONCAT(DISTINCT agent_name) AS sources_csv,
+        COUNT(*) AS session_count,
+        MAX(activity_time) AS last_activity
+      FROM sessions
+      GROUP BY project_identity_kind, project_identity_key;
+  `);
+}
+function recreateProjectGroupsView(db) {
+  db.exec("DROP VIEW IF EXISTS project_groups_v");
+  createProjectGroupsView(db);
+}
+function createLatestCacheSchema(db) {
+  createCacheTables(db);
+  createSessionTables(db);
+  createFileActivityTables(db);
+  createSearchTables(db);
+  createProjectTables(db);
+}
+function stringifyOptionalJson(value) {
+  return value == null ? null : JSON.stringify(value);
+}
+function parseOptionalJson(value) {
+  return value == null ? void 0 : JSON.parse(String(value));
+}
+function sourcePathFromMeta(meta) {
+  return typeof meta?.sourcePath === "string" ? meta.sourcePath : null;
+}
+function sourcePathFromMetaJson(metaJson) {
+  if (!metaJson) return null;
+  const meta = JSON.parse(metaJson);
+  return sourcePathFromMeta(meta);
+}
+function prepareUpsertSession(db) {
+  return db.prepare(`
+    INSERT INTO sessions(
+      agent_name,
+      session_id,
+      sort_index,
+      slug,
+      title,
+      source_path,
+      directory,
+      project_identity_kind,
+      project_identity_key,
+      project_display_name,
+      time_created,
+      time_updated,
+      activity_time,
+      message_count,
+      total_input_tokens,
+      total_output_tokens,
+      total_cache_read_tokens,
+      total_cache_create_tokens,
+      total_cost,
+      cost_source,
+      total_tokens,
+      model_usage_json,
+      smart_tags_json,
+      smart_tags_source_updated_at,
+      meta_json
+    ) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
+    ON CONFLICT(agent_name, session_id) DO UPDATE SET
+      sort_index = excluded.sort_index,
+      slug = excluded.slug,
+      title = excluded.title,
+      source_path = excluded.source_path,
+      directory = excluded.directory,
+      project_identity_kind = excluded.project_identity_kind,
+      project_identity_key = excluded.project_identity_key,
+      project_display_name = excluded.project_display_name,
+      time_created = excluded.time_created,
+      time_updated = excluded.time_updated,
+      activity_time = excluded.activity_time,
+      message_count = excluded.message_count,
+      total_input_tokens = excluded.total_input_tokens,
+      total_output_tokens = excluded.total_output_tokens,
+      total_cache_read_tokens = excluded.total_cache_read_tokens,
+      total_cache_create_tokens = excluded.total_cache_create_tokens,
+      total_cost = excluded.total_cost,
+      cost_source = excluded.cost_source,
+      total_tokens = excluded.total_tokens,
+      model_usage_json = excluded.model_usage_json,
+      smart_tags_json = excluded.smart_tags_json,
+      smart_tags_source_updated_at = excluded.smart_tags_source_updated_at,
+      meta_json = excluded.meta_json
+  `);
+}
+function prepareUpsertIndexedSession(db) {
+  return db.prepare(`
+    INSERT INTO sessions(
+      agent_name,
+      session_id,
+      sort_index,
+      slug,
+      title,
+      source_path,
+      directory,
+      project_identity_kind,
+      project_identity_key,
+      project_display_name,
+      time_created,
+      time_updated,
+      activity_time,
+      message_count,
+      total_input_tokens,
+      total_output_tokens,
+      total_cache_read_tokens,
+      total_cache_create_tokens,
+      total_cost,
+      cost_source,
+      total_tokens,
+      model_usage_json,
+      smart_tags_json,
+      smart_tags_source_updated_at,
+      meta_json
+    ) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
+    ON CONFLICT(agent_name, session_id) DO UPDATE SET
+      slug = excluded.slug,
+      title = excluded.title,
+      directory = excluded.directory,
+      project_identity_kind = excluded.project_identity_kind,
+      project_identity_key = excluded.project_identity_key,
+      project_display_name = excluded.project_display_name,
+      time_created = excluded.time_created,
+      time_updated = excluded.time_updated,
+      activity_time = excluded.activity_time,
+      message_count = excluded.message_count,
+      total_input_tokens = excluded.total_input_tokens,
+      total_output_tokens = excluded.total_output_tokens,
+      total_cache_read_tokens = excluded.total_cache_read_tokens,
+      total_cache_create_tokens = excluded.total_cache_create_tokens,
+      total_cost = excluded.total_cost,
+      cost_source = excluded.cost_source,
+      total_tokens = excluded.total_tokens,
+      model_usage_json = excluded.model_usage_json,
+      smart_tags_json = excluded.smart_tags_json,
+      smart_tags_source_updated_at = excluded.smart_tags_source_updated_at
+  `);
+}
+function upsertSessionRow(statement, agentName, session, metaJson, sortIndex, sourcePath) {
+  const identity = session.project_identity ?? computeIdentity(session.directory, realFs);
+  const activityTime = session.time_updated ?? session.time_created;
+  statement.run(
+    agentName,
+    session.id,
+    sortIndex,
+    session.slug,
+    session.title,
+    sourcePath,
+    session.directory,
+    identity.kind,
+    identity.key,
+    identity.displayName,
+    session.time_created,
+    session.time_updated ?? null,
+    activityTime,
+    session.stats.message_count,
+    session.stats.total_input_tokens,
+    session.stats.total_output_tokens,
+    session.stats.total_cache_read_tokens ?? null,
+    session.stats.total_cache_create_tokens ?? null,
+    session.stats.total_cost,
+    session.stats.cost_source ?? null,
+    session.stats.total_tokens ?? null,
+    stringifyOptionalJson(session.model_usage),
+    stringifyOptionalJson(session.smart_tags),
+    session.smart_tags_source_updated_at ?? null,
+    metaJson
+  );
+}
+function prepareInsertFileActivity(db) {
+  return db.prepare(`
+    INSERT INTO session_file_activity(
+      agent_name,
+      session_id,
+      project_identity_key,
+      path,
+      kind,
+      count,
+      latest_time
+    ) VALUES (?, ?, ?, ?, ?, ?, ?)
+  `);
+}
+function writeFileActivityRows(statement, activities) {
+  for (const activity of activities) {
+    statement.run(
+      activity.agent_name,
+      activity.session_id,
+      activity.project_identity_key,
+      activity.path,
+      activity.kind,
+      activity.count,
+      activity.latest_time
+    );
+  }
+}
+function sessionFromRow(row) {
+  const session = {
+    id: String(row.session_id),
+    slug: String(row.slug),
+    title: String(row.title),
+    directory: String(row.directory),
+    time_created: Number(row.time_created),
+    stats: {
+      message_count: Number(row.message_count ?? 0),
+      total_input_tokens: Number(row.total_input_tokens ?? 0),
+      total_output_tokens: Number(row.total_output_tokens ?? 0),
+      total_cost: Number(row.total_cost ?? 0)
+    }
+  };
+  if (row.project_identity_key) {
+    session.project_identity = {
+      kind: row.project_identity_kind ?? "path",
+      key: String(row.project_identity_key),
+      displayName: String(row.project_display_name ?? "")
+    };
+  }
+  if (row.time_updated != null) {
+    session.time_updated = Number(row.time_updated);
+  }
+  if (row.total_cache_read_tokens != null) {
+    session.stats.total_cache_read_tokens = Number(row.total_cache_read_tokens);
+  }
+  if (row.total_cache_create_tokens != null) {
+    session.stats.total_cache_create_tokens = Number(row.total_cache_create_tokens);
+  }
+  if (row.cost_source) {
+    session.stats.cost_source = row.cost_source;
+  }
+  if (row.total_tokens != null) {
+    session.stats.total_tokens = Number(row.total_tokens);
+  }
+  const modelUsage = parseOptionalJson(row.model_usage_json);
+  if (modelUsage) {
+    session.model_usage = modelUsage;
+  }
+  const smartTags = parseOptionalJson(row.smart_tags_json);
+  if (smartTags) {
+    session.smart_tags = smartTags;
+  }
+  if (row.smart_tags_source_updated_at != null) {
+    session.smart_tags_source_updated_at = Number(row.smart_tags_source_updated_at);
+  }
+  return session;
+}
+function recreateSearchIndexSchema(db) {
+  db.exec(`
+    DROP TRIGGER IF EXISTS session_documents_ai;
+    DROP TRIGGER IF EXISTS session_documents_ad;
+    DROP TRIGGER IF EXISTS session_documents_au;
+    DROP TABLE IF EXISTS session_documents_fts;
+  `);
+  createSearchTables(db);
+  rebuildSearchIndex(db);
+}
+function readLegacyCacheVersion(db) {
+  if (!tableExists(db, "cache_meta") || !columnExists(db, "cache_meta", "key") || !columnExists(db, "cache_meta", "value")) {
+    return 0;
   }
   const versionRow = db.prepare("SELECT value FROM cache_meta WHERE key = 'version'").get();
-  const version = Number(versionRow?.value ?? 0);
-  if (version === CACHE_VERSION) {
+  return Number(versionRow?.value ?? 0);
+}
+function inferCacheSchemaVersion(db) {
+  if (tableExists(db, "session_file_activity")) {
+    return 8;
+  }
+  if (tableExists(db, "sessions") || tableExists(db, "messages")) {
+    return 7;
+  }
+  if (tableExists(db, "project_sessions") || columnExists(db, "session_documents", "project_identity_key")) {
+    return 5;
+  }
+  if (tableExists(db, "session_documents")) {
+    return 4;
+  }
+  if (tableExists(db, "cached_sessions") || tableExists(db, "agent_cache")) {
+    return 3;
+  }
+  return 0;
+}
+function getCurrentCacheSchemaVersion(db) {
+  const userVersion = getUserVersion(db);
+  if (userVersion > 0) {
+    return userVersion;
+  }
+  const legacyVersion = readLegacyCacheVersion(db);
+  return Math.max(legacyVersion, inferCacheSchemaVersion(db));
+}
+function hasAnyCacheSchema(db) {
+  return [
+    "cache_meta",
+    "agent_cache",
+    "cached_sessions",
+    "sessions",
+    "messages",
+    "session_file_activity",
+    "session_documents",
+    "session_documents_fts",
+    "project_sessions"
+  ].some((table) => tableExists(db, table));
+}
+function backfillProjectSessions(db) {
+  if (!tableExists(db, "cached_sessions") || !tableExists(db, "project_sessions")) {
     return;
   }
-  db.exec(`
-    DELETE FROM agent_cache;
-    DELETE FROM cached_sessions;
-    DELETE FROM session_documents;
-    DELETE FROM project_sessions;
-    INSERT INTO session_documents_fts(session_documents_fts) VALUES ('rebuild');
-    INSERT INTO cache_meta(key, value)
-    VALUES ('version', '${CACHE_VERSION}')
-    ON CONFLICT(key) DO UPDATE SET value = excluded.value;
+  const rows = db.prepare("SELECT agent_name, session_id, session_json FROM cached_sessions").all();
+  const upsert = db.prepare(`
+    INSERT INTO project_sessions(
+      agent_name,
+      session_id,
+      identity_kind,
+      identity_key,
+      display_name,
+      directory,
+      activity_time
+    ) VALUES (?, ?, ?, ?, ?, ?, ?)
+    ON CONFLICT(agent_name, session_id) DO UPDATE SET
+      identity_kind = excluded.identity_kind,
+      identity_key = excluded.identity_key,
+      display_name = excluded.display_name,
+      directory = excluded.directory,
+      activity_time = excluded.activity_time
   `);
+  for (const row of rows) {
+    if (!row.session_json || !row.agent_name || !row.session_id) {
+      continue;
+    }
+    try {
+      const session = JSON.parse(row.session_json);
+      const identity = session.project_identity ?? computeIdentity(session.directory, realFs);
+      upsert.run(
+        row.agent_name,
+        row.session_id,
+        identity.kind,
+        identity.key,
+        identity.displayName,
+        session.directory,
+        session.time_updated ?? session.time_created
+      );
+    } catch {
+      continue;
+    }
+  }
+}
+function backfillSessionDocumentProjects(db) {
+  if (!tableExists(db, "session_documents") || !columnExists(db, "session_documents", "project_identity_key")) {
+    return;
+  }
+  const rows = db.prepare("SELECT id, directory FROM session_documents").all();
+  const update = db.prepare(`
+    UPDATE session_documents
+    SET
+      project_identity_kind = ?,
+      project_identity_key = ?,
+      project_display_name = ?
+    WHERE id = ?
+  `);
+  for (const row of rows) {
+    const identity = computeIdentity(String(row.directory ?? ""), realFs);
+    update.run(identity.kind, identity.key, identity.displayName, Number(row.id));
+  }
+}
+function migrateProjectIdentity(db) {
+  createProjectTables(db);
+  backfillProjectSessions(db);
+  backfillSessionDocumentProjects(db);
+}
+function backfillStructuredSessions(db) {
+  createSessionTables(db);
+  recreateProjectGroupsView(db);
+  const upsertSession = prepareUpsertSession(db);
+  if (tableExists(db, "cached_sessions")) {
+    const rows = db.prepare(
+      "SELECT agent_name, session_id, session_json, meta_json, rowid AS sort_index FROM cached_sessions ORDER BY agent_name, rowid"
+    ).all();
+    for (const row of rows) {
+      if (!row.agent_name || !row.session_json) {
+        continue;
+      }
+      try {
+        const session = JSON.parse(row.session_json);
+        upsertSessionRow(
+          upsertSession,
+          String(row.agent_name),
+          session,
+          row.meta_json ?? null,
+          Number(row.sort_index ?? 0),
+          sourcePathFromMetaJson(row.meta_json)
+        );
+      } catch {
+        continue;
+      }
+    }
+  }
+  if (!tableExists(db, "session_documents")) {
+    return;
+  }
+  const documentRows = db.prepare(
+    `
+        SELECT
+          d.agent_name,
+          d.session_id,
+          d.slug,
+          d.title,
+          d.directory,
+          d.project_identity_kind,
+          d.project_identity_key,
+          d.project_display_name,
+          d.time_created,
+          d.time_updated,
+          d.activity_time,
+          d.id
+        FROM session_documents d
+        LEFT JOIN sessions s ON s.agent_name = d.agent_name AND s.session_id = d.session_id
+        WHERE s.session_id IS NULL
+        ORDER BY d.id
+      `
+  ).all();
+  for (const row of documentRows) {
+    const directory = String(row.directory ?? "");
+    const identity = row.project_identity_key && row.project_identity_kind && row.project_display_name ? {
+      kind: row.project_identity_kind,
+      key: String(row.project_identity_key),
+      displayName: String(row.project_display_name)
+    } : computeIdentity(directory, realFs);
+    upsertSessionRow(
+      upsertSession,
+      String(row.agent_name),
+      {
+        id: String(row.session_id),
+        slug: String(row.slug),
+        title: String(row.title),
+        directory,
+        project_identity: identity,
+        time_created: Number(row.time_created ?? row.activity_time ?? 0),
+        time_updated: row.time_updated == null ? void 0 : Number(row.time_updated),
+        stats: {
+          message_count: 0,
+          total_input_tokens: 0,
+          total_output_tokens: 0,
+          total_cost: 0
+        }
+      },
+      null,
+      Number(row.id ?? 0),
+      null
+    );
+  }
+}
+function messageFromBackfillRow(row) {
+  const role = row.role === "assistant" || row.role === "tool" ? row.role : "user";
+  return {
+    id: String(row.message_id ?? ""),
+    role,
+    agent: row.agent ?? null,
+    time_created: Number(row.time_created ?? 0),
+    time_completed: row.time_completed == null ? null : Number(row.time_completed),
+    mode: row.mode ?? null,
+    model: row.model ?? null,
+    provider: row.provider ?? null,
+    parts: JSON.parse(String(row.parts_json ?? "[]")),
+    subagent_id: row.subagent_id ?? void 0,
+    nickname: row.nickname ?? void 0
+  };
+}
+function backfillFileActivity(db) {
+  createFileActivityTables(db);
+  if (!tableExists(db, "sessions") || !tableExists(db, "messages")) {
+    return;
+  }
+  const sessions = db.prepare(
+    `
+        SELECT agent_name, session_id, project_identity_key
+        FROM sessions
+        ORDER BY agent_name, session_id
+      `
+  ).all();
+  const loadMessages = db.prepare(`
+    SELECT
+      message_id,
+      role,
+      time_created,
+      time_completed,
+      agent,
+      mode,
+      model,
+      provider,
+      parts_json,
+      subagent_id,
+      nickname
+    FROM messages
+    WHERE agent_name = ? AND session_id = ?
+    ORDER BY message_index
+  `);
+  const deleteActivity = db.prepare(
+    "DELETE FROM session_file_activity WHERE agent_name = ? AND session_id = ?"
+  );
+  const insertActivity = prepareInsertFileActivity(db);
+  for (const session of sessions) {
+    if (!session.agent_name || !session.session_id || !session.project_identity_key) {
+      continue;
+    }
+    try {
+      const rows = loadMessages.all(session.agent_name, session.session_id);
+      const messages = rows.map((row) => messageFromBackfillRow(row));
+      const activities = extractSessionFileActivity(
+        String(session.agent_name),
+        String(session.session_id),
+        String(session.project_identity_key),
+        messages
+      );
+      deleteActivity.run(session.agent_name, session.session_id);
+      writeFileActivityRows(insertActivity, activities);
+    } catch {
+      continue;
+    }
+  }
+}
+function invalidateSearchContentHashes(db) {
+  if (tableExists(db, "session_documents") && columnExists(db, "session_documents", "content_hash")) {
+    db.exec("UPDATE session_documents SET content_hash = ''");
+  }
+}
+function rebuildSearchIndex(db) {
+  if (!tableExists(db, "session_documents_fts")) {
+    return;
+  }
+  db.exec("INSERT INTO session_documents_fts(session_documents_fts) VALUES ('rebuild')");
+}
+function shouldBulkSyncSearchIndex(options, changedCount) {
+  if (options.isBulk != null) {
+    return options.isBulk;
+  }
+  const threshold = options.bulkThreshold ?? SEARCH_INDEX_BULK_SYNC_THRESHOLD;
+  return threshold > 0 && changedCount >= threshold;
+}
+function ensureFtsReady(db) {
+  if (!tableExists(db, "session_documents_fts")) {
+    createSearchTables(db);
+  }
+  createSearchTriggers(db);
+}
+function ensureFtsConsistency(db) {
+  ensureFtsReady(db);
+  const cachePath = getCachePath2();
+  if (ftsIntegrityCheckedPath === cachePath) {
+    return;
+  }
+  try {
+    db.exec(
+      "INSERT INTO session_documents_fts(session_documents_fts, rank) VALUES ('integrity-check', 1)"
+    );
+    ftsIntegrityCheckedPath = cachePath;
+  } catch {
+    rebuildSearchIndex(db);
+    ftsIntegrityCheckedPath = cachePath;
+  }
+}
+function setCacheSchemaVersion(db) {
+  createCacheTables(db);
+  setUserVersion(db, CACHE_SCHEMA_VERSION);
+  db.prepare(
+    `
+      INSERT INTO cache_meta(key, value)
+      VALUES ('version', ?)
+      ON CONFLICT(key) DO UPDATE SET value = excluded.value
+    `
+  ).run(String(CACHE_SCHEMA_VERSION));
+}
+function ensureSchema(db, dbPath) {
+  const currentVersion = getCurrentCacheSchemaVersion(db);
+  if (currentVersion === 0 && !hasAnyCacheSchema(db)) {
+    createLatestCacheSchema(db);
+    setCacheSchemaVersion(db);
+    return;
+  }
+  runSchemaMigrations(db, {
+    dbPath,
+    currentVersion,
+    targetVersion: CACHE_SCHEMA_VERSION,
+    backupLabel: "cache-migration",
+    backupTables: [
+      "agent_cache",
+      "cached_sessions",
+      "sessions",
+      "messages",
+      "session_file_activity",
+      "session_documents",
+      "project_sessions"
+    ],
+    migrations: [
+      { version: 3, migrate: createCacheTables },
+      { version: 4, migrate: createSearchTables },
+      { version: 5, migrate: migrateProjectIdentity },
+      {
+        version: 6,
+        destructive: true,
+        migrate(db2) {
+          createLatestCacheSchema(db2);
+          recreateSearchIndexSchema(db2);
+          invalidateSearchContentHashes(db2);
+        }
+      },
+      { version: 7, migrate: backfillStructuredSessions },
+      { version: 8, migrate: backfillFileActivity }
+    ]
+  });
+  createLatestCacheSchema(db);
+  if (getUserVersion(db) <= CACHE_SCHEMA_VERSION) {
+    setCacheSchemaVersion(db);
+  }
 }
 function sessionContentHash(session) {
   return JSON.stringify([
@@ -4565,9 +5845,123 @@ function sessionContentHash(session) {
 function escapeFtsTerm(value) {
   return value.replaceAll('"', '""');
 }
+function splitSearchTokens(input) {
+  const tokens = [];
+  let token = "";
+  let inQuote = false;
+  for (const char of input) {
+    if (char === '"') {
+      inQuote = !inQuote;
+      token += char;
+      continue;
+    }
+    if (/\s/.test(char) && !inQuote) {
+      if (token) {
+        tokens.push(token);
+        token = "";
+      }
+      continue;
+    }
+    token += char;
+  }
+  if (token) {
+    tokens.push(token);
+  }
+  return tokens;
+}
+function unwrapSearchValue(value) {
+  const trimmed = value.trim();
+  if (trimmed.startsWith('"') && trimmed.endsWith('"')) {
+    return trimmed.slice(1, -1).trim();
+  }
+  return trimmed;
+}
+function parseCostQualifier(value, filters) {
+  const raw = unwrapSearchValue(value);
+  const range = raw.match(/^(\d+(?:\.\d+)?)\.\.(\d+(?:\.\d+)?)$/);
+  if (range) {
+    filters.costMin = Number(range[1]);
+    filters.costMax = Number(range[2]);
+    return;
+  }
+  const comparison = raw.match(/^(>=|>|<=|<)(\d+(?:\.\d+)?)$/);
+  if (comparison) {
+    const amount2 = Number(comparison[2]);
+    if (comparison[1]?.includes(">")) {
+      filters.costMin = amount2;
+      filters.costMinExclusive = comparison[1] === ">";
+    } else {
+      filters.costMax = amount2;
+      filters.costMaxExclusive = comparison[1] === "<";
+    }
+    return;
+  }
+  const amount = Number(raw);
+  if (!Number.isNaN(amount)) {
+    filters.costMin = amount;
+    filters.costMax = amount;
+  }
+}
+function appendUnique(values, value) {
+  if (values?.includes(value)) return values;
+  return [...values ?? [], value];
+}
+function isSmartTag(value) {
+  return value === "bugfix" || value === "refactoring" || value === "feature-dev" || value === "testing" || value === "docs" || value === "git-ops" || value === "build-deploy" || value === "exploration" || value === "planning";
+}
+function parseSearchQuery(input) {
+  const filters = {};
+  const textTokens = [];
+  let hasQualifiers = false;
+  for (const token of splitSearchTokens(input)) {
+    const match = token.match(/^([a-zA-Z][a-zA-Z_-]*):(.+)$/);
+    if (!match) {
+      textTokens.push(token);
+      continue;
+    }
+    const key = match[1].toLowerCase();
+    const value = unwrapSearchValue(match[2]);
+    if (!value) continue;
+    let consumed = true;
+    if (key === "agent") filters.agent = value.toLowerCase();
+    else if (key === "project") filters.project = value;
+    else if (key === "projectkey" || key === "project-key") filters.projectKey = value;
+    else if (key === "cwd") filters.cwd = value;
+    else if (key === "tool") filters.tools = appendUnique(filters.tools, value.toLowerCase());
+    else if (key === "file" || key === "path") filters.file = value;
+    else if (key === "kind" || key === "filekind" || key === "file-kind") {
+      if (value === "read" || value === "edit" || value === "write" || value === "delete") {
+        filters.fileKind = value;
+      } else {
+        consumed = false;
+      }
+    } else if (key === "tag" || key === "signal") {
+      const tag = value.toLowerCase();
+      if (isSmartTag(tag)) {
+        filters.tags = appendUnique(filters.tags, tag);
+      } else {
+        consumed = false;
+      }
+    } else if (key === "cost") {
+      parseCostQualifier(value, filters);
+    } else {
+      consumed = false;
+    }
+    if (consumed) {
+      hasQualifiers = true;
+    } else {
+      textTokens.push(token);
+    }
+  }
+  return {
+    text: textTokens.join(" ").trim(),
+    filters,
+    hasQualifiers
+  };
+}
 function toFtsQuery(input) {
-  const tokens = input.match(/"[^"]+"|\S+/g) ?? [];
-  return tokens.map((token) => {
+  const tokens = splitSearchTokens(input);
+  const mapped = tokens.map((token) => {
     if (/^OR$/i.test(token)) {
       return "OR";
     }
@@ -4575,7 +5969,10 @@ function toFtsQuery(input) {
       return `"${escapeFtsTerm(token.slice(1, -1))}"`;
     }
     return `"${escapeFtsTerm(token)}"`;
-  }).join(" ");
+  }).filter(
+    (token, index, values) => token !== "OR" || index > 0 && index < values.length - 1 && values[index - 1] !== "OR" && values[index + 1] !== "OR"
+  );
+  return mapped.join(" ");
 }
 function appendPlainText(value, chunks) {
   if (value == null) return;
@@ -4602,29 +5999,77 @@ function appendPlainText(value, chunks) {
     }
   }
 }
-function buildSessionContent(session) {
+function compactRecord(record) {
+  return Object.fromEntries(Object.entries(record).filter(([, value]) => value != null));
+}
+function summarizeToolPart(part) {
+  const state = part.state == null ? void 0 : compactRecord({
+    status: part.state.status,
+    error: part.state.error,
+    metadata: part.state.metadata
+  });
+  return compactRecord({
+    type: part.type,
+    tool: part.tool,
+    title: part.title,
+    nickname: part.nickname,
+    callID: part.callID,
+    approval_status: part.approval_status,
+    state
+  });
+}
+function buildMessageText(message) {
   const chunks = [];
-  appendPlainText(session.title, chunks);
-  for (const message of session.messages) {
-    chunks.push(message.role);
-    appendPlainText(message.agent, chunks);
-    appendPlainText(message.model, chunks);
-    for (const part of message.parts) {
-      appendPlainText(part.type, chunks);
-      appendPlainText(part.title, chunks);
-      appendPlainText(part.nickname, chunks);
-      appendPlainText(part.tool, chunks);
-      appendPlainText(part.text, chunks);
-      appendPlainText(part.input, chunks);
-      appendPlainText(part.output, chunks);
-      appendPlainText(part.state, chunks);
-    }
+  chunks.push(message.role);
+  appendPlainText(message.agent, chunks);
+  appendPlainText(message.model, chunks);
+  for (const part of message.parts) {
+    appendPlainText(part.type, chunks);
+    appendPlainText(part.title, chunks);
+    appendPlainText(part.nickname, chunks);
+    appendPlainText(part.tool, chunks);
+    appendPlainText(part.text, chunks);
+    appendPlainText(part.input, chunks);
+    appendPlainText(part.output, chunks);
+    appendPlainText(part.state, chunks);
+  }
+  return chunks.join("\n");
+}
+function normalizeMessages(session) {
+  return session.messages.map((message, index) => {
+    const toolMetadata = message.parts.filter((part) => part.type === "tool").map((part) => summarizeToolPart(part));
+    return {
+      index,
+      id: message.id || `${session.id}:${index}`,
+      role: message.role,
+      timeCreated: message.time_created,
+      timeCompleted: message.time_completed ?? null,
+      agent: message.agent ?? null,
+      mode: message.mode ?? null,
+      model: message.model ?? null,
+      provider: message.provider ?? null,
+      tokensJson: stringifyOptionalJson(message.tokens),
+      cost: message.cost ?? null,
+      costSource: message.cost_source ?? null,
+      partsJson: JSON.stringify(message.parts),
+      subagentId: message.subagent_id ?? null,
+      nickname: message.nickname ?? null,
+      contentText: buildMessageText(message),
+      toolMetadataJson: toolMetadata.length > 0 ? JSON.stringify(toolMetadata) : null
+    };
+  });
+}
+function buildSessionContentFromMessages(title, messages) {
+  const chunks = [];
+  appendPlainText(title, chunks);
+  for (const message of messages) {
+    appendPlainText(message.contentText, chunks);
   }
   return chunks.join("\n");
 }
 function deleteLegacyCacheFile() {
   const legacyPath = getLegacyCachePath();
-  if (!existsSync9(legacyPath)) {
+  if (!existsSync10(legacyPath)) {
     return;
   }
   try {
@@ -4644,19 +6089,39 @@ function loadCachedSessions(agentName) {
     }
     const rows = db.prepare(
       `
-          SELECT session_json, meta_json
-          FROM cached_sessions
+          SELECT
+            session_id,
+            sort_index,
+            slug,
+            title,
+            source_path,
+            directory,
+            project_identity_kind,
+            project_identity_key,
+            project_display_name,
+            time_created,
+            time_updated,
+            message_count,
+            total_input_tokens,
+            total_output_tokens,
+            total_cache_read_tokens,
+            total_cache_create_tokens,
+            total_cost,
+            cost_source,
+            total_tokens,
+            model_usage_json,
+            smart_tags_json,
+            smart_tags_source_updated_at,
+            meta_json
+          FROM sessions
           WHERE agent_name = ?
-          ORDER BY rowid
+          ORDER BY sort_index, activity_time DESC
         `
     ).all(agentName);
     const sessions = [];
     const meta = {};
     for (const row of rows) {
-      if (!row.session_json) {
-        continue;
-      }
-      const session = JSON.parse(row.session_json);
+      const session = sessionFromRow(row);
       sessions.push(session);
       if (row.meta_json) {
         meta[session.id] = JSON.parse(row.meta_json);
@@ -4668,17 +6133,27 @@ function loadCachedSessions(agentName) {
 function saveCachedSessions(agentName, sessions, meta = {}) {
   withCacheDb((db) => {
     const deleteAgent = db.prepare("DELETE FROM agent_cache WHERE agent_name = ?");
-    const deleteSessions = db.prepare("DELETE FROM cached_sessions WHERE agent_name = ?");
+    const deleteLegacySessions = db.prepare("DELETE FROM cached_sessions WHERE agent_name = ?");
+    const deleteSession = db.prepare(
+      "DELETE FROM sessions WHERE agent_name = ? AND session_id = ?"
+    );
+    const deleteSearchDocument = db.prepare(
+      "DELETE FROM session_documents WHERE agent_name = ? AND session_id = ?"
+    );
+    const deleteFileActivity = db.prepare(
+      "DELETE FROM session_file_activity WHERE agent_name = ? AND session_id = ?"
+    );
     const deleteProjectSessions = db.prepare("DELETE FROM project_sessions WHERE agent_name = ?");
     const upsertAgent = db.prepare(`
       INSERT INTO agent_cache(agent_name, timestamp)
       VALUES (?, ?)
       ON CONFLICT(agent_name) DO UPDATE SET timestamp = excluded.timestamp
     `);
-    const insertSession = db.prepare(`
+    const insertCachedSession = db.prepare(`
       INSERT INTO cached_sessions(agent_name, session_id, session_json, meta_json)
       VALUES (?, ?, ?, ?)
     `);
+    const upsertSession = prepareUpsertSession(db);
     const insertProjectSession = db.prepare(`
       INSERT INTO project_sessions(
         agent_name,
@@ -4692,17 +6167,32 @@ function saveCachedSessions(agentName, sessions, meta = {}) {
     `);
     const write = db.transaction(() => {
       const timestamp = Date.now();
+      const sessionIds = new Set(sessions.map((session) => session.id));
+      const existingSessionIds = db.prepare("SELECT session_id FROM sessions WHERE agent_name = ?").all(agentName);
       deleteAgent.run(agentName);
-      deleteSessions.run(agentName);
+      deleteLegacySessions.run(agentName);
       deleteProjectSessions.run(agentName);
       upsertAgent.run(agentName, timestamp);
-      for (const session of sessions) {
+      for (const row of existingSessionIds) {
+        const sessionId = String(row.session_id);
+        if (!sessionIds.has(sessionId)) {
+          deleteSearchDocument.run(agentName, sessionId);
+          deleteFileActivity.run(agentName, sessionId);
+          deleteSession.run(agentName, sessionId);
+        }
+      }
+      sessions.forEach((session, index) => {
         const identity = session.project_identity ?? computeIdentity(session.directory, realFs);
-        insertSession.run(
+        const sessionMeta = meta[session.id];
+        const metaJson = sessionMeta ? JSON.stringify(sessionMeta) : null;
+        insertCachedSession.run(agentName, session.id, JSON.stringify(session), metaJson);
+        upsertSessionRow(
+          upsertSession,
           agentName,
-          session.id,
-          JSON.stringify(session),
-          meta[session.id] ? JSON.stringify(meta[session.id]) : null
+          session,
+          metaJson,
+          index,
+          sourcePathFromMeta(sessionMeta)
         );
         insertProjectSession.run(
           agentName,
@@ -4713,13 +6203,14 @@ function saveCachedSessions(agentName, sessions, meta = {}) {
           session.directory,
           session.time_updated ?? session.time_created
         );
-      }
+      });
     });
     write();
     deleteLegacyCacheFile();
   });
 }
 function clearCache() {
+  ftsIntegrityCheckedPath = null;
   if (!hasCacheStorage()) {
     deleteLegacyCacheFile();
     return;
@@ -4728,6 +6219,10 @@ function clearCache() {
     db.exec(`
       DELETE FROM agent_cache;
       DELETE FROM cached_sessions;
+      DELETE FROM session_documents;
+      DELETE FROM session_file_activity;
+      DELETE FROM messages;
+      DELETE FROM sessions;
       DELETE FROM project_sessions;
     `);
   });
@@ -4736,7 +6231,7 @@ function clearCache() {
   const walPath = `${cachePath}-wal`;
   const shmPath = `${cachePath}-shm`;
   for (const filePath of [walPath, shmPath]) {
-    if (!existsSync9(filePath)) {
+    if (!existsSync10(filePath)) {
       continue;
     }
     try {
@@ -4751,36 +6246,54 @@ function getCacheInfo() {
   }
   const info = withCacheDb((db) => {
     const timestampRow = db.prepare("SELECT MAX(timestamp) AS value FROM agent_cache").get();
-    const sizeRow = db.prepare("SELECT COUNT(*) AS value FROM cached_sessions").get();
+    const sizeRow = db.prepare("SELECT COUNT(*) AS value FROM sessions").get();
     const lastScanTime = Number(timestampRow?.value ?? 0) || null;
     const size = Number(sizeRow?.value ?? 0);
     return { lastScanTime, size };
   });
   return info ?? { lastScanTime: null, size: 0 };
 }
-function syncSessionSearchIndex(agentName, sessions, loadSessionData) {
-  if (!hasCacheStorage()) {
-    return;
-  }
-  withCacheDb((db) => {
+function syncSessionSearchIndex(agentName, sessions, loadSessionData, options = {}) {
+  return withCacheDb((db) => {
+    ensureFtsConsistency(db);
+    const startedAt = performance.now();
     const existingRows = db.prepare(
       "SELECT session_id, content_hash FROM session_documents WHERE agent_name = ? ORDER BY id"
     ).all(agentName);
     const existingMap = new Map(
       existingRows.map((row) => [String(row.session_id), String(row.content_hash ?? "")])
     );
+    const sessionSortIndexMap = new Map(sessions.map((session, index) => [session.id, index]));
+    const messageCountRows = db.prepare(
+      "SELECT session_id, COUNT(*) AS value FROM messages WHERE agent_name = ? GROUP BY session_id"
+    ).all(agentName);
+    const messageCountMap = new Map(
+      messageCountRows.map((row) => [String(row.session_id), Number(row.value ?? 0)])
+    );
     const sessionMap = new Map(sessions.map((session) => [session.id, session]));
     const toDelete = existingRows.map((row) => String(row.session_id)).filter((sessionId) => !sessionMap.has(sessionId));
     const toUpsert = sessions.filter(
-      (session) => existingMap.get(session.id) !== sessionContentHash(session)
+      (session) => existingMap.get(session.id) !== sessionContentHash(session) || messageCountMap.get(session.id) !== session.stats.message_count
     );
+    const changedCount = toDelete.length + toUpsert.length;
+    const isBulk = shouldBulkSyncSearchIndex(options, changedCount);
     const loaded = toUpsert.map((session) => {
       try {
         const data = loadSessionData(session.id);
+        const messages = normalizeMessages(data);
+        const identity = session.project_identity ?? data.project_identity ?? computeIdentity(session.directory, realFs);
         return {
           session,
-          contentText: buildSessionContent(data),
-          contentHash: sessionContentHash(session)
+          identity,
+          messages,
+          contentText: buildSessionContentFromMessages(data.title ?? session.title, messages),
+          contentHash: sessionContentHash(session),
+          fileActivity: extractSessionFileActivity(
+            agentName,
+            session.id,
+            identity.key,
+            data.messages
+          )
         };
       } catch {
         return null;
@@ -4789,6 +6302,54 @@ function syncSessionSearchIndex(agentName, sessions, loadSessionData) {
     const deleteRow = db.prepare(
       "DELETE FROM session_documents WHERE agent_name = ? AND session_id = ?"
     );
+    const deleteMessages = db.prepare(
+      "DELETE FROM messages WHERE agent_name = ? AND session_id = ? AND message_index >= ?"
+    );
+    const deleteFileActivity = db.prepare(
+      "DELETE FROM session_file_activity WHERE agent_name = ? AND session_id = ?"
+    );
+    const upsertIndexedSession = prepareUpsertIndexedSession(db);
+    const insertFileActivity = prepareInsertFileActivity(db);
+    const upsertMessage = db.prepare(`
+      INSERT INTO messages(
+        agent_name,
+        session_id,
+        message_index,
+        message_id,
+        role,
+        time_created,
+        time_completed,
+        agent,
+        mode,
+        model,
+        provider,
+        tokens_json,
+        cost,
+        cost_source,
+        parts_json,
+        subagent_id,
+        nickname,
+        content_text,
+        tool_metadata_json
+      ) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
+      ON CONFLICT(agent_name, session_id, message_index) DO UPDATE SET
+        message_id = excluded.message_id,
+        role = excluded.role,
+        time_created = excluded.time_created,
+        time_completed = excluded.time_completed,
+        agent = excluded.agent,
+        mode = excluded.mode,
+        model = excluded.model,
+        provider = excluded.provider,
+        tokens_json = excluded.tokens_json,
+        cost = excluded.cost,
+        cost_source = excluded.cost_source,
+        parts_json = excluded.parts_json,
+        subagent_id = excluded.subagent_id,
+        nickname = excluded.nickname,
+        content_text = excluded.content_text,
+        tool_metadata_json = excluded.tool_metadata_json
+    `);
     const upsertRow = db.prepare(`
       INSERT INTO session_documents(
         agent_name,
@@ -4820,22 +6381,57 @@ function syncSessionSearchIndex(agentName, sessions, loadSessionData) {
         content_hash = excluded.content_hash,
         indexed_at = excluded.indexed_at
     `);
-    const write = db.transaction(() => {
+    const writeRows = () => {
       for (const sessionId of toDelete) {
         deleteRow.run(agentName, sessionId);
+        deleteFileActivity.run(agentName, sessionId);
+        deleteMessages.run(agentName, sessionId, 0);
       }
       for (const entry of loaded) {
         const activityTime = entry.session.time_updated ?? entry.session.time_created;
-        const identity = entry.session.project_identity ?? computeIdentity(entry.session.directory, realFs);
+        upsertSessionRow(
+          upsertIndexedSession,
+          agentName,
+          entry.session,
+          null,
+          sessionSortIndexMap.get(entry.session.id) ?? 0,
+          null
+        );
+        deleteFileActivity.run(agentName, entry.session.id);
+        writeFileActivityRows(insertFileActivity, entry.fileActivity);
+        for (const message of entry.messages) {
+          upsertMessage.run(
+            agentName,
+            entry.session.id,
+            message.index,
+            message.id,
+            message.role,
+            message.timeCreated,
+            message.timeCompleted ?? null,
+            message.agent ?? null,
+            message.mode ?? null,
+            message.model ?? null,
+            message.provider ?? null,
+            message.tokensJson ?? null,
+            message.cost ?? null,
+            message.costSource ?? null,
+            message.partsJson,
+            message.subagentId ?? null,
+            message.nickname ?? null,
+            message.contentText,
+            message.toolMetadataJson ?? null
+          );
+        }
+        deleteMessages.run(agentName, entry.session.id, entry.messages.length);
         upsertRow.run(
           agentName,
           entry.session.id,
           entry.session.slug,
           entry.session.title,
           entry.session.directory,
-          identity.kind,
-          identity.key,
-          identity.displayName,
+          entry.identity.kind,
+          entry.identity.key,
+          entry.identity.displayName,
           entry.session.time_created,
           entry.session.time_updated ?? null,
           activityTime,
@@ -4844,74 +6440,441 @@ function syncSessionSearchIndex(agentName, sessions, loadSessionData) {
           Date.now()
         );
       }
-    });
-    write();
+    };
+    let rebuildDurationMs;
+    const needsRebuild = isBulk && (toDelete.length > 0 || loaded.length > 0);
+    if (needsRebuild) {
+      db.transaction(() => {
+        dropSearchTriggers(db);
+        writeRows();
+        const rebuildStartedAt = performance.now();
+        rebuildSearchIndex(db);
+        rebuildDurationMs = performance.now() - rebuildStartedAt;
+        createSearchTriggers(db);
+      })();
+    } else {
+      db.transaction(writeRows)();
+    }
+    return {
+      agentName,
+      mode: isBulk ? "bulk" : "incremental",
+      sessions: sessions.length,
+      changed: toUpsert.length,
+      deleted: toDelete.length,
+      indexed: loaded.length,
+      skipped: toUpsert.length - loaded.length,
+      durationMs: performance.now() - startedAt,
+      rebuildDurationMs
+    };
+  });
+}
+function sessionHeadFromSearchRow(row) {
+  return sessionFromRow(row);
+}
+function mergeSearchLists(left, right) {
+  const values = [...left ?? [], ...right ?? []];
+  return values.length > 0 ? [...new Set(values)] : void 0;
+}
+function mergeSearchQueryOptions(query, options) {
+  const parsed2 = parseSearchQuery(query);
+  return {
+    text: parsed2.text || (parsed2.hasQualifiers ? "" : query.trim()),
+    options: {
+      ...options,
+      agent: options.agent ?? parsed2.filters.agent,
+      project: options.project ?? parsed2.filters.project,
+      projectKey: options.projectKey ?? parsed2.filters.projectKey,
+      cwd: options.cwd ?? parsed2.filters.cwd,
+      tags: mergeSearchLists(options.tags, parsed2.filters.tags),
+      tools: mergeSearchLists(options.tools, parsed2.filters.tools),
+      file: options.file ?? parsed2.filters.file,
+      fileKind: options.fileKind ?? parsed2.filters.fileKind,
+      costMin: options.costMin ?? parsed2.filters.costMin,
+      costMax: options.costMax ?? parsed2.filters.costMax,
+      costMinExclusive: options.costMinExclusive ?? parsed2.filters.costMinExclusive,
+      costMaxExclusive: options.costMaxExclusive ?? parsed2.filters.costMaxExclusive
+    },
+    parsed: parsed2
+  };
+}
+function sessionMatchesSearchCost(session, options) {
+  const cost = session.stats.total_cost;
+  if (options.costMin != null) {
+    if (options.costMinExclusive ? cost <= options.costMin : cost < options.costMin) {
+      return false;
+    }
+  }
+  if (options.costMax != null) {
+    if (options.costMaxExclusive ? cost >= options.costMax : cost > options.costMax) {
+      return false;
+    }
+  }
+  return true;
+}
+function likePattern(value) {
+  return `%${value.trim().toLowerCase().replace(/[\\%_]/g, "\\$&")}%`;
+}
+function escapeRegExp(value) {
+  return value.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
+}
+function buildSessionSearchFilters(options) {
+  const clauses = [];
+  const params = [];
+  if (options.agent) {
+    clauses.push("s.agent_name = ?");
+    params.push(options.agent);
+  }
+  if (options.projectKey) {
+    clauses.push("s.project_identity_key = ?");
+    params.push(options.projectKey);
+  }
+  if (options.cwd) {
+    clauses.push("(s.project_identity_key = ? OR LOWER(s.directory) LIKE ? ESCAPE '\\')");
+    params.push(computeIdentity(options.cwd, realFs).key, likePattern(options.cwd));
+  }
+  if (options.project) {
+    clauses.push(
+      "(LOWER(s.project_identity_key) LIKE ? ESCAPE '\\' OR LOWER(s.project_display_name) LIKE ? ESCAPE '\\' OR LOWER(s.directory) LIKE ? ESCAPE '\\')"
+    );
+    const pattern = likePattern(options.project);
+    params.push(pattern, pattern, pattern);
+  }
+  for (const tag of options.tags ?? []) {
+    clauses.push("s.smart_tags_json LIKE ?");
+    params.push(`%"${tag}"%`);
+  }
+  for (const tool of options.tools ?? []) {
+    clauses.push(
+      "EXISTS (SELECT 1 FROM messages m WHERE m.agent_name = s.agent_name AND m.session_id = s.session_id AND LOWER(m.tool_metadata_json) LIKE ? ESCAPE '\\')"
+    );
+    params.push(likePattern(tool));
+  }
+  if (options.file || options.fileKind) {
+    const fileClauses = ["fa.agent_name = s.agent_name", "fa.session_id = s.session_id"];
+    if (options.file) {
+      fileClauses.push("LOWER(fa.path) LIKE ? ESCAPE '\\'");
+      params.push(likePattern(options.file));
+    }
+    if (options.fileKind) {
+      fileClauses.push("fa.kind = ?");
+      params.push(options.fileKind);
+    }
+    clauses.push(
+      `EXISTS (SELECT 1 FROM session_file_activity fa WHERE ${fileClauses.join(" AND ")})`
+    );
+  }
+  if (options.from != null) {
+    clauses.push("s.activity_time >= ?");
+    params.push(options.from);
+  }
+  if (options.to != null) {
+    clauses.push("s.activity_time <= ?");
+    params.push(options.to);
+  }
+  if (options.costMin != null) {
+    clauses.push(options.costMinExclusive ? "s.total_cost > ?" : "s.total_cost >= ?");
+    params.push(options.costMin);
+  }
+  if (options.costMax != null) {
+    clauses.push(options.costMaxExclusive ? "s.total_cost < ?" : "s.total_cost <= ?");
+    params.push(options.costMax);
+  }
+  return {
+    where: clauses.length > 0 ? ` AND ${clauses.join(" AND ")}` : "",
+    params
+  };
+}
+function searchSessionColumns() {
+  return `
+    s.agent_name,
+    s.session_id,
+    s.slug,
+    s.title,
+    s.directory,
+    s.project_identity_kind,
+    s.project_identity_key,
+    s.project_display_name,
+    s.time_created,
+    s.time_updated,
+    s.message_count,
+    s.total_input_tokens,
+    s.total_output_tokens,
+    s.total_cache_read_tokens,
+    s.total_cache_create_tokens,
+    s.total_cost,
+    s.cost_source,
+    s.total_tokens,
+    s.model_usage_json,
+    s.smart_tags_json,
+    s.smart_tags_source_updated_at
+  `;
+}
+function parseTextTerms(input) {
+  const tokens = splitSearchTokens(input);
+  return {
+    terms: tokens.filter((token) => !/^OR$/i.test(token)).map((token) => unwrapSearchValue(token).toLowerCase()).filter(Boolean),
+    mode: tokens.some((token) => /^OR$/i.test(token)) ? "any" : "all"
+  };
+}
+function textMatchesTerms(text, terms) {
+  const lower = text.toLowerCase();
+  if (terms.terms.length === 0) return true;
+  if (terms.mode === "any") return terms.terms.some((term) => lower.includes(term));
+  return terms.terms.every((term) => lower.includes(term));
+}
+function highlightTerm(text, term) {
+  return text.replace(new RegExp(escapeRegExp(term), "gi"), (match) => `<mark>${match}</mark>`);
+}
+function buildTermSnippet(text, terms) {
+  const lower = text.toLowerCase();
+  const term = terms.terms.find((item) => lower.includes(item)) ?? terms.terms[0] ?? "";
+  if (!term) return text.slice(0, 180);
+  const index = lower.indexOf(term);
+  const start = Math.max(0, index - 80);
+  const end = Math.min(text.length, index + term.length + 80);
+  return `${start > 0 ? "\u2026 " : ""}${highlightTerm(text.slice(start, end), term)}${end < text.length ? " \u2026" : ""}`;
+}
+function messageMatchType(row) {
+  if (row.role === "user") return "user_message";
+  if (row.role === "tool" || row.mode === "tool" || row.tool_metadata_json) return "tool_output";
+  return "assistant_reply";
+}
+function resolveSearchMatch(db, row, textQuery) {
+  const terms = parseTextTerms(textQuery);
+  const title = String(row.title ?? "");
+  if (terms.terms.length === 0) {
+    return {
+      snippet: `Recent session \xB7 ${String(row.directory ?? "")}`,
+      matchType: "recent"
+    };
+  }
+  if (textMatchesTerms(title, terms)) {
+    return { snippet: buildTermSnippet(title, terms), matchType: "title" };
+  }
+  const messages = db.prepare(
+    `
+        SELECT role, mode, content_text, tool_metadata_json
+        FROM messages
+        WHERE agent_name = ? AND session_id = ?
+        ORDER BY message_index
+      `
+  ).all(row.agent_name, row.session_id);
+  for (const message of messages) {
+    const text = String(message.content_text ?? "");
+    if (!textMatchesTerms(text, terms)) continue;
+    return {
+      snippet: buildTermSnippet(text, terms),
+      matchType: messageMatchType(message)
+    };
+  }
+  return {
+    snippet: String(row.snippet ?? ""),
+    matchType: "assistant_reply"
+  };
+}
+function rowsToSearchResults(db, rows, textQuery) {
+  return rows.map((row) => {
+    const match = resolveSearchMatch(db, row, textQuery);
+    return {
+      agentName: String(row.agent_name),
+      session: sessionHeadFromSearchRow(row),
+      snippet: match.snippet,
+      matchType: match.matchType
+    };
   });
 }
 function searchSessions(query, options = {}) {
-  const normalizedQuery = query.trim();
-  if (!normalizedQuery || !hasCacheStorage()) {
+  const search = mergeSearchQueryOptions(query, options);
+  const normalizedQuery = search.text.trim();
+  if (!hasCacheStorage()) {
     return [];
   }
-  const ftsQuery = toFtsQuery(normalizedQuery);
   const results = withCacheDb((db) => {
+    ensureFtsReady(db);
+    const filters = buildSessionSearchFilters(search.options);
+    if (!normalizedQuery) {
+      const rows2 = db.prepare(
+        `
+            SELECT
+              ${searchSessionColumns()},
+              '' AS snippet
+            FROM sessions s
+            WHERE 1 = 1
+              ${filters.where}
+            ORDER BY s.activity_time DESC
+            LIMIT ?
+          `
+      ).all(...filters.params, search.options.limit ?? 50);
+      return rowsToSearchResults(db, rows2, "");
+    }
+    const ftsQuery = toFtsQuery(normalizedQuery);
+    if (!ftsQuery) return [];
     const rows = db.prepare(
       `
           SELECT
-            d.agent_name,
-            d.session_id,
-            d.slug,
-            d.title,
-            d.directory,
-            d.time_created,
-            d.time_updated,
+            ${searchSessionColumns()},
             COALESCE(
               NULLIF(snippet(session_documents_fts, 1, '<mark>', '</mark>', ' \u2026 ', 18), ''),
               highlight(session_documents_fts, 0, '<mark>', '</mark>')
             ) AS snippet
           FROM session_documents_fts
           JOIN session_documents d ON d.id = session_documents_fts.rowid
+          JOIN sessions s ON s.agent_name = d.agent_name AND s.session_id = d.session_id
           WHERE session_documents_fts MATCH ?
-            AND (? IS NULL OR d.agent_name = ?)
-            AND (? IS NULL OR d.project_identity_key = ? OR LOWER(d.directory) LIKE ?)
-            AND (? IS NULL OR d.activity_time >= ?)
-            AND (? IS NULL OR d.activity_time <= ?)
-          ORDER BY bm25(session_documents_fts, 8.0, 1.0), d.activity_time DESC
+            ${filters.where}
+          ORDER BY bm25(session_documents_fts, 8.0, 1.0), s.activity_time DESC
+          LIMIT ?
+        `
+    ).all(ftsQuery, ...filters.params, search.options.limit ?? 50);
+    return rowsToSearchResults(db, rows, normalizedQuery);
+  });
+  return results ?? [];
+}
+function normalizeFilePathSearch(value) {
+  return value.trim().replace(/^"|"$/g, "");
+}
+function fileActivityFilters(options) {
+  const path2 = options.path ? normalizeFilePathSearch(options.path) : "";
+  return {
+    projectKey: options.projectKey ?? null,
+    projectLike: options.project ? likePattern(options.project) : null,
+    cwdKey: options.cwd ? computeIdentity(options.cwd, realFs).key : null,
+    cwdLike: options.cwd ? likePattern(options.cwd) : null,
+    pathLike: path2 ? likePattern(path2) : null
+  };
+}
+function fileActivityFromRow(row) {
+  return {
+    agent_name: String(row.agent_name),
+    session_id: String(row.session_id),
+    project_identity_key: String(row.project_identity_key ?? ""),
+    path: String(row.path ?? ""),
+    kind: row.kind ?? "read",
+    count: Number(row.count ?? 0),
+    latest_time: Number(row.latest_time ?? 0)
+  };
+}
+function listFileActivity(options = {}) {
+  if (!hasCacheStorage()) {
+    return [];
+  }
+  const filters = fileActivityFilters(options);
+  const rows = withCacheDb(
+    (db) => db.prepare(
+      `
+          SELECT
+            fa.agent_name,
+            fa.session_id,
+            fa.project_identity_key,
+            fa.path,
+            fa.kind,
+            fa.count,
+            fa.latest_time,
+            s.slug,
+            s.title,
+            s.directory,
+            s.project_identity_kind,
+            s.project_display_name,
+            s.time_created,
+            s.time_updated,
+            s.message_count,
+            s.total_input_tokens,
+            s.total_output_tokens,
+            s.total_cache_read_tokens,
+            s.total_cache_create_tokens,
+            s.total_cost,
+            s.cost_source,
+            s.total_tokens
+          FROM session_file_activity fa
+          JOIN sessions s ON s.agent_name = fa.agent_name AND s.session_id = fa.session_id
+          WHERE (? IS NULL OR fa.agent_name = ?)
+            AND (? IS NULL OR fa.session_id = ?)
+            AND (? IS NULL OR fa.project_identity_key = ?)
+            AND (? IS NULL OR LOWER(fa.project_identity_key) LIKE ? ESCAPE '\\' OR LOWER(s.project_display_name) LIKE ? ESCAPE '\\' OR LOWER(s.directory) LIKE ? ESCAPE '\\')
+            AND (? IS NULL OR s.project_identity_key = ? OR LOWER(s.directory) LIKE ? ESCAPE '\\')
+            AND (? IS NULL OR LOWER(fa.path) LIKE ? ESCAPE '\\')
+            AND (? IS NULL OR fa.kind = ?)
+            AND (? IS NULL OR fa.latest_time >= ?)
+            AND (? IS NULL OR fa.latest_time <= ?)
+          ORDER BY fa.latest_time DESC, fa.count DESC, fa.path
           LIMIT ?
         `
     ).all(
-      ftsQuery,
       options.agent ?? null,
       options.agent ?? null,
-      options.cwd ?? null,
-      options.cwd ? computeIdentity(options.cwd, realFs).key : null,
-      options.cwd ? `%${options.cwd.toLowerCase()}%` : null,
+      options.sessionId ?? null,
+      options.sessionId ?? null,
+      filters.projectKey,
+      filters.projectKey,
+      filters.projectLike,
+      filters.projectLike,
+      filters.projectLike,
+      filters.projectLike,
+      filters.cwdKey,
+      filters.cwdKey,
+      filters.cwdLike,
+      filters.pathLike,
+      filters.pathLike,
+      options.kind ?? null,
+      options.kind ?? null,
       options.from ?? null,
       options.from ?? null,
       options.to ?? null,
       options.to ?? null,
       options.limit ?? 50
-    );
-    return rows.map((row) => ({
-      agentName: String(row.agent_name),
-      session: {
-        id: String(row.session_id),
-        slug: String(row.slug),
-        title: String(row.title),
-        directory: String(row.directory),
-        time_created: Number(row.time_created),
-        time_updated: row.time_updated == null ? void 0 : Number(row.time_updated),
-        stats: {
-          message_count: 0,
-          total_input_tokens: 0,
-          total_output_tokens: 0,
-          total_cost: 0
-        }
-      },
-      snippet: String(row.snippet ?? "")
-    }));
+    )
+  );
+  return (rows ?? []).map((row) => ({
+    ...fileActivityFromRow(row),
+    session: sessionHeadFromSearchRow(row)
+  }));
+}
+function listSessionFileActivity(agentName, sessionId) {
+  return listFileActivity({ agent: agentName, sessionId, limit: 500 }).map(
+    ({ session: _session, ...activity }) => activity
+  );
+}
+function highlightFilePath(path2, query) {
+  const needle = normalizeFilePathSearch(query);
+  if (!needle) return path2;
+  const lower = path2.toLowerCase();
+  const index = lower.indexOf(needle.toLowerCase());
+  if (index < 0) return path2;
+  return `${path2.slice(0, index)}<mark>${path2.slice(index, index + needle.length)}</mark>${path2.slice(
+    index + needle.length
+  )}`;
+}
+function searchFileActivitySessions(query, options = {}) {
+  const search = mergeSearchQueryOptions(query, options);
+  const path2 = normalizeFilePathSearch(search.options.file ?? search.text);
+  if (!path2) return [];
+  const rows = listFileActivity({
+    agent: search.options.agent,
+    projectKey: search.options.projectKey,
+    project: search.options.project,
+    cwd: search.options.cwd,
+    path: path2,
+    kind: search.options.fileKind,
+    from: search.options.from,
+    to: search.options.to,
+    limit: (search.options.limit ?? 50) * 3
   });
-  return results ?? [];
+  const seen = /* @__PURE__ */ new Set();
+  const results = [];
+  for (const row of rows) {
+    const key = `${row.agent_name}/${row.session_id}`;
+    if (seen.has(key)) continue;
+    if (!sessionMatchesSearchCost(row.session, search.options)) continue;
+    seen.add(key);
+    results.push({
+      agentName: row.agent_name,
+      session: row.session,
+      snippet: `${row.kind} ${highlightFilePath(row.path, path2)} \xB7 ${row.count} events`,
+      matchType: "file_path"
+    });
+    if (results.length >= (search.options.limit ?? 50)) break;
+  }
+  return results;
 }
 function listCachedProjectGroups(sessions) {
   if (sessions) {
@@ -5178,8 +7141,8 @@ async function scanAgentSmart(agent, options, onProgress) {
             phase: "complete",
             newCount: tagged2.sessions.length
           });
-          const filtered2 = filterSessions(tagged2.sessions, options);
-          return { agent, heads: filtered2, fromCache: true, refreshed: true };
+          const filtered3 = filterSessions(tagged2.sessions, options);
+          return { agent, heads: filtered3, fromCache: true, refreshed: true };
         }
         onProgress?.({ agent: agent.name, phase: "complete", newCount: cached.sessions.length });
       }
@@ -5188,8 +7151,8 @@ async function scanAgentSmart(agent, options, onProgress) {
       if (tagged.changed && options.writeCache !== false && options.from == null && options.to == null) {
         saveCachedSessions(agent.name, tagged.sessions, buildAgentCacheMeta(agent));
       }
-      const filtered = filterSessions(tagged.sessions, options);
-      return { agent, heads: filtered, fromCache: true };
+      const filtered2 = filterSessions(tagged.sessions, options);
+      return { agent, heads: filtered2, fromCache: true };
     }
   }
   return scanAgentFull(agent, options, onProgress);
@@ -5212,8 +7175,8 @@ async function scanAgentFull(agent, options, onProgress) {
       saveCachedSessions(agent.name, tagged.sessions, meta);
     }
     onProgress?.({ agent: agent.name, phase: "complete", newCount: tagged.sessions.length });
-    const filtered = filterSessions(tagged.sessions, options);
-    return { agent, heads: filtered, fromCache: false };
+    const filtered2 = filterSessions(tagged.sessions, options);
+    return { agent, heads: filtered2, fromCache: false };
   } catch (err) {
     console.error(`Error scanning ${agent.name}:`, err);
     return { agent, heads: [], fromCache: false };
@@ -5248,7 +7211,9 @@ async function scanSessionsAsync(options = {}, onProgress) {
   return scanSessions(options, onProgress);
 }
 var BOOKMARK_DB_FILENAME = "state.db";
-var BOOKMARK_DB_VERSION = 1;
+var BOOKMARK_SCHEMA_VERSION = 1;
+var MEMORY_STATE_STORE = "memory";
+var memoryBookmarks = /* @__PURE__ */ new Map();
 var BookmarkStorageUnavailableError = class extends Error {
   constructor() {
     super("SQLite state database is unavailable");
@@ -5256,20 +7221,50 @@ var BookmarkStorageUnavailableError = class extends Error {
   }
 };
 function getStateDir() {
+  if (process.env.CODESESH_STATE_DIR) {
+    return process.env.CODESESH_STATE_DIR;
+  }
   const p = platform2();
   if (p === "darwin") {
-    return join9(homedir5(), "Library", "Application Support", "codesesh");
+    return join10(homedir5(), "Library", "Application Support", "codesesh");
   }
   if (p === "win32") {
     const appData = process.env.APPDATA ?? process.env.LOCALAPPDATA;
-    return join9(appData ?? join9(homedir5(), "AppData", "Roaming"), "codesesh");
+    return join10(appData ?? join10(homedir5(), "AppData", "Roaming"), "codesesh");
   }
-  return join9(process.env.XDG_DATA_HOME ?? join9(homedir5(), ".local", "share"), "codesesh");
+  return join10(process.env.XDG_DATA_HOME ?? join10(homedir5(), ".local", "share"), "codesesh");
 }
 function getStateDbPath() {
-  return join9(getStateDir(), BOOKMARK_DB_FILENAME);
+  return join10(getStateDir(), BOOKMARK_DB_FILENAME);
+}
+function useMemoryStateStore() {
+  return process.env.CODESESH_STATE_STORE === MEMORY_STATE_STORE;
+}
+function getBookmarkKey(agentKey, sessionId) {
+  return JSON.stringify([agentKey, sessionId]);
+}
+function getActivityTime(bookmark) {
+  return bookmark.time_updated ?? bookmark.time_created;
+}
+function sortBookmarks(bookmarks) {
+  return bookmarks.sort((a, b) => {
+    const activityDelta = getActivityTime(b) - getActivityTime(a);
+    return activityDelta || b.bookmarked_at - a.bookmarked_at;
+  });
 }
-function ensureSchema2(db) {
+function listMemoryBookmarks() {
+  return sortBookmarks(Array.from(memoryBookmarks.values()));
+}
+function upsertMemoryBookmark(bookmark) {
+  const key = getBookmarkKey(bookmark.agentKey, bookmark.sessionId);
+  const saved = {
+    ...bookmark,
+    bookmarked_at: memoryBookmarks.get(key)?.bookmarked_at ?? Date.now()
+  };
+  memoryBookmarks.set(key, saved);
+  return saved;
+}
+function createStateSchema(db) {
   db.exec(`
     CREATE TABLE IF NOT EXISTS state_meta (
       key TEXT PRIMARY KEY,
@@ -5289,24 +7284,66 @@ function ensureSchema2(db) {
       PRIMARY KEY (agent_name, session_id)
     );
   `);
+}
+function readLegacyStateVersion(db) {
+  if (!tableExists(db, "state_meta") || !columnExists(db, "state_meta", "key") || !columnExists(db, "state_meta", "value")) {
+    return 0;
+  }
   const row = db.prepare("SELECT value FROM state_meta WHERE key = 'version'").get();
-  const version = Number(row?.value ?? 0);
-  if (version === BOOKMARK_DB_VERSION) return;
+  return Number(row?.value ?? 0);
+}
+function getCurrentStateSchemaVersion(db) {
+  const userVersion = getUserVersion(db);
+  if (userVersion > 0) {
+    return userVersion;
+  }
+  const legacyVersion = readLegacyStateVersion(db);
+  if (legacyVersion > 0) {
+    return legacyVersion;
+  }
+  return tableExists(db, "bookmarks") ? 1 : 0;
+}
+function hasAnyStateSchema(db) {
+  return tableExists(db, "state_meta") || tableExists(db, "bookmarks");
+}
+function setStateSchemaVersion(db) {
+  createStateSchema(db);
+  setUserVersion(db, BOOKMARK_SCHEMA_VERSION);
   db.prepare(
     `
       INSERT INTO state_meta(key, value)
       VALUES ('version', ?)
       ON CONFLICT(key) DO UPDATE SET value = excluded.value
     `
-  ).run(String(BOOKMARK_DB_VERSION));
+  ).run(String(BOOKMARK_SCHEMA_VERSION));
+}
+function ensureSchema2(db, dbPath) {
+  const currentVersion = getCurrentStateSchemaVersion(db);
+  if (currentVersion === 0 && !hasAnyStateSchema(db)) {
+    setStateSchemaVersion(db);
+    return;
+  }
+  runSchemaMigrations(db, {
+    dbPath,
+    currentVersion,
+    targetVersion: BOOKMARK_SCHEMA_VERSION,
+    backupLabel: "state-migration",
+    backupTables: ["bookmarks"],
+    migrations: [{ version: 1, migrate: createStateSchema }]
+  });
+  createStateSchema(db);
+  if (getUserVersion(db) <= BOOKMARK_SCHEMA_VERSION) {
+    setStateSchemaVersion(db);
+  }
 }
 function withStateDb(fn) {
-  const db = openDb(getStateDbPath());
+  const statePath = getStateDbPath();
+  const db = openDb(statePath);
   if (!db) {
     throw new BookmarkStorageUnavailableError();
   }
   try {
-    ensureSchema2(db);
+    ensureSchema2(db, statePath);
     return fn(db);
   } finally {
     db.close();
@@ -5326,6 +7363,9 @@ function toBookmarkRecord(row) {
   };
 }
 function listBookmarks() {
+  if (useMemoryStateStore()) {
+    return listMemoryBookmarks();
+  }
   return withStateDb((db) => {
     const rows = db.prepare(
       `
@@ -5347,6 +7387,9 @@ function listBookmarks() {
   });
 }
 function upsertBookmark(bookmark) {
+  if (useMemoryStateStore()) {
+    return upsertMemoryBookmark(bookmark);
+  }
   return withStateDb((db) => {
     const existing = db.prepare(
       `
@@ -5392,6 +7435,12 @@ function upsertBookmark(bookmark) {
   });
 }
 function importBookmarks(bookmarks) {
+  if (useMemoryStateStore()) {
+    for (const bookmark of bookmarks) {
+      upsertMemoryBookmark(bookmark);
+    }
+    return listMemoryBookmarks();
+  }
   return withStateDb((db) => {
     const existingRows = db.prepare("SELECT agent_name, session_id, bookmarked_at FROM bookmarks").all();
     const existingTimes = new Map(
@@ -5459,6 +7508,10 @@ function importBookmarks(bookmarks) {
   });
 }
 function deleteBookmark(agentKey, sessionId) {
+  if (useMemoryStateStore()) {
+    memoryBookmarks.delete(getBookmarkKey(agentKey, sessionId));
+    return;
+  }
   withStateDb((db) => {
     db.prepare(
       `
@@ -5475,15 +7528,30 @@ export {
   getRegisteredAgents,
   getAgentInfoMap,
   getAgentByName,
+  parsedSession,
+  skippedSession,
+  filteredSession,
+  getParsedSession,
   BaseAgent,
   firstExisting,
   resolveProviderRoots,
   getCursorDataPath,
   parseJsonlLines,
   readJsonlFile,
+  cleanDisplayText,
+  firstVisibleLine,
   normalizeTitleText,
   basenameTitle,
   resolveSessionTitle,
+  parsed,
+  skipped,
+  filtered,
+  cleanInternalText,
+  cleanMessagePart,
+  cleanMessageParts,
+  cleanParsedMessage,
+  cleanParsedMessages,
+  firstUserMessageTitle,
   perf,
   getPricingRegistry,
   hasBillablePricing,
@@ -5504,12 +7572,19 @@ export {
   computeIdentity,
   getSmartTagSourceTimestamp,
   classifySessionTags,
+  extractFileActivityOccurrences,
+  summarizeFileActivity,
+  extractSessionFileActivity,
+  parseSearchQuery,
   loadCachedSessions,
   saveCachedSessions,
   clearCache,
   getCacheInfo,
   syncSessionSearchIndex,
   searchSessions,
+  listFileActivity,
+  listSessionFileActivity,
+  searchFileActivitySessions,
   listCachedProjectGroups,
   filterSessions,
   scanSessions,
@@ -5520,4 +7595,4 @@ export {
   importBookmarks,
   deleteBookmark
 };
-//# sourceMappingURL=chunk-FZNZAMTZ.js.map
+//# sourceMappingURL=chunk-SQYHWMQV.js.map