codesesh 0.6.1 → 0.7.1

package/dist/{chunk-SQYHWMQV.js → chunk-7GQEIPVK.js}

@@ -31,13 +31,13 @@ import {
 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 existsSync9, readFileSync as readFileSync7 } from "fs";
 import { spawnSync } from "child_process";
-import { homedir as homedir3 } from "os";
+import * as os from "os";
 import * as path from "path";
+import { resolve, sep } from "path";
 import { existsSync as existsSync10, rmSync, unlinkSync } from "fs";
 import { join as join9 } from "path";
 import { homedir as homedir4 } from "os";
@@ -701,7 +701,7 @@ function withEstimatedSessionCost(stats, model) {
 function estimateTokenCost(model, tokens) {
   return estimateCostForTokens(model, tokens)?.cost ?? null;
 }
-var RECENT_SESSION_REVALIDATION_WINDOW_MS = 24 * 60 * 60 * 1e3;
+var HEAD_INDEX_VERSION = "claudecode-head-v1";
 function parseTimestampMs(data) {
   const raw = String(data["timestamp"] ?? "").trim();
   if (!raw) return 0;
@@ -743,36 +743,64 @@ var ClaudeCodeAgent = class extends BaseAgent {
     const listMarker = perf.start("listProjectDirs");
     const projectDirs = this.listProjectDirs();
     perf.end(listMarker);
-    for (const projectDir of projectDirs) {
+    const filesByProject = projectDirs.map((projectDir) => {
       const fileMarker = perf.start(`listJsonlFiles:${basename2(projectDir)}`);
-      const files = this.listJsonlFiles(projectDir);
+      const files = this.listJsonlFiles(projectDir).filter((file) => {
+        try {
+          return matchesScanWindow(statSync(file).mtimeMs, options);
+        } catch {
+          return false;
+        }
+      });
       perf.end(fileMarker);
+      return { projectDir, files };
+    });
+    const totalFiles = filesByProject.reduce((total, item) => total + item.files.length, 0);
+    options?.onProgress?.({ total: totalFiles, processed: 0, sessions: 0 });
+    let processed = 0;
+    for (const { projectDir, files } of filesByProject) {
       for (const file of files) {
         try {
-          if (!matchesScanWindow(statSync(file).mtimeMs, options)) continue;
           const parseMarker = perf.start(`parseSessionHead:${basename2(file)}`);
           const head = getParsedSession(this.parseSessionHeadResult(file, projectDir));
           perf.end(parseMarker);
           if (head) {
             heads.push(head);
-            this.sessionMetaMap.set(head.id, {
-              id: head.id,
-              title: head.title,
-              sourcePath: file,
-              directory: head.directory,
-              model: head.stats.total_tokens ? "unknown" : void 0,
-              messageCount: head.stats.message_count,
-              createdAt: head.time_created,
-              updatedAt: head.time_updated ?? head.time_created
-            });
+            this.sessionMetaMap.set(head.id, this.buildSessionMeta(head, file, projectDir));
           }
         } catch {
+        } finally {
+          processed += 1;
+          options?.onProgress?.({ total: totalFiles, processed, sessions: heads.length });
         }
       }
     }
     perf.end(scanMarker);
     return heads;
   }
+  listSessionSources() {
+    if (!this.basePath) return [];
+    const refs = [];
+    for (const projectDir of this.listProjectDirs()) {
+      for (const file of this.listJsonlFiles(projectDir)) {
+        const sessionId = basename2(file, ".jsonl");
+        refs.push({
+          sessionId,
+          sourcePath: file,
+          fingerprint: this.sourceFingerprint(file, projectDir)
+        });
+      }
+    }
+    return refs;
+  }
+  scanSessionSource(sourcePath) {
+    const projectDir = dirname(sourcePath);
+    const head = getParsedSession(this.parseSessionHeadResult(sourcePath, projectDir));
+    if (head) {
+      this.sessionMetaMap.set(head.id, this.buildSessionMeta(head, sourcePath, projectDir));
+    }
+    return head;
+  }
   getSessionMetaMap() {
     return this.sessionMetaMap;
   }
@@ -844,23 +872,14 @@ var ClaudeCodeAgent = class extends BaseAgent {
   }
   /**
    * 检测文件系统变更
-   * 通过比较文件修改时间判断是否有新内容
+   * - 已有 session：statSync 检测文件修改（APFS 写文件不更新 dir mtime，必须 file-level）
+   * - 新 session 检测：readdirSync 文件列表比对，比 dir statSync 快 ~10x
    */
-  checkForChanges(sinceTimestamp, cachedSessions) {
+  checkForChanges(_sinceTimestamp, cachedSessions) {
     if (!this.basePath) {
       return { hasChanges: false, timestamp: Date.now() };
     }
-    const now = Date.now();
     const changedIds = /* @__PURE__ */ new Set();
-    const recentSessions = cachedSessions.filter(
-      (session) => now - session.time_created <= RECENT_SESSION_REVALIDATION_WINDOW_MS
-    );
-    for (const session of recentSessions) {
-      changedIds.add(session.id);
-      const meta = this.sessionMetaMap.get(session.id);
-      if (!meta) continue;
-      delete this.sessionsIndexCache[basename2(dirname(meta.sourcePath))];
-    }
     for (const session of cachedSessions) {
       const meta = this.sessionMetaMap.get(session.id);
       if (!meta) {
@@ -868,32 +887,36 @@ var ClaudeCodeAgent = class extends BaseAgent {
         continue;
       }
       try {
-        const stat = statSync(meta.sourcePath);
-        if (stat.mtimeMs > sinceTimestamp) {
+        if (this.hasMetaChanged(meta)) {
           changedIds.add(session.id);
+          delete this.sessionsIndexCache[basename2(dirname(meta.sourcePath))];
         }
       } catch {
         changedIds.add(session.id);
       }
     }
+    const cachedIdSet = new Set(cachedSessions.map((s) => s.id));
+    let hasNewFiles = false;
     try {
-      let totalFiles = 0;
-      for (const dir of this.listProjectDirs()) {
-        totalFiles += this.listJsonlFiles(dir).length;
+      outer: for (const dir of this.listProjectDirs()) {
+        try {
+          for (const file of this.listJsonlFiles(dir)) {
+            if (!cachedIdSet.has(basename2(file, ".jsonl"))) {
+              hasNewFiles = true;
+              delete this.sessionsIndexCache[basename2(dir)];
+              break outer;
+            }
+          }
+        } catch {
+        }
       }
-      const hasNewFiles = totalFiles > cachedSessions.length;
-      return {
-        hasChanges: changedIds.size > 0 || hasNewFiles,
-        changedIds: Array.from(changedIds),
-        timestamp: Date.now()
-      };
     } catch {
-      return {
-        hasChanges: changedIds.size > 0,
-        changedIds: Array.from(changedIds),
-        timestamp: Date.now()
-      };
     }
+    return {
+      hasChanges: changedIds.size > 0 || hasNewFiles,
+      changedIds: Array.from(changedIds),
+      timestamp: Date.now()
+    };
   }
   /**
    * 增量扫描 - 只扫描变更的会话
@@ -901,48 +924,16 @@ var ClaudeCodeAgent = class extends BaseAgent {
   incrementalScan(cachedSessions, changedIds) {
     if (!this.basePath) return cachedSessions;
     const sessionMap = new Map(cachedSessions.map((s) => [s.id, s]));
+    const changedSet = new Set(changedIds);
     for (const projectDir of this.listProjectDirs()) {
       for (const file of this.listJsonlFiles(projectDir)) {
         try {
           const sessionId = basename2(file, ".jsonl");
-          if (changedIds.includes(sessionId)) {
-            const head = getParsedSession(this.parseSessionHeadResult(file, projectDir));
-            if (head) {
-              sessionMap.set(head.id, head);
-              this.sessionMetaMap.set(head.id, {
-                id: head.id,
-                title: head.title,
-                sourcePath: file,
-                directory: head.directory,
-                model: head.stats.total_tokens ? "unknown" : void 0,
-                messageCount: head.stats.message_count,
-                createdAt: head.time_created,
-                updatedAt: head.time_updated ?? head.time_created
-              });
-            }
-          }
-        } catch {
-        }
-      }
-    }
-    for (const projectDir of this.listProjectDirs()) {
-      for (const file of this.listJsonlFiles(projectDir)) {
-        try {
-          const sessionId = basename2(file, ".jsonl");
-          if (!sessionMap.has(sessionId)) {
+          if (changedSet.has(sessionId) || !sessionMap.has(sessionId)) {
             const head = getParsedSession(this.parseSessionHeadResult(file, projectDir));
             if (head) {
               sessionMap.set(head.id, head);
-              this.sessionMetaMap.set(head.id, {
-                id: head.id,
-                title: head.title,
-                sourcePath: file,
-                directory: head.directory,
-                model: head.stats.total_tokens ? "unknown" : void 0,
-                messageCount: head.stats.message_count,
-                createdAt: head.time_created,
-                updatedAt: head.time_updated ?? head.time_created
-              });
+              this.sessionMetaMap.set(head.id, this.buildSessionMeta(head, file, projectDir));
             }
           }
         } catch {
@@ -967,12 +958,57 @@ var ClaudeCodeAgent = class extends BaseAgent {
       return [];
     }
   }
+  buildSessionMeta(head, file, projectDir) {
+    const indexPath = this.getSessionsIndexPath(projectDir);
+    return {
+      id: head.id,
+      title: head.title,
+      sourcePath: file,
+      sourceFingerprint: this.sourceFingerprint(file, projectDir),
+      sourceMtimeMs: statSync(file).mtimeMs,
+      indexPath: existsSync3(indexPath) ? indexPath : null,
+      indexMtimeMs: this.getFileMtimeMs(indexPath),
+      headIndexVersion: HEAD_INDEX_VERSION,
+      directory: head.directory,
+      model: head.stats.total_tokens ? "unknown" : void 0,
+      messageCount: head.stats.message_count,
+      createdAt: head.time_created,
+      updatedAt: head.time_updated ?? head.time_created
+    };
+  }
+  hasMetaChanged(meta) {
+    if (meta.headIndexVersion !== HEAD_INDEX_VERSION) return true;
+    if (typeof meta.sourceMtimeMs !== "number") return true;
+    if (statSync(meta.sourcePath).mtimeMs !== meta.sourceMtimeMs) return true;
+    const indexPath = meta.indexPath ?? this.getSessionsIndexPath(dirname(meta.sourcePath));
+    return this.getFileMtimeMs(indexPath) !== (meta.indexMtimeMs ?? null);
+  }
+  sourceFingerprint(file, projectDir) {
+    const stat = statSync(file);
+    const indexPath = this.getSessionsIndexPath(projectDir);
+    return JSON.stringify([
+      HEAD_INDEX_VERSION,
+      stat.mtimeMs,
+      stat.size,
+      this.getFileMtimeMs(indexPath)
+    ]);
+  }
+  getSessionsIndexPath(projectDir) {
+    return join3(projectDir, "sessions-index.json");
+  }
+  getFileMtimeMs(filePath) {
+    try {
+      return statSync(filePath).mtimeMs;
+    } catch {
+      return null;
+    }
+  }
   loadSessionsIndex(projectDir) {
     const cacheKey = basename2(projectDir);
     if (cacheKey in this.sessionsIndexCache) {
       return this.sessionsIndexCache[cacheKey];
     }
-    const indexPath = join3(projectDir, "sessions-index.json");
+    const indexPath = this.getSessionsIndexPath(projectDir);
     const map = /* @__PURE__ */ new Map();
     if (existsSync3(indexPath)) {
       try {
@@ -1675,11 +1711,7 @@ var OpenCodeAgent = class extends BaseAgent {
         rows = db.prepare(`
           SELECT
             s.id, s.title, s.time_created, s.time_updated, s.slug, s.directory,
-            s.version, s.summary_files,
-            (SELECT COUNT(*) FROM message m WHERE m.session_id = s.id) AS message_count,
-            (SELECT m.data FROM message m
-             WHERE m.session_id = s.id AND m.data LIKE '%"modelID"%'
-             ORDER BY m.time_created DESC LIMIT 1) AS model_message_data
+            s.version, s.summary_files
           FROM session s
           WHERE COALESCE(s.time_updated, s.time_created) >= ?
           ORDER BY s.time_created DESC
@@ -1693,17 +1725,28 @@ var OpenCodeAgent = class extends BaseAgent {
           ORDER BY s.time_created DESC
         `).all(cutoffTime);
       }
+      const headContexts = hasMessageTable ? this.buildHeadContexts(
+        this.readHeadMessageRows(db, cutoffTime),
+        this.readHeadPartRows(db, cutoffTime)
+      ) : /* @__PURE__ */ new Map();
       const heads = [];
+      options?.onProgress?.({ total: rows.length, processed: 0, sessions: 0 });
+      let processed = 0;
       for (const row of rows) {
-        const head = getParsedSession(this.parseSessionHeadRow(db, row, hasMessageTable));
-        if (!head) continue;
-        heads.push(head);
-        if (this.dbPath) {
-          this.sessionMetaMap.set(head.id, {
-            id: head.id,
-            sourcePath: this.dbPath
-          });
+        const head = getParsedSession(
+          this.parseSessionHeadRow(row, hasMessageTable, headContexts.get(String(row.id ?? "")))
+        );
+        if (head) {
+          heads.push(head);
+          if (this.dbPath) {
+            this.sessionMetaMap.set(head.id, {
+              id: head.id,
+              sourcePath: this.dbPath
+            });
+          }
         }
+        processed += 1;
+        options?.onProgress?.({ total: rows.length, processed, sessions: heads.length });
       }
       return heads;
     } catch {
@@ -1712,15 +1755,15 @@ var OpenCodeAgent = class extends BaseAgent {
       db.close();
     }
   }
-  parseSessionHeadRow(db, row, hasMessageTable) {
+  parseSessionHeadRow(row, hasMessageTable, context) {
     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);
+    const stats = context?.stats ?? null;
+    const messageCount = stats?.message_count ?? 0;
     if (hasMessageTable && messageCount === 0) return filteredSession("no visible messages");
-    const messageTitle = hasMessageTable ? this.readFirstUserTitle(db, id) : null;
+    const messageTitle = context?.messageTitle ?? null;
     return parsedSession({
       id,
       slug: `opencode/${id}`,
@@ -1737,6 +1780,29 @@ var OpenCodeAgent = class extends BaseAgent {
       }
     });
   }
+  readHeadMessageRows(db, cutoffTime) {
+    return db.prepare(
+      `
+          SELECT m.id, m.session_id, m.data, m.time_created
+          FROM message m
+          JOIN session s ON s.id = m.session_id
+          WHERE COALESCE(s.time_updated, s.time_created) >= ?
+          ORDER BY m.session_id, m.time_created ASC
+        `
+    ).all(cutoffTime);
+  }
+  readHeadPartRows(db, cutoffTime) {
+    return db.prepare(
+      `
+          SELECT p.message_id, p.data, p.time_created
+          FROM part p
+          JOIN message m ON m.id = p.message_id
+          JOIN session s ON s.id = m.session_id
+          WHERE COALESCE(s.time_updated, s.time_created) >= ?
+          ORDER BY p.message_id, p.time_created ASC
+        `
+    ).all(cutoffTime);
+  }
   getSessionMetaMap() {
     return this.sessionMetaMap;
   }
@@ -1773,92 +1839,103 @@ var OpenCodeAgent = class extends BaseAgent {
   incrementalScan(_cachedSessions, _changedIds) {
     return this.scan();
   }
+  parsePartRow(partRow) {
+    const partData = JSON.parse(String(partRow.data ?? "{}"));
+    const partType = String(partData.type ?? "");
+    if (isInternalEventType(partType)) return null;
+    if (partType === "text" || partType === "reasoning") {
+      const text = cleanInternalText(String(partData.text ?? ""));
+      if (!text) return null;
+      return {
+        type: partType,
+        text,
+        time_created: Number(partRow.time_created ?? 0)
+      };
+    }
+    if (partType === "tool") {
+      return {
+        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 null;
+  }
   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)
-        });
+    const partRows = db.prepare("SELECT data, time_created FROM part WHERE message_id = ? ORDER BY time_created ASC").all(messageId);
+    return partRows.map((partRow) => this.parsePartRow(partRow)).filter((part) => part !== null);
+  }
+  buildPartsByMessage(partRows) {
+    const partsByMessage = /* @__PURE__ */ new Map();
+    for (const row of partRows) {
+      const messageId = String(row.message_id ?? "");
+      if (!messageId) continue;
+      const part = this.parsePartRow(row);
+      if (!part) continue;
+      const parts = partsByMessage.get(messageId);
+      if (parts) {
+        parts.push(part);
+      } else {
+        partsByMessage.set(messageId, [part]);
       }
     }
-    return parts;
+    return partsByMessage;
   }
-  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) {
+  buildHeadContexts(messageRows, partRows) {
+    const partsByMessage = this.buildPartsByMessage(partRows);
+    const contexts = /* @__PURE__ */ new Map();
+    for (const row of messageRows) {
+      const sessionId = String(row.session_id ?? "");
+      if (!sessionId) continue;
       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;
+      const parts = partsByMessage.get(String(row.id ?? "")) ?? [];
+      if (parts.length === 0) continue;
+      let context = contexts.get(sessionId);
+      if (!context) {
+        context = {
+          stats: {
+            message_count: 0,
+            total_input_tokens: 0,
+            total_output_tokens: 0,
+            total_cost: 0
+          },
+          messageTitle: null
+        };
+        contexts.set(sessionId, context);
+      }
+      const cost = Number(msgData.cost ?? 0);
+      const tokens = msgData.tokens;
+      const inputTokens = Number(tokens?.input ?? 0);
+      const outputTokens = Number(tokens?.output ?? 0);
+      const model = msgData.modelID ?? null;
+      const estimatedCost = cost > 0 ? null : estimateTokenCost(model, { input: inputTokens, output: outputTokens });
+      if (estimatedCost !== null) context.stats.cost_source = "estimated";
+      context.stats.total_cost += cost || estimatedCost || 0;
+      context.stats.total_input_tokens += inputTokens;
+      context.stats.total_output_tokens += outputTokens;
+      context.stats.message_count += 1;
+      if (!context.messageTitle && String(msgData.role ?? "") === "user") {
+        context.messageTitle = firstUserMessageTitle([
+          {
+            id: String(row.id ?? ""),
+            role: "user",
+            agent: null,
+            time_created: Number(row.time_created ?? 0),
+            parts
+          }
+        ]);
+      }
     }
-    return null;
-  }
-  readSessionStats(db, sessionId) {
-    try {
-      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);
-        const outputTokens = Number(tokens?.output ?? 0);
-        const model = msgData.modelID ?? null;
-        const estimatedCost = cost > 0 ? null : estimateTokenCost(model, { input: inputTokens, output: outputTokens });
-        if (estimatedCost !== null) hasEstimatedCost = true;
-        totalCost += cost || estimatedCost || 0;
-        totalInputTokens += inputTokens;
-        totalOutputTokens += outputTokens;
-        messageCount++;
+    for (const context of contexts.values()) {
+      if (context.stats.total_cost > 0 && context.stats.cost_source !== "estimated") {
+        context.stats.cost_source = "recorded";
       }
-      return {
-        message_count: messageCount,
-        total_input_tokens: totalInputTokens,
-        total_output_tokens: totalOutputTokens,
-        total_cost: totalCost,
-        cost_source: totalCost > 0 ? hasEstimatedCost ? "estimated" : "recorded" : void 0
-      };
-    } catch {
-      return null;
     }
+    return contexts;
   }
   getSessionData(sessionId) {
     if (!this.dbPath) {
@@ -2162,14 +2239,24 @@ var KimiAgent = class extends BaseAgent {
     const listMarker = perf.start("listSessionDirs");
     const sessionDirs = this.listSessionDirs();
     perf.end(listMarker);
-    const heads = [];
+    const metas = [];
     for (const dir of sessionDirs) {
       try {
         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;
+        if (meta && matchesScanWindow(meta.createdAt, options)) {
+          metas.push(meta);
+        }
+      } catch {
+      }
+    }
+    options?.onProgress?.({ total: metas.length, processed: 0, sessions: 0 });
+    const heads = [];
+    let processed = 0;
+    for (const meta of metas) {
+      try {
+        meta.sourceFingerprint = this.sourceFingerprint(meta);
         this.sessionMetaMap.set(meta.id, meta);
         const stats = this.extractStats(meta.sourcePath);
         heads.push({
@@ -2182,11 +2269,46 @@ var KimiAgent = class extends BaseAgent {
           stats
         });
       } catch {
+      } finally {
+        processed += 1;
+        options?.onProgress?.({ total: metas.length, processed, sessions: heads.length });
       }
     }
     perf.end(scanMarker);
     return heads;
   }
+  listSessionSources() {
+    if (!this.basePath) return [];
+    const refs = [];
+    for (const dir of this.listSessionDirs()) {
+      const meta = getParsedSession(this.parseSessionDirResult(dir));
+      if (!meta) continue;
+      meta.sourceFingerprint = this.sourceFingerprint(meta);
+      this.sessionMetaMap.set(meta.id, meta);
+      refs.push({
+        sessionId: meta.id,
+        sourcePath: meta.sourcePath,
+        fingerprint: this.sourceFingerprint(meta)
+      });
+    }
+    return refs;
+  }
+  scanSessionSource(sourcePath) {
+    const meta = getParsedSession(this.parseSessionDirResult(sourcePath));
+    if (!meta) return null;
+    meta.sourceFingerprint = this.sourceFingerprint(meta);
+    this.sessionMetaMap.set(meta.id, meta);
+    const stats = this.extractStats(meta.sourcePath);
+    return {
+      id: meta.id,
+      slug: `kimi/${meta.id}`,
+      title: meta.title,
+      directory: meta.cwd,
+      time_created: meta.createdAt,
+      time_updated: meta.createdAt,
+      stats
+    };
+  }
   getSessionMetaMap() {
     return this.sessionMetaMap;
   }
@@ -2498,6 +2620,21 @@ var KimiAgent = class extends BaseAgent {
     return this.buildSessionData(meta, filteredMessages, stats);
   }
   // --- Helpers ---
+  sourceFingerprint(meta) {
+    const fileMtime = (path2) => {
+      if (!path2) return null;
+      try {
+        return statSync3(path2).mtimeMs;
+      } catch {
+        return null;
+      }
+    };
+    return JSON.stringify([
+      fileMtime(meta.metaFile),
+      fileMtime(meta.contextFile),
+      fileMtime(meta.wireFile)
+    ]);
+  }
   buildMessage(opts) {
     return {
       id: opts.messageId,
@@ -2695,6 +2832,8 @@ var KimiAgent = class extends BaseAgent {
 var PROPOSED_PLAN_PATTERN = /<proposed_plan>\s*([\s\S]*?)\s*<\/proposed_plan>/;
 var PLAN_APPROVAL_PREFIX = "PLEASE IMPLEMENT THIS PLAN";
 var SUBAGENT_NOTIFICATION_PATTERN = /<subagent_notification>\s*([\s\S]*?)\s*<\/subagent_notification>/;
+var HEAD_INDEX_VERSION2 = "codex-head-v1";
+var PARSER_VERSION = "codex-parser-v3";
 var DEVELOPER_LIKE_USER_MARKERS = [
   "agents.md instructions for",
   "<instructions>",
@@ -2713,7 +2852,6 @@ var CODEX_TOOL_TITLE_MAP = {
   spawn_agent: "subagent",
   subagent: "subagent"
 };
-var RECENT_SESSION_REVALIDATION_WINDOW_MS2 = 24 * 60 * 60 * 1e3;
 function extractSessionId(filename) {
   const stem = basename5(filename, ".jsonl");
   const parts = stem.split("-");
@@ -2738,8 +2876,23 @@ function extractCachedInputTokens(usage) {
   if (!usage) return 0;
   return Number(usage["cached_input_tokens"] ?? usage["cache_read_input_tokens"] ?? 0);
 }
-function mapToolTitle2(name) {
-  return CODEX_TOOL_TITLE_MAP[name] ?? name;
+function resolveToolIdentity(name, namespace) {
+  const mappedName = CODEX_TOOL_TITLE_MAP[name];
+  if (mappedName) return { tool: mappedName };
+  const namespaceText = typeof namespace === "string" ? namespace.trim() : "";
+  if (!namespaceText) return { tool: name };
+  const namespaceName = namespaceText.split("__").at(-1) ?? namespaceText;
+  const toolName = name.replace(/^[_.]+/, "");
+  if (!namespaceName) {
+    return {
+      tool: toolName || name,
+      metadata: { name, namespace: namespaceText }
+    };
+  }
+  return {
+    tool: `${namespaceName}.${toolName || name}`,
+    metadata: { name, namespace: namespaceText }
+  };
 }
 function normalizeToolArguments2(raw) {
   if (typeof raw === "string") {
@@ -2870,6 +3023,8 @@ var CodexAgent = class extends BaseAgent {
     const listMarker = perf.start("listRolloutFiles");
     const files = this.listRolloutFiles(options);
     perf.end(listMarker);
+    options?.onProgress?.({ total: files.length, processed: 0, sessions: 0 });
+    let processed = 0;
     for (const file of files) {
       try {
         const parseMarker = perf.start(`parseSessionHead:${basename5(file)}`);
@@ -2877,23 +3032,34 @@ var CodexAgent = class extends BaseAgent {
         perf.end(parseMarker);
         if (head) {
           heads.push(head);
-          this.sessionMetaMap.set(head.id, {
-            id: head.id,
-            title: head.title,
-            sourcePath: file,
-            directory: head.directory,
-            model: null,
-            messageCount: head.stats.message_count,
-            createdAt: head.time_created,
-            updatedAt: head.time_updated ?? head.time_created
-          });
+          this.sessionMetaMap.set(head.id, this.buildSessionMeta(head, file));
         }
       } catch {
+      } finally {
+        processed += 1;
+        options?.onProgress?.({ total: files.length, processed, sessions: heads.length });
       }
     }
     perf.end(scanMarker);
     return heads;
   }
+  listSessionSources() {
+    if (!this.basePath) return [];
+    this.loadSessionIndex();
+    return this.listRolloutFiles().map((file) => ({
+      sessionId: extractSessionId(file),
+      sourcePath: file,
+      fingerprint: this.sourceFingerprint(file)
+    }));
+  }
+  scanSessionSource(sourcePath) {
+    this.loadSessionIndex();
+    const head = getParsedSession(this.parseSessionHeadResult(sourcePath));
+    if (head) {
+      this.sessionMetaMap.set(head.id, this.buildSessionMeta(head, sourcePath));
+    }
+    return head;
+  }
   getSessionMetaMap() {
     return this.sessionMetaMap;
   }
@@ -2903,32 +3069,26 @@ var CodexAgent = class extends BaseAgent {
   /**
    * 检测文件系统变更
    */
-  checkForChanges(sinceTimestamp, cachedSessions) {
+  checkForChanges(_sinceTimestamp, cachedSessions) {
     if (!this.basePath) {
       return { hasChanges: false, timestamp: Date.now() };
     }
-    const now = Date.now();
-    const changedIds = /* @__PURE__ */ new Set();
     const currentFiles = this.listRolloutFiles();
     const currentIds = new Set(currentFiles.map((file) => extractSessionId(file)));
     const cachedIds = new Set(cachedSessions.map((session) => session.id));
-    const recentIds = cachedSessions.filter((session) => now - session.time_created <= RECENT_SESSION_REVALIDATION_WINDOW_MS2).map((session) => session.id);
-    for (const sessionId of recentIds) {
-      changedIds.add(sessionId);
-    }
+    const changedIds = /* @__PURE__ */ new Set();
     for (const session of cachedSessions) {
-      const meta = this.sessionMetaMap.get(session.id);
       if (!currentIds.has(session.id)) {
         changedIds.add(session.id);
         continue;
       }
+      const meta = this.sessionMetaMap.get(session.id);
       if (!meta) {
         changedIds.add(session.id);
         continue;
       }
       try {
-        const stat = statSync4(meta.sourcePath);
-        if (stat.mtimeMs > sinceTimestamp) {
+        if (this.hasMetaChanged(meta)) {
           changedIds.add(session.id);
         }
       } catch {
@@ -2936,7 +3096,7 @@ var CodexAgent = class extends BaseAgent {
       }
     }
     const hasAddedSessions = currentFiles.some((file) => !cachedIds.has(extractSessionId(file)));
-    if (recentIds.length > 0) {
+    if (hasAddedSessions || changedIds.size > 0) {
       this.sessionIndexCache.clear();
     }
     return {
@@ -2967,16 +3127,7 @@ var CodexAgent = class extends BaseAgent {
           const head = this.parseSessionHead(file);
           if (head) {
             sessionMap.set(head.id, head);
-            this.sessionMetaMap.set(head.id, {
-              id: head.id,
-              title: head.title,
-              sourcePath: file,
-              directory: head.directory,
-              model: null,
-              messageCount: head.stats.message_count,
-              createdAt: head.time_created,
-              updatedAt: head.time_updated ?? head.time_created
-            });
+            this.sessionMetaMap.set(head.id, this.buildSessionMeta(head, file));
           }
         }
       } catch {
@@ -2989,16 +3140,7 @@ var CodexAgent = class extends BaseAgent {
           const head = this.parseSessionHead(file);
           if (head) {
             sessionMap.set(head.id, head);
-            this.sessionMetaMap.set(head.id, {
-              id: head.id,
-              title: head.title,
-              sourcePath: file,
-              directory: head.directory,
-              model: null,
-              messageCount: head.stats.message_count,
-              createdAt: head.time_created,
-              updatedAt: head.time_updated ?? head.time_created
-            });
+            this.sessionMetaMap.set(head.id, this.buildSessionMeta(head, file));
           }
         }
       } catch {
@@ -3145,13 +3287,18 @@ var CodexAgent = class extends BaseAgent {
   walkDirForRolloutFiles(dir, options) {
     const files = [];
     try {
-      for (const entry of readdirSync3(dir)) {
-        const fullPath = join7(dir, entry);
-        const stat = statSync4(fullPath);
-        if (stat.isDirectory()) {
+      for (const entry of readdirSync3(dir, { withFileTypes: true })) {
+        const fullPath = join7(dir, entry.name);
+        if (entry.isDirectory()) {
           files.push(...this.walkDirForRolloutFiles(fullPath, options));
-        } else if (entry.endsWith(".jsonl") && entry.startsWith("rollout-")) {
-          if (!matchesScanWindow(stat.mtimeMs, options)) continue;
+        } else if (entry.name.endsWith(".jsonl") && entry.name.startsWith("rollout-")) {
+          if (options?.from != null || options?.to != null) {
+            try {
+              if (!matchesScanWindow(statSync4(fullPath).mtimeMs, options)) continue;
+            } catch {
+              continue;
+            }
+          }
           files.push(fullPath);
         }
       }
@@ -3159,11 +3306,59 @@ var CodexAgent = class extends BaseAgent {
     }
     return files;
   }
+  buildSessionMeta(head, file) {
+    const indexPath = this.getSessionIndexPath();
+    return {
+      id: head.id,
+      title: head.title,
+      sourcePath: file,
+      sourceFingerprint: this.sourceFingerprint(file),
+      sourceMtimeMs: statSync4(file).mtimeMs,
+      indexPath: existsSync7(indexPath) ? indexPath : null,
+      indexMtimeMs: this.getFileMtimeMs(indexPath),
+      headIndexVersion: HEAD_INDEX_VERSION2,
+      parserVersion: PARSER_VERSION,
+      directory: head.directory,
+      model: null,
+      messageCount: head.stats.message_count,
+      createdAt: head.time_created,
+      updatedAt: head.time_updated ?? head.time_created
+    };
+  }
+  hasMetaChanged(meta) {
+    if (meta.headIndexVersion !== HEAD_INDEX_VERSION2) return true;
+    if (meta.parserVersion !== PARSER_VERSION) return true;
+    if (typeof meta.sourceMtimeMs !== "number") return true;
+    if (statSync4(meta.sourcePath).mtimeMs !== meta.sourceMtimeMs) return true;
+    const indexPath = meta.indexPath ?? this.getSessionIndexPath();
+    return this.getFileMtimeMs(indexPath) !== (meta.indexMtimeMs ?? null);
+  }
+  sourceFingerprint(file) {
+    const stat = statSync4(file);
+    const indexPath = this.getSessionIndexPath();
+    return JSON.stringify([
+      HEAD_INDEX_VERSION2,
+      PARSER_VERSION,
+      stat.mtimeMs,
+      stat.size,
+      this.getFileMtimeMs(indexPath)
+    ]);
+  }
+  getSessionIndexPath() {
+    const roots = resolveProviderRoots();
+    return join7(roots.codexRoot, "session_index.jsonl");
+  }
+  getFileMtimeMs(filePath) {
+    try {
+      return statSync4(filePath).mtimeMs;
+    } catch {
+      return null;
+    }
+  }
   // ---- Session index ----
   loadSessionIndex() {
     if (this.sessionIndexCache.size > 0) return;
-    const roots = resolveProviderRoots();
-    const indexPath = join7(roots.codexRoot, "session_index.jsonl");
+    const indexPath = this.getSessionIndexPath();
     if (!existsSync7(indexPath)) return;
     try {
       const content = readFileSync5(indexPath, "utf-8");
@@ -3646,16 +3841,17 @@ var CodexAgent = class extends BaseAgent {
     if (!name) {
       return { currentAssistantIndex, latestAssistantTextIndex, pendingPlan: null };
     }
-    const mappedName = mapToolTitle2(name);
+    const toolIdentity = resolveToolIdentity(name, payload["namespace"]);
     const arguments_ = normalizeToolArguments2(payload["arguments"]);
     const toolPart = {
       type: "tool",
-      tool: mappedName,
+      tool: toolIdentity.tool,
       callID: callId,
-      title: `Tool: ${mappedName}`,
+      title: `Tool: ${toolIdentity.tool}`,
       state: {
         arguments: arguments_,
-        output: null
+        output: null,
+        metadata: toolIdentity.metadata
       },
       time_created: timestampMs
     };
@@ -3712,17 +3908,18 @@ var CodexAgent = class extends BaseAgent {
     if (!name) {
       return { currentAssistantIndex, latestAssistantTextIndex, pendingPlan: null };
     }
-    const mappedName = mapToolTitle2(name);
+    const toolIdentity = resolveToolIdentity(name, payload["namespace"]);
     const rawInput = payload["input"];
     const normalizedInput = normalizeCustomToolArguments(name, rawInput);
     const toolPart = {
       type: "tool",
-      tool: mappedName,
+      tool: toolIdentity.tool,
       callID: callId,
-      title: `Tool: ${mappedName}`,
+      title: `Tool: ${toolIdentity.tool}`,
       state: {
         arguments: normalizedInput,
-        output: null
+        output: null,
+        metadata: toolIdentity.metadata
       },
       time_created: timestampMs
     };
@@ -3797,7 +3994,7 @@ var CURSOR_TOOL_TITLE_MAP = {
   ripgrep_raw_search: "grep",
   glob_file_search: "glob"
 };
-function mapToolTitle3(toolName) {
+function mapToolTitle2(toolName) {
   return CURSOR_TOOL_TITLE_MAP[toolName] ?? toolName;
 }
 function normalizeToolOutputParts2(output, timestampMs) {
@@ -3866,9 +4063,9 @@ function buildToolPart(action, timestampMs) {
   const toolName = action.tool ?? "unknown";
   return {
     type: "tool",
-    tool: mapToolTitle3(toolName),
+    tool: mapToolTitle2(toolName),
     callID: action.type ? `${action.type}:${String(action.input?.id ?? "")}` : "",
-    title: `Tool: ${mapToolTitle3(toolName)}`,
+    title: `Tool: ${mapToolTitle2(toolName)}`,
     state: buildToolState(action),
     time_created: timestampMs
   };
@@ -3990,6 +4187,8 @@ var CursorAgent = class extends BaseAgent {
     try {
       const rows = db.prepare("SELECT key, value FROM cursorDiskKV WHERE key LIKE 'composerData:%'").all();
       const heads = [];
+      options?.onProgress?.({ total: rows.length, processed: 0, sessions: 0 });
+      let processed = 0;
       for (const row of rows) {
         try {
           const composer = JSON.parse(row.value);
@@ -4093,6 +4292,9 @@ var CursorAgent = class extends BaseAgent {
             sourcePath: this.dbPath || ""
           });
         } catch {
+        } finally {
+          processed += 1;
+          options?.onProgress?.({ total: rows.length, processed, sessions: heads.length });
         }
       }
       perf.end(scanMarker);
@@ -4350,7 +4552,7 @@ var CursorAgent = class extends BaseAgent {
   convertToolFormerData(toolData, timestampMs) {
     if (!toolData || !toolData.name) return null;
     const toolName = toolData.name;
-    const normalizedName = toolName === "create_plan" ? "plan" : mapToolTitle3(toolName);
+    const normalizedName = toolName === "create_plan" ? "plan" : mapToolTitle2(toolName);
     const state = {
       status: toolData.status === "completed" ? "completed" : "running"
     };
@@ -4579,7 +4781,7 @@ function computeIdentity(cwd, fs) {
   if (!cwd) return loose();
   const pathOps = getPathOps(cwd);
   const absoluteCwd = pathOps.resolve(cwd);
-  const homeDir = homedir3();
+  const homeDir = os.homedir();
   const homePathOps = getPathOps(homeDir);
   const home = homePathOps === pathOps ? pathOps.resolve(homeDir) : homeDir;
   if (absoluteCwd === home || LOOSE_DIRS.has(absoluteCwd)) return loose();
@@ -4620,6 +4822,10 @@ function computeIdentity(cwd, fs) {
       displayName: deriveDisplayName({ kind: "manifest_path", key: manifestDir, fs })
     };
   }
+  if (homePathOps === pathOps) {
+    const synthetic = synthesizeCodexScratchIdentity(absoluteCwd, home, pathOps);
+    if (synthetic) return synthetic;
+  }
   return {
     kind: "path",
     key: absoluteCwd,
@@ -4629,6 +4835,14 @@ function computeIdentity(cwd, fs) {
 function loose() {
   return { kind: "loose", key: "loose", displayName: "Loose" };
 }
+function synthesizeCodexScratchIdentity(absoluteCwd, home, pathOps) {
+  const root = pathOps.resolve(pathOps.join(home, "Documents", "Codex"));
+  const child = pathOps.relative(root, absoluteCwd);
+  if (!child || child === ".." || child.startsWith(`..${pathOps.sep}`) || pathOps.isAbsolute(child)) {
+    return null;
+  }
+  return { kind: "synthetic", key: "codex:scratch", displayName: "Chats" };
+}
 function getPathOps(input) {
   if (/^[a-zA-Z]:[\\/]/.test(input) || input.startsWith("\\\\") || input.includes("\\")) {
     return path.win32;
@@ -4684,6 +4898,28 @@ function parseManifestName(file, text) {
   }
   return null;
 }
+function createProjectScopeMatcher(queryPath, fs = realFs) {
+  return {
+    identityKey: computeIdentity(queryPath, fs).key,
+    path: normalizeScopePath(queryPath)
+  };
+}
+function matchesProjectScope(session, scope) {
+  if (!session.directory) return false;
+  if (session.project_identity?.key === scope.identityKey) return true;
+  return isPathScopeMatch(scope.path, session.directory);
+}
+function filterSessionsByProjectScope(sessions, queryPath, fs) {
+  const scope = createProjectScopeMatcher(queryPath, fs);
+  return sessions.filter((session) => matchesProjectScope(session, scope));
+}
+function isPathScopeMatch(queryPath, sessionPath) {
+  const session = normalizeScopePath(sessionPath);
+  return session === queryPath || session.startsWith(queryPath + "/") || queryPath.startsWith(session + "/");
+}
+function normalizeScopePath(path2) {
+  return resolve(path2).replaceAll(sep, "/");
+}
 var TAG_ORDER = [
   "bugfix",
   "refactoring",
@@ -4953,7 +5189,8 @@ function extractSessionFileActivity(agentName, sessionId, projectIdentityKey, me
     extractFileActivityOccurrences(messages)
   );
 }
-var CACHE_SCHEMA_VERSION = 8;
+var CACHE_SCHEMA_VERSION = 13;
+var CACHE_INITIALIZATION_VERSION = "session-cache-v2";
 var CACHE_TTL = 7 * 24 * 60 * 60 * 1e3;
 var CACHE_FILENAME = "codesesh.db";
 var LEGACY_CACHE_FILENAME = "scan-cache.json";
@@ -4984,6 +5221,17 @@ function withCacheDb(fn) {
     db.close();
   }
 }
+function withCacheDbReadOnly(fn) {
+  const db = openDbReadOnly(getCachePath2());
+  if (!db) return null;
+  try {
+    return fn(db);
+  } catch {
+    return null;
+  } finally {
+    db.close();
+  }
+}
 function createCacheTables(db) {
   db.exec(`
     CREATE TABLE IF NOT EXISTS cache_meta (
@@ -5003,6 +5251,13 @@ function createCacheTables(db) {
       meta_json TEXT,
       PRIMARY KEY (agent_name, session_id)
     );
+
+    CREATE TABLE IF NOT EXISTS cache_initialization (
+      agent_name TEXT PRIMARY KEY,
+      initialized_at INTEGER NOT NULL,
+      index_version TEXT NOT NULL,
+      last_sync_at INTEGER NOT NULL
+    );
   `);
 }
 function createSessionTables(db) {
@@ -5071,38 +5326,148 @@ function createSessionTables(db) {
     CREATE INDEX IF NOT EXISTS idx_messages_session
       ON messages(agent_name, session_id, message_index);
   `);
+  createMessageToolTables(db);
 }
-function createFileActivityTables(db) {
+function createMessageToolTables(db) {
   db.exec(`
-    CREATE TABLE IF NOT EXISTS session_file_activity (
+    CREATE TABLE IF NOT EXISTS message_tools (
       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)
+      message_index INTEGER NOT NULL,
+      tool_name TEXT NOT NULL,
+      PRIMARY KEY (agent_name, session_id, message_index, tool_name),
+      FOREIGN KEY (agent_name, session_id, message_index)
+        REFERENCES messages(agent_name, session_id, message_index)
         ON DELETE CASCADE
     );
 
-    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);
+    CREATE INDEX IF NOT EXISTS idx_message_tools_filter
+      ON message_tools(tool_name, agent_name, session_id);
   `);
 }
-function createSearchTables(db) {
+function createMessageSearchTables(db) {
+  if (!tableExists(db, "messages")) {
+    createSessionTables(db);
+  }
   db.exec(`
-    CREATE TABLE IF NOT EXISTS session_documents (
-      id INTEGER PRIMARY KEY AUTOINCREMENT,
-      agent_name TEXT NOT NULL,
+    CREATE VIRTUAL TABLE IF NOT EXISTS messages_fts USING fts5(
+      content_text,
+      content='messages',
+      content_rowid='rowid'
+    );
+  `);
+  createMessageSearchTriggers(db);
+}
+function createMessageSearchTriggers(db) {
+  db.exec(`
+    CREATE TRIGGER IF NOT EXISTS messages_ai AFTER INSERT ON messages BEGIN
+      INSERT INTO messages_fts(rowid, content_text)
+      VALUES (new.rowid, new.content_text);
+    END;
+
+    CREATE TRIGGER IF NOT EXISTS messages_ad AFTER DELETE ON messages BEGIN
+      INSERT INTO messages_fts(messages_fts, rowid, content_text)
+      VALUES ('delete', old.rowid, old.content_text);
+    END;
+
+    CREATE TRIGGER IF NOT EXISTS messages_au AFTER UPDATE ON messages BEGIN
+      INSERT INTO messages_fts(messages_fts, rowid, content_text)
+      VALUES ('delete', old.rowid, old.content_text);
+      INSERT INTO messages_fts(rowid, content_text)
+      VALUES (new.rowid, new.content_text);
+    END;
+  `);
+}
+function dropMessageSearchTriggers(db) {
+  db.exec(`
+    DROP TRIGGER IF EXISTS messages_ai;
+    DROP TRIGGER IF EXISTS messages_ad;
+    DROP TRIGGER IF EXISTS messages_au;
+  `);
+}
+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 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_latest
+      ON session_file_activity(latest_time DESC, count DESC, path);
+
+    CREATE INDEX IF NOT EXISTS idx_file_activity_agent_latest
+      ON session_file_activity(agent_name, latest_time DESC, count DESC, path);
+
+    CREATE INDEX IF NOT EXISTS idx_file_activity_project_latest_ordered
+      ON session_file_activity(project_identity_key, latest_time DESC, count DESC, path);
+
+    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);
+  `);
+  createFileActivityPathSearchTables(db);
+}
+function createFileActivityPathSearchTables(db) {
+  db.exec(`
+    CREATE VIRTUAL TABLE IF NOT EXISTS session_file_activity_path_fts USING fts5(
+      path,
+      content='session_file_activity',
+      content_rowid='rowid',
+      tokenize='trigram'
+    );
+  `);
+  createFileActivityPathSearchTriggers(db);
+}
+function createFileActivityPathSearchTriggers(db) {
+  db.exec(`
+    CREATE TRIGGER IF NOT EXISTS session_file_activity_path_ai
+    AFTER INSERT ON session_file_activity BEGIN
+      INSERT INTO session_file_activity_path_fts(rowid, path)
+      VALUES (new.rowid, new.path);
+    END;
+
+    CREATE TRIGGER IF NOT EXISTS session_file_activity_path_ad
+    AFTER DELETE ON session_file_activity BEGIN
+      INSERT INTO session_file_activity_path_fts(session_file_activity_path_fts, rowid, path)
+      VALUES ('delete', old.rowid, old.path);
+    END;
+
+    CREATE TRIGGER IF NOT EXISTS session_file_activity_path_au
+    AFTER UPDATE ON session_file_activity BEGIN
+      INSERT INTO session_file_activity_path_fts(session_file_activity_path_fts, rowid, path)
+      VALUES ('delete', old.rowid, old.path);
+      INSERT INTO session_file_activity_path_fts(rowid, path)
+      VALUES (new.rowid, new.path);
+    END;
+  `);
+}
+function rebuildFileActivityPathIndex(db) {
+  if (!tableExists(db, "session_file_activity_path_fts")) {
+    return;
+  }
+  db.exec(
+    "INSERT INTO session_file_activity_path_fts(session_file_activity_path_fts) VALUES ('rebuild')"
+  );
+}
+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,
@@ -5227,6 +5592,7 @@ function recreateProjectGroupsView(db) {
 function createLatestCacheSchema(db) {
   createCacheTables(db);
   createSessionTables(db);
+  createMessageSearchTables(db);
   createFileActivityTables(db);
   createSearchTables(db);
   createProjectTables(db);
@@ -5245,6 +5611,34 @@ function sourcePathFromMetaJson(metaJson) {
   const meta = JSON.parse(metaJson);
   return sourcePathFromMeta(meta);
 }
+function prepareUpsertCachedSession(db) {
+  return db.prepare(`
+    INSERT INTO cached_sessions(agent_name, session_id, session_json, meta_json)
+    VALUES (?, ?, ?, ?)
+    ON CONFLICT(agent_name, session_id) DO UPDATE SET
+      session_json = excluded.session_json,
+      meta_json = excluded.meta_json
+  `);
+}
+function prepareUpsertProjectSession(db) {
+  return 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
+  `);
+}
 function prepareUpsertSession(db) {
   return db.prepare(`
     INSERT INTO sessions(
@@ -5396,6 +5790,16 @@ function prepareInsertFileActivity(db) {
     ) VALUES (?, ?, ?, ?, ?, ?, ?)
   `);
 }
+function prepareInsertMessageTool(db) {
+  return db.prepare(`
+    INSERT OR IGNORE INTO message_tools(
+      agent_name,
+      session_id,
+      message_index,
+      tool_name
+    ) VALUES (?, ?, ?, ?)
+  `);
+}
 function writeFileActivityRows(statement, activities) {
   for (const activity of activities) {
     statement.run(
@@ -5409,6 +5813,17 @@ function writeFileActivityRows(statement, activities) {
     );
   }
 }
+function writeProjectSessionRow(statement, agentName, session, identity) {
+  statement.run(
+    agentName,
+    session.id,
+    identity.kind,
+    identity.key,
+    identity.displayName,
+    session.directory,
+    session.time_updated ?? session.time_created
+  );
+}
 function sessionFromRow(row) {
   const session = {
     id: String(row.session_id),
@@ -5476,6 +5891,15 @@ function readLegacyCacheVersion(db) {
   return Number(versionRow?.value ?? 0);
 }
 function inferCacheSchemaVersion(db) {
+  if (tableExists(db, "message_tools")) {
+    return 11;
+  }
+  if (tableExists(db, "session_file_activity_path_fts")) {
+    return 10;
+  }
+  if (tableExists(db, "messages_fts")) {
+    return 9;
+  }
   if (tableExists(db, "session_file_activity")) {
     return 8;
   }
@@ -5508,7 +5932,9 @@ function hasAnyCacheSchema(db) {
     "cached_sessions",
     "sessions",
     "messages",
+    "message_tools",
     "session_file_activity",
+    "session_file_activity_path_fts",
     "session_documents",
     "session_documents_fts",
     "project_sessions"
@@ -5580,6 +6006,46 @@ function migrateProjectIdentity(db) {
   backfillProjectSessions(db);
   backfillSessionDocumentProjects(db);
 }
+function refreshProjectIdentities(db) {
+  if (tableExists(db, "sessions") && columnExists(db, "sessions", "project_identity_key") && columnExists(db, "sessions", "directory")) {
+    const rows = db.prepare("SELECT agent_name, session_id, directory FROM sessions").all();
+    const update = db.prepare(`
+      UPDATE sessions
+      SET
+        project_identity_kind = ?,
+        project_identity_key = ?,
+        project_display_name = ?
+      WHERE agent_name = ? AND session_id = ?
+    `);
+    const updateFileActivity = tableExists(db, "session_file_activity") && columnExists(db, "session_file_activity", "project_identity_key") ? db.prepare(`
+            UPDATE session_file_activity
+            SET project_identity_key = ?
+            WHERE agent_name = ? AND session_id = ?
+          `) : null;
+    for (const row of rows) {
+      const identity = computeIdentity(String(row.directory ?? ""), realFs);
+      update.run(identity.kind, identity.key, identity.displayName, row.agent_name, row.session_id);
+      updateFileActivity?.run(identity.key, row.agent_name, row.session_id);
+    }
+  }
+  if (tableExists(db, "project_sessions") && columnExists(db, "project_sessions", "identity_key") && columnExists(db, "project_sessions", "directory")) {
+    const rows = db.prepare("SELECT agent_name, session_id, directory FROM project_sessions").all();
+    const update = db.prepare(`
+      UPDATE project_sessions
+      SET
+        identity_kind = ?,
+        identity_key = ?,
+        display_name = ?
+      WHERE agent_name = ? AND session_id = ?
+    `);
+    for (const row of rows) {
+      const identity = computeIdentity(String(row.directory ?? ""), realFs);
+      update.run(identity.kind, identity.key, identity.displayName, row.agent_name, row.session_id);
+    }
+  }
+  backfillSessionDocumentProjects(db);
+  recreateProjectGroupsView(db);
+}
 function backfillStructuredSessions(db) {
   createSessionTables(db);
   recreateProjectGroupsView(db);
@@ -5678,6 +6144,43 @@ function messageFromBackfillRow(row) {
     nickname: row.nickname ?? void 0
   };
 }
+function messageFromCachedRow(row) {
+  const message = messageFromBackfillRow(row);
+  const tokens = parseOptionalJson(row.tokens_json);
+  if (tokens) {
+    message.tokens = tokens;
+  }
+  if (row.cost != null) {
+    message.cost = Number(row.cost);
+  }
+  if (row.cost_source) {
+    message.cost_source = row.cost_source;
+  }
+  return message;
+}
+function backfillMessageTools(db) {
+  createMessageToolTables(db);
+  if (!tableExists(db, "messages")) {
+    return;
+  }
+  db.exec("DELETE FROM message_tools");
+  const rows = db.prepare(
+    `
+        SELECT agent_name, session_id, message_index, tool_metadata_json
+        FROM messages
+        WHERE tool_metadata_json IS NOT NULL
+      `
+  ).all();
+  const insertTool = prepareInsertMessageTool(db);
+  for (const row of rows) {
+    if (!row.agent_name || !row.session_id || row.message_index == null) {
+      continue;
+    }
+    for (const toolName of toolNamesFromMetadataJson(row.tool_metadata_json)) {
+      insertTool.run(row.agent_name, row.session_id, row.message_index, toolName);
+    }
+  }
+}
 function backfillFileActivity(db) {
   createFileActivityTables(db);
   if (!tableExists(db, "sessions") || !tableExists(db, "messages")) {
@@ -5742,6 +6245,12 @@ function rebuildSearchIndex(db) {
   }
   db.exec("INSERT INTO session_documents_fts(session_documents_fts) VALUES ('rebuild')");
 }
+function rebuildMessageSearchIndex(db) {
+  if (!tableExists(db, "messages_fts")) {
+    return;
+  }
+  db.exec("INSERT INTO messages_fts(messages_fts) VALUES ('rebuild')");
+}
 function shouldBulkSyncSearchIndex(options, changedCount) {
   if (options.isBulk != null) {
     return options.isBulk;
@@ -5754,6 +6263,11 @@ function ensureFtsReady(db) {
     createSearchTables(db);
   }
   createSearchTriggers(db);
+  const needsMessageSearchRebuild = !tableExists(db, "messages_fts");
+  createMessageSearchTables(db);
+  if (needsMessageSearchRebuild) {
+    rebuildMessageSearchIndex(db);
+  }
 }
 function ensureFtsConsistency(db) {
   ensureFtsReady(db);
@@ -5765,9 +6279,11 @@ function ensureFtsConsistency(db) {
     db.exec(
       "INSERT INTO session_documents_fts(session_documents_fts, rank) VALUES ('integrity-check', 1)"
     );
+    db.exec("INSERT INTO messages_fts(messages_fts, rank) VALUES ('integrity-check', 1)");
     ftsIntegrityCheckedPath = cachePath;
   } catch {
     rebuildSearchIndex(db);
+    rebuildMessageSearchIndex(db);
     ftsIntegrityCheckedPath = cachePath;
   }
 }
@@ -5796,9 +6312,11 @@ function ensureSchema(db, dbPath) {
     backupLabel: "cache-migration",
     backupTables: [
       "agent_cache",
+      "cache_initialization",
       "cached_sessions",
       "sessions",
       "messages",
+      "message_tools",
       "session_file_activity",
       "session_documents",
       "project_sessions"
@@ -5817,7 +6335,34 @@ function ensureSchema(db, dbPath) {
         }
       },
       { version: 7, migrate: backfillStructuredSessions },
-      { version: 8, migrate: backfillFileActivity }
+      { version: 8, migrate: backfillFileActivity },
+      {
+        version: 9,
+        migrate(db2) {
+          createMessageSearchTables(db2);
+          rebuildMessageSearchIndex(db2);
+        }
+      },
+      {
+        version: 10,
+        migrate(db2) {
+          createFileActivityPathSearchTables(db2);
+          rebuildFileActivityPathIndex(db2);
+        }
+      },
+      {
+        version: 11,
+        migrate(db2) {
+          backfillMessageTools(db2);
+        }
+      },
+      {
+        version: 12,
+        migrate(db2) {
+          refreshProjectIdentities(db2);
+        }
+      },
+      { version: 13, migrate: createCacheTables }
     ]
   });
   createLatestCacheSchema(db);
@@ -6002,6 +6547,36 @@ function appendPlainText(value, chunks) {
 function compactRecord(record) {
   return Object.fromEntries(Object.entries(record).filter(([, value]) => value != null));
 }
+function normalizeToolName2(value) {
+  if (typeof value !== "string") return null;
+  const name = value.trim().toLowerCase();
+  return name || null;
+}
+function toolNamesFromMetadataJson(value) {
+  if (!value) return [];
+  try {
+    const metadata = JSON.parse(String(value));
+    if (!Array.isArray(metadata)) return [];
+    const tools = /* @__PURE__ */ new Set();
+    for (const item of metadata) {
+      if (item == null || typeof item !== "object") continue;
+      const toolName = normalizeToolName2(item.tool);
+      if (toolName) tools.add(toolName);
+    }
+    return [...tools];
+  } catch {
+    return [];
+  }
+}
+function toolNamesFromMessage(message) {
+  const tools = /* @__PURE__ */ new Set();
+  for (const part of message.parts) {
+    if (part.type !== "tool") continue;
+    const toolName = normalizeToolName2(part.tool);
+    if (toolName) tools.add(toolName);
+  }
+  return [...tools];
+}
 function summarizeToolPart(part) {
   const state = part.state == null ? void 0 : compactRecord({
     status: part.state.status,
@@ -6055,7 +6630,8 @@ function normalizeMessages(session) {
       subagentId: message.subagent_id ?? null,
       nickname: message.nickname ?? null,
       contentText: buildMessageText(message),
-      toolMetadataJson: toolMetadata.length > 0 ? JSON.stringify(toolMetadata) : null
+      toolMetadataJson: toolMetadata.length > 0 ? JSON.stringify(toolMetadata) : null,
+      toolNames: toolNamesFromMessage(message)
     };
   });
 }
@@ -6077,14 +6653,14 @@ function deleteLegacyCacheFile() {
   } catch {
   }
 }
-function loadCachedSessions(agentName) {
+function loadCachedSessions(agentName, options = {}) {
   if (!hasCacheStorage()) {
     return null;
   }
   return withCacheDb((db) => {
     const timestampRow = db.prepare("SELECT timestamp AS value FROM agent_cache WHERE agent_name = ?").get(agentName);
     const timestamp = Number(timestampRow?.value ?? 0);
-    if (!timestamp || Date.now() - timestamp > CACHE_TTL) {
+    if (!timestamp || !options.ignoreTtl && Date.now() - timestamp > CACHE_TTL) {
       return null;
     }
     const rows = db.prepare(
@@ -6130,6 +6706,113 @@ function loadCachedSessions(agentName) {
     return { sessions, meta, timestamp };
   });
 }
+function isAgentCacheInitialized(agentName, indexVersion = CACHE_INITIALIZATION_VERSION) {
+  if (!hasCacheStorage()) {
+    return false;
+  }
+  return withCacheDbReadOnly((db) => {
+    if (!tableExists(db, "cache_initialization")) return false;
+    const row = db.prepare(
+      `
+            SELECT index_version
+            FROM cache_initialization
+            WHERE agent_name = ?
+          `
+    ).get(agentName);
+    return row?.index_version === indexVersion;
+  }) ?? false;
+}
+function markAgentCacheInitialized(agentName, indexVersion = CACHE_INITIALIZATION_VERSION) {
+  withCacheDb((db) => {
+    const now = Date.now();
+    db.prepare(
+      `
+        INSERT INTO cache_initialization(agent_name, initialized_at, index_version, last_sync_at)
+        VALUES (?, ?, ?, ?)
+        ON CONFLICT(agent_name) DO UPDATE SET
+          index_version = excluded.index_version,
+          last_sync_at = excluded.last_sync_at
+      `
+    ).run(agentName, now, indexVersion, now);
+  });
+}
+function loadCachedSessionData(agentName, sessionId) {
+  if (!hasCacheStorage()) {
+    return null;
+  }
+  return withCacheDbReadOnly((db) => {
+    const row = db.prepare(
+      `
+          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 = ? AND session_id = ?
+        `
+    ).get(agentName, sessionId);
+    if (!row) {
+      return null;
+    }
+    const messageRows = db.prepare(
+      `
+          SELECT
+            message_id,
+            role,
+            time_created,
+            time_completed,
+            agent,
+            mode,
+            model,
+            provider,
+            tokens_json,
+            cost,
+            cost_source,
+            parts_json,
+            subagent_id,
+            nickname
+          FROM messages
+          WHERE agent_name = ? AND session_id = ?
+          ORDER BY message_index
+        `
+    ).all(agentName, sessionId);
+    const head = sessionFromRow(row);
+    const fileActivityRows = db.prepare(
+      `
+          SELECT agent_name, session_id, project_identity_key, path, kind, count, latest_time
+          FROM session_file_activity
+          WHERE agent_name = ? AND session_id = ?
+          ORDER BY latest_time DESC, count DESC, path
+          LIMIT 500
+        `
+    ).all(agentName, sessionId);
+    return {
+      ...head,
+      messages: messageRows.map((messageRow) => messageFromCachedRow(messageRow)),
+      file_activity: fileActivityRows.map((activityRow) => fileActivityFromRow(activityRow))
+    };
+  });
+}
 function saveCachedSessions(agentName, sessions, meta = {}) {
   withCacheDb((db) => {
     const deleteAgent = db.prepare("DELETE FROM agent_cache WHERE agent_name = ?");
@@ -6140,31 +6823,27 @@ function saveCachedSessions(agentName, sessions, meta = {}) {
     const deleteSearchDocument = 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 = ?"
+    );
+    const deleteMessageTools = db.prepare(
+      "DELETE FROM message_tools WHERE agent_name = ? AND session_id = ?"
+    );
     const deleteFileActivity = db.prepare(
       "DELETE FROM session_file_activity WHERE agent_name = ? AND session_id = ?"
     );
+    const deleteProjectSession = db.prepare(
+      "DELETE FROM project_sessions 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 insertCachedSession = db.prepare(`
-      INSERT INTO cached_sessions(agent_name, session_id, session_json, meta_json)
-      VALUES (?, ?, ?, ?)
-    `);
+    const upsertCachedSession = prepareUpsertCachedSession(db);
     const upsertSession = prepareUpsertSession(db);
-    const insertProjectSession = db.prepare(`
-      INSERT INTO project_sessions(
-        agent_name,
-        session_id,
-        identity_kind,
-        identity_key,
-        display_name,
-        directory,
-        activity_time
-      ) VALUES (?, ?, ?, ?, ?, ?, ?)
-    `);
+    const upsertProjectSession = prepareUpsertProjectSession(db);
     const write = db.transaction(() => {
       const timestamp = Date.now();
       const sessionIds = new Set(sessions.map((session) => session.id));
@@ -6177,7 +6856,10 @@ function saveCachedSessions(agentName, sessions, meta = {}) {
         const sessionId = String(row.session_id);
         if (!sessionIds.has(sessionId)) {
           deleteSearchDocument.run(agentName, sessionId);
+          deleteMessageTools.run(agentName, sessionId);
+          deleteMessages.run(agentName, sessionId);
           deleteFileActivity.run(agentName, sessionId);
+          deleteProjectSession.run(agentName, sessionId);
           deleteSession.run(agentName, sessionId);
         }
       }
@@ -6185,7 +6867,7 @@ function saveCachedSessions(agentName, sessions, meta = {}) {
         const identity = session.project_identity ?? computeIdentity(session.directory, realFs);
         const sessionMeta = meta[session.id];
         const metaJson = sessionMeta ? JSON.stringify(sessionMeta) : null;
-        insertCachedSession.run(agentName, session.id, JSON.stringify(session), metaJson);
+        upsertCachedSession.run(agentName, session.id, JSON.stringify(session), metaJson);
         upsertSessionRow(
           upsertSession,
           agentName,
@@ -6194,16 +6876,73 @@ function saveCachedSessions(agentName, sessions, meta = {}) {
           index,
           sourcePathFromMeta(sessionMeta)
         );
-        insertProjectSession.run(
+        writeProjectSessionRow(upsertProjectSession, agentName, session, identity);
+      });
+    });
+    write();
+    deleteLegacyCacheFile();
+  });
+}
+function saveCachedSessionChanges(agentName, changes, removedSessionIds, meta = {}) {
+  if (changes.length === 0 && removedSessionIds.length === 0) {
+    return;
+  }
+  withCacheDb((db) => {
+    const deleteLegacySession = db.prepare(
+      "DELETE FROM cached_sessions WHERE agent_name = ? AND session_id = ?"
+    );
+    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 deleteMessages = db.prepare(
+      "DELETE FROM messages WHERE agent_name = ? AND session_id = ?"
+    );
+    const deleteMessageTools = db.prepare(
+      "DELETE FROM message_tools WHERE agent_name = ? AND session_id = ?"
+    );
+    const deleteFileActivity = db.prepare(
+      "DELETE FROM session_file_activity WHERE agent_name = ? AND session_id = ?"
+    );
+    const deleteProjectSession = db.prepare(
+      "DELETE FROM project_sessions WHERE agent_name = ? AND session_id = ?"
+    );
+    const upsertAgent = db.prepare(`
+      INSERT INTO agent_cache(agent_name, timestamp)
+      VALUES (?, ?)
+      ON CONFLICT(agent_name) DO UPDATE SET timestamp = excluded.timestamp
+    `);
+    const upsertCachedSession = prepareUpsertCachedSession(db);
+    const upsertSession = prepareUpsertSession(db);
+    const upsertProjectSession = prepareUpsertProjectSession(db);
+    const write = db.transaction(() => {
+      upsertAgent.run(agentName, Date.now());
+      for (const sessionId of new Set(removedSessionIds)) {
+        deleteLegacySession.run(agentName, sessionId);
+        deleteSearchDocument.run(agentName, sessionId);
+        deleteMessageTools.run(agentName, sessionId);
+        deleteMessages.run(agentName, sessionId);
+        deleteFileActivity.run(agentName, sessionId);
+        deleteProjectSession.run(agentName, sessionId);
+        deleteSession.run(agentName, sessionId);
+      }
+      for (const { session, sortIndex } of changes) {
+        const identity = session.project_identity ?? computeIdentity(session.directory, realFs);
+        const sessionMeta = meta[session.id];
+        const metaJson = sessionMeta ? JSON.stringify(sessionMeta) : null;
+        upsertCachedSession.run(agentName, session.id, JSON.stringify(session), metaJson);
+        upsertSessionRow(
+          upsertSession,
           agentName,
-          session.id,
-          identity.kind,
-          identity.key,
-          identity.displayName,
-          session.directory,
-          session.time_updated ?? session.time_created
+          session,
+          metaJson,
+          sortIndex,
+          sourcePathFromMeta(sessionMeta)
         );
-      });
+        writeProjectSessionRow(upsertProjectSession, agentName, session, identity);
+      }
     });
     write();
     deleteLegacyCacheFile();
@@ -6218,9 +6957,11 @@ function clearCache() {
   withCacheDb((db) => {
     db.exec(`
       DELETE FROM agent_cache;
+      DELETE FROM cache_initialization;
       DELETE FROM cached_sessions;
       DELETE FROM session_documents;
       DELETE FROM session_file_activity;
+      DELETE FROM message_tools;
       DELETE FROM messages;
       DELETE FROM sessions;
       DELETE FROM project_sessions;
@@ -6253,6 +6994,173 @@ function getCacheInfo() {
   });
   return info ?? { lastScanTime: null, size: 0 };
 }
+function loadSearchIndexEntry(agentName, change, loadSessionData) {
+  try {
+    const data = loadSessionData(change.session.id);
+    const messages = normalizeMessages(data);
+    const identity = change.session.project_identity ?? data.project_identity ?? computeIdentity(change.session.directory, realFs);
+    return {
+      session: change.session,
+      identity,
+      messages,
+      contentText: buildSessionContentFromMessages(data.title ?? change.session.title, messages),
+      contentHash: sessionContentHash(change.session),
+      fileActivity: extractSessionFileActivity(
+        agentName,
+        change.session.id,
+        identity.key,
+        data.messages
+      ),
+      sortIndex: change.sortIndex
+    };
+  } catch {
+    return null;
+  }
+}
+function writeSearchIndexRows(db, agentName, removedSessionIds, entries) {
+  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 deleteMessageTools = db.prepare(
+    "DELETE FROM message_tools 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 insertMessageTool = prepareInsertMessageTool(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,
+      session_id,
+      slug,
+      title,
+      directory,
+      project_identity_kind,
+      project_identity_key,
+      project_display_name,
+      time_created,
+      time_updated,
+      activity_time,
+      content_text,
+      content_hash,
+      indexed_at
+    ) 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,
+      content_text = excluded.content_text,
+      content_hash = excluded.content_hash,
+      indexed_at = excluded.indexed_at
+  `);
+  for (const sessionId of new Set(removedSessionIds)) {
+    deleteRow.run(agentName, sessionId);
+    deleteFileActivity.run(agentName, sessionId);
+    deleteMessageTools.run(agentName, sessionId, 0);
+    deleteMessages.run(agentName, sessionId, 0);
+  }
+  for (const entry of entries) {
+    const activityTime = entry.session.time_updated ?? entry.session.time_created;
+    upsertSessionRow(upsertIndexedSession, agentName, entry.session, null, entry.sortIndex, null);
+    deleteFileActivity.run(agentName, entry.session.id);
+    deleteMessageTools.run(agentName, entry.session.id, 0);
+    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
+      );
+      for (const toolName of message.toolNames) {
+        insertMessageTool.run(agentName, entry.session.id, message.index, toolName);
+      }
+    }
+    deleteMessages.run(agentName, entry.session.id, entry.messages.length);
+    upsertRow.run(
+      agentName,
+      entry.session.id,
+      entry.session.slug,
+      entry.session.title,
+      entry.session.directory,
+      entry.identity.kind,
+      entry.identity.key,
+      entry.identity.displayName,
+      entry.session.time_created,
+      entry.session.time_updated ?? null,
+      activityTime,
+      entry.contentText,
+      entry.contentHash,
+      Date.now()
+    );
+  }
+}
 function syncSessionSearchIndex(agentName, sessions, loadSessionData, options = {}) {
   return withCacheDb((db) => {
     ensureFtsConsistency(db);
@@ -6277,180 +7185,27 @@ function syncSessionSearchIndex(agentName, sessions, loadSessionData, options =
     );
     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,
-          identity,
-          messages,
-          contentText: buildSessionContentFromMessages(data.title ?? session.title, messages),
-          contentHash: sessionContentHash(session),
-          fileActivity: extractSessionFileActivity(
-            agentName,
-            session.id,
-            identity.key,
-            data.messages
-          )
-        };
-      } catch {
-        return null;
-      }
-    }).filter((entry) => entry !== null);
-    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,
-        session_id,
-        slug,
-        title,
-        directory,
-        project_identity_kind,
-        project_identity_key,
-        project_display_name,
-        time_created,
-        time_updated,
-        activity_time,
-        content_text,
-        content_hash,
-        indexed_at
-      ) 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,
-        content_text = excluded.content_text,
-        content_hash = excluded.content_hash,
-        indexed_at = excluded.indexed_at
-    `);
-    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;
-        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,
-          entry.identity.kind,
-          entry.identity.key,
-          entry.identity.displayName,
-          entry.session.time_created,
-          entry.session.time_updated ?? null,
-          activityTime,
-          entry.contentText,
-          entry.contentHash,
-          Date.now()
-        );
-      }
-    };
+    const loaded = toUpsert.map(
+      (session) => loadSearchIndexEntry(
+        agentName,
+        { session, sortIndex: sessionSortIndexMap.get(session.id) ?? 0 },
+        loadSessionData
+      )
+    ).filter((entry) => entry !== null);
+    const writeRows = () => writeSearchIndexRows(db, agentName, toDelete, loaded);
     let rebuildDurationMs;
     const needsRebuild = isBulk && (toDelete.length > 0 || loaded.length > 0);
     if (needsRebuild) {
       db.transaction(() => {
         dropSearchTriggers(db);
+        dropMessageSearchTriggers(db);
         writeRows();
         const rebuildStartedAt = performance.now();
         rebuildSearchIndex(db);
+        rebuildMessageSearchIndex(db);
         rebuildDurationMs = performance.now() - rebuildStartedAt;
         createSearchTriggers(db);
+        createMessageSearchTriggers(db);
       })();
     } else {
       db.transaction(writeRows)();
@@ -6468,6 +7223,68 @@ function syncSessionSearchIndex(agentName, sessions, loadSessionData, options =
     };
   });
 }
+function syncSessionSearchIndexChanges(agentName, changes, removedSessionIds, loadSessionData, options = {}) {
+  if (changes.length === 0 && removedSessionIds.length === 0) {
+    return {
+      agentName,
+      mode: "incremental",
+      sessions: 0,
+      changed: 0,
+      deleted: 0,
+      indexed: 0,
+      skipped: 0,
+      durationMs: 0
+    };
+  }
+  return withCacheDb((db) => {
+    ensureFtsConsistency(db);
+    const startedAt = performance.now();
+    const getIndexedRow = db.prepare(
+      "SELECT content_hash FROM session_documents WHERE agent_name = ? AND session_id = ?"
+    );
+    const getMessageCount = db.prepare(
+      "SELECT COUNT(*) AS value FROM messages WHERE agent_name = ? AND session_id = ?"
+    );
+    const toUpsert = changes.filter(({ session }) => {
+      const indexed = getIndexedRow.get(agentName, session.id);
+      const messageCount = getMessageCount.get(agentName, session.id);
+      return String(indexed?.content_hash ?? "") !== sessionContentHash(session) || Number(messageCount?.value ?? 0) !== session.stats.message_count;
+    });
+    const uniqueRemovedSessionIds = Array.from(new Set(removedSessionIds));
+    const changedCount = uniqueRemovedSessionIds.length + toUpsert.length;
+    const isBulk = shouldBulkSyncSearchIndex(options, changedCount);
+    const loaded = toUpsert.map((change) => loadSearchIndexEntry(agentName, change, loadSessionData)).filter((entry) => entry !== null);
+    const writeRows = () => writeSearchIndexRows(db, agentName, uniqueRemovedSessionIds, loaded);
+    let rebuildDurationMs;
+    const needsRebuild = isBulk && (uniqueRemovedSessionIds.length > 0 || loaded.length > 0);
+    if (needsRebuild) {
+      db.transaction(() => {
+        dropSearchTriggers(db);
+        dropMessageSearchTriggers(db);
+        writeRows();
+        const rebuildStartedAt = performance.now();
+        rebuildSearchIndex(db);
+        rebuildMessageSearchIndex(db);
+        rebuildDurationMs = performance.now() - rebuildStartedAt;
+        createSearchTriggers(db);
+        createMessageSearchTriggers(db);
+      })();
+    } else {
+      db.transaction(writeRows)();
+    }
+    return {
+      agentName,
+      mode: isBulk ? "bulk" : "incremental",
+      sessions: changes.length,
+      changed: toUpsert.length,
+      deleted: uniqueRemovedSessionIds.length,
+      indexed: loaded.length,
+      skipped: toUpsert.length - loaded.length,
+      durationMs: performance.now() - startedAt,
+      rebuildDurationMs
+    };
+  });
+}
 function sessionHeadFromSearchRow(row) {
   return sessionFromRow(row);
 }
@@ -6514,6 +7331,11 @@ function sessionMatchesSearchCost(session, options) {
 function likePattern(value) {
   return `%${value.trim().toLowerCase().replace(/[\\%_]/g, "\\$&")}%`;
 }
+function filePathFtsQuery(value) {
+  const path2 = normalizeFilePathSearch(value);
+  if (path2.length < 3) return null;
+  return `"${path2.replaceAll('"', '""')}"`;
+}
 function escapeRegExp(value) {
   return value.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
 }
@@ -6544,16 +7366,26 @@ function buildSessionSearchFilters(options) {
     params.push(`%"${tag}"%`);
   }
   for (const tool of options.tools ?? []) {
+    const toolName = normalizeToolName2(tool);
+    if (!toolName) continue;
     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 '\\')"
+      "EXISTS (SELECT 1 FROM message_tools mt WHERE mt.tool_name = ? AND mt.agent_name = s.agent_name AND mt.session_id = s.session_id)"
     );
-    params.push(likePattern(tool));
+    params.push(toolName);
   }
   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));
+      const pathQuery = filePathFtsQuery(options.file);
+      if (pathQuery) {
+        fileClauses.push(
+          "fa.rowid IN (SELECT rowid FROM session_file_activity_path_fts WHERE path MATCH ?)"
+        );
+        params.push(pathQuery);
+      } else {
+        fileClauses.push("LOWER(fa.path) LIKE ? ESCAPE '\\'");
+        params.push(likePattern(options.file));
+      }
     }
     if (options.fileKind) {
       fileClauses.push("fa.kind = ?");
@@ -6639,8 +7471,51 @@ function messageMatchType(row) {
   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);
+function searchResultRowKey(row) {
+  return `${String(row.agent_name)}\0${String(row.session_id)}`;
+}
+function fetchMessageSearchMatches(db, rows, ftsQuery, terms) {
+  const candidates = rows.filter((row) => !textMatchesTerms(String(row.title ?? ""), terms));
+  if (candidates.length === 0) {
+    return /* @__PURE__ */ new Map();
+  }
+  const clauses = [];
+  const params = [ftsQuery];
+  for (const row of candidates) {
+    clauses.push("(m.agent_name = ? AND m.session_id = ?)");
+    params.push(String(row.agent_name), String(row.session_id));
+  }
+  const messageRows = db.prepare(
+    `
+        SELECT
+          m.agent_name,
+          m.session_id,
+          m.message_index,
+          m.role,
+          m.mode,
+          m.content_text,
+          m.tool_metadata_json
+        FROM messages_fts
+        JOIN messages m ON m.rowid = messages_fts.rowid
+        WHERE messages_fts MATCH ?
+          AND (${clauses.join(" OR ")})
+        ORDER BY m.message_index
+      `
+  ).all(...params);
+  const matches = /* @__PURE__ */ new Map();
+  for (const message of messageRows) {
+    const key = searchResultRowKey(message);
+    if (matches.has(key)) continue;
+    const text = String(message.content_text ?? "");
+    if (!textMatchesTerms(text, terms)) continue;
+    matches.set(key, {
+      snippet: buildTermSnippet(text, terms),
+      matchType: messageMatchType(message)
+    });
+  }
+  return matches;
+}
+function resolveSearchMatch(row, terms, messageMatches) {
   const title = String(row.title ?? "");
   if (terms.terms.length === 0) {
     return {
@@ -6651,30 +7526,20 @@ function resolveSearchMatch(db, row, textQuery) {
   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)
-    };
+  const messageMatch = messageMatches.get(searchResultRowKey(row));
+  if (messageMatch) {
+    return messageMatch;
   }
   return {
     snippet: String(row.snippet ?? ""),
     matchType: "assistant_reply"
   };
 }
-function rowsToSearchResults(db, rows, textQuery) {
+function rowsToSearchResults(db, rows, textQuery, ftsQuery = toFtsQuery(textQuery)) {
+  const terms = parseTextTerms(textQuery);
+  const messageMatches = terms.terms.length > 0 && ftsQuery ? fetchMessageSearchMatches(db, rows, ftsQuery, terms) : /* @__PURE__ */ new Map();
   return rows.map((row) => {
-    const match = resolveSearchMatch(db, row, textQuery);
+    const match = resolveSearchMatch(row, terms, messageMatches);
     return {
       agentName: String(row.agent_name),
       session: sessionHeadFromSearchRow(row),
@@ -6726,7 +7591,7 @@ function searchSessions(query, options = {}) {
           LIMIT ?
         `
     ).all(ftsQuery, ...filters.params, search.options.limit ?? 50);
-    return rowsToSearchResults(db, rows, normalizedQuery);
+    return rowsToSearchResults(db, rows, normalizedQuery, ftsQuery);
   });
   return results ?? [];
 }
@@ -6740,6 +7605,7 @@ function fileActivityFilters(options) {
     projectLike: options.project ? likePattern(options.project) : null,
     cwdKey: options.cwd ? computeIdentity(options.cwd, realFs).key : null,
     cwdLike: options.cwd ? likePattern(options.cwd) : null,
+    path: path2,
     pathLike: path2 ? likePattern(path2) : null
   };
 }
@@ -6754,14 +7620,68 @@ function fileActivityFromRow(row) {
     latest_time: Number(row.latest_time ?? 0)
   };
 }
+function buildFileActivityWhere(options) {
+  const filters = fileActivityFilters(options);
+  const clauses = [];
+  const params = [];
+  if (options.agent != null) {
+    clauses.push("fa.agent_name = ?");
+    params.push(options.agent);
+  }
+  if (options.sessionId != null) {
+    clauses.push("fa.session_id = ?");
+    params.push(options.sessionId);
+  }
+  if (filters.projectKey != null) {
+    clauses.push("fa.project_identity_key = ?");
+    params.push(filters.projectKey);
+  }
+  if (filters.projectLike != null) {
+    clauses.push(
+      "(LOWER(fa.project_identity_key) LIKE ? ESCAPE '\\' OR LOWER(s.project_display_name) LIKE ? ESCAPE '\\' OR LOWER(s.directory) LIKE ? ESCAPE '\\')"
+    );
+    params.push(filters.projectLike, filters.projectLike, filters.projectLike);
+  }
+  if (filters.cwdKey != null) {
+    clauses.push("(s.project_identity_key = ? OR LOWER(s.directory) LIKE ? ESCAPE '\\')");
+    params.push(filters.cwdKey, filters.cwdLike);
+  }
+  if (filters.pathLike != null) {
+    const pathQuery = filePathFtsQuery(filters.path);
+    if (pathQuery) {
+      clauses.push(
+        "fa.rowid IN (SELECT rowid FROM session_file_activity_path_fts WHERE path MATCH ?)"
+      );
+      params.push(pathQuery);
+    } else {
+      clauses.push("LOWER(fa.path) LIKE ? ESCAPE '\\'");
+      params.push(filters.pathLike);
+    }
+  }
+  if (options.kind != null) {
+    clauses.push("fa.kind = ?");
+    params.push(options.kind);
+  }
+  if (options.from != null) {
+    clauses.push("fa.latest_time >= ?");
+    params.push(options.from);
+  }
+  if (options.to != null) {
+    clauses.push("fa.latest_time <= ?");
+    params.push(options.to);
+  }
+  return {
+    where: clauses.length > 0 ? `WHERE ${clauses.join(" AND ")}` : "",
+    params
+  };
+}
 function listFileActivity(options = {}) {
   if (!hasCacheStorage()) {
     return [];
   }
-  const filters = fileActivityFilters(options);
-  const rows = withCacheDb(
-    (db) => db.prepare(
-      `
+  const filters = buildFileActivityWhere(options);
+  const queryRows = (db) => db.prepare(
+    `
           SELECT
             fa.agent_name,
             fa.session_id,
@@ -6787,43 +7707,15 @@ function listFileActivity(options = {}) {
             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 <= ?)
+          ${filters.where}
           ORDER BY fa.latest_time DESC, fa.count DESC, fa.path
           LIMIT ?
         `
-    ).all(
-      options.agent ?? null,
-      options.agent ?? 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
-    )
-  );
+  ).all(...filters.params, options.limit ?? 50);
+  let rows = withCacheDbReadOnly(queryRows);
+  if (rows == null && options.path) {
+    rows = withCacheDb(queryRows);
+  }
   return (rows ?? []).map((row) => ({
     ...fileActivityFromRow(row),
     session: sessionHeadFromSearchRow(row)
@@ -6905,15 +7797,6 @@ function listCachedProjectGroups(sessions) {
   });
   return groups ?? [];
 }
-function isPathScopeMatch(queryPath, sessionPath) {
-  if (!sessionPath) return false;
-  const q = resolve(queryPath);
-  const s = resolve(sessionPath);
-  const sepNorm = (p) => p.replaceAll(sep, "/");
-  const sn = sepNorm(s);
-  const qn = sepNorm(q);
-  return sn === qn || sn.startsWith(qn + "/") || qn.startsWith(sn + "/");
-}
 function createIdentityResolver() {
   const cache = /* @__PURE__ */ new Map();
   return (directory) => {
@@ -6935,17 +7818,10 @@ function attachProjectIdentities(sessions) {
     };
   });
 }
-function isProjectScopeMatch(queryPath, session) {
-  if (!session.directory) return false;
-  const queryIdentity = computeIdentity(queryPath, realFs);
-  if (session.project_identity?.key === queryIdentity.key) return true;
-  return isPathScopeMatch(queryPath, session.directory);
-}
 function filterSessions(sessions, options) {
   let result = sessions;
   if (options.cwd) {
-    const cwd = options.cwd;
-    result = result.filter((s) => isProjectScopeMatch(cwd, s));
+    result = filterSessionsByProjectScope(result, options.cwd);
   }
   if (options.from != null) {
     result = result.filter((s) => (s.time_updated ?? s.time_created) >= options.from);
@@ -6964,8 +7840,34 @@ function buildAgentCacheMeta(agent) {
   }
   return meta;
 }
+function sessionCacheValue(session) {
+  return JSON.stringify(session);
+}
+function buildCacheChanges(cachedSessions, updatedSessions, changedIds = []) {
+  const cachedMap = new Map(cachedSessions.map((session) => [session.id, session]));
+  const updatedIds = new Set(updatedSessions.map((session) => session.id));
+  const changedIdSet = new Set(changedIds);
+  const removedSessionIds = cachedSessions.filter((session) => !updatedIds.has(session.id)).map((session) => session.id);
+  const changes = [];
+  updatedSessions.forEach((session, sortIndex) => {
+    const cached = cachedMap.get(session.id);
+    if (!cached || changedIdSet.has(session.id) || cached !== session && sessionCacheValue(cached) !== sessionCacheValue(session)) {
+      changes.push({ session, sortIndex });
+    }
+  });
+  return { changes, removedSessionIds };
+}
+function saveCachedSessionDiff(agent, cachedSessions, updatedSessions, changedIds = []) {
+  const diff = buildCacheChanges(cachedSessions, updatedSessions, changedIds);
+  saveCachedSessionChanges(
+    agent.name,
+    diff.changes,
+    diff.removedSessionIds,
+    buildAgentCacheMeta(agent)
+  );
+}
 function getSmartTagWorkerCount(sessionCount) {
-  if (sessionCount < 8) return 1;
+  if (sessionCount < 50) return 1;
   return Math.min(sessionCount, Math.max(1, Math.min(4, availableParallelism() - 1)));
 }
 function chunkSessions(items, chunkCount) {
@@ -6998,58 +7900,12 @@ function ensureSessionTagsSync(agent, sessions) {
   });
   return { sessions: tagged, changed };
 }
-async function classifySessionTagsInWorker(agentName, sessionIds) {
+async function classifySessionTagsInWorker(workerUrl, agentName, sessionIds, meta) {
   return new Promise((resolveWorker, rejectWorker) => {
-    const worker = new Worker(
-      `
-        const { parentPort, workerData } = require("node:worker_threads");
-
-        (async () => {
-          const {
-            createRegisteredAgents,
-            classifySessionTags,
-            getSmartTagSourceTimestamp,
-          } = await import("@codesesh/core");
-
-          const agent = createRegisteredAgents().find((item) => item.name === workerData.agentName);
-          const results = [];
-
-          if (agent) {
-            for (const sessionId of workerData.sessionIds) {
-              try {
-                const data = agent.getSessionData(sessionId);
-                results.push({
-                  id: sessionId,
-                  tags: classifySessionTags(data),
-                  sourceUpdatedAt: getSmartTagSourceTimestamp(data),
-                });
-              } catch (error) {
-                results.push({
-                  id: sessionId,
-                  error: error instanceof Error ? error.message : String(error),
-                });
-              }
-            }
-          }
-
-          parentPort?.postMessage(results);
-        })().catch((error) => {
-          parentPort?.postMessage([
-            {
-              id: "",
-              error: error instanceof Error ? error.message : String(error),
-            },
-          ]);
-        });
-      `,
-      {
-        eval: true,
-        workerData: { agentName, sessionIds }
-      }
-    );
-    worker.once("message", (results) => {
-      resolveWorker(results);
+    const worker = new Worker(workerUrl, {
+      workerData: { agentName, sessionIds, meta }
     });
+    worker.once("message", (results) => resolveWorker(results));
     worker.once("error", rejectWorker);
     worker.once("exit", (code) => {
       if (code !== 0) {
@@ -7058,7 +7914,7 @@ async function classifySessionTagsInWorker(agentName, sessionIds) {
     });
   });
 }
-async function ensureSessionTags(agent, sessions) {
+async function ensureSessionTags(agent, sessions, workerUrl) {
   const staleSessions = sessions.filter((session) => {
     const sourceUpdatedAt = session.time_updated ?? session.time_created;
     const currentTags = Array.isArray(session.smart_tags) ? session.smart_tags : null;
@@ -7067,16 +7923,19 @@ async function ensureSessionTags(agent, sessions) {
   if (staleSessions.length === 0) {
     return { sessions, changed: false };
   }
-  const workerCount = getSmartTagWorkerCount(staleSessions.length);
+  const workerCount = workerUrl ? getSmartTagWorkerCount(staleSessions.length) : 1;
   if (workerCount <= 1) {
     return ensureSessionTagsSync(agent, sessions);
   }
+  const meta = buildAgentCacheMeta(agent);
   try {
     const results = (await Promise.all(
       chunkSessions(
         staleSessions.map((session) => session.id),
         workerCount
-      ).map((sessionIds) => classifySessionTagsInWorker(agent.name, sessionIds))
+      ).map(
+        (sessionIds) => classifySessionTagsInWorker(workerUrl, agent.name, sessionIds, meta)
+      )
     )).flat();
     const resultMap = new Map(results.filter((item) => item.tags).map((item) => [item.id, item]));
     return {
@@ -7096,10 +7955,14 @@ async function ensureSessionTags(agent, sessions) {
   }
 }
 async function scanAgentSmart(agent, options, onProgress) {
+  const agentStart = performance.now();
+  const timing = { total: 0 };
   const useCache = options.useCache ?? true;
   const canValidateCache = Boolean(agent.checkForChanges && agent.incrementalScan);
   if (useCache) {
+    const t0 = performance.now();
     const cached = loadCachedSessions(agent.name);
+    timing.cacheLoad = performance.now() - t0;
     if (cached !== null) {
       if (agent.setSessionMetaMap) {
         const metaMap = /* @__PURE__ */ new Map();
@@ -7108,6 +7971,26 @@ async function scanAgentSmart(agent, options, onProgress) {
         }
         agent.setSessionMetaMap(metaMap);
       }
+      if (options.cacheOnly) {
+        onProgress?.({
+          agent: agent.name,
+          phase: "cache",
+          cachedCount: cached.sessions.length
+        });
+        onProgress?.({ agent: agent.name, phase: "complete", newCount: cached.sessions.length });
+        const t32 = performance.now();
+        const cachedWithIdentity2 = attachProjectIdentities(cached.sessions);
+        timing.identity = performance.now() - t32;
+        const filtered3 = filterSessions(cachedWithIdentity2, options);
+        timing.total = performance.now() - agentStart;
+        return {
+          agent,
+          heads: filtered3,
+          fromCache: true,
+          timing,
+          cacheTimestamp: cached.timestamp
+        };
+      }
       const isAvail = agent.isAvailable();
       if (!isAvail) {
         return null;
@@ -7119,22 +8002,35 @@ async function scanAgentSmart(agent, options, onProgress) {
       });
       if (canValidateCache) {
         onProgress?.({ agent: agent.name, phase: "checking" });
+        const t1 = performance.now();
         const checkResult = await Promise.resolve(
           agent.checkForChanges(cached.timestamp, cached.sessions)
         );
+        timing.checkChanges = performance.now() - t1;
         if (checkResult.hasChanges) {
           onProgress?.({
             agent: agent.name,
             phase: "incremental",
             changedCount: checkResult.changedIds?.length
           });
+          const t2 = performance.now();
           const updatedSessions = await Promise.resolve(
             agent.incrementalScan(cached.sessions, checkResult.changedIds || [])
           );
+          timing.scan = performance.now() - t2;
+          const t32 = performance.now();
           const sessionsWithIdentity = attachProjectIdentities(updatedSessions);
-          const tagged2 = options.includeSmartTags === false ? { sessions: sessionsWithIdentity, changed: false } : await ensureSessionTags(agent, sessionsWithIdentity);
-          if (options.writeCache !== false && options.from == null && options.to == null) {
-            saveCachedSessions(agent.name, tagged2.sessions, buildAgentCacheMeta(agent));
+          timing.identity = performance.now() - t32;
+          const t42 = performance.now();
+          const tagged2 = options.includeSmartTags === false ? { sessions: sessionsWithIdentity, changed: false } : await ensureSessionTags(agent, sessionsWithIdentity, options.smartTagWorkerUrl);
+          timing.tags = performance.now() - t42;
+          if (options.writeCache !== false) {
+            saveCachedSessionDiff(
+              agent,
+              cached.sessions,
+              tagged2.sessions,
+              checkResult.changedIds ?? []
+            );
           }
           onProgress?.({
             agent: agent.name,
@@ -7142,22 +8038,45 @@ async function scanAgentSmart(agent, options, onProgress) {
             newCount: tagged2.sessions.length
           });
           const filtered3 = filterSessions(tagged2.sessions, options);
-          return { agent, heads: filtered3, fromCache: true, refreshed: true };
+          timing.total = performance.now() - agentStart;
+          return {
+            agent,
+            heads: filtered3,
+            fromCache: true,
+            refreshed: true,
+            timing,
+            cacheTimestamp: checkResult.timestamp
+          };
         }
         onProgress?.({ agent: agent.name, phase: "complete", newCount: cached.sessions.length });
       }
+      const t3 = performance.now();
       const cachedWithIdentity = attachProjectIdentities(cached.sessions);
-      const tagged = options.includeSmartTags === false ? { sessions: cachedWithIdentity, changed: false } : await ensureSessionTags(agent, cachedWithIdentity);
-      if (tagged.changed && options.writeCache !== false && options.from == null && options.to == null) {
-        saveCachedSessions(agent.name, tagged.sessions, buildAgentCacheMeta(agent));
+      timing.identity = performance.now() - t3;
+      const t4 = performance.now();
+      const tagged = options.includeSmartTags === false ? { sessions: cachedWithIdentity, changed: false } : await ensureSessionTags(agent, cachedWithIdentity, options.smartTagWorkerUrl);
+      timing.tags = performance.now() - t4;
+      if (tagged.changed && options.writeCache !== false) {
+        saveCachedSessionDiff(agent, cached.sessions, tagged.sessions);
       }
       const filtered2 = filterSessions(tagged.sessions, options);
-      return { agent, heads: filtered2, fromCache: true };
+      timing.total = performance.now() - agentStart;
+      return {
+        agent,
+        heads: filtered2,
+        fromCache: true,
+        timing,
+        cacheTimestamp: cached.timestamp
+      };
     }
   }
-  return scanAgentFull(agent, options, onProgress);
+  if (options.cacheOnly) {
+    timing.total = performance.now() - agentStart;
+    return null;
+  }
+  return scanAgentFull(agent, options, onProgress, timing, agentStart);
 }
-async function scanAgentFull(agent, options, onProgress) {
+async function scanAgentFull(agent, options, onProgress, timing = { total: 0 }, agentStart = performance.now()) {
   const availMarker = perf.start(`agent:${agent.name}:isAvailable`);
   const isAvail = agent.isAvailable();
   perf.end(availMarker);
@@ -7166,17 +8085,38 @@ async function scanAgentFull(agent, options, onProgress) {
   }
   try {
     const scanMarker = perf.start(`agent:${agent.name}:scan`);
-    const heads = agent.scan({ from: options.from, to: options.to, fast: options.fast });
+    const t0 = performance.now();
+    const heads = agent.scan({
+      from: options.from,
+      to: options.to,
+      fast: options.fast,
+      onProgress: (progress) => {
+        onProgress?.({
+          agent: agent.name,
+          phase: "incremental",
+          cachedCount: progress.total,
+          newCount: progress.sessions,
+          changedCount: progress.processed
+        });
+      }
+    });
     perf.end(scanMarker);
+    timing.scan = performance.now() - t0;
+    const t1 = performance.now();
     const headsWithIdentity = attachProjectIdentities(heads);
-    const tagged = options.includeSmartTags === false ? { sessions: headsWithIdentity, changed: false } : await ensureSessionTags(agent, headsWithIdentity);
+    timing.identity = performance.now() - t1;
+    const t2 = performance.now();
+    const tagged = options.includeSmartTags === false ? { sessions: headsWithIdentity, changed: false } : await ensureSessionTags(agent, headsWithIdentity, options.smartTagWorkerUrl);
+    timing.tags = performance.now() - t2;
     const meta = buildAgentCacheMeta(agent);
     if (options.writeCache !== false && options.from == null && options.to == null) {
       saveCachedSessions(agent.name, tagged.sessions, meta);
+      markAgentCacheInitialized(agent.name);
     }
     onProgress?.({ agent: agent.name, phase: "complete", newCount: tagged.sessions.length });
     const filtered2 = filterSessions(tagged.sessions, options);
-    return { agent, heads: filtered2, fromCache: false };
+    timing.total = performance.now() - agentStart;
+    return { agent, heads: filtered2, fromCache: false, timing };
   } catch (err) {
     console.error(`Error scanning ${agent.name}:`, err);
     return { agent, heads: [], fromCache: false };
@@ -7188,6 +8128,7 @@ async function scanSessions(options = {}, onProgress) {
   const byAgent = {};
   const allSessions = [];
   const availableAgents = [];
+  const cacheTimestamps = {};
   const agentFilter = options.agents?.length ? new Set(options.agents.map((a) => a.toLowerCase())) : null;
   const agentsToScan = agents.filter((agent) => {
     if (agentFilter && !agentFilter.has(agent.name.toLowerCase())) {
@@ -7197,15 +8138,28 @@ async function scanSessions(options = {}, onProgress) {
   });
   const scanPromises = agentsToScan.map((agent) => scanAgentSmart(agent, options, onProgress));
   const results = await Promise.all(scanPromises);
+  const timings = {};
   for (const result of results) {
     if (result) {
       availableAgents.push(result.agent);
       byAgent[result.agent.name] = result.heads;
       allSessions.push(...result.heads);
+      if (result.timing) {
+        timings[result.agent.name] = result.timing;
+      }
+      if (result.cacheTimestamp != null) {
+        cacheTimestamps[result.agent.name] = result.cacheTimestamp;
+      }
     }
   }
   perf.end(scanMarker);
-  return { sessions: allSessions, byAgent, agents: availableAgents };
+  return {
+    sessions: allSessions,
+    byAgent,
+    agents: availableAgents,
+    timings,
+    cacheTimestamps: Object.keys(cacheTimestamps).length > 0 ? cacheTimestamps : void 0
+  };
 }
 async function scanSessionsAsync(options = {}, onProgress) {
   return scanSessions(options, onProgress);
@@ -7570,6 +8524,9 @@ export {
   buildProjectGroups,
   normalizeGitRemote,
   computeIdentity,
+  createProjectScopeMatcher,
+  matchesProjectScope,
+  filterSessionsByProjectScope,
   getSmartTagSourceTimestamp,
   classifySessionTags,
   extractFileActivityOccurrences,
@@ -7577,10 +8534,15 @@ export {
   extractSessionFileActivity,
   parseSearchQuery,
   loadCachedSessions,
+  isAgentCacheInitialized,
+  markAgentCacheInitialized,
+  loadCachedSessionData,
   saveCachedSessions,
+  saveCachedSessionChanges,
   clearCache,
   getCacheInfo,
   syncSessionSearchIndex,
+  syncSessionSearchIndexChanges,
   searchSessions,
   listFileActivity,
   listSessionFileActivity,
@@ -7595,4 +8557,4 @@ export {
   importBookmarks,
   deleteBookmark
 };
-//# sourceMappingURL=chunk-SQYHWMQV.js.map
+//# sourceMappingURL=chunk-7GQEIPVK.js.map