codesesh 0.9.1 → 0.10.0

package/dist/{chunk-5UOLRSFH.js → chunk-ZQMIB7QO.js}

@@ -1,19 +1,19 @@
 #!/usr/bin/env node
 
 // ../core/dist/index.mjs
-import { existsSync as existsSync3, readdirSync, readFileSync as readFileSync3, statSync } from "fs";
+import { existsSync as existsSync4, readdirSync, readFileSync as readFileSync3, statSync as statSync2 } from "fs";
 import { join as join3, basename as basename2, dirname } from "path";
-import { existsSync } from "fs";
+import { existsSync, statSync } from "fs";
+import { existsSync as existsSync2 } from "fs";
 import { homedir, platform } from "os";
 import { join } from "path";
 import { readFileSync } from "fs";
 import { basename } from "path";
-import { existsSync as existsSync2, mkdirSync, readFileSync as readFileSync2, writeFileSync } from "fs";
+import { existsSync as existsSync3, mkdirSync, readFileSync as readFileSync2, writeFileSync } from "fs";
 import { homedir as homedir2 } from "os";
 import { join as join2 } from "path";
-import { existsSync as existsSync5, statSync as statSync2 } from "fs";
 import { join as join5 } from "path";
-import { existsSync as existsSync4, mkdirSync as mkdirSync2 } from "fs";
+import { existsSync as existsSync5, mkdirSync as mkdirSync2 } from "fs";
 import { basename as basename3, dirname as dirname2, join as join4 } from "path";
 import { createRequire } from "module";
 import { createHash } from "crypto";
@@ -40,9 +40,10 @@ import { spawnSync } from "child_process";
 import * as os from "os";
 import * as path from "path";
 import { resolve, sep } from "path";
-import { existsSync as existsSync11, rmSync, unlinkSync } from "fs";
+import { existsSync as existsSync11 } from "fs";
 import { join as join10 } from "path";
 import { homedir as homedir4 } from "os";
+import { existsSync as existsSync12, rmSync, unlinkSync } from "fs";
 import { homedir as homedir5, platform as platform2 } from "os";
 import { join as join11 } from "path";
 var registrations = [];
@@ -88,6 +89,105 @@ var BaseAgent = class {
     return `${this.name}://${sessionId}`;
   }
 };
+var FileSystemSessionSource = class extends BaseAgent {
+  sessionMetaMap = /* @__PURE__ */ new Map();
+  getSessionMetaMap() {
+    return this.sessionMetaMap;
+  }
+  setSessionMetaMap(meta) {
+    this.sessionMetaMap = meta;
+  }
+  /**
+   * 变更检测：枚举当前源 → 与缓存 metaMap 的指纹/路径比对。
+   * 新增、变更、删除三类统一产出 changedIds。
+   */
+  checkForChanges(_sinceTimestamp, cachedSessions) {
+    const currentRefs = this.listSessionSources();
+    const currentIds = new Set(currentRefs.map((ref) => ref.sessionId));
+    const changedIds = /* @__PURE__ */ new Set();
+    for (const ref of currentRefs) {
+      const meta = this.sessionMetaMap.get(ref.sessionId);
+      const samePath = meta?.sourcePath === ref.sourcePath;
+      const sameFingerprint = typeof meta?.sourceFingerprint === "string" && meta.sourceFingerprint === ref.fingerprint;
+      if (!samePath || !sameFingerprint) changedIds.add(ref.sessionId);
+    }
+    for (const session of cachedSessions) {
+      if (!currentIds.has(session.id)) changedIds.add(session.id);
+    }
+    const changedIdList = [...changedIds];
+    return {
+      hasChanges: changedIdList.length > 0,
+      changedIds: changedIdList,
+      timestamp: Date.now()
+    };
+  }
+  /**
+   * 增量扫描：对变更/新增源调用 scanSessionSource 重解析，
+   * 删除已消失的源，合并回 cachedSessions。
+   */
+  incrementalScan(cachedSessions, changedIds) {
+    const sessionMap = new Map(cachedSessions.map((session) => [session.id, session]));
+    const changedSet = new Set(changedIds);
+    const currentIds = /* @__PURE__ */ new Set();
+    for (const ref of this.listSessionSources()) {
+      currentIds.add(ref.sessionId);
+      if (!changedSet.has(ref.sessionId)) continue;
+      const head = this.scanSessionSource(ref.sourcePath);
+      if (head) {
+        sessionMap.set(head.id, head);
+      } else {
+        sessionMap.delete(ref.sessionId);
+        this.sessionMetaMap.delete(ref.sessionId);
+      }
+    }
+    for (const id of changedSet) {
+      if (!currentIds.has(id)) {
+        sessionMap.delete(id);
+        this.sessionMetaMap.delete(id);
+      }
+    }
+    return [...sessionMap.values()];
+  }
+};
+var DatabaseSessionSource = class extends BaseAgent {
+  sessionMetaMap = /* @__PURE__ */ new Map();
+  /** 记录单个会话的缓存 meta（sourcePath = dbPath）。 */
+  rememberSession(sessionId) {
+    const dbPath = this.getDatabasePath();
+    if (!dbPath) return;
+    this.sessionMetaMap.set(sessionId, { id: sessionId, sourcePath: dbPath });
+  }
+  getSessionMetaMap() {
+    return this.sessionMetaMap;
+  }
+  setSessionMetaMap(meta) {
+    this.sessionMetaMap = meta;
+  }
+  /**
+   * 变更检测：数据库内部变更难以按行定位，简单起见按库文件 mtime 判定。
+   * 库有变更则标记全部缓存会话刷新。
+   */
+  checkForChanges(sinceTimestamp, cachedSessions) {
+    const dbPath = this.getDatabasePath();
+    if (!dbPath || !existsSync(dbPath)) {
+      return { hasChanges: false, timestamp: Date.now() };
+    }
+    try {
+      const hasChanges = statSync(dbPath).mtimeMs > sinceTimestamp;
+      return {
+        hasChanges,
+        changedIds: hasChanges ? cachedSessions.map((session) => session.id) : [],
+        timestamp: Date.now()
+      };
+    } catch {
+      return { hasChanges: false, timestamp: Date.now() };
+    }
+  }
+  /** 增量扫描：数据库型无法增量，直接全量重扫。 */
+  incrementalScan(_cachedSessions, _changedIds) {
+    return this.scan();
+  }
+};
 function envPath(name) {
   const value = process.env[name];
   if (!value) return null;
@@ -95,7 +195,7 @@ function envPath(name) {
 }
 function firstExisting(...paths) {
   for (const p of paths) {
-    if (existsSync(p)) return p;
+    if (existsSync2(p)) return p;
   }
   return null;
 }
@@ -527,7 +627,7 @@ function parseLiteLLMData(data) {
 }
 function loadDiskCache() {
   const path2 = getCachePath();
-  if (!existsSync2(path2)) return;
+  if (!existsSync3(path2)) return;
   try {
     const cached = JSON.parse(readFileSync2(path2, "utf-8"));
     if (Date.now() - cached.timestamp <= CACHE_TTL_MS) {
@@ -550,7 +650,7 @@ function hasBillablePricing(pricing) {
 }
 async function refreshPricingCache() {
   const path2 = getCachePath();
-  if (existsSync2(path2)) {
+  if (existsSync3(path2)) {
     try {
       const cached = JSON.parse(readFileSync2(path2, "utf-8"));
       if (typeof cached.timestamp === "number" && Date.now() - cached.timestamp <= CACHE_TTL_MS) {
@@ -733,13 +833,13 @@ function extractClaudeUsage(data, msg) {
     cacheCreate: numericUsage(u["cache_creation_input_tokens"])
   };
 }
-var ClaudeCodeAgent = class extends BaseAgent {
+var ClaudeCodeAgent = class extends FileSystemSessionSource {
   name = "claudecode";
   displayName = "Claude Code";
   basePath = null;
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
   sessionsIndexCache = {};
-  sessionMetaMap = /* @__PURE__ */ new Map();
+  sessionsIndexMtime = {};
   findBasePath() {
     const roots = resolveProviderRoots();
     return firstExisting(join3(roots.claudeRoot, "projects"), "data/claudecode");
@@ -750,7 +850,7 @@ var ClaudeCodeAgent = class extends BaseAgent {
     try {
       for (const entry of readdirSync(this.basePath)) {
         const dir = join3(this.basePath, entry);
-        if (existsSync3(dir) && readdirSync(dir).some((f) => f.endsWith(".jsonl"))) {
+        if (existsSync4(dir) && readdirSync(dir).some((f) => f.endsWith(".jsonl"))) {
           return true;
         }
       }
@@ -769,7 +869,7 @@ var ClaudeCodeAgent = class extends BaseAgent {
       const fileMarker = perf.start(`listJsonlFiles:${basename2(projectDir)}`);
       const files = this.listJsonlFiles(projectDir).filter((file) => {
         try {
-          return matchesScanWindow(statSync(file).mtimeMs, options);
+          return matchesScanWindow(statSync2(file).mtimeMs, options);
         } catch {
           return false;
         }
@@ -823,18 +923,12 @@ var ClaudeCodeAgent = class extends BaseAgent {
     }
     return head;
   }
-  getSessionMetaMap() {
-    return this.sessionMetaMap;
-  }
-  setSessionMetaMap(meta) {
-    this.sessionMetaMap = meta;
-  }
   getSessionData(sessionId) {
     const meta = this.sessionMetaMap.get(sessionId);
     if (!meta) {
       throw new Error(`Session not found: ${sessionId}`);
     }
-    if (!existsSync3(meta.sourcePath)) {
+    if (!existsSync4(meta.sourcePath)) {
       throw new Error(`Session file missing: ${meta.sourcePath}`);
     }
     const content = readFileSync3(meta.sourcePath, "utf-8");
@@ -894,83 +988,11 @@ var ClaudeCodeAgent = class extends BaseAgent {
       messages: cleanedMessages
     };
   }
-  /**
-   * 检测文件系统变更
-   * - 已有 session：statSync 检测文件修改（APFS 写文件不更新 dir mtime，必须 file-level）
-   * - 新 session 检测：readdirSync 文件列表比对，比 dir statSync 快 ~10x
-   */
-  checkForChanges(_sinceTimestamp, cachedSessions) {
-    if (!this.basePath) {
-      return { hasChanges: false, timestamp: Date.now() };
-    }
-    const changedIds = /* @__PURE__ */ new Set();
-    for (const session of cachedSessions) {
-      const meta = this.sessionMetaMap.get(session.id);
-      if (!meta) {
-        changedIds.add(session.id);
-        continue;
-      }
-      try {
-        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 {
-      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 {
-        }
-      }
-    } catch {
-    }
-    return {
-      hasChanges: changedIds.size > 0 || hasNewFiles,
-      changedIds: Array.from(changedIds),
-      timestamp: Date.now()
-    };
-  }
-  /**
-   * 增量扫描 - 只扫描变更的会话
-   */
-  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 (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, this.buildSessionMeta(head, file, projectDir));
-            }
-          }
-        } catch {
-        }
-      }
-    }
-    return Array.from(sessionMap.values());
-  }
   // --- Private helpers ---
   listProjectDirs() {
     if (!this.basePath) return [];
     try {
-      return readdirSync(this.basePath).map((e) => join3(this.basePath, e)).filter((p) => existsSync3(p));
+      return readdirSync(this.basePath).map((e) => join3(this.basePath, e)).filter((p) => existsSync4(p));
     } catch {
       return [];
     }
@@ -989,8 +1011,8 @@ var ClaudeCodeAgent = class extends BaseAgent {
       title: head.title,
       sourcePath: file,
       sourceFingerprint: this.sourceFingerprint(file, projectDir),
-      sourceMtimeMs: statSync(file).mtimeMs,
-      indexPath: existsSync3(indexPath) ? indexPath : null,
+      sourceMtimeMs: statSync2(file).mtimeMs,
+      indexPath: existsSync4(indexPath) ? indexPath : null,
       indexMtimeMs: this.getFileMtimeMs(indexPath),
       headIndexVersion: HEAD_INDEX_VERSION,
       directory: head.directory,
@@ -1000,15 +1022,8 @@ var ClaudeCodeAgent = class extends BaseAgent {
       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 stat = statSync2(file);
     const indexPath = this.getSessionsIndexPath(projectDir);
     return JSON.stringify([
       HEAD_INDEX_VERSION,
@@ -1022,19 +1037,20 @@ var ClaudeCodeAgent = class extends BaseAgent {
   }
   getFileMtimeMs(filePath) {
     try {
-      return statSync(filePath).mtimeMs;
+      return statSync2(filePath).mtimeMs;
     } catch {
       return null;
     }
   }
   loadSessionsIndex(projectDir) {
     const cacheKey = basename2(projectDir);
-    if (cacheKey in this.sessionsIndexCache) {
+    const indexPath = this.getSessionsIndexPath(projectDir);
+    const mtime = this.getFileMtimeMs(indexPath);
+    if (cacheKey in this.sessionsIndexCache && this.sessionsIndexMtime[cacheKey] === mtime) {
       return this.sessionsIndexCache[cacheKey];
     }
-    const indexPath = this.getSessionsIndexPath(projectDir);
     const map = /* @__PURE__ */ new Map();
-    if (existsSync3(indexPath)) {
+    if (existsSync4(indexPath)) {
       try {
         const data = JSON.parse(readFileSync3(indexPath, "utf-8"));
         const entries = data?.entries ?? [];
@@ -1048,6 +1064,7 @@ var ClaudeCodeAgent = class extends BaseAgent {
       }
     }
     this.sessionsIndexCache[cacheKey] = map;
+    this.sessionsIndexMtime[cacheKey] = mtime;
     return map;
   }
   parseSessionHead(filePath, projectDir) {
@@ -1064,7 +1081,7 @@ var ClaudeCodeAgent = class extends BaseAgent {
     } catch {
       return skippedSession("malformed first record");
     }
-    const createdAt = parseTimestampMs(firstRecord) || statSync(filePath).mtimeMs;
+    const createdAt = parseTimestampMs(firstRecord) || statSync2(filePath).mtimeMs;
     const index = this.loadSessionsIndex(projectDir);
     const indexEntry = index.get(sessionId);
     const explicitTitle = indexEntry?.summary ? String(indexEntry.summary) : null;
@@ -1636,7 +1653,7 @@ function backupDatabase(db, dbPath, label) {
   }
   const timestamp = new Date(Date.now()).toISOString().replaceAll(":", "").replaceAll(".", "-");
   let backupPath = join4(dirname2(dbPath), `${basename3(dbPath)}.${timestamp}.${label}.bak`);
-  for (let counter = 1; existsSync4(backupPath); counter += 1) {
+  for (let counter = 1; existsSync5(backupPath); counter += 1) {
     backupPath = join4(dirname2(dbPath), `${basename3(dbPath)}.${timestamp}.${label}.${counter}.bak`);
   }
   db.exec(`VACUUM INTO ${quoteSqlString(backupPath)}`);
@@ -1709,12 +1726,16 @@ function openDb(dbPath) {
 function isSqliteAvailable() {
   return DatabaseConstructor !== null;
 }
-var OpenCodeAgent = class extends BaseAgent {
+var OpenCodeAgent = class extends DatabaseSessionSource {
   name = "opencode";
   displayName = "OpenCode";
   dbPath = null;
-  // Session metadata for caching
-  sessionMetaMap = /* @__PURE__ */ new Map();
+  getDatabasePath() {
+    if (!this.dbPath) {
+      this.dbPath = this.findDbPath();
+    }
+    return this.dbPath;
+  }
   findDbPath() {
     if (!isSqliteAvailable()) return null;
     const roots = resolveProviderRoots();
@@ -1830,42 +1851,6 @@ var OpenCodeAgent = class extends BaseAgent {
         `
     ).all(cutoffTime);
   }
-  getSessionMetaMap() {
-    return this.sessionMetaMap;
-  }
-  setSessionMetaMap(meta) {
-    this.sessionMetaMap = meta;
-  }
-  /**
-   * 检测数据库变更
-   * 对于 SQLite，检测数据库文件修改时间
-   */
-  checkForChanges(sinceTimestamp, cachedSessions) {
-    if (!this.dbPath) {
-      this.dbPath = this.findDbPath();
-    }
-    if (!this.dbPath || !existsSync5(this.dbPath)) {
-      return { hasChanges: false, timestamp: Date.now() };
-    }
-    try {
-      const stat = statSync2(this.dbPath);
-      const hasChanges = stat.mtimeMs > sinceTimestamp;
-      const changedIds = hasChanges ? cachedSessions.map((s) => s.id) : [];
-      return {
-        hasChanges,
-        changedIds,
-        timestamp: Date.now()
-      };
-    } catch {
-      return { hasChanges: false, timestamp: Date.now() };
-    }
-  }
-  /**
-   * 增量扫描 - 重新查询数据库
-   */
-  incrementalScan(_cachedSessions, _changedIds) {
-    return this.scan();
-  }
   parsePartRow(partRow) {
     const partData = JSON.parse(String(partRow.data ?? "{}"));
     const partType = String(partData.type ?? "");
@@ -2145,11 +2130,10 @@ function extractFirstUserTitle(contextFile, wireFile) {
   }
   return null;
 }
-var KimiAgent = class extends BaseAgent {
+var KimiAgent = class extends FileSystemSessionSource {
   name = "kimi";
   displayName = "Kimi-Cli";
   basePath = null;
-  sessionMetaMap = /* @__PURE__ */ new Map();
   projectMap = /* @__PURE__ */ new Map();
   defaultModel = null;
   findBasePath() {
@@ -2310,8 +2294,6 @@ var KimiAgent = class extends BaseAgent {
     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,
@@ -2336,87 +2318,6 @@ var KimiAgent = class extends BaseAgent {
       stats
     };
   }
-  getSessionMetaMap() {
-    return this.sessionMetaMap;
-  }
-  setSessionMetaMap(meta) {
-    this.sessionMetaMap = meta;
-  }
-  /**
-   * 检测文件系统变更
-   */
-  checkForChanges(sinceTimestamp, cachedSessions) {
-    const changedIds = /* @__PURE__ */ new Set();
-    const cachedIds = new Set(cachedSessions.map((session) => session.id));
-    const currentIds = /* @__PURE__ */ new Set();
-    for (const dir of this.listSessionDirs()) {
-      const meta = getParsedSession(this.parseSessionDirResult(dir));
-      if (!meta) continue;
-      currentIds.add(meta.id);
-      this.sessionMetaMap.set(meta.id, meta);
-      if (!cachedIds.has(meta.id)) {
-        changedIds.add(meta.id);
-        continue;
-      }
-      const dataFile = meta.wireFile || meta.contextFile;
-      try {
-        const metaStat = statSync3(meta.metaFile);
-        if (metaStat.mtimeMs > sinceTimestamp) {
-          changedIds.add(meta.id);
-          continue;
-        }
-        if (dataFile) {
-          const dataStat = statSync3(dataFile);
-          if (dataStat.mtimeMs > sinceTimestamp) {
-            changedIds.add(meta.id);
-          }
-        }
-      } catch {
-        changedIds.add(meta.id);
-      }
-    }
-    for (const session of cachedSessions) {
-      if (!currentIds.has(session.id)) changedIds.add(session.id);
-    }
-    const changedIdList = Array.from(changedIds);
-    return {
-      hasChanges: changedIdList.length > 0,
-      changedIds: changedIdList,
-      timestamp: Date.now()
-    };
-  }
-  /**
-   * 增量扫描
-   */
-  incrementalScan(cachedSessions, changedIds) {
-    const sessionMap = new Map(cachedSessions.map((s) => [s.id, s]));
-    const changedIdSet = new Set(changedIds);
-    for (const id of changedIdSet) {
-      sessionMap.delete(id);
-      this.sessionMetaMap.delete(id);
-    }
-    for (const dir of this.listSessionDirs()) {
-      try {
-        const meta = getParsedSession(this.parseSessionDirResult(dir));
-        if (!meta) continue;
-        if (changedIdSet.has(meta.id)) {
-          this.sessionMetaMap.set(meta.id, meta);
-          const stats = this.extractStats(meta.sourcePath);
-          sessionMap.set(meta.id, {
-            id: meta.id,
-            slug: `kimi/${meta.id}`,
-            title: meta.title,
-            directory: meta.cwd,
-            time_created: meta.createdAt,
-            time_updated: meta.createdAt,
-            stats
-          });
-        }
-      } catch {
-      }
-    }
-    return Array.from(sessionMap.values());
-  }
   getSessionData(sessionId) {
     const meta = this.sessionMetaMap.get(sessionId);
     if (!meta) throw new Error(`Session not found: ${sessionId}`);
@@ -3019,12 +2920,12 @@ function extractPatchContent(lines, startIndex) {
   }
   return { text: contentLines.join("\n"), nextLineIndex: i };
 }
-var CodexAgent = class extends BaseAgent {
+var CodexAgent = class extends FileSystemSessionSource {
   name = "codex";
   displayName = "Codex";
   basePath = null;
   sessionIndexCache = /* @__PURE__ */ new Map();
-  sessionMetaMap = /* @__PURE__ */ new Map();
+  sessionIndexMtime = null;
   // ---- BaseAgent implementation ----
   findBasePath() {
     const roots = resolveProviderRoots();
@@ -3087,94 +2988,6 @@ var CodexAgent = class extends BaseAgent {
     }
     return head;
   }
-  getSessionMetaMap() {
-    return this.sessionMetaMap;
-  }
-  setSessionMetaMap(meta) {
-    this.sessionMetaMap = meta;
-  }
-  /**
-   * 检测文件系统变更
-   */
-  checkForChanges(_sinceTimestamp, cachedSessions) {
-    if (!this.basePath) {
-      return { hasChanges: false, timestamp: Date.now() };
-    }
-    const currentFiles = this.listRolloutFiles();
-    const currentIds = new Set(currentFiles.map((file) => extractSessionId(file)));
-    const cachedIds = new Set(cachedSessions.map((session) => session.id));
-    const changedIds = /* @__PURE__ */ new Set();
-    for (const session of cachedSessions) {
-      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 {
-        if (this.hasMetaChanged(meta)) {
-          changedIds.add(session.id);
-        }
-      } catch {
-        changedIds.add(session.id);
-      }
-    }
-    const hasAddedSessions = currentFiles.some((file) => !cachedIds.has(extractSessionId(file)));
-    if (hasAddedSessions || changedIds.size > 0) {
-      this.sessionIndexCache.clear();
-    }
-    return {
-      hasChanges: changedIds.size > 0 || hasAddedSessions,
-      changedIds: Array.from(changedIds),
-      timestamp: Date.now()
-    };
-  }
-  /**
-   * 增量扫描
-   */
-  incrementalScan(cachedSessions, changedIds) {
-    if (!this.basePath) return cachedSessions;
-    const sessionMap = new Map(cachedSessions.map((s) => [s.id, s]));
-    const changedSet = new Set(changedIds);
-    const currentFiles = this.listRolloutFiles();
-    const currentIds = new Set(currentFiles.map((file) => extractSessionId(file)));
-    for (const session of cachedSessions) {
-      if (!currentIds.has(session.id)) {
-        sessionMap.delete(session.id);
-        this.sessionMetaMap.delete(session.id);
-      }
-    }
-    for (const file of currentFiles) {
-      try {
-        const sessionId = extractSessionId(file);
-        if (changedSet.has(sessionId)) {
-          const head = this.parseSessionHead(file);
-          if (head) {
-            sessionMap.set(head.id, head);
-            this.sessionMetaMap.set(head.id, this.buildSessionMeta(head, file));
-          }
-        }
-      } catch {
-      }
-    }
-    for (const file of currentFiles) {
-      try {
-        const sessionId = extractSessionId(file);
-        if (!sessionMap.has(sessionId)) {
-          const head = this.parseSessionHead(file);
-          if (head) {
-            sessionMap.set(head.id, head);
-            this.sessionMetaMap.set(head.id, this.buildSessionMeta(head, file));
-          }
-        }
-      } catch {
-      }
-    }
-    return Array.from(sessionMap.values());
-  }
   getSessionData(sessionId) {
     const meta = this.sessionMetaMap.get(sessionId);
     if (!meta) throw new Error(`Session not found: ${sessionId}`);
@@ -3352,14 +3165,6 @@ var CodexAgent = class extends BaseAgent {
       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 indexTitle = this.getTitleForSession(meta.id);
-    return indexTitle !== null && indexTitle !== meta.title;
-  }
   sourceFingerprint(file) {
     const stat = statSync4(file);
     const sessionId = extractSessionId(file);
@@ -3384,9 +3189,12 @@ var CodexAgent = class extends BaseAgent {
   }
   // ---- Session index ----
   loadSessionIndex() {
-    if (this.sessionIndexCache.size > 0) return;
     const indexPath = this.getSessionIndexPath();
-    if (!existsSync7(indexPath)) return;
+    const mtime = this.getFileMtimeMs(indexPath);
+    if (this.sessionIndexCache.size > 0 && this.sessionIndexMtime === mtime) return;
+    this.sessionIndexCache.clear();
+    this.sessionIndexMtime = mtime;
+    if (mtime === null) return;
     try {
       const content = readFileSync5(indexPath, "utf-8");
       for (const record of parseJsonlLines(content)) {
@@ -4122,14 +3930,18 @@ function convertActionToPart(action, timestampMs) {
   }
   return null;
 }
-var CursorAgent = class extends BaseAgent {
+var CursorAgent = class extends DatabaseSessionSource {
   name = "cursor";
   displayName = "Cursor";
   dbPath = null;
   // Cache composer data from scan so getSessionData can reuse it
   composerCache = /* @__PURE__ */ new Map();
-  // Session metadata for caching
-  sessionMetaMap = /* @__PURE__ */ new Map();
+  getDatabasePath() {
+    if (!this.dbPath) {
+      this.dbPath = this.findDbPath();
+    }
+    return this.dbPath;
+  }
   findDbPath() {
     if (!isSqliteAvailable()) return null;
     const dataPath = getCursorDataPath();
@@ -4332,42 +4144,6 @@ var CursorAgent = class extends BaseAgent {
       db.close();
     }
   }
-  getSessionMetaMap() {
-    return this.sessionMetaMap;
-  }
-  setSessionMetaMap(meta) {
-    this.sessionMetaMap = meta;
-  }
-  /**
-   * 检测数据库变更
-   * 对于 SQLite，检测数据库文件修改时间
-   */
-  checkForChanges(sinceTimestamp, cachedSessions) {
-    if (!this.dbPath) {
-      this.dbPath = this.findDbPath();
-    }
-    if (!this.dbPath || !existsSync8(this.dbPath)) {
-      return { hasChanges: false, timestamp: Date.now() };
-    }
-    try {
-      const stat = statSync5(this.dbPath);
-      const hasChanges = stat.mtimeMs > sinceTimestamp;
-      const changedIds = hasChanges ? cachedSessions.map((s) => s.id) : [];
-      return {
-        hasChanges,
-        changedIds,
-        timestamp: Date.now()
-      };
-    } catch {
-      return { hasChanges: false, timestamp: Date.now() };
-    }
-  }
-  /**
-   * 增量扫描 - 重新查询数据库
-   */
-  incrementalScan(_cachedSessions, _changedIds) {
-    return this.scan();
-  }
   getSessionData(sessionId) {
     if (!this.dbPath) {
       this.dbPath = this.findDbPath();
@@ -4766,11 +4542,10 @@ function buildCurrentPathEntries(entries) {
   }
   return path2.reverse();
 }
-var PiAgent = class extends BaseAgent {
+var PiAgent = class extends FileSystemSessionSource {
   name = "pi";
   displayName = "Pi";
   basePath = null;
-  sessionMetaMap = /* @__PURE__ */ new Map();
   findBasePath() {
     const roots = resolveProviderRoots();
     return firstExisting(join9(roots.piRoot, "agent", "sessions"), "data/pi");
@@ -4818,69 +4593,6 @@ var PiAgent = class extends BaseAgent {
     }
     return head;
   }
-  getSessionMetaMap() {
-    return this.sessionMetaMap;
-  }
-  setSessionMetaMap(meta) {
-    this.sessionMetaMap = meta;
-  }
-  checkForChanges(_sinceTimestamp, cachedSessions) {
-    if (!this.basePath) return { hasChanges: false, timestamp: Date.now() };
-    const currentFiles = this.listSessionFiles();
-    const currentIds = new Set(currentFiles.map((file) => extractSessionIdFromFilename(file)));
-    const cachedIds = new Set(cachedSessions.map((session) => session.id));
-    const changedIds = /* @__PURE__ */ new Set();
-    for (const session of cachedSessions) {
-      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 {
-        if (this.hasMetaChanged(meta)) changedIds.add(session.id);
-      } catch {
-        changedIds.add(session.id);
-      }
-    }
-    const hasAddedSessions = currentFiles.some(
-      (file) => !cachedIds.has(extractSessionIdFromFilename(file))
-    );
-    return {
-      hasChanges: changedIds.size > 0 || hasAddedSessions,
-      changedIds: [...changedIds],
-      timestamp: Date.now()
-    };
-  }
-  incrementalScan(cachedSessions, changedIds) {
-    if (!this.basePath) return cachedSessions;
-    const sessionMap = new Map(cachedSessions.map((session) => [session.id, session]));
-    const changedSet = new Set(changedIds);
-    const currentFiles = this.listSessionFiles();
-    const currentIds = new Set(currentFiles.map((file) => extractSessionIdFromFilename(file)));
-    for (const session of cachedSessions) {
-      if (!currentIds.has(session.id)) {
-        sessionMap.delete(session.id);
-        this.sessionMetaMap.delete(session.id);
-      }
-    }
-    for (const file of currentFiles) {
-      try {
-        const sessionId = extractSessionIdFromFilename(file);
-        if (!changedSet.has(sessionId) && sessionMap.has(sessionId)) continue;
-        const head = getParsedSession(this.parseSessionHeadResult(file));
-        if (head) {
-          sessionMap.set(head.id, head);
-          this.sessionMetaMap.set(head.id, this.buildSessionMeta(head, file));
-        }
-      } catch {
-      }
-    }
-    return [...sessionMap.values()];
-  }
   getSessionData(sessionId) {
     const meta = this.sessionMetaMap.get(sessionId);
     if (!meta) throw new Error(`Session not found: ${sessionId}`);
@@ -4943,11 +4655,6 @@ var PiAgent = class extends BaseAgent {
       updatedAt: head.time_updated ?? head.time_created
     };
   }
-  hasMetaChanged(meta) {
-    if (meta.headIndexVersion !== HEAD_INDEX_VERSION3) return true;
-    if (meta.parserVersion !== PARSER_VERSION2) return true;
-    return statSync6(meta.sourcePath).mtimeMs !== meta.sourceMtimeMs;
-  }
   sourceFingerprint(file) {
     const stat = statSync6(file);
     return JSON.stringify([HEAD_INDEX_VERSION3, PARSER_VERSION2, stat.mtimeMs, stat.size]);
@@ -5805,12 +5512,16 @@ function extractSessionFileActivity(agentName, sessionId, projectIdentityKey, me
     extractFileActivityOccurrences(messages)
   );
 }
-var CACHE_SCHEMA_VERSION = 13;
-var CACHE_INITIALIZATION_VERSION = "session-cache-v2";
 var CACHE_FILENAME = "codesesh.db";
 var LEGACY_CACHE_FILENAME = "scan-cache.json";
 var SEARCH_INDEX_BULK_SYNC_THRESHOLD = 100;
 var ftsIntegrityCheckedPath = null;
+function getFtsIntegrityCheckedPath() {
+  return ftsIntegrityCheckedPath;
+}
+function setFtsIntegrityCheckedPath(path2) {
+  ftsIntegrityCheckedPath = path2;
+}
 function getCacheDir2() {
   return join10(homedir4(), ".cache", "codesesh");
 }
@@ -5823,408 +5534,33 @@ function getLegacyCachePath() {
 function hasCacheStorage() {
   return existsSync11(getCachePath2());
 }
-function withCacheDb(fn) {
-  const cachePath = getCachePath2();
-  const db = openDb(cachePath);
-  if (!db) return null;
-  try {
-    ensureSchema(db, cachePath);
-    return fn(db);
-  } catch {
-    return null;
-  } finally {
-    db.close();
-  }
+function likePattern(value) {
+  return `%${value.trim().toLowerCase().replace(/[\\%_]/g, "\\$&")}%`;
 }
-function withCacheDbReadOnly(fn) {
-  const db = openDbReadOnly(getCachePath2());
-  if (!db) return null;
-  try {
-    return fn(db);
-  } catch {
-    return null;
-  } finally {
-    db.close();
-  }
+function filePathFtsQuery(value) {
+  const path2 = normalizeFilePathSearch(value);
+  if (path2.length < 3) return null;
+  return `"${path2.replaceAll('"', '""')}"`;
 }
-function createCacheTables(db) {
-  db.exec(`
-    CREATE TABLE IF NOT EXISTS cache_meta (
-      key TEXT PRIMARY KEY,
-      value TEXT NOT NULL
-    );
-
-    CREATE TABLE IF NOT EXISTS agent_cache (
-      agent_name TEXT PRIMARY KEY,
-      timestamp INTEGER NOT NULL
-    );
-
-    CREATE TABLE IF NOT EXISTS cached_sessions (
-      agent_name TEXT NOT NULL,
-      session_id TEXT NOT NULL,
-      session_json TEXT NOT NULL,
-      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 escapeRegExp(value) {
+  return value.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
 }
-function createSessionTables(db) {
-  db.exec(`
-    CREATE TABLE IF NOT EXISTS sessions (
-      agent_name TEXT NOT NULL,
-      session_id TEXT NOT NULL,
-      sort_index INTEGER NOT NULL DEFAULT 0,
-      slug TEXT NOT NULL,
-      title TEXT NOT NULL,
-      source_path TEXT,
-      directory TEXT NOT NULL,
-      project_identity_kind TEXT NOT NULL,
-      project_identity_key TEXT NOT NULL,
-      project_display_name TEXT NOT NULL,
-      time_created INTEGER NOT NULL,
-      time_updated INTEGER,
-      activity_time INTEGER NOT NULL,
-      message_count INTEGER NOT NULL,
-      total_input_tokens INTEGER NOT NULL,
-      total_output_tokens INTEGER NOT NULL,
-      total_cache_read_tokens INTEGER,
-      total_cache_create_tokens INTEGER,
-      total_cost REAL NOT NULL,
-      cost_source TEXT,
-      total_tokens INTEGER,
-      model_usage_json TEXT,
-      smart_tags_json TEXT,
-      smart_tags_source_updated_at INTEGER,
-      meta_json TEXT,
-      PRIMARY KEY (agent_name, session_id)
-    );
-
-    CREATE INDEX IF NOT EXISTS idx_sessions_agent_activity
-      ON sessions(agent_name, activity_time);
-
-    CREATE INDEX IF NOT EXISTS idx_sessions_project
-      ON sessions(project_identity_kind, project_identity_key, activity_time);
-
-    CREATE TABLE IF NOT EXISTS messages (
-      agent_name TEXT NOT NULL,
-      session_id TEXT NOT NULL,
-      message_index INTEGER NOT NULL,
-      message_id TEXT NOT NULL,
-      role TEXT NOT NULL,
-      time_created INTEGER NOT NULL,
-      time_completed INTEGER,
-      agent TEXT,
-      mode TEXT,
-      model TEXT,
-      provider TEXT,
-      tokens_json TEXT,
-      cost REAL,
-      cost_source TEXT,
-      parts_json TEXT NOT NULL,
-      subagent_id TEXT,
-      nickname TEXT,
-      content_text TEXT NOT NULL,
-      tool_metadata_json TEXT,
-      PRIMARY KEY (agent_name, session_id, message_index),
-      FOREIGN KEY (agent_name, session_id)
-        REFERENCES sessions(agent_name, session_id)
-        ON DELETE CASCADE
-    );
-
-    CREATE INDEX IF NOT EXISTS idx_messages_session
-      ON messages(agent_name, session_id, message_index);
-  `);
-  createMessageToolTables(db);
+function normalizeFilePathSearch(value) {
+  return value.trim().replace(/^"|"$/g, "");
 }
-function createMessageToolTables(db) {
-  db.exec(`
-    CREATE TABLE IF NOT EXISTS message_tools (
-      agent_name TEXT NOT NULL,
-      session_id TEXT NOT NULL,
-      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_message_tools_filter
-      ON message_tools(tool_name, agent_name, session_id);
-  `);
+function stringifyOptionalJson(value) {
+  return value == null ? null : JSON.stringify(value);
 }
-function createMessageSearchTables(db) {
-  if (!tableExists(db, "messages")) {
-    createSessionTables(db);
-  }
-  db.exec(`
-    CREATE VIRTUAL TABLE IF NOT EXISTS messages_fts USING fts5(
-      content_text,
-      content='messages',
-      content_rowid='rowid'
-    );
-  `);
-  createMessageSearchTriggers(db);
+function parseOptionalJson(value) {
+  return value == null ? void 0 : JSON.parse(String(value));
 }
-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 sourcePathFromMeta(meta) {
+  return typeof meta?.sourcePath === "string" ? meta.sourcePath : null;
 }
-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,
-      directory TEXT NOT NULL,
-      time_created INTEGER NOT NULL,
-      time_updated INTEGER,
-      activity_time INTEGER NOT NULL,
-      content_text TEXT NOT NULL,
-      content_hash TEXT NOT NULL,
-      indexed_at INTEGER NOT NULL,
-      UNIQUE(agent_name, session_id)
-    );
-
-    CREATE VIRTUAL TABLE IF NOT EXISTS session_documents_fts USING fts5(
-      title,
-      content_text,
-      content='session_documents',
-      content_rowid='id'
-    );
-  `);
-  createSearchTriggers(db);
-}
-function createSearchTriggers(db) {
-  db.exec(`
-    CREATE TRIGGER IF NOT EXISTS session_documents_ai AFTER INSERT ON session_documents BEGIN
-      INSERT INTO session_documents_fts(rowid, title, content_text)
-      VALUES (new.id, new.title, new.content_text);
-    END;
-
-    CREATE TRIGGER IF NOT EXISTS session_documents_ad AFTER DELETE ON session_documents BEGIN
-      INSERT INTO session_documents_fts(session_documents_fts, rowid, title, content_text)
-      VALUES ('delete', old.id, old.title, old.content_text);
-    END;
-
-    CREATE TRIGGER IF NOT EXISTS session_documents_au AFTER UPDATE ON session_documents BEGIN
-      INSERT INTO session_documents_fts(session_documents_fts, rowid, title, content_text)
-      VALUES ('delete', old.id, old.title, old.content_text);
-      INSERT INTO session_documents_fts(rowid, title, content_text)
-      VALUES (new.id, new.title, new.content_text);
-    END;
-  `);
-}
-function dropSearchTriggers(db) {
-  db.exec(`
-    DROP TRIGGER IF EXISTS session_documents_ai;
-    DROP TRIGGER IF EXISTS session_documents_ad;
-    DROP TRIGGER IF EXISTS session_documents_au;
-  `);
-}
-function ensureProjectColumns(db) {
-  if (!tableExists(db, "session_documents")) {
-    return;
-  }
-  if (!columnExists(db, "session_documents", "project_identity_kind")) {
-    db.exec(
-      "ALTER TABLE session_documents ADD COLUMN project_identity_kind TEXT NOT NULL DEFAULT 'path'"
-    );
-  }
-  if (!columnExists(db, "session_documents", "project_identity_key")) {
-    db.exec(
-      "ALTER TABLE session_documents ADD COLUMN project_identity_key TEXT NOT NULL DEFAULT ''"
-    );
-  }
-  if (!columnExists(db, "session_documents", "project_display_name")) {
-    db.exec(
-      "ALTER TABLE session_documents ADD COLUMN project_display_name TEXT NOT NULL DEFAULT ''"
-    );
-  }
-}
-function createProjectTables(db) {
-  ensureProjectColumns(db);
-  db.exec(`
-    CREATE TABLE IF NOT EXISTS project_sessions (
-      agent_name TEXT NOT NULL,
-      session_id TEXT NOT NULL,
-      identity_kind TEXT NOT NULL,
-      identity_key TEXT NOT NULL,
-      display_name TEXT NOT NULL,
-      directory TEXT NOT NULL,
-      activity_time INTEGER NOT NULL,
-      PRIMARY KEY (agent_name, session_id)
-    );
-
-    CREATE INDEX IF NOT EXISTS idx_project_sessions_identity
-      ON project_sessions(identity_kind, identity_key);
-  `);
-  createProjectGroupsView(db);
-}
-function createProjectGroupsView(db) {
-  if (!tableExists(db, "sessions")) {
-    db.exec(`
-      CREATE VIEW IF NOT EXISTS project_groups_v AS
-        SELECT
-          identity_kind,
-          identity_key,
-          MIN(display_name) AS display_name,
-          GROUP_CONCAT(DISTINCT agent_name) AS sources_csv,
-          COUNT(*) AS session_count,
-          MAX(activity_time) AS last_activity
-        FROM project_sessions
-        GROUP BY identity_kind, identity_key;
-    `);
-    return;
-  }
-  db.exec(`
-    CREATE VIEW IF NOT EXISTS project_groups_v AS
-      SELECT
-        project_identity_kind AS identity_kind,
-        project_identity_key AS identity_key,
-        MIN(project_display_name) AS display_name,
-        GROUP_CONCAT(DISTINCT agent_name) AS sources_csv,
-        COUNT(*) AS session_count,
-        MAX(activity_time) AS last_activity
-      FROM sessions
-      GROUP BY project_identity_kind, project_identity_key;
-  `);
-}
-function recreateProjectGroupsView(db) {
-  db.exec("DROP VIEW IF EXISTS project_groups_v");
-  createProjectGroupsView(db);
-}
-function createLatestCacheSchema(db) {
-  createCacheTables(db);
-  createSessionTables(db);
-  createMessageSearchTables(db);
-  createFileActivityTables(db);
-  createSearchTables(db);
-  createProjectTables(db);
-}
-function stringifyOptionalJson(value) {
-  return value == null ? null : JSON.stringify(value);
-}
-function parseOptionalJson(value) {
-  return value == null ? void 0 : JSON.parse(String(value));
-}
-function sourcePathFromMeta(meta) {
-  return typeof meta?.sourcePath === "string" ? meta.sourcePath : null;
-}
-function sourcePathFromMetaJson(metaJson) {
-  if (!metaJson) return null;
-  const meta = JSON.parse(metaJson);
-  return sourcePathFromMeta(meta);
+function sourcePathFromMetaJson(metaJson) {
+  if (!metaJson) return null;
+  const meta = JSON.parse(metaJson);
+  return sourcePathFromMeta(meta);
 }
 function prepareUpsertCachedSession(db) {
   return db.prepare(`
@@ -6488,1126 +5824,1165 @@ function sessionFromRow(row) {
   }
   return session;
 }
-function recreateSearchIndexSchema(db) {
-  db.exec(`
-    DROP TRIGGER IF EXISTS session_documents_ai;
-    DROP TRIGGER IF EXISTS session_documents_ad;
-    DROP TRIGGER IF EXISTS session_documents_au;
-    DROP TABLE IF EXISTS session_documents_fts;
-  `);
-  createSearchTables(db);
-  rebuildSearchIndex(db);
+function messageFromBackfillRow(row) {
+  const role = row.role === "assistant" || row.role === "tool" ? row.role : "user";
+  return {
+    id: String(row.message_id ?? ""),
+    role,
+    agent: row.agent ?? null,
+    time_created: Number(row.time_created ?? 0),
+    time_completed: row.time_completed == null ? null : Number(row.time_completed),
+    mode: row.mode ?? null,
+    model: row.model ?? null,
+    provider: row.provider ?? null,
+    parts: JSON.parse(String(row.parts_json ?? "[]")),
+    subagent_id: row.subagent_id ?? void 0,
+    nickname: row.nickname ?? void 0
+  };
 }
-function readLegacyCacheVersion(db) {
-  if (!tableExists(db, "cache_meta") || !columnExists(db, "cache_meta", "key") || !columnExists(db, "cache_meta", "value")) {
-    return 0;
+function messageFromCachedRow(row) {
+  const message = messageFromBackfillRow(row);
+  const tokens = parseOptionalJson(row.tokens_json);
+  if (tokens) {
+    message.tokens = tokens;
   }
-  const versionRow = db.prepare("SELECT value FROM cache_meta WHERE key = 'version'").get();
-  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 (row.cost != null) {
+    message.cost = Number(row.cost);
   }
-  if (tableExists(db, "session_file_activity")) {
-    return 8;
+  if (row.cost_source) {
+    message.cost_source = row.cost_source;
   }
-  if (tableExists(db, "sessions") || tableExists(db, "messages")) {
-    return 7;
+  return message;
+}
+function appendPlainText(value, chunks) {
+  if (value == null) return;
+  if (typeof value === "string") {
+    const normalized = value.trim();
+    if (normalized) {
+      chunks.push(normalized);
+    }
+    return;
   }
-  if (tableExists(db, "project_sessions") || columnExists(db, "session_documents", "project_identity_key")) {
-    return 5;
+  if (typeof value === "number" || typeof value === "boolean") {
+    chunks.push(String(value));
+    return;
   }
-  if (tableExists(db, "session_documents")) {
-    return 4;
+  if (Array.isArray(value)) {
+    for (const item of value) {
+      appendPlainText(item, chunks);
+    }
+    return;
   }
-  if (tableExists(db, "cached_sessions") || tableExists(db, "agent_cache")) {
-    return 3;
+  if (typeof value === "object") {
+    for (const nested of Object.values(value)) {
+      appendPlainText(nested, chunks);
+    }
   }
-  return 0;
 }
-function getCurrentCacheSchemaVersion(db) {
-  const userVersion = getUserVersion(db);
-  if (userVersion > 0) {
-    return userVersion;
-  }
-  const legacyVersion = readLegacyCacheVersion(db);
-  return Math.max(legacyVersion, inferCacheSchemaVersion(db));
+function compactRecord(record) {
+  return Object.fromEntries(Object.entries(record).filter(([, value]) => value != null));
 }
-function hasAnyCacheSchema(db) {
-  return [
-    "cache_meta",
-    "agent_cache",
-    "cached_sessions",
-    "sessions",
-    "messages",
-    "message_tools",
-    "session_file_activity",
-    "session_file_activity_path_fts",
-    "session_documents",
-    "session_documents_fts",
-    "project_sessions"
-  ].some((table) => tableExists(db, table));
+function normalizeToolName2(value) {
+  if (typeof value !== "string") return null;
+  const name = value.trim().toLowerCase();
+  return name || null;
 }
-function backfillProjectSessions(db) {
-  if (!tableExists(db, "cached_sessions") || !tableExists(db, "project_sessions")) {
-    return;
-  }
-  const rows = db.prepare("SELECT agent_name, session_id, session_json FROM cached_sessions").all();
-  const upsert = db.prepare(`
-    INSERT INTO project_sessions(
-      agent_name,
-      session_id,
-      identity_kind,
-      identity_key,
-      display_name,
-      directory,
-      activity_time
-    ) VALUES (?, ?, ?, ?, ?, ?, ?)
-    ON CONFLICT(agent_name, session_id) DO UPDATE SET
-      identity_kind = excluded.identity_kind,
-      identity_key = excluded.identity_key,
-      display_name = excluded.display_name,
-      directory = excluded.directory,
-      activity_time = excluded.activity_time
-  `);
-  for (const row of rows) {
-    if (!row.session_json || !row.agent_name || !row.session_id) {
-      continue;
-    }
-    try {
-      const session = JSON.parse(row.session_json);
-      const identity = session.project_identity ?? computeIdentity(session.directory, realFs);
-      upsert.run(
-        row.agent_name,
-        row.session_id,
-        identity.kind,
-        identity.key,
-        identity.displayName,
-        session.directory,
-        session.time_updated ?? session.time_created
-      );
-    } catch {
-      continue;
+function 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 backfillSessionDocumentProjects(db) {
-  if (!tableExists(db, "session_documents") || !columnExists(db, "session_documents", "project_identity_key")) {
-    return;
-  }
-  const rows = db.prepare("SELECT id, directory FROM session_documents").all();
-  const update = db.prepare(`
-    UPDATE session_documents
-    SET
-      project_identity_kind = ?,
-      project_identity_key = ?,
-      project_display_name = ?
-    WHERE id = ?
-  `);
-  for (const row of rows) {
-    const identity = computeIdentity(String(row.directory ?? ""), realFs);
-    update.run(identity.kind, identity.key, identity.displayName, Number(row.id));
+function 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 migrateProjectIdentity(db) {
-  createProjectTables(db);
-  backfillProjectSessions(db);
-  backfillSessionDocumentProjects(db);
+function summarizeToolPart(part) {
+  const state = part.state == null ? void 0 : compactRecord({
+    status: part.state.status,
+    error: part.state.error,
+    metadata: part.state.metadata
+  });
+  return compactRecord({
+    type: part.type,
+    tool: part.tool,
+    title: part.title,
+    nickname: part.nickname,
+    callID: part.callID,
+    approval_status: part.approval_status,
+    state
+  });
 }
-function 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);
-    }
+function buildMessageText(message) {
+  const chunks = [];
+  chunks.push(message.role);
+  appendPlainText(message.agent, chunks);
+  appendPlainText(message.model, chunks);
+  for (const part of message.parts) {
+    appendPlainText(part.type, chunks);
+    appendPlainText(part.title, chunks);
+    appendPlainText(part.nickname, chunks);
+    appendPlainText(part.tool, chunks);
+    appendPlainText(part.text, chunks);
+    appendPlainText(part.input, chunks);
+    appendPlainText(part.output, chunks);
+    appendPlainText(part.state, chunks);
   }
-  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);
-    }
+  return chunks.join("\n");
+}
+function normalizeMessages(session) {
+  return session.messages.map((message, index) => {
+    const toolMetadata = message.parts.filter((part) => part.type === "tool").map((part) => summarizeToolPart(part));
+    return {
+      index,
+      id: message.id || `${session.id}:${index}`,
+      role: message.role,
+      timeCreated: message.time_created,
+      timeCompleted: message.time_completed ?? null,
+      agent: message.agent ?? null,
+      mode: message.mode ?? null,
+      model: message.model ?? null,
+      provider: message.provider ?? null,
+      tokensJson: stringifyOptionalJson(message.tokens),
+      cost: message.cost ?? null,
+      costSource: message.cost_source ?? null,
+      partsJson: JSON.stringify(message.parts),
+      subagentId: message.subagent_id ?? null,
+      nickname: message.nickname ?? null,
+      contentText: buildMessageText(message),
+      toolMetadataJson: toolMetadata.length > 0 ? JSON.stringify(toolMetadata) : null,
+      toolNames: toolNamesFromMessage(message)
+    };
+  });
+}
+function buildSessionContentFromMessages(title, messages) {
+  const chunks = [];
+  appendPlainText(title, chunks);
+  for (const message of messages) {
+    appendPlainText(message.contentText, chunks);
   }
-  backfillSessionDocumentProjects(db);
-  recreateProjectGroupsView(db);
+  return chunks.join("\n");
 }
-function backfillStructuredSessions(db) {
-  createSessionTables(db);
-  recreateProjectGroupsView(db);
-  const upsertSession = prepareUpsertSession(db);
-  if (tableExists(db, "cached_sessions")) {
-    const rows = db.prepare(
-      "SELECT agent_name, session_id, session_json, meta_json, rowid AS sort_index FROM cached_sessions ORDER BY agent_name, rowid"
-    ).all();
-    for (const row of rows) {
-      if (!row.agent_name || !row.session_json) {
-        continue;
-      }
-      try {
-        const session = JSON.parse(row.session_json);
-        upsertSessionRow(
-          upsertSession,
-          String(row.agent_name),
-          session,
-          row.meta_json ?? null,
-          Number(row.sort_index ?? 0),
-          sourcePathFromMetaJson(row.meta_json)
-        );
-      } catch {
-        continue;
-      }
-    }
+var CACHE_SCHEMA_VERSION = 13;
+function withCacheDb(fn) {
+  const cachePath = getCachePath2();
+  const db = openDb(cachePath);
+  if (!db) return null;
+  try {
+    ensureSchema(db, cachePath);
+    return fn(db);
+  } catch {
+    return null;
+  } finally {
+    db.close();
   }
-  if (!tableExists(db, "session_documents")) {
-    return;
+}
+function withCacheDbReadOnly(fn) {
+  const db = openDbReadOnly(getCachePath2());
+  if (!db) return null;
+  try {
+    return fn(db);
+  } catch {
+    return null;
+  } finally {
+    db.close();
   }
-  const documentRows = db.prepare(
-    `
-        SELECT
-          d.agent_name,
-          d.session_id,
-          d.slug,
-          d.title,
-          d.directory,
-          d.project_identity_kind,
-          d.project_identity_key,
-          d.project_display_name,
-          d.time_created,
-          d.time_updated,
-          d.activity_time,
-          d.id
-        FROM session_documents d
-        LEFT JOIN sessions s ON s.agent_name = d.agent_name AND s.session_id = d.session_id
-        WHERE s.session_id IS NULL
-        ORDER BY d.id
-      `
-  ).all();
-  for (const row of documentRows) {
-    const directory = String(row.directory ?? "");
-    const identity = row.project_identity_key && row.project_identity_kind && row.project_display_name ? {
-      kind: row.project_identity_kind,
-      key: String(row.project_identity_key),
-      displayName: String(row.project_display_name)
-    } : computeIdentity(directory, realFs);
-    upsertSessionRow(
-      upsertSession,
-      String(row.agent_name),
-      {
-        id: String(row.session_id),
-        slug: String(row.slug),
-        title: String(row.title),
-        directory,
-        project_identity: identity,
-        time_created: Number(row.time_created ?? row.activity_time ?? 0),
-        time_updated: row.time_updated == null ? void 0 : Number(row.time_updated),
-        stats: {
-          message_count: 0,
-          total_input_tokens: 0,
-          total_output_tokens: 0,
-          total_cost: 0
-        }
-      },
-      null,
-      Number(row.id ?? 0),
-      null
+}
+function createCacheTables(db) {
+  db.exec(`
+    CREATE TABLE IF NOT EXISTS cache_meta (
+      key TEXT PRIMARY KEY,
+      value TEXT NOT NULL
     );
-  }
+
+    CREATE TABLE IF NOT EXISTS agent_cache (
+      agent_name TEXT PRIMARY KEY,
+      timestamp INTEGER NOT NULL
+    );
+
+    CREATE TABLE IF NOT EXISTS cached_sessions (
+      agent_name TEXT NOT NULL,
+      session_id TEXT NOT NULL,
+      session_json TEXT NOT NULL,
+      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 messageFromBackfillRow(row) {
-  const role = row.role === "assistant" || row.role === "tool" ? row.role : "user";
-  return {
-    id: String(row.message_id ?? ""),
-    role,
-    agent: row.agent ?? null,
-    time_created: Number(row.time_created ?? 0),
-    time_completed: row.time_completed == null ? null : Number(row.time_completed),
-    mode: row.mode ?? null,
-    model: row.model ?? null,
-    provider: row.provider ?? null,
-    parts: JSON.parse(String(row.parts_json ?? "[]")),
-    subagent_id: row.subagent_id ?? void 0,
-    nickname: row.nickname ?? void 0
-  };
+function createSessionTables(db) {
+  db.exec(`
+    CREATE TABLE IF NOT EXISTS sessions (
+      agent_name TEXT NOT NULL,
+      session_id TEXT NOT NULL,
+      sort_index INTEGER NOT NULL DEFAULT 0,
+      slug TEXT NOT NULL,
+      title TEXT NOT NULL,
+      source_path TEXT,
+      directory TEXT NOT NULL,
+      project_identity_kind TEXT NOT NULL,
+      project_identity_key TEXT NOT NULL,
+      project_display_name TEXT NOT NULL,
+      time_created INTEGER NOT NULL,
+      time_updated INTEGER,
+      activity_time INTEGER NOT NULL,
+      message_count INTEGER NOT NULL,
+      total_input_tokens INTEGER NOT NULL,
+      total_output_tokens INTEGER NOT NULL,
+      total_cache_read_tokens INTEGER,
+      total_cache_create_tokens INTEGER,
+      total_cost REAL NOT NULL,
+      cost_source TEXT,
+      total_tokens INTEGER,
+      model_usage_json TEXT,
+      smart_tags_json TEXT,
+      smart_tags_source_updated_at INTEGER,
+      meta_json TEXT,
+      PRIMARY KEY (agent_name, session_id)
+    );
+
+    CREATE INDEX IF NOT EXISTS idx_sessions_agent_activity
+      ON sessions(agent_name, activity_time);
+
+    CREATE INDEX IF NOT EXISTS idx_sessions_project
+      ON sessions(project_identity_kind, project_identity_key, activity_time);
+
+    CREATE TABLE IF NOT EXISTS messages (
+      agent_name TEXT NOT NULL,
+      session_id TEXT NOT NULL,
+      message_index INTEGER NOT NULL,
+      message_id TEXT NOT NULL,
+      role TEXT NOT NULL,
+      time_created INTEGER NOT NULL,
+      time_completed INTEGER,
+      agent TEXT,
+      mode TEXT,
+      model TEXT,
+      provider TEXT,
+      tokens_json TEXT,
+      cost REAL,
+      cost_source TEXT,
+      parts_json TEXT NOT NULL,
+      subagent_id TEXT,
+      nickname TEXT,
+      content_text TEXT NOT NULL,
+      tool_metadata_json TEXT,
+      PRIMARY KEY (agent_name, session_id, message_index),
+      FOREIGN KEY (agent_name, session_id)
+        REFERENCES sessions(agent_name, session_id)
+        ON DELETE CASCADE
+    );
+
+    CREATE INDEX IF NOT EXISTS idx_messages_session
+      ON messages(agent_name, session_id, message_index);
+  `);
+  createMessageToolTables(db);
 }
-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 createMessageToolTables(db) {
+  db.exec(`
+    CREATE TABLE IF NOT EXISTS message_tools (
+      agent_name TEXT NOT NULL,
+      session_id TEXT NOT NULL,
+      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_message_tools_filter
+      ON message_tools(tool_name, agent_name, session_id);
+  `);
 }
-function backfillMessageTools(db) {
-  createMessageToolTables(db);
+function createMessageSearchTables(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);
-    }
+    createSessionTables(db);
   }
+  db.exec(`
+    CREATE VIRTUAL TABLE IF NOT EXISTS messages_fts USING fts5(
+      content_text,
+      content='messages',
+      content_rowid='rowid'
+    );
+  `);
+  createMessageSearchTriggers(db);
 }
-function backfillFileActivity(db) {
-  createFileActivityTables(db);
-  if (!tableExists(db, "sessions") || !tableExists(db, "messages")) {
-    return;
-  }
-  const sessions = db.prepare(
-    `
-        SELECT agent_name, session_id, project_identity_key
-        FROM sessions
-        ORDER BY agent_name, session_id
-      `
-  ).all();
-  const loadMessages = db.prepare(`
-    SELECT
-      message_id,
-      role,
-      time_created,
-      time_completed,
-      agent,
-      mode,
-      model,
-      provider,
-      parts_json,
-      subagent_id,
-      nickname
-    FROM messages
-    WHERE agent_name = ? AND session_id = ?
-    ORDER BY message_index
+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;
   `);
-  const deleteActivity = db.prepare(
-    "DELETE FROM session_file_activity WHERE agent_name = ? AND session_id = ?"
-  );
-  const insertActivity = prepareInsertFileActivity(db);
-  for (const session of sessions) {
-    if (!session.agent_name || !session.session_id || !session.project_identity_key) {
-      continue;
-    }
-    try {
-      const rows = loadMessages.all(session.agent_name, session.session_id);
-      const messages = rows.map((row) => messageFromBackfillRow(row));
-      const activities = extractSessionFileActivity(
-        String(session.agent_name),
-        String(session.session_id),
-        String(session.project_identity_key),
-        messages
-      );
-      deleteActivity.run(session.agent_name, session.session_id);
-      writeFileActivityRows(insertActivity, activities);
-    } catch {
-      continue;
-    }
-  }
 }
-function invalidateSearchContentHashes(db) {
-  if (tableExists(db, "session_documents") && columnExists(db, "session_documents", "content_hash")) {
-    db.exec("UPDATE session_documents SET content_hash = ''");
-  }
+function dropMessageSearchTriggers(db) {
+  db.exec(`
+    DROP TRIGGER IF EXISTS messages_ai;
+    DROP TRIGGER IF EXISTS messages_ad;
+    DROP TRIGGER IF EXISTS messages_au;
+  `);
 }
-function rebuildSearchIndex(db) {
-  if (!tableExists(db, "session_documents_fts")) {
-    return;
-  }
-  db.exec("INSERT INTO session_documents_fts(session_documents_fts) VALUES ('rebuild')");
+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 rebuildMessageSearchIndex(db) {
-  if (!tableExists(db, "messages_fts")) {
+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 messages_fts(messages_fts) VALUES ('rebuild')");
+  db.exec(
+    "INSERT INTO session_file_activity_path_fts(session_file_activity_path_fts) VALUES ('rebuild')"
+  );
 }
-function shouldBulkSyncSearchIndex(options, changedCount) {
-  if (options.isBulk != null) {
-    return options.isBulk;
-  }
-  const threshold = options.bulkThreshold ?? SEARCH_INDEX_BULK_SYNC_THRESHOLD;
-  return threshold > 0 && changedCount >= threshold;
+function createSearchTables(db) {
+  db.exec(`
+    CREATE TABLE IF NOT EXISTS session_documents (
+      id INTEGER PRIMARY KEY AUTOINCREMENT,
+      agent_name TEXT NOT NULL,
+      session_id TEXT NOT NULL,
+      slug TEXT NOT NULL,
+      title TEXT NOT NULL,
+      directory TEXT NOT NULL,
+      time_created INTEGER NOT NULL,
+      time_updated INTEGER,
+      activity_time INTEGER NOT NULL,
+      content_text TEXT NOT NULL,
+      content_hash TEXT NOT NULL,
+      indexed_at INTEGER NOT NULL,
+      UNIQUE(agent_name, session_id)
+    );
+
+    CREATE VIRTUAL TABLE IF NOT EXISTS session_documents_fts USING fts5(
+      title,
+      content_text,
+      content='session_documents',
+      content_rowid='id'
+    );
+  `);
+  createSearchTriggers(db);
+}
+function createSearchTriggers(db) {
+  db.exec(`
+    CREATE TRIGGER IF NOT EXISTS session_documents_ai AFTER INSERT ON session_documents BEGIN
+      INSERT INTO session_documents_fts(rowid, title, content_text)
+      VALUES (new.id, new.title, new.content_text);
+    END;
+
+    CREATE TRIGGER IF NOT EXISTS session_documents_ad AFTER DELETE ON session_documents BEGIN
+      INSERT INTO session_documents_fts(session_documents_fts, rowid, title, content_text)
+      VALUES ('delete', old.id, old.title, old.content_text);
+    END;
+
+    CREATE TRIGGER IF NOT EXISTS session_documents_au AFTER UPDATE ON session_documents BEGIN
+      INSERT INTO session_documents_fts(session_documents_fts, rowid, title, content_text)
+      VALUES ('delete', old.id, old.title, old.content_text);
+      INSERT INTO session_documents_fts(rowid, title, content_text)
+      VALUES (new.id, new.title, new.content_text);
+    END;
+  `);
+}
+function dropSearchTriggers(db) {
+  db.exec(`
+    DROP TRIGGER IF EXISTS session_documents_ai;
+    DROP TRIGGER IF EXISTS session_documents_ad;
+    DROP TRIGGER IF EXISTS session_documents_au;
+  `);
 }
-function ensureFtsReady(db) {
-  if (!tableExists(db, "session_documents_fts")) {
-    createSearchTables(db);
+function ensureProjectColumns(db) {
+  if (!tableExists(db, "session_documents")) {
+    return;
   }
-  createSearchTriggers(db);
-  const needsMessageSearchRebuild = !tableExists(db, "messages_fts");
-  createMessageSearchTables(db);
-  if (needsMessageSearchRebuild) {
-    rebuildMessageSearchIndex(db);
+  if (!columnExists(db, "session_documents", "project_identity_kind")) {
+    db.exec(
+      "ALTER TABLE session_documents ADD COLUMN project_identity_kind TEXT NOT NULL DEFAULT 'path'"
+    );
   }
-}
-function ensureFtsConsistency(db) {
-  ensureFtsReady(db);
-  const cachePath = getCachePath2();
-  if (ftsIntegrityCheckedPath === cachePath) {
-    return;
+  if (!columnExists(db, "session_documents", "project_identity_key")) {
+    db.exec(
+      "ALTER TABLE session_documents ADD COLUMN project_identity_key TEXT NOT NULL DEFAULT ''"
+    );
   }
-  try {
+  if (!columnExists(db, "session_documents", "project_display_name")) {
     db.exec(
-      "INSERT INTO session_documents_fts(session_documents_fts, rank) VALUES ('integrity-check', 1)"
+      "ALTER TABLE session_documents ADD COLUMN project_display_name TEXT NOT NULL DEFAULT ''"
     );
-    db.exec("INSERT INTO messages_fts(messages_fts, rank) VALUES ('integrity-check', 1)");
-    ftsIntegrityCheckedPath = cachePath;
-  } catch {
-    rebuildSearchIndex(db);
-    rebuildMessageSearchIndex(db);
-    ftsIntegrityCheckedPath = cachePath;
   }
 }
-function setCacheSchemaVersion(db) {
-  createCacheTables(db);
-  setUserVersion(db, CACHE_SCHEMA_VERSION);
-  db.prepare(
-    `
-      INSERT INTO cache_meta(key, value)
-      VALUES ('version', ?)
-      ON CONFLICT(key) DO UPDATE SET value = excluded.value
-    `
-  ).run(String(CACHE_SCHEMA_VERSION));
+function createProjectTables(db) {
+  ensureProjectColumns(db);
+  db.exec(`
+    CREATE TABLE IF NOT EXISTS project_sessions (
+      agent_name TEXT NOT NULL,
+      session_id TEXT NOT NULL,
+      identity_kind TEXT NOT NULL,
+      identity_key TEXT NOT NULL,
+      display_name TEXT NOT NULL,
+      directory TEXT NOT NULL,
+      activity_time INTEGER NOT NULL,
+      PRIMARY KEY (agent_name, session_id)
+    );
+
+    CREATE INDEX IF NOT EXISTS idx_project_sessions_identity
+      ON project_sessions(identity_kind, identity_key);
+  `);
+  createProjectGroupsView(db);
 }
-function ensureSchema(db, dbPath) {
-  const currentVersion = getCurrentCacheSchemaVersion(db);
-  if (currentVersion === 0 && !hasAnyCacheSchema(db)) {
-    createLatestCacheSchema(db);
-    setCacheSchemaVersion(db);
+function createProjectGroupsView(db) {
+  if (!tableExists(db, "sessions")) {
+    db.exec(`
+      CREATE VIEW IF NOT EXISTS project_groups_v AS
+        SELECT
+          identity_kind,
+          identity_key,
+          MIN(display_name) AS display_name,
+          GROUP_CONCAT(DISTINCT agent_name) AS sources_csv,
+          COUNT(*) AS session_count,
+          MAX(activity_time) AS last_activity
+        FROM project_sessions
+        GROUP BY identity_kind, identity_key;
+    `);
     return;
   }
-  runSchemaMigrations(db, {
-    dbPath,
-    currentVersion,
-    targetVersion: CACHE_SCHEMA_VERSION,
-    backupLabel: "cache-migration",
-    backupTables: [
-      "agent_cache",
-      "cache_initialization",
-      "cached_sessions",
-      "sessions",
-      "messages",
-      "message_tools",
-      "session_file_activity",
-      "session_documents",
-      "project_sessions"
-    ],
-    migrations: [
-      { version: 3, migrate: createCacheTables },
-      { version: 4, migrate: createSearchTables },
-      { version: 5, migrate: migrateProjectIdentity },
-      {
-        version: 6,
-        destructive: true,
-        migrate(db2) {
-          createLatestCacheSchema(db2);
-          recreateSearchIndexSchema(db2);
-          invalidateSearchContentHashes(db2);
-        }
-      },
-      { version: 7, migrate: backfillStructuredSessions },
-      { version: 8, migrate: backfillFileActivity },
-      {
-        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);
-  if (getUserVersion(db) <= CACHE_SCHEMA_VERSION) {
-    setCacheSchemaVersion(db);
-  }
+  db.exec(`
+    CREATE VIEW IF NOT EXISTS project_groups_v AS
+      SELECT
+        project_identity_kind AS identity_kind,
+        project_identity_key AS identity_key,
+        MIN(project_display_name) AS display_name,
+        GROUP_CONCAT(DISTINCT agent_name) AS sources_csv,
+        COUNT(*) AS session_count,
+        MAX(activity_time) AS last_activity
+      FROM sessions
+      GROUP BY project_identity_kind, project_identity_key;
+  `);
 }
-function sessionContentHash(session) {
-  return JSON.stringify([
-    session.slug,
-    session.title,
-    session.directory,
-    session.time_created,
-    session.time_updated ?? session.time_created,
-    session.stats.message_count,
-    session.stats.total_input_tokens,
-    session.stats.total_output_tokens,
-    session.stats.total_cache_read_tokens ?? 0,
-    session.stats.total_cache_create_tokens ?? 0,
-    session.stats.total_cost,
-    session.stats.cost_source ?? "",
-    session.stats.total_tokens ?? 0
-  ]);
+function recreateProjectGroupsView(db) {
+  db.exec("DROP VIEW IF EXISTS project_groups_v");
+  createProjectGroupsView(db);
 }
-function escapeFtsTerm(value) {
-  return value.replaceAll('"', '""');
+function createLatestCacheSchema(db) {
+  createCacheTables(db);
+  createSessionTables(db);
+  createMessageSearchTables(db);
+  createFileActivityTables(db);
+  createSearchTables(db);
+  createProjectTables(db);
 }
-function splitSearchTokens(input) {
-  const tokens = [];
-  let token = "";
-  let inQuote = false;
-  for (const char of input) {
-    if (char === '"') {
-      inQuote = !inQuote;
-      token += char;
-      continue;
-    }
-    if (/\s/.test(char) && !inQuote) {
-      if (token) {
-        tokens.push(token);
-        token = "";
-      }
-      continue;
-    }
-    token += char;
-  }
-  if (token) {
-    tokens.push(token);
-  }
-  return tokens;
+function recreateSearchIndexSchema(db) {
+  db.exec(`
+    DROP TRIGGER IF EXISTS session_documents_ai;
+    DROP TRIGGER IF EXISTS session_documents_ad;
+    DROP TRIGGER IF EXISTS session_documents_au;
+    DROP TABLE IF EXISTS session_documents_fts;
+  `);
+  createSearchTables(db);
+  rebuildSearchIndex(db);
 }
-function unwrapSearchValue(value) {
-  const trimmed = value.trim();
-  if (trimmed.startsWith('"') && trimmed.endsWith('"')) {
-    return trimmed.slice(1, -1).trim();
+function readLegacyCacheVersion(db) {
+  if (!tableExists(db, "cache_meta") || !columnExists(db, "cache_meta", "key") || !columnExists(db, "cache_meta", "value")) {
+    return 0;
   }
-  return trimmed;
+  const versionRow = db.prepare("SELECT value FROM cache_meta WHERE key = 'version'").get();
+  return Number(versionRow?.value ?? 0);
 }
-function parseCostQualifier(value, filters) {
-  const raw = unwrapSearchValue(value);
-  const range = raw.match(/^(\d+(?:\.\d+)?)\.\.(\d+(?:\.\d+)?)$/);
-  if (range) {
-    filters.costMin = Number(range[1]);
-    filters.costMax = Number(range[2]);
-    return;
+function inferCacheSchemaVersion(db) {
+  if (tableExists(db, "message_tools")) {
+    return 11;
   }
-  const comparison = raw.match(/^(>=|>|<=|<)(\d+(?:\.\d+)?)$/);
-  if (comparison) {
-    const amount2 = Number(comparison[2]);
-    if (comparison[1]?.includes(">")) {
-      filters.costMin = amount2;
-      filters.costMinExclusive = comparison[1] === ">";
-    } else {
-      filters.costMax = amount2;
-      filters.costMaxExclusive = comparison[1] === "<";
-    }
-    return;
+  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;
   }
-  const amount = Number(raw);
-  if (!Number.isNaN(amount)) {
-    filters.costMin = amount;
-    filters.costMax = amount;
+  if (tableExists(db, "sessions") || tableExists(db, "messages")) {
+    return 7;
+  }
+  if (tableExists(db, "project_sessions") || columnExists(db, "session_documents", "project_identity_key")) {
+    return 5;
+  }
+  if (tableExists(db, "session_documents")) {
+    return 4;
+  }
+  if (tableExists(db, "cached_sessions") || tableExists(db, "agent_cache")) {
+    return 3;
   }
+  return 0;
 }
-function appendUnique(values, value) {
-  if (values?.includes(value)) return values;
-  return [...values ?? [], value];
+function getCurrentCacheSchemaVersion(db) {
+  const userVersion = getUserVersion(db);
+  if (userVersion > 0) {
+    return userVersion;
+  }
+  const legacyVersion = readLegacyCacheVersion(db);
+  return Math.max(legacyVersion, inferCacheSchemaVersion(db));
 }
-function isSmartTag(value) {
-  return value === "bugfix" || value === "refactoring" || value === "feature-dev" || value === "testing" || value === "docs" || value === "git-ops" || value === "build-deploy" || value === "exploration" || value === "planning";
+function hasAnyCacheSchema(db) {
+  return [
+    "cache_meta",
+    "agent_cache",
+    "cached_sessions",
+    "sessions",
+    "messages",
+    "message_tools",
+    "session_file_activity",
+    "session_file_activity_path_fts",
+    "session_documents",
+    "session_documents_fts",
+    "project_sessions"
+  ].some((table) => tableExists(db, table));
 }
-function parseSearchQuery(input) {
-  const filters = {};
-  const textTokens = [];
-  let hasQualifiers = false;
-  for (const token of splitSearchTokens(input)) {
-    const match = token.match(/^([a-zA-Z][a-zA-Z_-]*):(.+)$/);
-    if (!match) {
-      textTokens.push(token);
+function backfillProjectSessions(db) {
+  if (!tableExists(db, "cached_sessions") || !tableExists(db, "project_sessions")) {
+    return;
+  }
+  const rows = db.prepare("SELECT agent_name, session_id, session_json FROM cached_sessions").all();
+  const upsert = db.prepare(`
+    INSERT INTO project_sessions(
+      agent_name,
+      session_id,
+      identity_kind,
+      identity_key,
+      display_name,
+      directory,
+      activity_time
+    ) VALUES (?, ?, ?, ?, ?, ?, ?)
+    ON CONFLICT(agent_name, session_id) DO UPDATE SET
+      identity_kind = excluded.identity_kind,
+      identity_key = excluded.identity_key,
+      display_name = excluded.display_name,
+      directory = excluded.directory,
+      activity_time = excluded.activity_time
+  `);
+  for (const row of rows) {
+    if (!row.session_json || !row.agent_name || !row.session_id) {
       continue;
     }
-    const key = match[1].toLowerCase();
-    const value = unwrapSearchValue(match[2]);
-    if (!value) continue;
-    let consumed = true;
-    if (key === "agent") filters.agent = value.toLowerCase();
-    else if (key === "project") filters.project = value;
-    else if (key === "projectkey" || key === "project-key") filters.projectKey = value;
-    else if (key === "cwd") filters.cwd = value;
-    else if (key === "tool") filters.tools = appendUnique(filters.tools, value.toLowerCase());
-    else if (key === "file" || key === "path") filters.file = value;
-    else if (key === "kind" || key === "filekind" || key === "file-kind") {
-      if (value === "read" || value === "edit" || value === "write" || value === "delete") {
-        filters.fileKind = value;
-      } else {
-        consumed = false;
-      }
-    } else if (key === "tag" || key === "signal") {
-      const tag = value.toLowerCase();
-      if (isSmartTag(tag)) {
-        filters.tags = appendUnique(filters.tags, tag);
-      } else {
-        consumed = false;
-      }
-    } else if (key === "cost") {
-      parseCostQualifier(value, filters);
-    } else {
-      consumed = false;
-    }
-    if (consumed) {
-      hasQualifiers = true;
-    } else {
-      textTokens.push(token);
+    try {
+      const session = JSON.parse(row.session_json);
+      const identity = session.project_identity ?? computeIdentity(session.directory, realFs);
+      upsert.run(
+        row.agent_name,
+        row.session_id,
+        identity.kind,
+        identity.key,
+        identity.displayName,
+        session.directory,
+        session.time_updated ?? session.time_created
+      );
+    } catch {
+      continue;
     }
   }
-  return {
-    text: textTokens.join(" ").trim(),
-    filters,
-    hasQualifiers
-  };
-}
-function toFtsQuery(input) {
-  const tokens = splitSearchTokens(input);
-  const mapped = tokens.map((token) => {
-    if (/^OR$/i.test(token)) {
-      return "OR";
-    }
-    if (token.startsWith('"') && token.endsWith('"')) {
-      return `"${escapeFtsTerm(token.slice(1, -1))}"`;
-    }
-    return `"${escapeFtsTerm(token)}"`;
-  }).filter(
-    (token, index, values) => token !== "OR" || index > 0 && index < values.length - 1 && values[index - 1] !== "OR" && values[index + 1] !== "OR"
-  );
-  return mapped.join(" ");
 }
-function appendPlainText(value, chunks) {
-  if (value == null) return;
-  if (typeof value === "string") {
-    const normalized = value.trim();
-    if (normalized) {
-      chunks.push(normalized);
-    }
+function backfillSessionDocumentProjects(db) {
+  if (!tableExists(db, "session_documents") || !columnExists(db, "session_documents", "project_identity_key")) {
     return;
   }
-  if (typeof value === "number" || typeof value === "boolean") {
-    chunks.push(String(value));
-    return;
+  const rows = db.prepare("SELECT id, directory FROM session_documents").all();
+  const update = db.prepare(`
+    UPDATE session_documents
+    SET
+      project_identity_kind = ?,
+      project_identity_key = ?,
+      project_display_name = ?
+    WHERE id = ?
+  `);
+  for (const row of rows) {
+    const identity = computeIdentity(String(row.directory ?? ""), realFs);
+    update.run(identity.kind, identity.key, identity.displayName, Number(row.id));
   }
-  if (Array.isArray(value)) {
-    for (const item of value) {
-      appendPlainText(item, chunks);
+}
+function migrateProjectIdentity(db) {
+  createProjectTables(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);
     }
-    return;
   }
-  if (typeof value === "object") {
-    for (const nested of Object.values(value)) {
-      appendPlainText(nested, chunks);
+  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 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);
+function backfillStructuredSessions(db) {
+  createSessionTables(db);
+  recreateProjectGroupsView(db);
+  const upsertSession = prepareUpsertSession(db);
+  if (tableExists(db, "cached_sessions")) {
+    const rows = db.prepare(
+      "SELECT agent_name, session_id, session_json, meta_json, rowid AS sort_index FROM cached_sessions ORDER BY agent_name, rowid"
+    ).all();
+    for (const row of rows) {
+      if (!row.agent_name || !row.session_json) {
+        continue;
+      }
+      try {
+        const session = JSON.parse(row.session_json);
+        upsertSessionRow(
+          upsertSession,
+          String(row.agent_name),
+          session,
+          row.meta_json ?? null,
+          Number(row.sort_index ?? 0),
+          sourcePathFromMetaJson(row.meta_json)
+        );
+      } catch {
+        continue;
+      }
     }
-    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,
-    error: part.state.error,
-    metadata: part.state.metadata
-  });
-  return compactRecord({
-    type: part.type,
-    tool: part.tool,
-    title: part.title,
-    nickname: part.nickname,
-    callID: part.callID,
-    approval_status: part.approval_status,
-    state
-  });
-}
-function buildMessageText(message) {
-  const chunks = [];
-  chunks.push(message.role);
-  appendPlainText(message.agent, chunks);
-  appendPlainText(message.model, chunks);
-  for (const part of message.parts) {
-    appendPlainText(part.type, chunks);
-    appendPlainText(part.title, chunks);
-    appendPlainText(part.nickname, chunks);
-    appendPlainText(part.tool, chunks);
-    appendPlainText(part.text, chunks);
-    appendPlainText(part.input, chunks);
-    appendPlainText(part.output, chunks);
-    appendPlainText(part.state, chunks);
+  if (!tableExists(db, "session_documents")) {
+    return;
   }
-  return chunks.join("\n");
-}
-function normalizeMessages(session) {
-  return session.messages.map((message, index) => {
-    const toolMetadata = message.parts.filter((part) => part.type === "tool").map((part) => summarizeToolPart(part));
-    return {
-      index,
-      id: message.id || `${session.id}:${index}`,
-      role: message.role,
-      timeCreated: message.time_created,
-      timeCompleted: message.time_completed ?? null,
-      agent: message.agent ?? null,
-      mode: message.mode ?? null,
-      model: message.model ?? null,
-      provider: message.provider ?? null,
-      tokensJson: stringifyOptionalJson(message.tokens),
-      cost: message.cost ?? null,
-      costSource: message.cost_source ?? null,
-      partsJson: JSON.stringify(message.parts),
-      subagentId: message.subagent_id ?? null,
-      nickname: message.nickname ?? null,
-      contentText: buildMessageText(message),
-      toolMetadataJson: toolMetadata.length > 0 ? JSON.stringify(toolMetadata) : null,
-      toolNames: toolNamesFromMessage(message)
-    };
-  });
-}
-function buildSessionContentFromMessages(title, messages) {
-  const chunks = [];
-  appendPlainText(title, chunks);
-  for (const message of messages) {
-    appendPlainText(message.contentText, chunks);
+  const documentRows = db.prepare(
+    `
+        SELECT
+          d.agent_name,
+          d.session_id,
+          d.slug,
+          d.title,
+          d.directory,
+          d.project_identity_kind,
+          d.project_identity_key,
+          d.project_display_name,
+          d.time_created,
+          d.time_updated,
+          d.activity_time,
+          d.id
+        FROM session_documents d
+        LEFT JOIN sessions s ON s.agent_name = d.agent_name AND s.session_id = d.session_id
+        WHERE s.session_id IS NULL
+        ORDER BY d.id
+      `
+  ).all();
+  for (const row of documentRows) {
+    const directory = String(row.directory ?? "");
+    const identity = row.project_identity_key && row.project_identity_kind && row.project_display_name ? {
+      kind: row.project_identity_kind,
+      key: String(row.project_identity_key),
+      displayName: String(row.project_display_name)
+    } : computeIdentity(directory, realFs);
+    upsertSessionRow(
+      upsertSession,
+      String(row.agent_name),
+      {
+        id: String(row.session_id),
+        slug: String(row.slug),
+        title: String(row.title),
+        directory,
+        project_identity: identity,
+        time_created: Number(row.time_created ?? row.activity_time ?? 0),
+        time_updated: row.time_updated == null ? void 0 : Number(row.time_updated),
+        stats: {
+          message_count: 0,
+          total_input_tokens: 0,
+          total_output_tokens: 0,
+          total_cost: 0
+        }
+      },
+      null,
+      Number(row.id ?? 0),
+      null
+    );
   }
-  return chunks.join("\n");
 }
-function deleteLegacyCacheFile() {
-  const legacyPath = getLegacyCachePath();
-  if (!existsSync11(legacyPath)) {
+function backfillMessageTools(db) {
+  createMessageToolTables(db);
+  if (!tableExists(db, "messages")) {
     return;
   }
-  try {
-    unlinkSync(legacyPath);
-  } catch {
+  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 loadCachedSessions(agentName) {
-  if (!hasCacheStorage()) {
-    return null;
+function backfillFileActivity(db) {
+  createFileActivityTables(db);
+  if (!tableExists(db, "sessions") || !tableExists(db, "messages")) {
+    return;
   }
-  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) {
-      return null;
-    }
-    const rows = db.prepare(
+  const sessions = db.prepare(
+    `
+        SELECT agent_name, session_id, project_identity_key
+        FROM sessions
+        ORDER BY agent_name, session_id
       `
-          SELECT
-            session_id,
-            sort_index,
-            slug,
-            title,
-            source_path,
-            directory,
-            project_identity_kind,
-            project_identity_key,
-            project_display_name,
-            time_created,
-            time_updated,
-            message_count,
-            total_input_tokens,
-            total_output_tokens,
-            total_cache_read_tokens,
-            total_cache_create_tokens,
-            total_cost,
-            cost_source,
-            total_tokens,
-            model_usage_json,
-            smart_tags_json,
-            smart_tags_source_updated_at,
-            meta_json
-          FROM sessions
-          WHERE agent_name = ?
-          ORDER BY sort_index, activity_time DESC
-        `
-    ).all(agentName);
-    const sessions = [];
-    const meta = {};
-    for (const row of rows) {
-      const session = sessionFromRow(row);
-      sessions.push(session);
-      if (row.meta_json) {
-        meta[session.id] = JSON.parse(row.meta_json);
-      }
+  ).all();
+  const loadMessages = db.prepare(`
+    SELECT
+      message_id,
+      role,
+      time_created,
+      time_completed,
+      agent,
+      mode,
+      model,
+      provider,
+      parts_json,
+      subagent_id,
+      nickname
+    FROM messages
+    WHERE agent_name = ? AND session_id = ?
+    ORDER BY message_index
+  `);
+  const deleteActivity = db.prepare(
+    "DELETE FROM session_file_activity WHERE agent_name = ? AND session_id = ?"
+  );
+  const insertActivity = prepareInsertFileActivity(db);
+  for (const session of sessions) {
+    if (!session.agent_name || !session.session_id || !session.project_identity_key) {
+      continue;
     }
-    return { sessions, meta, timestamp };
-  });
+    try {
+      const rows = loadMessages.all(session.agent_name, session.session_id);
+      const messages = rows.map((row) => messageFromBackfillRow(row));
+      const activities = extractSessionFileActivity(
+        String(session.agent_name),
+        String(session.session_id),
+        String(session.project_identity_key),
+        messages
+      );
+      deleteActivity.run(session.agent_name, session.session_id);
+      writeFileActivityRows(insertActivity, activities);
+    } catch {
+      continue;
+    }
+  }
+}
+function invalidateSearchContentHashes(db) {
+  if (tableExists(db, "session_documents") && columnExists(db, "session_documents", "content_hash")) {
+    db.exec("UPDATE session_documents SET content_hash = ''");
+  }
 }
-function isAgentCacheInitialized(agentName, indexVersion = CACHE_INITIALIZATION_VERSION) {
-  if (!hasCacheStorage()) {
-    return false;
+function rebuildSearchIndex(db) {
+  if (!tableExists(db, "session_documents_fts")) {
+    return;
   }
-  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;
+  db.exec("INSERT INTO session_documents_fts(session_documents_fts) VALUES ('rebuild')");
 }
-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 rebuildMessageSearchIndex(db) {
+  if (!tableExists(db, "messages_fts")) {
+    return;
+  }
+  db.exec("INSERT INTO messages_fts(messages_fts) VALUES ('rebuild')");
 }
-function loadCachedSessionData(agentName, sessionId) {
-  if (!hasCacheStorage()) {
-    return null;
+function ensureFtsReady(db) {
+  if (!tableExists(db, "session_documents_fts")) {
+    createSearchTables(db);
+  }
+  createSearchTriggers(db);
+  const needsMessageSearchRebuild = !tableExists(db, "messages_fts");
+  createMessageSearchTables(db);
+  if (needsMessageSearchRebuild) {
+    rebuildMessageSearchIndex(db);
   }
-  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 = ?");
-    const deleteLegacySessions = db.prepare("DELETE FROM cached_sessions WHERE agent_name = ?");
-    const deleteSession = db.prepare(
-      "DELETE FROM sessions WHERE agent_name = ? AND session_id = ?"
-    );
-    const deleteSearchDocument = db.prepare(
-      "DELETE FROM session_documents WHERE agent_name = ? AND session_id = ?"
-    );
-    const 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 = ?"
+function ensureFtsConsistency(db) {
+  ensureFtsReady(db);
+  const cachePath = getCachePath2();
+  if (getFtsIntegrityCheckedPath() === cachePath) {
+    return;
+  }
+  try {
+    db.exec(
+      "INSERT INTO session_documents_fts(session_documents_fts, rank) VALUES ('integrity-check', 1)"
     );
-    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 upsertCachedSession = prepareUpsertCachedSession(db);
-    const upsertSession = prepareUpsertSession(db);
-    const upsertProjectSession = prepareUpsertProjectSession(db);
-    const write = db.transaction(() => {
-      const timestamp = Date.now();
-      const sessionIds = new Set(sessions.map((session) => session.id));
-      const existingSessionIds = db.prepare("SELECT session_id FROM sessions WHERE agent_name = ?").all(agentName);
-      deleteAgent.run(agentName);
-      deleteLegacySessions.run(agentName);
-      deleteProjectSessions.run(agentName);
-      upsertAgent.run(agentName, timestamp);
-      for (const row of existingSessionIds) {
-        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);
+    db.exec("INSERT INTO messages_fts(messages_fts, rank) VALUES ('integrity-check', 1)");
+    setFtsIntegrityCheckedPath(cachePath);
+  } catch {
+    rebuildSearchIndex(db);
+    rebuildMessageSearchIndex(db);
+    setFtsIntegrityCheckedPath(cachePath);
+  }
+}
+function setCacheSchemaVersion(db) {
+  createCacheTables(db);
+  setUserVersion(db, CACHE_SCHEMA_VERSION);
+  db.prepare(
+    `
+      INSERT INTO cache_meta(key, value)
+      VALUES ('version', ?)
+      ON CONFLICT(key) DO UPDATE SET value = excluded.value
+    `
+  ).run(String(CACHE_SCHEMA_VERSION));
+}
+function ensureSchema(db, dbPath) {
+  const currentVersion = getCurrentCacheSchemaVersion(db);
+  if (currentVersion === 0 && !hasAnyCacheSchema(db)) {
+    createLatestCacheSchema(db);
+    setCacheSchemaVersion(db);
+    return;
+  }
+  runSchemaMigrations(db, {
+    dbPath,
+    currentVersion,
+    targetVersion: CACHE_SCHEMA_VERSION,
+    backupLabel: "cache-migration",
+    backupTables: [
+      "agent_cache",
+      "cache_initialization",
+      "cached_sessions",
+      "sessions",
+      "messages",
+      "message_tools",
+      "session_file_activity",
+      "session_documents",
+      "project_sessions"
+    ],
+    migrations: [
+      { version: 3, migrate: createCacheTables },
+      { version: 4, migrate: createSearchTables },
+      { version: 5, migrate: migrateProjectIdentity },
+      {
+        version: 6,
+        destructive: true,
+        migrate(db2) {
+          createLatestCacheSchema(db2);
+          recreateSearchIndexSchema(db2);
+          invalidateSearchContentHashes(db2);
         }
-      }
-      sessions.forEach((session, index) => {
-        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,
-          metaJson,
-          index,
-          sourcePathFromMeta(sessionMeta)
-        );
-        writeProjectSessionRow(upsertProjectSession, agentName, session, identity);
-      });
-    });
-    write();
-    deleteLegacyCacheFile();
+      },
+      { version: 7, migrate: backfillStructuredSessions },
+      { 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);
+  if (getUserVersion(db) <= CACHE_SCHEMA_VERSION) {
+    setCacheSchemaVersion(db);
+  }
 }
-function saveCachedSessionChanges(agentName, changes, removedSessionIds, meta = {}) {
-  if (changes.length === 0 && removedSessionIds.length === 0) {
-    return;
+function shouldBulkSyncSearchIndex(options, changedCount) {
+  if (options.isBulk != null) {
+    return options.isBulk;
   }
-  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,
-          metaJson,
-          sortIndex,
-          sourcePathFromMeta(sessionMeta)
-        );
-        writeProjectSessionRow(upsertProjectSession, agentName, session, identity);
+  const threshold = options.bulkThreshold ?? SEARCH_INDEX_BULK_SYNC_THRESHOLD;
+  return threshold > 0 && changedCount >= threshold;
+}
+function sessionContentHash(session) {
+  return JSON.stringify([
+    session.slug,
+    session.title,
+    session.directory,
+    session.time_created,
+    session.time_updated ?? session.time_created,
+    session.stats.message_count,
+    session.stats.total_input_tokens,
+    session.stats.total_output_tokens,
+    session.stats.total_cache_read_tokens ?? 0,
+    session.stats.total_cache_create_tokens ?? 0,
+    session.stats.total_cost,
+    session.stats.cost_source ?? "",
+    session.stats.total_tokens ?? 0
+  ]);
+}
+function escapeFtsTerm(value) {
+  return value.replaceAll('"', '""');
+}
+function splitSearchTokens(input) {
+  const tokens = [];
+  let token = "";
+  let inQuote = false;
+  for (const char of input) {
+    if (char === '"') {
+      inQuote = !inQuote;
+      token += char;
+      continue;
+    }
+    if (/\s/.test(char) && !inQuote) {
+      if (token) {
+        tokens.push(token);
+        token = "";
       }
-    });
-    write();
-    deleteLegacyCacheFile();
-  });
+      continue;
+    }
+    token += char;
+  }
+  if (token) {
+    tokens.push(token);
+  }
+  return tokens;
 }
-function clearCache() {
-  ftsIntegrityCheckedPath = null;
-  if (!hasCacheStorage()) {
-    deleteLegacyCacheFile();
+function unwrapSearchValue(value) {
+  const trimmed = value.trim();
+  if (trimmed.startsWith('"') && trimmed.endsWith('"')) {
+    return trimmed.slice(1, -1).trim();
+  }
+  return trimmed;
+}
+function parseCostQualifier(value, filters) {
+  const raw = unwrapSearchValue(value);
+  const range = raw.match(/^(\d+(?:\.\d+)?)\.\.(\d+(?:\.\d+)?)$/);
+  if (range) {
+    filters.costMin = Number(range[1]);
+    filters.costMax = Number(range[2]);
     return;
   }
-  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;
-    `);
-  });
-  deleteLegacyCacheFile();
-  const cachePath = getCachePath2();
-  const walPath = `${cachePath}-wal`;
-  const shmPath = `${cachePath}-shm`;
-  for (const filePath of [walPath, shmPath]) {
-    if (!existsSync11(filePath)) {
+  const comparison = raw.match(/^(>=|>|<=|<)(\d+(?:\.\d+)?)$/);
+  if (comparison) {
+    const amount2 = Number(comparison[2]);
+    if (comparison[1]?.includes(">")) {
+      filters.costMin = amount2;
+      filters.costMinExclusive = comparison[1] === ">";
+    } else {
+      filters.costMax = amount2;
+      filters.costMaxExclusive = comparison[1] === "<";
+    }
+    return;
+  }
+  const amount = Number(raw);
+  if (!Number.isNaN(amount)) {
+    filters.costMin = amount;
+    filters.costMax = amount;
+  }
+}
+function appendUnique(values, value) {
+  if (values?.includes(value)) return values;
+  return [...values ?? [], value];
+}
+function isSmartTag(value) {
+  return value === "bugfix" || value === "refactoring" || value === "feature-dev" || value === "testing" || value === "docs" || value === "git-ops" || value === "build-deploy" || value === "exploration" || value === "planning";
+}
+function parseSearchQuery(input) {
+  const filters = {};
+  const textTokens = [];
+  let hasQualifiers = false;
+  for (const token of splitSearchTokens(input)) {
+    const match = token.match(/^([a-zA-Z][a-zA-Z_-]*):(.+)$/);
+    if (!match) {
+      textTokens.push(token);
       continue;
     }
-    try {
-      rmSync(filePath, { force: true });
-    } catch {
+    const key = match[1].toLowerCase();
+    const value = unwrapSearchValue(match[2]);
+    if (!value) continue;
+    let consumed = true;
+    if (key === "agent") filters.agent = value.toLowerCase();
+    else if (key === "project") filters.project = value;
+    else if (key === "projectkey" || key === "project-key") filters.projectKey = value;
+    else if (key === "cwd") filters.cwd = value;
+    else if (key === "tool") filters.tools = appendUnique(filters.tools, value.toLowerCase());
+    else if (key === "file" || key === "path") filters.file = value;
+    else if (key === "kind" || key === "filekind" || key === "file-kind") {
+      if (value === "read" || value === "edit" || value === "write" || value === "delete") {
+        filters.fileKind = value;
+      } else {
+        consumed = false;
+      }
+    } else if (key === "tag" || key === "signal") {
+      const tag = value.toLowerCase();
+      if (isSmartTag(tag)) {
+        filters.tags = appendUnique(filters.tags, tag);
+      } else {
+        consumed = false;
+      }
+    } else if (key === "cost") {
+      parseCostQualifier(value, filters);
+    } else {
+      consumed = false;
+    }
+    if (consumed) {
+      hasQualifiers = true;
+    } else {
+      textTokens.push(token);
     }
   }
+  return {
+    text: textTokens.join(" ").trim(),
+    filters,
+    hasQualifiers
+  };
 }
-function getCacheInfo() {
-  if (!hasCacheStorage()) {
-    return { lastScanTime: null, size: 0 };
-  }
-  const info = withCacheDb((db) => {
-    const timestampRow = db.prepare("SELECT MAX(timestamp) AS value FROM agent_cache").get();
-    const sizeRow = db.prepare("SELECT COUNT(*) AS value FROM sessions").get();
-    const lastScanTime = Number(timestampRow?.value ?? 0) || null;
-    const size = Number(sizeRow?.value ?? 0);
-    return { lastScanTime, size };
-  });
-  return info ?? { lastScanTime: null, size: 0 };
+function toFtsQuery(input) {
+  const tokens = splitSearchTokens(input);
+  const mapped = tokens.map((token) => {
+    if (/^OR$/i.test(token)) {
+      return "OR";
+    }
+    if (token.startsWith('"') && token.endsWith('"')) {
+      return `"${escapeFtsTerm(token.slice(1, -1))}"`;
+    }
+    return `"${escapeFtsTerm(token)}"`;
+  }).filter(
+    (token, index, values) => token !== "OR" || index > 0 && index < values.length - 1 && values[index - 1] !== "OR" && values[index + 1] !== "OR"
+  );
+  return mapped.join(" ");
 }
 function loadSearchIndexEntry(agentName, change, loadSessionData) {
   try {
@@ -7943,17 +7318,6 @@ function sessionMatchesSearchCost(session, options) {
   }
   return true;
 }
-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, "\\$&");
-}
 function buildSessionSearchFilters(options) {
   const clauses = [];
   const params = [];
@@ -8081,307 +7445,656 @@ function buildTermSnippet(text, terms) {
   const end = Math.min(text.length, index + term.length + 80);
   return `${start > 0 ? "\u2026 " : ""}${highlightTerm(text.slice(start, end), term)}${end < text.length ? " \u2026" : ""}`;
 }
-function messageMatchType(row) {
-  if (row.role === "user") return "user_message";
-  if (row.role === "tool" || row.mode === "tool" || row.tool_metadata_json) return "tool_output";
-  return "assistant_reply";
+function messageMatchType(row) {
+  if (row.role === "user") return "user_message";
+  if (row.role === "tool" || row.mode === "tool" || row.tool_metadata_json) return "tool_output";
+  return "assistant_reply";
+}
+function 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 {
+      snippet: `Recent session \xB7 ${String(row.directory ?? "")}`,
+      matchType: "recent"
+    };
+  }
+  if (textMatchesTerms(title, terms)) {
+    return { snippet: buildTermSnippet(title, terms), matchType: "title" };
+  }
+  const messageMatch = messageMatches.get(searchResultRowKey(row));
+  if (messageMatch) {
+    return messageMatch;
+  }
+  return {
+    snippet: String(row.snippet ?? ""),
+    matchType: "assistant_reply"
+  };
+}
+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(row, terms, messageMatches);
+    return {
+      agentName: String(row.agent_name),
+      session: sessionHeadFromSearchRow(row),
+      snippet: match.snippet,
+      matchType: match.matchType
+    };
+  });
+}
+function searchSessions(query, options = {}) {
+  const search = mergeSearchQueryOptions(query, options);
+  const normalizedQuery = search.text.trim();
+  if (!hasCacheStorage()) {
+    return [];
+  }
+  const results = withCacheDb((db) => {
+    ensureFtsReady(db);
+    const filters = buildSessionSearchFilters(search.options);
+    if (!normalizedQuery) {
+      const rows2 = db.prepare(
+        `
+            SELECT
+              ${searchSessionColumns()},
+              '' AS snippet
+            FROM sessions s
+            WHERE 1 = 1
+              ${filters.where}
+            ORDER BY s.activity_time DESC
+            LIMIT ?
+          `
+      ).all(...filters.params, search.options.limit ?? 50);
+      return rowsToSearchResults(db, rows2, "");
+    }
+    const ftsQuery = toFtsQuery(normalizedQuery);
+    if (!ftsQuery) return [];
+    const rows = db.prepare(
+      `
+          SELECT
+            ${searchSessionColumns()},
+            COALESCE(
+              NULLIF(snippet(session_documents_fts, 1, '<mark>', '</mark>', ' \u2026 ', 18), ''),
+              highlight(session_documents_fts, 0, '<mark>', '</mark>')
+            ) AS snippet
+          FROM session_documents_fts
+          JOIN session_documents d ON d.id = session_documents_fts.rowid
+          JOIN sessions s ON s.agent_name = d.agent_name AND s.session_id = d.session_id
+          WHERE session_documents_fts MATCH ?
+            ${filters.where}
+          ORDER BY bm25(session_documents_fts, 8.0, 1.0), s.activity_time DESC
+          LIMIT ?
+        `
+    ).all(ftsQuery, ...filters.params, search.options.limit ?? 50);
+    return rowsToSearchResults(db, rows, normalizedQuery, ftsQuery);
+  });
+  return results ?? [];
+}
+function fileActivityFilters(options) {
+  const path2 = options.path ? normalizeFilePathSearch(options.path) : "";
+  return {
+    projectKey: options.projectKey ?? null,
+    projectLike: options.project ? likePattern(options.project) : null,
+    cwdKey: options.cwd ? computeIdentity(options.cwd, realFs).key : null,
+    cwdLike: options.cwd ? likePattern(options.cwd) : null,
+    path: path2,
+    pathLike: path2 ? likePattern(path2) : null
+  };
+}
+function fileActivityFromRow(row) {
+  return {
+    agent_name: String(row.agent_name),
+    session_id: String(row.session_id),
+    project_identity_key: String(row.project_identity_key ?? ""),
+    path: String(row.path ?? ""),
+    kind: row.kind ?? "read",
+    count: Number(row.count ?? 0),
+    latest_time: Number(row.latest_time ?? 0)
+  };
+}
+function 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 = buildFileActivityWhere(options);
+  const queryRows = (db) => db.prepare(
+    `
+          SELECT
+            fa.agent_name,
+            fa.session_id,
+            fa.project_identity_key,
+            fa.path,
+            fa.kind,
+            fa.count,
+            fa.latest_time,
+            s.slug,
+            s.title,
+            s.directory,
+            s.project_identity_kind,
+            s.project_display_name,
+            s.time_created,
+            s.time_updated,
+            s.message_count,
+            s.total_input_tokens,
+            s.total_output_tokens,
+            s.total_cache_read_tokens,
+            s.total_cache_create_tokens,
+            s.total_cost,
+            s.cost_source,
+            s.total_tokens
+          FROM session_file_activity fa
+          JOIN sessions s ON s.agent_name = fa.agent_name AND s.session_id = fa.session_id
+          ${filters.where}
+          ORDER BY fa.latest_time DESC, fa.count DESC, fa.path
+          LIMIT ?
+        `
+  ).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)
+  }));
+}
+function listSessionFileActivity(agentName, sessionId) {
+  return listFileActivity({ agent: agentName, sessionId, limit: 500 }).map(
+    ({ session: _session, ...activity }) => activity
+  );
 }
-function searchResultRowKey(row) {
-  return `${String(row.agent_name)}\0${String(row.session_id)}`;
+function highlightFilePath(path2, query) {
+  const needle = normalizeFilePathSearch(query);
+  if (!needle) return path2;
+  const lower = path2.toLowerCase();
+  const index = lower.indexOf(needle.toLowerCase());
+  if (index < 0) return path2;
+  return `${path2.slice(0, index)}<mark>${path2.slice(index, index + needle.length)}</mark>${path2.slice(
+    index + needle.length
+  )}`;
 }
-function 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)
+function searchFileActivitySessions(query, options = {}) {
+  const search = mergeSearchQueryOptions(query, options);
+  const path2 = normalizeFilePathSearch(search.options.file ?? search.text);
+  if (!path2) return [];
+  const rows = listFileActivity({
+    agent: search.options.agent,
+    projectKey: search.options.projectKey,
+    project: search.options.project,
+    cwd: search.options.cwd,
+    path: path2,
+    kind: search.options.fileKind,
+    from: search.options.from,
+    to: search.options.to,
+    limit: (search.options.limit ?? 50) * 3
+  });
+  const seen = /* @__PURE__ */ new Set();
+  const results = [];
+  for (const row of rows) {
+    const key = `${row.agent_name}/${row.session_id}`;
+    if (seen.has(key)) continue;
+    if (!sessionMatchesSearchCost(row.session, search.options)) continue;
+    seen.add(key);
+    results.push({
+      agentName: row.agent_name,
+      session: row.session,
+      snippet: `${row.kind} ${highlightFilePath(row.path, path2)} \xB7 ${row.count} events`,
+      matchType: "file_path"
     });
+    if (results.length >= (search.options.limit ?? 50)) break;
   }
-  return matches;
+  return results;
 }
-function resolveSearchMatch(row, terms, messageMatches) {
-  const title = String(row.title ?? "");
-  if (terms.terms.length === 0) {
-    return {
-      snippet: `Recent session \xB7 ${String(row.directory ?? "")}`,
-      matchType: "recent"
-    };
+var CACHE_INITIALIZATION_VERSION = "session-cache-v2";
+function deleteLegacyCacheFile() {
+  const legacyPath = getLegacyCachePath();
+  if (!existsSync12(legacyPath)) {
+    return;
   }
-  if (textMatchesTerms(title, terms)) {
-    return { snippet: buildTermSnippet(title, terms), matchType: "title" };
+  try {
+    unlinkSync(legacyPath);
+  } catch {
   }
-  const messageMatch = messageMatches.get(searchResultRowKey(row));
-  if (messageMatch) {
-    return messageMatch;
+}
+function loadCachedSessions(agentName) {
+  if (!hasCacheStorage()) {
+    return null;
   }
-  return {
-    snippet: String(row.snippet ?? ""),
-    matchType: "assistant_reply"
-  };
+  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) {
+      return null;
+    }
+    const rows = 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 = ?
+          ORDER BY sort_index, activity_time DESC
+        `
+    ).all(agentName);
+    const sessions = [];
+    const meta = {};
+    for (const row of rows) {
+      const session = sessionFromRow(row);
+      sessions.push(session);
+      if (row.meta_json) {
+        meta[session.id] = JSON.parse(row.meta_json);
+      }
+    }
+    return { sessions, meta, timestamp };
+  });
 }
-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(row, terms, messageMatches);
-    return {
-      agentName: String(row.agent_name),
-      session: sessionHeadFromSearchRow(row),
-      snippet: match.snippet,
-      matchType: match.matchType
-    };
+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 searchSessions(query, options = {}) {
-  const search = mergeSearchQueryOptions(query, options);
-  const normalizedQuery = search.text.trim();
+function loadCachedSessionData(agentName, sessionId) {
   if (!hasCacheStorage()) {
-    return [];
+    return null;
   }
-  const results = withCacheDb((db) => {
-    ensureFtsReady(db);
-    const filters = buildSessionSearchFilters(search.options);
-    if (!normalizedQuery) {
-      const rows2 = db.prepare(
+  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 = ?
         `
-            SELECT
-              ${searchSessionColumns()},
-              '' AS snippet
-            FROM sessions s
-            WHERE 1 = 1
-              ${filters.where}
-            ORDER BY s.activity_time DESC
-            LIMIT ?
-          `
-      ).all(...filters.params, search.options.limit ?? 50);
-      return rowsToSearchResults(db, rows2, "");
+    ).get(agentName, sessionId);
+    if (!row) {
+      return null;
     }
-    const ftsQuery = toFtsQuery(normalizedQuery);
-    if (!ftsQuery) return [];
-    const rows = db.prepare(
+    const messageRows = db.prepare(
       `
           SELECT
-            ${searchSessionColumns()},
-            COALESCE(
-              NULLIF(snippet(session_documents_fts, 1, '<mark>', '</mark>', ' \u2026 ', 18), ''),
-              highlight(session_documents_fts, 0, '<mark>', '</mark>')
-            ) AS snippet
-          FROM session_documents_fts
-          JOIN session_documents d ON d.id = session_documents_fts.rowid
-          JOIN sessions s ON s.agent_name = d.agent_name AND s.session_id = d.session_id
-          WHERE session_documents_fts MATCH ?
-            ${filters.where}
-          ORDER BY bm25(session_documents_fts, 8.0, 1.0), s.activity_time DESC
-          LIMIT ?
+            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(ftsQuery, ...filters.params, search.options.limit ?? 50);
-    return rowsToSearchResults(db, rows, normalizedQuery, ftsQuery);
+    ).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))
+    };
   });
-  return results ?? [];
-}
-function normalizeFilePathSearch(value) {
-  return value.trim().replace(/^"|"$/g, "");
-}
-function fileActivityFilters(options) {
-  const path2 = options.path ? normalizeFilePathSearch(options.path) : "";
-  return {
-    projectKey: options.projectKey ?? null,
-    projectLike: options.project ? likePattern(options.project) : null,
-    cwdKey: options.cwd ? computeIdentity(options.cwd, realFs).key : null,
-    cwdLike: options.cwd ? likePattern(options.cwd) : null,
-    path: path2,
-    pathLike: path2 ? likePattern(path2) : null
-  };
 }
-function fileActivityFromRow(row) {
-  return {
-    agent_name: String(row.agent_name),
-    session_id: String(row.session_id),
-    project_identity_key: String(row.project_identity_key ?? ""),
-    path: String(row.path ?? ""),
-    kind: row.kind ?? "read",
-    count: Number(row.count ?? 0),
-    latest_time: Number(row.latest_time ?? 0)
-  };
+function saveCachedSessions(agentName, sessions, meta = {}) {
+  withCacheDb((db) => {
+    const deleteAgent = db.prepare("DELETE FROM agent_cache WHERE agent_name = ?");
+    const deleteLegacySessions = db.prepare("DELETE FROM cached_sessions WHERE agent_name = ?");
+    const deleteSession = db.prepare(
+      "DELETE FROM sessions WHERE agent_name = ? AND session_id = ?"
+    );
+    const deleteSearchDocument = db.prepare(
+      "DELETE FROM session_documents WHERE agent_name = ? AND session_id = ?"
+    );
+    const 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 upsertCachedSession = prepareUpsertCachedSession(db);
+    const upsertSession = prepareUpsertSession(db);
+    const upsertProjectSession = prepareUpsertProjectSession(db);
+    const write = db.transaction(() => {
+      const timestamp = Date.now();
+      const sessionIds = new Set(sessions.map((session) => session.id));
+      const existingSessionIds = db.prepare("SELECT session_id FROM sessions WHERE agent_name = ?").all(agentName);
+      deleteAgent.run(agentName);
+      deleteLegacySessions.run(agentName);
+      deleteProjectSessions.run(agentName);
+      upsertAgent.run(agentName, timestamp);
+      for (const row of existingSessionIds) {
+        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);
+        }
+      }
+      sessions.forEach((session, index) => {
+        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,
+          metaJson,
+          index,
+          sourcePathFromMeta(sessionMeta)
+        );
+        writeProjectSessionRow(upsertProjectSession, agentName, session, identity);
+      });
+    });
+    write();
+    deleteLegacyCacheFile();
+  });
 }
-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);
+function saveCachedSessionChanges(agentName, changes, removedSessionIds, meta = {}) {
+  if (changes.length === 0 && removedSessionIds.length === 0) {
+    return;
   }
-  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 '\\')"
+  withCacheDb((db) => {
+    const deleteLegacySession = db.prepare(
+      "DELETE FROM cached_sessions WHERE agent_name = ? AND session_id = ?"
     );
-    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
-  };
+    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,
+          metaJson,
+          sortIndex,
+          sourcePathFromMeta(sessionMeta)
+        );
+        writeProjectSessionRow(upsertProjectSession, agentName, session, identity);
+      }
+    });
+    write();
+    deleteLegacyCacheFile();
+  });
 }
-function listFileActivity(options = {}) {
+function clearCache() {
+  setFtsIntegrityCheckedPath(null);
   if (!hasCacheStorage()) {
-    return [];
+    deleteLegacyCacheFile();
+    return;
   }
-  const filters = buildFileActivityWhere(options);
-  const queryRows = (db) => db.prepare(
-    `
-          SELECT
-            fa.agent_name,
-            fa.session_id,
-            fa.project_identity_key,
-            fa.path,
-            fa.kind,
-            fa.count,
-            fa.latest_time,
-            s.slug,
-            s.title,
-            s.directory,
-            s.project_identity_kind,
-            s.project_display_name,
-            s.time_created,
-            s.time_updated,
-            s.message_count,
-            s.total_input_tokens,
-            s.total_output_tokens,
-            s.total_cache_read_tokens,
-            s.total_cache_create_tokens,
-            s.total_cost,
-            s.cost_source,
-            s.total_tokens
-          FROM session_file_activity fa
-          JOIN sessions s ON s.agent_name = fa.agent_name AND s.session_id = fa.session_id
-          ${filters.where}
-          ORDER BY fa.latest_time DESC, fa.count DESC, fa.path
-          LIMIT ?
-        `
-  ).all(...filters.params, options.limit ?? 50);
-  let rows = withCacheDbReadOnly(queryRows);
-  if (rows == null && options.path) {
-    rows = withCacheDb(queryRows);
+  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;
+    `);
+  });
+  deleteLegacyCacheFile();
+  const cachePath = getCachePath2();
+  const walPath = `${cachePath}-wal`;
+  const shmPath = `${cachePath}-shm`;
+  for (const filePath of [walPath, shmPath]) {
+    if (!existsSync12(filePath)) {
+      continue;
+    }
+    try {
+      rmSync(filePath, { force: true });
+    } catch {
+    }
   }
-  return (rows ?? []).map((row) => ({
-    ...fileActivityFromRow(row),
-    session: sessionHeadFromSearchRow(row)
-  }));
-}
-function listSessionFileActivity(agentName, sessionId) {
-  return listFileActivity({ agent: agentName, sessionId, limit: 500 }).map(
-    ({ session: _session, ...activity }) => activity
-  );
-}
-function highlightFilePath(path2, query) {
-  const needle = normalizeFilePathSearch(query);
-  if (!needle) return path2;
-  const lower = path2.toLowerCase();
-  const index = lower.indexOf(needle.toLowerCase());
-  if (index < 0) return path2;
-  return `${path2.slice(0, index)}<mark>${path2.slice(index, index + needle.length)}</mark>${path2.slice(
-    index + needle.length
-  )}`;
 }
-function searchFileActivitySessions(query, options = {}) {
-  const search = mergeSearchQueryOptions(query, options);
-  const path2 = normalizeFilePathSearch(search.options.file ?? search.text);
-  if (!path2) return [];
-  const rows = listFileActivity({
-    agent: search.options.agent,
-    projectKey: search.options.projectKey,
-    project: search.options.project,
-    cwd: search.options.cwd,
-    path: path2,
-    kind: search.options.fileKind,
-    from: search.options.from,
-    to: search.options.to,
-    limit: (search.options.limit ?? 50) * 3
-  });
-  const seen = /* @__PURE__ */ new Set();
-  const results = [];
-  for (const row of rows) {
-    const key = `${row.agent_name}/${row.session_id}`;
-    if (seen.has(key)) continue;
-    if (!sessionMatchesSearchCost(row.session, search.options)) continue;
-    seen.add(key);
-    results.push({
-      agentName: row.agent_name,
-      session: row.session,
-      snippet: `${row.kind} ${highlightFilePath(row.path, path2)} \xB7 ${row.count} events`,
-      matchType: "file_path"
-    });
-    if (results.length >= (search.options.limit ?? 50)) break;
+function getCacheInfo() {
+  if (!hasCacheStorage()) {
+    return { lastScanTime: null, size: 0 };
   }
-  return results;
+  const info = withCacheDb((db) => {
+    const timestampRow = db.prepare("SELECT MAX(timestamp) AS value FROM agent_cache").get();
+    const sizeRow = db.prepare("SELECT COUNT(*) AS value FROM sessions").get();
+    const lastScanTime = Number(timestampRow?.value ?? 0) || null;
+    const size = Number(sizeRow?.value ?? 0);
+    return { lastScanTime, size };
+  });
+  return info ?? { lastScanTime: null, size: 0 };
 }
 function listCachedProjectGroups(sessions) {
   if (sessions) {
@@ -8423,57 +8136,89 @@ function createIdentityResolver() {
     return identity;
   };
 }
-function attachProjectIdentities(sessions) {
+function attachMissingProjectIdentities(sessions) {
   const resolveIdentity = createIdentityResolver();
   return sessions.map((session) => {
     if (session.project_identity) return session;
-    return {
-      ...session,
-      project_identity: resolveIdentity(session.directory)
-    };
+    return { ...session, project_identity: resolveIdentity(session.directory) };
   });
 }
-function filterSessions(sessions, options) {
-  let result = sessions;
-  if (options.cwd) {
-    result = filterSessionsByProjectScope(result, options.cwd);
-  }
-  if (options.from != null) {
-    result = result.filter((s) => (s.time_updated ?? s.time_created) >= options.from);
-  }
-  if (options.to != null) {
-    result = result.filter((s) => (s.time_updated ?? s.time_created) <= options.to);
-  }
-  return result;
-}
-function buildAgentCacheMeta(agent) {
+function buildAgentCacheMeta(agent, sessionIds) {
   const metaMap = agent.getSessionMetaMap?.();
   const meta = {};
   if (!metaMap) return meta;
   for (const [id, data] of metaMap.entries()) {
+    if (sessionIds && !sessionIds.has(id)) continue;
     meta[id] = { id, ...data };
   }
   return meta;
 }
-function sessionCacheValue(session) {
-  return JSON.stringify(session);
+function sessionSignature(session) {
+  return JSON.stringify([
+    session.title,
+    session.directory,
+    session.time_created,
+    session.time_updated ?? session.time_created,
+    session.stats.message_count,
+    session.stats.total_input_tokens,
+    session.stats.total_output_tokens,
+    session.stats.total_cost,
+    session.stats.total_tokens ?? 0,
+    session.smart_tags_source_updated_at ?? null
+  ]);
+}
+function sortSessions(sessions) {
+  return [...sessions].sort(
+    (a, b) => (b.time_updated ?? b.time_created) - (a.time_updated ?? a.time_created)
+  );
 }
-function buildCacheChanges(cachedSessions, updatedSessions, changedIds = []) {
+function computeSessionDiff(cachedSessions, updatedSessions, changedIds = [], signature = sessionSignature) {
   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 = [];
+  const removedSessionIds = [];
+  let newCount = 0;
+  let updatedCount = 0;
   updatedSessions.forEach((session, sortIndex) => {
     const cached = cachedMap.get(session.id);
-    if (!cached || changedIdSet.has(session.id) || cached !== session && sessionCacheValue(cached) !== sessionCacheValue(session)) {
+    if (!cached) {
+      newCount += 1;
+      changes.push({ session, sortIndex });
+      return;
+    }
+    const hasSignatureChange = signature(cached) !== signature(session);
+    if (changedIdSet.has(session.id) || hasSignatureChange) {
+      updatedCount += 1;
       changes.push({ session, sortIndex });
     }
   });
-  return { changes, removedSessionIds };
+  for (const session of cachedSessions) {
+    if (!updatedIds.has(session.id)) {
+      removedSessionIds.push(session.id);
+    }
+  }
+  return {
+    changes,
+    removedSessionIds,
+    counts: { new: newCount, updated: updatedCount, removed: removedSessionIds.length }
+  };
+}
+function filterSessions(sessions, options) {
+  let result = sessions;
+  if (options.cwd) {
+    result = filterSessionsByProjectScope(result, options.cwd);
+  }
+  if (options.from != null) {
+    result = result.filter((s) => (s.time_updated ?? s.time_created) >= options.from);
+  }
+  if (options.to != null) {
+    result = result.filter((s) => (s.time_updated ?? s.time_created) <= options.to);
+  }
+  return result;
 }
 function saveCachedSessionDiff(agent, cachedSessions, updatedSessions, changedIds = []) {
-  const diff = buildCacheChanges(cachedSessions, updatedSessions, changedIds);
+  const diff = computeSessionDiff(cachedSessions, updatedSessions, changedIds, sessionSignature);
   saveCachedSessionChanges(
     agent.name,
     diff.changes,
@@ -8573,19 +8318,16 @@ 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();
-        for (const [id, meta] of Object.entries(cached.meta)) {
-          metaMap.set(id, meta);
-        }
-        agent.setSessionMetaMap(metaMap);
+      const metaMap = /* @__PURE__ */ new Map();
+      for (const [id, meta] of Object.entries(cached.meta)) {
+        metaMap.set(id, meta);
       }
+      agent.setSessionMetaMap(metaMap);
       if (options.cacheOnly) {
         onProgress?.({
           agent: agent.name,
@@ -8594,7 +8336,7 @@ async function scanAgentSmart(agent, options, onProgress) {
         });
         onProgress?.({ agent: agent.name, phase: "complete", newCount: cached.sessions.length });
         const t32 = performance.now();
-        const cachedWithIdentity2 = attachProjectIdentities(cached.sessions);
+        const cachedWithIdentity2 = attachMissingProjectIdentities(cached.sessions);
         timing.identity = performance.now() - t32;
         const filtered3 = filterSessions(cachedWithIdentity2, options);
         timing.total = performance.now() - agentStart;
@@ -8615,58 +8357,56 @@ async function scanAgentSmart(agent, options, onProgress) {
         phase: "cache",
         cachedCount: cached.sessions.length
       });
-      if (canValidateCache) {
-        onProgress?.({ agent: agent.name, phase: "checking" });
-        const t1 = performance.now();
-        const checkResult = await Promise.resolve(
-          agent.checkForChanges(cached.timestamp, cached.sessions)
+      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.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);
-          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,
-            phase: "complete",
-            newCount: tagged2.sessions.length
-          });
-          const filtered3 = filterSessions(tagged2.sessions, options);
-          timing.total = performance.now() - agentStart;
-          return {
+        timing.scan = performance.now() - t2;
+        const t32 = performance.now();
+        const sessionsWithIdentity = attachMissingProjectIdentities(updatedSessions);
+        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,
-            heads: filtered3,
-            fromCache: true,
-            refreshed: true,
-            timing,
-            cacheTimestamp: checkResult.timestamp
-          };
+            cached.sessions,
+            tagged2.sessions,
+            checkResult.changedIds ?? []
+          );
         }
-        onProgress?.({ agent: agent.name, phase: "complete", newCount: cached.sessions.length });
+        onProgress?.({
+          agent: agent.name,
+          phase: "complete",
+          newCount: tagged2.sessions.length
+        });
+        const filtered3 = filterSessions(tagged2.sessions, options);
+        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 cachedWithIdentity = attachMissingProjectIdentities(cached.sessions);
       timing.identity = performance.now() - t3;
       const t4 = performance.now();
       const tagged = options.includeSmartTags === false ? { sessions: cachedWithIdentity, changed: false } : await ensureSessionTags(agent, cachedWithIdentity, options.smartTagWorkerUrl);
@@ -8718,7 +8458,7 @@ async function scanAgentFull(agent, options, onProgress, timing = { total: 0 },
     perf.end(scanMarker);
     timing.scan = performance.now() - t0;
     const t1 = performance.now();
-    const headsWithIdentity = attachProjectIdentities(heads);
+    const headsWithIdentity = attachMissingProjectIdentities(heads);
     timing.identity = performance.now() - t1;
     const t2 = performance.now();
     const tagged = options.includeSmartTags === false ? { sessions: headsWithIdentity, changed: false } : await ensureSessionTags(agent, headsWithIdentity, options.smartTagWorkerUrl);
@@ -9090,6 +8830,161 @@ function deleteBookmark(agentKey, sessionId) {
     ).run(agentKey, sessionId);
   });
 }
+var DASHBOARD_RECENT_LIMIT = 10;
+function getTotalTokens(stats) {
+  return stats.total_tokens ?? stats.total_input_tokens + stats.total_output_tokens;
+}
+function getSessionAgentName(session) {
+  return session.slug.split("/")[0]?.toLowerCase() || "unknown";
+}
+function getSessionActivityTime(session) {
+  return session.time_updated ?? session.time_created;
+}
+function toLocalDateKey(ts) {
+  const d = new Date(ts);
+  return `${d.getFullYear()}-${String(d.getMonth() + 1).padStart(2, "0")}-${String(
+    d.getDate()
+  ).padStart(2, "0")}`;
+}
+function startOfLocalDay(ts) {
+  const d = new Date(ts);
+  d.setHours(0, 0, 0, 0);
+  return d.getTime();
+}
+function buildDashboard(sessions, options) {
+  const { byAgentNames, scope, from, to, agentInfoMap } = options;
+  const agentMetrics = /* @__PURE__ */ new Map();
+  const agentMetricKeyByName = /* @__PURE__ */ new Map();
+  for (const name of byAgentNames) {
+    if (scope.agent && name.toLowerCase() !== scope.agent) continue;
+    agentMetrics.set(name, { sessions: 0, messages: 0, tokens: 0 });
+    agentMetricKeyByName.set(name.toLowerCase(), name);
+  }
+  let totalSessions = 0;
+  let totalMessages = 0;
+  let totalTokens = 0;
+  let totalCost = 0;
+  let hasEstimatedCost = false;
+  let latestActivity = 0;
+  const recentCandidates = [];
+  const modelAgg = /* @__PURE__ */ new Map();
+  const dailyMap = /* @__PURE__ */ new Map();
+  const dailyTokenMap = /* @__PURE__ */ new Map();
+  if (from != null) {
+    const bucketStart = startOfLocalDay(from);
+    const bucketDays = Math.floor((startOfLocalDay(to) - bucketStart) / 864e5) + 1;
+    for (let i = 0; i < bucketDays; i += 1) {
+      const ts = bucketStart + i * 864e5;
+      const key = toLocalDateKey(ts);
+      dailyMap.set(key, { date: key, sessions: 0, messages: 0 });
+      dailyTokenMap.set(key, { date: key, input: 0, output: 0, cache_read: 0, cache_create: 0 });
+    }
+  }
+  for (const session of sessions) {
+    const agentName = getSessionAgentName(session);
+    if (scope.agent && agentName !== scope.agent) continue;
+    if (scope.projectKey) {
+      const identity = session.project_identity;
+      if (!identity || identity.key !== scope.projectKey) continue;
+      if (scope.projectKind && identity.kind !== scope.projectKind) continue;
+    }
+    const activity = getSessionActivityTime(session);
+    if (from != null && activity < from) continue;
+    if (activity > to) continue;
+    const messageCount = session.stats.message_count;
+    const sessionTokens = getTotalTokens(session.stats);
+    totalSessions += 1;
+    totalMessages += messageCount;
+    totalTokens += sessionTokens;
+    totalCost += session.stats.total_cost ?? 0;
+    if (session.stats.cost_source === "estimated") hasEstimatedCost = true;
+    if (activity > latestActivity) latestActivity = activity;
+    const metricKey = agentMetricKeyByName.get(agentName);
+    if (metricKey) {
+      const metric = agentMetrics.get(metricKey);
+      metric.sessions += 1;
+      metric.messages += messageCount;
+      metric.tokens += sessionTokens;
+    }
+    const key = toLocalDateKey(activity);
+    let bucket = dailyMap.get(key);
+    if (!bucket) {
+      bucket = { date: key, sessions: 0, messages: 0 };
+      dailyMap.set(key, bucket);
+    }
+    bucket.sessions += 1;
+    bucket.messages += messageCount;
+    let tokenBucket = dailyTokenMap.get(key);
+    if (!tokenBucket) {
+      tokenBucket = { date: key, input: 0, output: 0, cache_read: 0, cache_create: 0 };
+      dailyTokenMap.set(key, tokenBucket);
+    }
+    const cacheRead = session.stats.total_cache_read_tokens ?? 0;
+    const cacheCreate = session.stats.total_cache_create_tokens ?? 0;
+    const pureInput = session.stats.total_input_tokens - cacheRead - cacheCreate;
+    tokenBucket.input += Math.max(0, pureInput);
+    tokenBucket.output += session.stats.total_output_tokens;
+    tokenBucket.cache_read += cacheRead;
+    tokenBucket.cache_create += cacheCreate;
+    if (session.model_usage) {
+      for (const [model, tokens] of Object.entries(session.model_usage)) {
+        const entry = modelAgg.get(model);
+        if (entry) {
+          entry.tokens += tokens;
+          entry.sessions += 1;
+        } else {
+          modelAgg.set(model, { tokens, sessions: 1 });
+        }
+      }
+    }
+    let recentIndex = recentCandidates.length;
+    for (let i = 0; i < recentCandidates.length; i += 1) {
+      if (activity > recentCandidates[i].activity) {
+        recentIndex = i;
+        break;
+      }
+    }
+    if (recentIndex < DASHBOARD_RECENT_LIMIT) {
+      recentCandidates.splice(recentIndex, 0, { session, activity });
+      if (recentCandidates.length > DASHBOARD_RECENT_LIMIT) recentCandidates.pop();
+    }
+  }
+  const perAgent = [...agentMetrics.entries()].map(([name, metrics]) => {
+    const info = agentInfoMap?.get(name);
+    return {
+      name,
+      displayName: info?.displayName ?? name,
+      icon: info?.icon ?? "",
+      sessions: metrics.sessions,
+      messages: metrics.messages,
+      tokens: metrics.tokens
+    };
+  }).filter((item) => item.sessions > 0).sort((a, b) => b.sessions - a.sessions);
+  const dailyActivity = [...dailyMap.values()].sort((a, b) => a.date.localeCompare(b.date));
+  const dailyTokenActivity = [...dailyTokenMap.values()].sort(
+    (a, b) => a.date.localeCompare(b.date)
+  );
+  const modelDistribution = [...modelAgg.entries()].map(([model, { tokens, sessions: count }]) => ({ model, tokens, sessions: count })).sort((a, b) => b.tokens - a.tokens);
+  const recentSessions = recentCandidates.map(({ session }) => {
+    const agentKey = getSessionAgentName(session);
+    return { ...session, agentName: agentKey };
+  });
+  return {
+    totals: {
+      sessions: totalSessions,
+      messages: totalMessages,
+      tokens: totalTokens,
+      cost: totalCost,
+      cost_source: totalCost > 0 ? hasEstimatedCost ? "estimated" : "recorded" : void 0,
+      latestActivity: latestActivity || void 0
+    },
+    perAgent,
+    dailyActivity,
+    dailyTokenActivity,
+    modelDistribution,
+    recentSessions
+  };
+}
 
 export {
   registerAgent,
@@ -9102,6 +8997,8 @@ export {
   filteredSession,
   getParsedSession,
   BaseAgent,
+  FileSystemSessionSource,
+  DatabaseSessionSource,
   firstExisting,
   resolveProviderRoots,
   getCursorDataPath,
@@ -9148,6 +9045,12 @@ export {
   summarizeFileActivity,
   extractSessionFileActivity,
   parseSearchQuery,
+  syncSessionSearchIndex,
+  syncSessionSearchIndexChanges,
+  searchSessions,
+  listFileActivity,
+  listSessionFileActivity,
+  searchFileActivitySessions,
   loadCachedSessions,
   isAgentCacheInitialized,
   markAgentCacheInitialized,
@@ -9156,13 +9059,12 @@ export {
   saveCachedSessionChanges,
   clearCache,
   getCacheInfo,
-  syncSessionSearchIndex,
-  syncSessionSearchIndexChanges,
-  searchSessions,
-  listFileActivity,
-  listSessionFileActivity,
-  searchFileActivitySessions,
   listCachedProjectGroups,
+  attachMissingProjectIdentities,
+  buildAgentCacheMeta,
+  sessionSignature,
+  sortSessions,
+  computeSessionDiff,
   filterSessions,
   scanSessions,
   scanSessionsAsync,
@@ -9170,6 +9072,13 @@ export {
   listBookmarks,
   upsertBookmark,
   importBookmarks,
-  deleteBookmark
+  deleteBookmark,
+  DASHBOARD_RECENT_LIMIT,
+  getTotalTokens,
+  getSessionAgentName,
+  getSessionActivityTime,
+  toLocalDateKey,
+  startOfLocalDay,
+  buildDashboard
 };
-//# sourceMappingURL=chunk-5UOLRSFH.js.map
+//# sourceMappingURL=chunk-ZQMIB7QO.js.map