codesesh 0.16.0 → 0.17.0

package/dist/{chunk-MWSJTNOW.js → chunk-7APNDHQ6.js}

@@ -1,6 +1,149 @@
 #!/usr/bin/env node
 
-// ../core/dist/chunk-M5ISIPFR.mjs
+// ../core/dist/chunk-BOTICQC6.mjs
+function toRecord(value) {
+  return value !== null && typeof value === "object" && !Array.isArray(value) ? value : null;
+}
+function optionalString(value) {
+  return typeof value === "string" && value ? value : void 0;
+}
+function optionalTime(value) {
+  return typeof value === "number" && Number.isFinite(value) ? value : void 0;
+}
+function timeField(time_created) {
+  return time_created === void 0 ? {} : { time_created };
+}
+function firstDefined(...values) {
+  return values.find((value) => value !== void 0);
+}
+function normalizeStatus(state, output, error) {
+  const status = state.status;
+  if (status === "running" || status === "completed" || status === "error") return status;
+  if (status === "success") return "completed";
+  if (error != null) return "error";
+  if (output !== void 0) return "completed";
+  return "running";
+}
+function normalizeMetadata(state) {
+  const rawMetadata = state.metadata ?? state.meta;
+  const extras = Object.fromEntries(
+    Object.entries(state).filter(
+      ([key]) => !["status", "input", "arguments", "output", "result", "error", "metadata", "meta"].includes(
+        key
+      )
+    )
+  );
+  if (Object.keys(extras).length === 0) return rawMetadata;
+  const metadata = toRecord(rawMetadata);
+  return metadata ? { ...metadata, ...extras } : extras;
+}
+function normalizeToolState(value, legacyPart) {
+  const state = toRecord(value) ?? {};
+  const input = firstDefined(state.input, state.arguments, legacyPart.input);
+  const output = firstDefined(state.output, state.result, legacyPart.output);
+  const error = state.error;
+  const metadata = normalizeMetadata(state);
+  return {
+    status: normalizeStatus(state, output, error),
+    ...input !== void 0 ? { input } : {},
+    ...output !== void 0 ? { output } : {},
+    ...error !== void 0 ? { error } : {},
+    ...metadata !== void 0 ? { metadata } : {}
+  };
+}
+function planText(value) {
+  if (typeof value === "string") return value;
+  const record = toRecord(value);
+  if (!record) return "";
+  return planText(record.text ?? record.plan ?? record.content);
+}
+function normalizePlanPart(value, time_created) {
+  const approval_status = value.approval_status === "fail" ? "fail" : "success";
+  const text = planText(value.text ?? (approval_status === "fail" ? value.output : value.input));
+  return text ? { type: "plan", text, approval_status, ...timeField(time_created) } : null;
+}
+function normalizeImagePart(value, time_created) {
+  const data = optionalString(value.data);
+  const url = optionalString(value.url);
+  const mime_type = optionalString(value.mime_type);
+  if (data && mime_type) {
+    return {
+      type: "image",
+      data,
+      mime_type,
+      ...url ? { url } : {},
+      ...timeField(time_created)
+    };
+  }
+  if (url) {
+    return {
+      type: "image",
+      url,
+      ...data ? { data } : {},
+      ...mime_type ? { mime_type } : {},
+      ...timeField(time_created)
+    };
+  }
+  return null;
+}
+function normalizeToolPart(value, time_created) {
+  const title = optionalString(value.title);
+  const callID = optionalString(value.callID);
+  const tool = optionalString(value.tool)?.trim() || title?.replace(/^tool:\s*/i, "").trim();
+  if (!tool) return null;
+  return {
+    type: "tool",
+    tool,
+    ...title ? { title } : {},
+    ...callID ? { callID } : {},
+    state: normalizeToolState(value.state, value),
+    ...timeField(time_created)
+  };
+}
+function normalizeMessagePart(value) {
+  const part = toRecord(value);
+  if (!part) return null;
+  const time_created = optionalTime(part.time_created);
+  if (part.type === "text" || part.type === "reasoning") {
+    if (typeof part.text !== "string") return null;
+    return { type: part.type, text: part.text, ...timeField(time_created) };
+  }
+  if (part.type === "plan") return normalizePlanPart(part, time_created);
+  if (part.type === "image") return normalizeImagePart(part, time_created);
+  if (part.type === "tool") return normalizeToolPart(part, time_created);
+  return null;
+}
+function normalizeMessageParts(value) {
+  if (!Array.isArray(value)) return [];
+  return value.flatMap((part) => {
+    const normalized = normalizeMessagePart(part);
+    return normalized ? [normalized] : [];
+  });
+}
+var UNKNOWN_AGENT_NAME = "unknown";
+function normalizeSessionReference(reference) {
+  return {
+    agentName: reference.agentName.trim().toLowerCase(),
+    sessionId: reference.sessionId
+  };
+}
+function parseSessionReference(value) {
+  const separatorIndex = value.indexOf("/");
+  if (separatorIndex <= 0 || separatorIndex === value.length - 1) return null;
+  const agentName = value.slice(0, separatorIndex).trim().toLowerCase();
+  if (!agentName) return null;
+  return {
+    agentName,
+    sessionId: value.slice(separatorIndex + 1)
+  };
+}
+function formatSessionReference(reference) {
+  const normalized = normalizeSessionReference(reference);
+  return `${normalized.agentName}/${normalized.sessionId}`;
+}
+function getSessionAgentKey(session) {
+  return parseSessionReference(session.slug)?.agentName ?? UNKNOWN_AGENT_NAME;
+}
 function compareSessionActivityDesc(a, b) {
   return (b.time_updated ?? b.time_created) - (a.time_updated ?? a.time_created);
 }
@@ -12,55 +155,146 @@ function sortSessionsByActivity(sessions) {
   }
   return [...sessions];
 }
+function mergeSortedSessions(shards) {
+  const active = shards.filter((shard) => shard.length > 0);
+  if (active.length === 0) return [];
+  if (active.length === 1) return [...active[0]];
+  const total = active.reduce((sum, shard) => sum + shard.length, 0);
+  const merged = [];
+  const cursors = Array.from({ length: active.length }, () => 0);
+  for (let position = 0; position < total; position += 1) {
+    let pick = -1;
+    for (let shard = 0; shard < active.length; shard += 1) {
+      const cursor = cursors[shard];
+      if (cursor >= active[shard].length) continue;
+      if (pick === -1 || compareSessionActivityDesc(active[shard][cursor], active[pick][cursors[pick]]) < 0) {
+        pick = shard;
+      }
+    }
+    merged.push(active[pick][cursors[pick]]);
+    cursors[pick] += 1;
+  }
+  return merged;
+}
+var SAMPLE_SESSION_HEAD = {
+  id: "session-1",
+  slug: "claudecode/session-1",
+  title: "Fix flaky search index test",
+  directory: "/Users/dev/project",
+  project_identity: {
+    kind: "git_remote",
+    key: "github.com/example/project",
+    displayName: "example/project"
+  },
+  time_created: 17e11,
+  time_updated: 17000036e5,
+  stats: {
+    message_count: 12,
+    total_input_tokens: 4200,
+    total_output_tokens: 1800,
+    total_cost: 0.042,
+    cost_source: "recorded",
+    total_tokens: 6e3,
+    total_cache_read_tokens: 3e3,
+    total_cache_create_tokens: 500
+  },
+  model_usage: { "claude-5-sonnet": 6e3 },
+  smart_tags: ["bugfix"],
+  smart_tags_source_updated_at: 17000036e5
+};
+var SAMPLE_SESSIONS_UPDATED_EVENT = {
+  type: "sessions-updated",
+  changedAgents: ["claudecode"],
+  newSessions: 1,
+  updatedSessions: 0,
+  removedSessions: 0,
+  totalSessions: 43,
+  timestamp: 170000002e4,
+  changedSessionHeads: [
+    {
+      reference: { agentName: "claudecode", sessionId: SAMPLE_SESSION_HEAD.id },
+      session: SAMPLE_SESSION_HEAD
+    }
+  ],
+  removedSessionRefs: []
+};
+var SAMPLE_DASHBOARD_DATA = {
+  totals: {
+    sessions: 1,
+    messages: 12,
+    tokens: 6e3,
+    cost: 0.042,
+    cost_source: "recorded",
+    latestActivity: 17000036e5
+  },
+  perAgent: [
+    {
+      name: "claudecode",
+      displayName: "Claude Code",
+      icon: "claude",
+      sessions: 1,
+      messages: 12,
+      tokens: 6e3
+    }
+  ],
+  dailyActivity: [{ date: "2023-11-14", sessions: 1, messages: 12 }],
+  dailyTokenActivity: [
+    { date: "2023-11-14", input: 700, output: 1800, cache_read: 3e3, cache_create: 500 }
+  ],
+  modelDistribution: [{ model: "claude-5-sonnet", tokens: 6e3, sessions: 1 }],
+  recentSessions: [
+    {
+      reference: { agentName: "claudecode", sessionId: SAMPLE_SESSION_HEAD.id },
+      session: SAMPLE_SESSION_HEAD
+    }
+  ],
+  recentFileActivities: [],
+  window: { from: 16999e8, to: 17000036e5, days: 1 }
+};
 
 // ../core/dist/index.mjs
-import { existsSync as existsSync4, readdirSync, readFileSync as readFileSync2, statSync as statSync2 } from "fs";
-import { join as join3, basename as basename2, dirname } from "path";
-import { existsSync, statSync } from "fs";
+import { existsSync as existsSync4, readdirSync as readdirSync2, readFileSync as readFileSync2, statSync as statSync2 } from "fs";
+import { join as join4, basename as basename2, dirname } from "path";
+import { existsSync, readdirSync, statSync } from "fs";
+import { join } from "path";
 import { existsSync as existsSync2 } from "fs";
 import { homedir, platform } from "os";
-import { join } from "path";
+import { join as join2 } from "path";
 import { closeSync, openSync, readSync } from "fs";
 import { StringDecoder } from "string_decoder";
 import { basename } from "path";
 import { existsSync as existsSync3, mkdirSync, readFileSync, writeFileSync } from "fs";
 import { homedir as homedir2 } from "os";
-import { join as join2 } from "path";
-import { join as join5 } from "path";
+import { join as join3 } from "path";
+import { join as join6 } from "path";
 import { existsSync as existsSync5, mkdirSync as mkdirSync2 } from "fs";
-import { basename as basename3, dirname as dirname2, join as join4 } from "path";
+import { basename as basename3, dirname as dirname2, join as join5 } from "path";
 import { createRequire } from "module";
 import { createHash } from "crypto";
-import { existsSync as existsSync6, readFileSync as readFileSync3, readdirSync as readdirSync2, statSync as statSync3 } from "fs";
-import { join as join6, basename as basename4, dirname as dirname3 } from "path";
-import {
-  closeSync as closeSync2,
-  existsSync as existsSync7,
-  openSync as openSync2,
-  readFileSync as readFileSync4,
-  readSync as readSync2,
-  readdirSync as readdirSync3,
-  statSync as statSync4
-} from "fs";
-import { join as join7, basename as basename5 } from "path";
+import { existsSync as existsSync6, readFileSync as readFileSync3, readdirSync as readdirSync3, statSync as statSync3 } from "fs";
+import { join as join7, basename as basename4, dirname as dirname3 } from "path";
+import { closeSync as closeSync2, existsSync as existsSync7, openSync as openSync2, readFileSync as readFileSync4, readSync as readSync2, statSync as statSync4 } from "fs";
+import { join as join8, basename as basename5 } from "path";
 import { existsSync as existsSync8, readdirSync as readdirSync4, readFileSync as readFileSync5, statSync as statSync5 } from "fs";
-import { join as join8, normalize } from "path";
-import { existsSync as existsSync9, readFileSync as readFileSync6, readdirSync as readdirSync5, statSync as statSync6 } from "fs";
-import { basename as basename6, join as join9 } from "path";
-import { join as join10 } from "path";
+import { homedir as homedir3, platform as platform2 } from "os";
+import { join as join9, normalize } from "path";
+import { existsSync as existsSync9 } from "fs";
+import { basename as basename6, join as join10 } from "path";
+import { homedir as homedir4, platform as platform3 } from "os";
+import { join as join11 } from "path";
 import { availableParallelism } from "os";
 import { Worker } from "worker_threads";
-import { existsSync as existsSync10, readFileSync as readFileSync7 } from "fs";
+import { existsSync as existsSync10, readFileSync as readFileSync6 } from "fs";
 import { spawnSync } from "child_process";
 import * as os from "os";
 import * as path from "path";
 import { resolve, sep } from "path";
-import { existsSync as existsSync11 } from "fs";
-import { join as join11 } 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 { existsSync as existsSync11 } from "fs";
 import { join as join12 } from "path";
+import { homedir as homedir6 } from "os";
+import { homedir as homedir7, platform as platform4 } from "os";
+import { join as join13 } from "path";
 var registrations = [];
 function registerAgent(reg) {
   registrations.push(reg);
@@ -79,16 +313,20 @@ function getAgentInfoMap(sessionsByAgent) {
       displayName: agent.displayName,
       icon: registration.icon,
       iconColored: registration.iconColored,
+      resumeCommandPrefix: registration.resumeCommandPrefix,
       count: sessionsByAgent[agent.name] ?? 0
     };
   });
 }
-function getAgentByName(name) {
-  return registrations.find((registration) => registration.create().name === name);
-}
 var diagnostics = null;
 function toSafeSink(sink) {
   return {
+    info(event, detail) {
+      try {
+        sink.info?.(event, detail);
+      } catch {
+      }
+    },
     warn(event, detail) {
       try {
         sink.warn(event, detail);
@@ -120,6 +358,36 @@ function matchesScanWindow(activityTime, options) {
   if (options?.to != null && activityTime > options.to) return false;
   return true;
 }
+function readCachedMeta(meta, sessionId) {
+  if (meta instanceof Map) return meta.get(sessionId);
+  return meta[sessionId];
+}
+function fingerprintMatches(ref, cached) {
+  return typeof cached?.sourceFingerprint === "string" && cached.sourceFingerprint === ref.fingerprint;
+}
+function wasEnumeratedThisPass(cached, options) {
+  if (options?.from == null && options?.to == null) return true;
+  const mtimeMs = cached?.sourceMtimeMs;
+  return typeof mtimeMs === "number" && matchesScanWindow(mtimeMs, options);
+}
+function diffSessionSources(refs, cachedSessions, cachedMeta, options) {
+  const cachedIds = new Set(cachedSessions.map((session) => session.id));
+  const enumeratedIds = /* @__PURE__ */ new Set();
+  const changedIds = [];
+  for (const ref of refs) {
+    enumeratedIds.add(ref.sessionId);
+    const meta = readCachedMeta(cachedMeta, ref.sessionId);
+    const unchanged = cachedIds.has(ref.sessionId) && meta?.sourcePath === ref.sourcePath && fingerprintMatches(ref, meta);
+    if (!unchanged) changedIds.push(ref.sessionId);
+  }
+  const removedIds = [];
+  for (const session of cachedSessions) {
+    if (enumeratedIds.has(session.id)) continue;
+    if (!wasEnumeratedThisPass(readCachedMeta(cachedMeta, session.id), options)) continue;
+    removedIds.push(session.id);
+  }
+  return { changedIds, removedIds };
+}
 var BaseAgent = class {
   getUri(sessionId) {
     return `${this.name}://${sessionId}`;
@@ -127,6 +395,7 @@ var BaseAgent = class {
 };
 var FileSystemSessionSource = class extends BaseAgent {
   sessionMetaMap = /* @__PURE__ */ new Map();
+  sourceFileStats = /* @__PURE__ */ new Map();
   scan(options) {
     const sources = this.listSessionSources(options);
     const sessions = [];
@@ -158,27 +427,62 @@ var FileSystemSessionSource = class extends BaseAgent {
   setSessionMetaMap(meta) {
     this.sessionMetaMap = meta;
   }
+  walkFiles(roots, isSessionFile, options = {}) {
+    const files = [];
+    this.sourceFileStats.clear();
+    const walk = (directory) => {
+      let entries;
+      try {
+        entries = readdirSync(directory, { withFileTypes: true });
+      } catch {
+        return;
+      }
+      for (const entry of entries) {
+        const filePath = join(directory, entry.name);
+        if (entry.isDirectory()) {
+          if (options.recursive !== false) walk(filePath);
+          continue;
+        }
+        if (!isSessionFile(entry)) continue;
+        let stat;
+        try {
+          stat = statSync(filePath);
+        } catch {
+          continue;
+        }
+        if (!matchesScanWindow(stat.mtimeMs, options.scanWindow)) continue;
+        files.push({ file: filePath, stat });
+        this.sourceFileStats.set(filePath, stat);
+      }
+    };
+    for (const root of typeof roots === "string" ? [roots] : roots) walk(root);
+    return files;
+  }
+  sessionSourceFile(sourcePath) {
+    return {
+      file: sourcePath,
+      stat: this.sourceFileStats.get(sourcePath) ?? statSync(sourcePath)
+    };
+  }
+  readFileMtimeMs(filePath) {
+    if (!filePath) return null;
+    try {
+      return statSync(filePath).mtimeMs;
+    } catch {
+      return null;
+    }
+  }
   /**
-   * 变更检测：枚举当前源 → 与缓存 metaMap 的指纹/路径比对。
+   * 变更检测：枚举当前源 → 交给 diffSessionSources 比对。
    * 新增、变更、删除三类统一产出 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];
+    const diff = diffSessionSources(currentRefs, cachedSessions, this.sessionMetaMap);
+    const changedIds = [.../* @__PURE__ */ new Set([...diff.changedIds, ...diff.removedIds])];
     return {
-      hasChanges: changedIdList.length > 0,
-      changedIds: changedIdList,
+      hasChanges: changedIds.length > 0,
+      changedIds,
       timestamp: Date.now(),
       refs: currentRefs
     };
@@ -212,6 +516,37 @@ var FileSystemSessionSource = class extends BaseAgent {
     return [...sessionMap.values()];
   }
 };
+var SingleFileSessionSource = class extends FileSystemSessionSource {
+  scanSessionSource(sourcePath, options) {
+    const head = this.parseFileSessionHead(sourcePath, options);
+    if (head) {
+      this.sessionMetaMap.set(
+        head.id,
+        this.createFileSessionMeta(head, this.sessionSourceFile(sourcePath))
+      );
+    }
+    return head;
+  }
+  buildFileSessionMeta({
+    head,
+    source,
+    fingerprint,
+    extras
+  }) {
+    return {
+      ...extras,
+      id: head.id,
+      title: head.title,
+      sourcePath: source.file,
+      sourceFingerprint: fingerprint,
+      sourceMtimeMs: source.stat.mtimeMs,
+      directory: head.directory,
+      messageCount: head.stats.message_count,
+      createdAt: head.time_created,
+      updatedAt: head.time_updated ?? head.time_created
+    };
+  }
+};
 var DatabaseSessionSource = class extends BaseAgent {
   sessionMetaMap = /* @__PURE__ */ new Map();
   /** 记录单个会话的缓存 meta（sourcePath = dbPath）。 */
@@ -227,10 +562,9 @@ var DatabaseSessionSource = class extends BaseAgent {
     this.sessionMetaMap = meta;
   }
   /**
-   * 变更检测：数据库内部变更难以按行定位，简单起见按库文件 mtime 判定。
-   * 库有变更则标记全部缓存会话刷新。
+   * 变更检测：数据库内部变更难以按行定位，按库文件 mtime 判定。
    */
-  checkForChanges(sinceTimestamp, cachedSessions) {
+  checkForChanges(sinceTimestamp, _cachedSessions) {
     const dbPath = this.getDatabasePath();
     if (!dbPath || !existsSync(dbPath)) {
       return { hasChanges: false, timestamp: Date.now() };
@@ -239,7 +573,6 @@ var DatabaseSessionSource = class extends BaseAgent {
       const hasChanges = statSync(dbPath).mtimeMs > sinceTimestamp;
       return {
         hasChanges,
-        changedIds: hasChanges ? cachedSessions.map((session) => session.id) : [],
         timestamp: Date.now()
       };
     } catch {
@@ -251,7 +584,7 @@ var DatabaseSessionSource = class extends BaseAgent {
     return this.scan();
   }
 };
-function envPath(name) {
+function readEnvPath(name) {
   const value = process.env[name];
   if (!value) return null;
   return value;
@@ -262,49 +595,17 @@ function firstExisting(...paths) {
   }
   return null;
 }
-function getDataHome() {
-  const xdg = envPath("XDG_DATA_HOME");
+function resolveDataHome() {
+  const xdg = readEnvPath("XDG_DATA_HOME");
   if (xdg) return xdg;
   const p = platform();
   if (p === "win32") {
-    return envPath("LOCALAPPDATA") ?? envPath("APPDATA") ?? join(homedir(), "AppData", "Local");
-  }
-  return join(homedir(), ".local", "share");
-}
-function resolveProviderRoots() {
-  const home = homedir();
-  return {
-    codexRoot: envPath("CODEX_HOME") ?? join(home, ".codex"),
-    claudeRoot: envPath("CLAUDE_CONFIG_DIR") ?? join(home, ".claude"),
-    kimiRoot: envPath("KIMI_SHARE_DIR") ?? join(home, ".kimi"),
-    opencodeRoot: join(getDataHome(), "opencode"),
-    piRoot: envPath("PI_HOME") ?? join(home, ".pi"),
-    zcodeRoot: getZCodeDataPath()
-  };
-}
-function getCursorDataPath() {
-  const override = envPath("CURSOR_DATA_PATH");
-  if (override) return override;
-  const p = platform();
-  if (p === "darwin") {
-    return firstExisting(join(homedir(), "Library", "Application Support", "Cursor", "User"));
-  }
-  if (p === "linux") {
-    const xdg = envPath("XDG_CONFIG_HOME") ?? join(homedir(), ".config");
-    return firstExisting(join(xdg, "Cursor", "User"));
-  }
-  if (p === "win32") {
-    const appData = envPath("APPDATA") ?? join(homedir(), "AppData", "Roaming");
-    return firstExisting(join(appData, "Cursor", "User"));
+    return readEnvPath("LOCALAPPDATA") ?? readEnvPath("APPDATA") ?? join2(homedir(), "AppData", "Local");
   }
-  return null;
+  return join2(homedir(), ".local", "share");
 }
-function getZCodeDataPath() {
-  const p = platform();
-  if (p === "darwin" || p === "win32") {
-    return join(homedir(), ".zcode");
-  }
-  return null;
+function resolveHomePath(environmentVariable, fallbackDirectory) {
+  return readEnvPath(environmentVariable) ?? join2(homedir(), fallbackDirectory);
 }
 var READ_CHUNK_BYTES = 1 << 20;
 function* parseJsonlLines(content) {
@@ -329,18 +630,26 @@ function* readJsonlFileLines(filePath, chunkBytes = READ_CHUNK_BYTES) {
   try {
     const buffer = Buffer.alloc(chunkBytes);
     const decoder = new StringDecoder("utf8");
-    let remainder = "";
+    let pending = [];
     let bytesRead = readSync(fd, buffer, 0, chunkBytes, -1);
     while (bytesRead > 0) {
-      const lines = (remainder + decoder.write(buffer.subarray(0, bytesRead))).split("\n");
-      remainder = lines.pop();
-      for (const line of lines) {
-        const trimmed = line.trim();
-        if (trimmed) yield trimmed;
+      const decoded = decoder.write(buffer.subarray(0, bytesRead));
+      const lastBreak = decoded.lastIndexOf("\n");
+      if (lastBreak === -1) {
+        if (decoded) pending.push(decoded);
+      } else {
+        pending.push(decoded.slice(0, lastBreak));
+        const complete = pending.join("");
+        pending = [decoded.slice(lastBreak + 1)];
+        for (const line of complete.split("\n")) {
+          const trimmed = line.trim();
+          if (trimmed) yield trimmed;
+        }
       }
       bytesRead = readSync(fd, buffer, 0, chunkBytes, -1);
     }
-    const tail = (remainder + decoder.end()).trim();
+    pending.push(decoder.end());
+    const tail = pending.join("").trim();
     if (tail) yield tail;
   } finally {
     closeSync(fd);
@@ -412,11 +721,6 @@ function cleanDisplayText(text) {
   cleaned = cleaned.replace(/[ \t]+(?=\r?\n|$)/g, "").replace(/(?:\r?\n)+$/g, "");
   return cleaned.trim() ? cleaned : null;
 }
-function firstVisibleLine(text) {
-  const cleaned = cleanDisplayText(text);
-  if (!cleaned) return null;
-  return cleaned.split("\n").find((line) => line.trim())?.trim() ?? null;
-}
 var TITLE_MAX_LENGTH = 100;
 var UNTITLED_SESSION = "Untitled Session";
 function normalizeTitleText(text) {
@@ -459,28 +763,25 @@ function cleanUnknown(value) {
   return cleaned;
 }
 function cleanMessagePart(part) {
-  const next = { ...part };
-  if (typeof next.text === "string") {
-    next.text = cleanInternalText(next.text);
-    if (!next.text && (next.type === "text" || next.type === "reasoning" || next.type === "plan")) {
-      return null;
-    }
-  }
-  if (typeof next.title === "string") {
-    const title = cleanInternalText(next.title);
-    if (title) next.title = title;
-    else delete next.title;
-  }
-  if (next.input !== void 0) {
-    next.input = cleanUnknown(next.input);
-  }
-  if (next.output !== void 0) {
-    next.output = cleanUnknown(next.output);
-  }
-  if (next.state !== void 0) {
-    next.state = cleanUnknown(next.state);
-  }
-  return next;
+  if (part.type === "text" || part.type === "reasoning" || part.type === "plan") {
+    const text = cleanInternalText(part.text);
+    return text ? { ...part, text } : null;
+  }
+  if (part.type !== "tool") return part;
+  const title = part.title ? cleanInternalText(part.title) : "";
+  const state = {
+    ...part.state,
+    ...part.state.input !== void 0 ? { input: cleanUnknown(part.state.input) } : {},
+    ...part.state.output !== void 0 ? { output: cleanUnknown(part.state.output) } : {},
+    ...part.state.error !== void 0 ? { error: cleanUnknown(part.state.error) } : {},
+    ...part.state.metadata !== void 0 ? { metadata: cleanUnknown(part.state.metadata) } : {}
+  };
+  const { title: _title, ...withoutTitle } = part;
+  return {
+    ...withoutTitle,
+    ...title ? { title } : {},
+    state
+  };
 }
 function cleanMessageParts(parts) {
   return parts.flatMap((part) => {
@@ -503,7 +804,7 @@ function firstUserMessageTitle(messages) {
   for (const message of messages) {
     if (message.role !== "user") continue;
     for (const part of message.parts) {
-      if (part.type !== "text" || typeof part.text !== "string") continue;
+      if (part.type !== "text") continue;
       const title = normalizeTitleText(cleanInternalText(part.text));
       if (title) return title;
     }
@@ -587,10 +888,10 @@ function costNumber(value, fallback) {
   return typeof value === "number" && Number.isFinite(value) ? value : fallback;
 }
 function getCacheDir() {
-  return join2(homedir2(), ".cache", "codesesh");
+  return join3(homedir2(), ".cache", "codesesh");
 }
 function getCachePath() {
-  return join2(getCacheDir(), "litellm-pricing.json");
+  return join3(getCacheDir(), "litellm-pricing.json");
 }
 function loadSnapshot() {
   const map = /* @__PURE__ */ new Map();
@@ -794,42 +1095,6 @@ function estimateCostForTokens(model, usage) {
   const cost = input * pricing.inputCostPerToken + output * pricing.outputCostPerToken + reasoning * pricing.reasoningCostPerToken + cacheRead * pricing.cacheReadCostPerToken + cacheCreate * pricing.cacheCreateCostPerToken + webSearchRequests * pricing.webSearchCostPerRequest;
   return cost > 0 ? { cost: Number(cost.toFixed(8)), source: "estimated" } : null;
 }
-function applyMessageCost(message) {
-  if ((message.cost ?? 0) > 0) {
-    message.cost_source = "recorded";
-    return;
-  }
-  const estimate = estimateCostForTokens(message.model, message.tokens);
-  if (!estimate) return;
-  message.cost = estimate.cost;
-  message.cost_source = estimate.source;
-}
-function applyMessageCosts(messages) {
-  let totalCost = 0;
-  let source;
-  for (const message of messages) {
-    applyMessageCost(message);
-    const cost = message.cost ?? 0;
-    if (cost <= 0) continue;
-    totalCost += cost;
-    if (message.cost_source === "estimated") source = "estimated";
-    else if (!source) source = "recorded";
-  }
-  return { totalCost: Number(totalCost.toFixed(8)), source };
-}
-function withEstimatedSessionCost(stats, model) {
-  if (stats.total_cost > 0) {
-    return { ...stats, cost_source: stats.cost_source ?? "recorded" };
-  }
-  const estimate = estimateCostForTokens(model, {
-    input: stats.total_input_tokens,
-    output: stats.total_output_tokens,
-    cache_read: stats.total_cache_read_tokens,
-    cache_create: stats.total_cache_create_tokens
-  });
-  if (!estimate) return stats;
-  return { ...stats, total_cost: estimate.cost, cost_source: estimate.source };
-}
 function estimateTokenCost(model, tokens) {
   return estimateCostForTokens(model, tokens)?.cost ?? null;
 }
@@ -943,9 +1208,12 @@ var TranscriptBuilder = class {
   }
   resolveToolCall(callId, resolution) {
     return this.updateToolCall(callId, (part) => {
-      const state = part.state ?? (part.state = {});
+      const state = part.state;
       if (resolution.output !== void 0) state.output = resolution.output;
       if (resolution.status !== void 0) state.status = resolution.status;
+      else if (resolution.output !== void 0 && state.status === "running") {
+        state.status = "completed";
+      }
       if (resolution.metadata !== void 0) state.metadata = resolution.metadata;
       if (resolution.consume) this.pendingToolCalls.delete(callId);
     });
@@ -1004,7 +1272,9 @@ var TranscriptBuilder = class {
   }
   appendPartIfNew(message, part) {
     const tail = message.parts.at(-1);
-    if (tail?.type === part.type && tail.text === part.text) return;
+    if ("text" in part && tail?.type === part.type && "text" in tail && tail.text === part.text) {
+      return;
+    }
     message.parts.push(part);
   }
   applyMissingMetadata(message, input) {
@@ -1044,6 +1314,9 @@ var TranscriptBuilder = class {
   }
 };
 var HEAD_INDEX_VERSION = "claudecode-head-v2";
+function resolveClaudeCodeDataRoot() {
+  return resolveHomePath("CLAUDE_CONFIG_DIR", ".claude");
+}
 function parseTimestampMs(data) {
   const raw = data["timestamp"];
   const value = asString(raw);
@@ -1089,7 +1362,7 @@ function extractClaudeUsage(data, msg) {
     cacheCreate: readUsageNumber(usage, "cache_creation_input_tokens")
   };
 }
-var ClaudeCodeAgent = class extends FileSystemSessionSource {
+var ClaudeCodeAgent = class extends SingleFileSessionSource {
   name = "claudecode";
   displayName = "Claude Code";
   basePath = null;
@@ -1097,16 +1370,22 @@ var ClaudeCodeAgent = class extends FileSystemSessionSource {
   sessionsIndexCache = {};
   sessionsIndexMtime = {};
   findBasePath() {
-    const roots = resolveProviderRoots();
-    return firstExisting(join3(roots.claudeRoot, "projects"), "data/claudecode");
+    return firstExisting(join4(resolveClaudeCodeDataRoot(), "projects"), "data/claudecode");
+  }
+  getSessionWatchPlan() {
+    const dataRoot = resolveClaudeCodeDataRoot();
+    return {
+      status: "supported",
+      targets: [{ root: dataRoot, path: join4(dataRoot, "projects") }, { path: "data/claudecode" }]
+    };
   }
   isAvailable() {
     this.basePath = this.findBasePath();
     if (!this.basePath) return false;
     try {
-      for (const entry of readdirSync(this.basePath)) {
-        const dir = join3(this.basePath, entry);
-        if (existsSync4(dir) && readdirSync(dir).some((f) => f.endsWith(".jsonl"))) {
+      for (const entry of readdirSync2(this.basePath)) {
+        const dir = join4(this.basePath, entry);
+        if (existsSync4(dir) && readdirSync2(dir).some((f) => f.endsWith(".jsonl"))) {
           return true;
         }
       }
@@ -1116,34 +1395,24 @@ var ClaudeCodeAgent = class extends FileSystemSessionSource {
   }
   listSessionSources(options) {
     if (!this.basePath) return [];
-    const refs = [];
-    for (const projectDir of this.listProjectDirs()) {
+    const projectDirs = this.listProjectDirs();
+    const indexMtimes = /* @__PURE__ */ new Map();
+    for (const projectDir of projectDirs) {
       const indexPath = this.getSessionsIndexPath(projectDir);
-      for (const file of this.listJsonlFiles(projectDir)) {
-        let stat;
-        try {
-          stat = statSync2(file);
-        } catch {
-          continue;
-        }
-        if (!matchesScanWindow(stat.mtimeMs, options)) continue;
-        const sessionId = basename2(file, ".jsonl");
-        refs.push({
-          sessionId,
-          sourcePath: file,
-          fingerprint: this.sourceFingerprint(stat, indexPath)
-        });
-      }
+      indexMtimes.set(projectDir, this.readFileMtimeMs(indexPath));
     }
-    return refs;
+    return this.walkFiles(projectDirs, (entry) => entry.name.endsWith(".jsonl"), {
+      recursive: false,
+      scanWindow: options
+    }).map(({ file, stat }) => ({
+      sessionId: basename2(file, ".jsonl"),
+      sourcePath: file,
+      fingerprint: this.sourceFingerprint(stat, indexMtimes.get(dirname(file)) ?? null)
+    }));
   }
-  scanSessionSource(sourcePath) {
+  parseFileSessionHead(sourcePath) {
     const projectDir = dirname(sourcePath);
-    const head = getParsedSession(this.parseSessionHeadResult(sourcePath, projectDir));
-    if (head) {
-      this.sessionMetaMap.set(head.id, this.buildSessionMeta(head, sourcePath, projectDir));
-    }
-    return head;
+    return getParsedSession(this.parseSessionHeadResult(sourcePath, projectDir));
   }
   getSessionData(sessionId) {
     const meta = this.sessionMetaMap.get(sessionId);
@@ -1153,11 +1422,10 @@ var ClaudeCodeAgent = class extends FileSystemSessionSource {
     if (!existsSync4(meta.sourcePath)) {
       throw new Error(`Session file missing: ${meta.sourcePath}`);
     }
-    const content = readFileSync2(meta.sourcePath, "utf-8");
     const builder = new TranscriptBuilder();
     const assistantUuidToToolCalls = /* @__PURE__ */ new Map();
     const countedUsageKeys = /* @__PURE__ */ new Set();
-    for (const record of parseJsonlLines(content)) {
+    for (const record of readJsonlFile(meta.sourcePath)) {
       try {
         this.convertRecord(record, builder, assistantUuidToToolCalls, countedUsageKeys);
       } catch {
@@ -1165,6 +1433,7 @@ var ClaudeCodeAgent = class extends FileSystemSessionSource {
     }
     const transcript = builder.finish();
     return {
+      reference: { agentName: this.name, sessionId: meta.id },
       id: meta.id,
       title: meta.title,
       slug: `claudecode/${meta.id}`,
@@ -1180,60 +1449,38 @@ var ClaudeCodeAgent = class extends FileSystemSessionSource {
   listProjectDirs() {
     if (!this.basePath) return [];
     try {
-      return readdirSync(this.basePath).map((e) => join3(this.basePath, e)).filter((p) => existsSync4(p));
-    } catch {
-      return [];
-    }
-  }
-  listJsonlFiles(dir) {
-    try {
-      return readdirSync(dir).filter((f) => f.endsWith(".jsonl") && f !== "sessions-index.json").map((f) => join3(dir, f));
+      return readdirSync2(this.basePath).map((e) => join4(this.basePath, e)).filter((p) => existsSync4(p));
     } catch {
       return [];
     }
   }
-  buildSessionMeta(head, file, projectDir) {
+  createFileSessionMeta(head, source) {
+    const projectDir = dirname(source.file);
     const indexPath = this.getSessionsIndexPath(projectDir);
-    const stat = statSync2(file);
-    return {
-      id: head.id,
-      title: head.title,
-      sourcePath: file,
-      sourceFingerprint: this.sourceFingerprint(stat, indexPath),
-      sourceMtimeMs: stat.mtimeMs,
-      indexPath: existsSync4(indexPath) ? indexPath : null,
-      indexMtimeMs: this.getFileMtimeMs(indexPath),
-      headIndexVersion: HEAD_INDEX_VERSION,
-      directory: head.directory,
-      model: head.stats.total_tokens ? "unknown" : void 0,
-      messageCount: head.stats.message_count,
-      createdAt: head.time_created,
-      updatedAt: head.time_updated ?? head.time_created
-    };
+    const indexMtime = this.readFileMtimeMs(indexPath);
+    return this.buildFileSessionMeta({
+      head,
+      source,
+      fingerprint: this.sourceFingerprint(source.stat, indexMtime),
+      extras: {
+        indexPath: indexMtime === null ? null : indexPath,
+        indexMtimeMs: indexMtime,
+        headIndexVersion: HEAD_INDEX_VERSION,
+        model: head.stats.total_tokens ? "unknown" : void 0
+      }
+    });
   }
   /** Fingerprint depends on an already-fetched stat to avoid re-statting the same file. */
-  sourceFingerprint(stat, indexPath) {
-    return JSON.stringify([
-      HEAD_INDEX_VERSION,
-      stat.mtimeMs,
-      stat.size,
-      this.getFileMtimeMs(indexPath)
-    ]);
+  sourceFingerprint(stat, indexMtime) {
+    return JSON.stringify([HEAD_INDEX_VERSION, stat.mtimeMs, stat.size, indexMtime]);
   }
   getSessionsIndexPath(projectDir) {
-    return join3(projectDir, "sessions-index.json");
-  }
-  getFileMtimeMs(filePath) {
-    try {
-      return statSync2(filePath).mtimeMs;
-    } catch {
-      return null;
-    }
+    return join4(projectDir, "sessions-index.json");
   }
   loadSessionsIndex(projectDir) {
     const cacheKey = basename2(projectDir);
     const indexPath = this.getSessionsIndexPath(projectDir);
-    const mtime = this.getFileMtimeMs(indexPath);
+    const mtime = this.readFileMtimeMs(indexPath);
     if (cacheKey in this.sessionsIndexCache && this.sessionsIndexMtime[cacheKey] === mtime) {
       return this.sessionsIndexCache[cacheKey];
     }
@@ -1255,25 +1502,14 @@ var ClaudeCodeAgent = class extends FileSystemSessionSource {
     this.sessionsIndexMtime[cacheKey] = mtime;
     return map;
   }
-  parseSessionHead(filePath, projectDir) {
-    return getParsedSession(this.parseSessionHeadResult(filePath, projectDir));
-  }
   parseSessionHeadResult(filePath, projectDir) {
-    const content = readFileSync2(filePath, "utf-8");
-    const lines = content.split("\n").filter((l) => l.trim());
-    if (lines.length === 0) return skippedSession("empty file");
     const sessionId = basename2(filePath, ".jsonl");
-    let firstRecord;
-    try {
-      firstRecord = JSON.parse(lines[0]);
-    } catch {
-      return skippedSession("malformed first record");
-    }
-    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;
-    let updatedAt = createdAt;
+    let createdAt = 0;
+    let updatedAt = 0;
+    let lineIndex = 0;
     let messageCount = 0;
     let model = null;
     let cwd = null;
@@ -1285,9 +1521,22 @@ var ClaudeCodeAgent = class extends FileSystemSessionSource {
     const modelUsageMap = {};
     const countedUsageKeys = /* @__PURE__ */ new Set();
     let messageTitle = null;
-    for (const [lineIndex, line] of lines.entries()) {
+    for (const line of readJsonlFileLines(filePath)) {
+      let data;
+      try {
+        data = JSON.parse(line);
+      } catch {
+        if (lineIndex === 0) return skippedSession("malformed first record");
+        lineIndex += 1;
+        continue;
+      }
+      if (lineIndex === 0) {
+        createdAt = parseTimestampMs(data) || statSync2(filePath).mtimeMs;
+        updatedAt = createdAt;
+      }
+      const recordIndex = lineIndex;
+      lineIndex += 1;
       try {
-        const data = JSON.parse(line);
         if (isInternalEventType(data["type"])) continue;
         const ts = parseTimestampMs(data);
         if (ts > updatedAt) updatedAt = ts;
@@ -1310,7 +1559,7 @@ var ClaudeCodeAgent = class extends FileSystemSessionSource {
             const m = asString(msg["model"]);
             if (m?.trim()) model = m.trim();
           }
-          if (messageTitle === null && lineIndex < 20 && role === "user") {
+          if (messageTitle === null && recordIndex < 20 && role === "user") {
             const candidate = this.extractUserMessageTitle(msg["content"]);
             if (candidate) messageTitle = candidate;
           }
@@ -1345,6 +1594,7 @@ var ClaudeCodeAgent = class extends FileSystemSessionSource {
       } catch {
       }
     }
+    if (lineIndex === 0) return skippedSession("empty file");
     const directory = cwd ?? projectDir;
     const directoryTitle = basenameTitle(directory) || basenameTitle(projectDir);
     const title = resolveSessionTitle(explicitTitle, messageTitle, directoryTitle);
@@ -1523,6 +1773,7 @@ var ClaudeCodeAgent = class extends FileSystemSessionSource {
       callID: String(part["id"] ?? ""),
       title: `Tool: ${toolName}`,
       state: {
+        status: "running",
         input: part["input"] ?? {},
         output: null
       },
@@ -1609,15 +1860,16 @@ var ClaudeCodeAgent = class extends FileSystemSessionSource {
   backfillToolOutput(builder, callId, outputParts, stateUpdates) {
     if (!callId) return false;
     return builder.updateToolCall(callId, (part) => {
-      const state = part.state ?? (part.state = {});
+      const state = part.state;
       if (outputParts.length > 0) {
         const existing = state.output;
         if (Array.isArray(existing)) existing.push(...outputParts);
         else if (existing == null) state.output = [...outputParts];
         else state.output = [existing, ...outputParts];
       }
-      if (stateUpdates) Object.assign(state, stateUpdates);
-      if (outputParts.length > 0 && !state.status) state.status = "completed";
+      if (stateUpdates?.status) state.status = stateUpdates.status;
+      if (stateUpdates?.metadata !== void 0) state.metadata = stateUpdates.metadata;
+      if (outputParts.length > 0 && state.status === "running") state.status = "completed";
     });
   }
   resolveToolCallId(data, item, assistantUuidToToolCalls) {
@@ -1635,11 +1887,11 @@ var ClaudeCodeAgent = class extends FileSystemSessionSource {
     const updates = {};
     const success = result["success"];
     if (typeof success === "boolean") {
-      updates["status"] = success ? "success" : "error";
+      updates.status = success ? "completed" : "error";
     }
     const commandName = result["commandName"];
     if (commandName) {
-      updates["meta"] = { commandName };
+      updates.metadata = { commandName };
     }
     return updates;
   }
@@ -1715,9 +1967,9 @@ function backupDatabase(db, dbPath, label) {
     return null;
   }
   const timestamp = new Date(Date.now()).toISOString().replaceAll(":", "").replaceAll(".", "-");
-  let backupPath = join4(dirname2(dbPath), `${basename3(dbPath)}.${timestamp}.${label}.bak`);
+  let backupPath = join5(dirname2(dbPath), `${basename3(dbPath)}.${timestamp}.${label}.bak`);
   for (let counter = 1; existsSync5(backupPath); counter += 1) {
-    backupPath = join4(dirname2(dbPath), `${basename3(dbPath)}.${timestamp}.${label}.${counter}.bak`);
+    backupPath = join5(dirname2(dbPath), `${basename3(dbPath)}.${timestamp}.${label}.${counter}.bak`);
   }
   db.exec(`VACUUM INTO ${quoteSqlString(backupPath)}`);
   return backupPath;
@@ -1738,23 +1990,53 @@ function runSchemaMigrations(db, options) {
     if (migration.version > options.targetVersion) {
       break;
     }
-    if (migration.destructive) {
-      const backupPath = backupDatabaseIfPopulated(
-        db,
-        options.dbPath,
-        options.backupLabel,
-        options.backupTables
-      );
-      if (backupPath) {
-        backups.push(backupPath);
+    const fromVersion = currentVersion;
+    const startedAt = performance.now();
+    getCoreDiagnostics()?.info?.("sqlite.migration.started", {
+      label: options.backupLabel,
+      from_version: fromVersion,
+      to_version: migration.version,
+      destructive: migration.destructive ?? false
+    });
+    try {
+      let backupCreated = false;
+      if (migration.destructive) {
+        const backupPath = backupDatabaseIfPopulated(
+          db,
+          options.dbPath,
+          options.backupLabel,
+          options.backupTables
+        );
+        if (backupPath) {
+          backups.push(backupPath);
+          backupCreated = true;
+        }
       }
+      const apply = db.transaction(() => {
+        migration.migrate(db);
+        setUserVersion(db, migration.version);
+      });
+      apply();
+      currentVersion = migration.version;
+      getCoreDiagnostics()?.info?.("sqlite.migration.completed", {
+        label: options.backupLabel,
+        from_version: fromVersion,
+        to_version: migration.version,
+        destructive: migration.destructive ?? false,
+        backup_created: backupCreated,
+        duration_ms: Math.round(performance.now() - startedAt)
+      });
+    } catch (error) {
+      getCoreDiagnostics()?.warn("sqlite.migration.failed", {
+        label: options.backupLabel,
+        from_version: fromVersion,
+        to_version: migration.version,
+        destructive: migration.destructive ?? false,
+        duration_ms: Math.round(performance.now() - startedAt),
+        message: error instanceof Error ? error.message : String(error)
+      });
+      throw error;
     }
-    const apply = db.transaction(() => {
-      migration.migrate(db);
-      setUserVersion(db, migration.version);
-    });
-    apply();
-    currentVersion = migration.version;
   }
   if (currentVersion < options.targetVersion) {
     setUserVersion(db, options.targetVersion);
@@ -1843,6 +2125,9 @@ var OpenCodeSqliteAgent = class extends DatabaseSessionSource {
     }
     return this.dbPath;
   }
+  getSessionWatchPlan() {
+    return this.config.getSessionWatchPlan();
+  }
   findDbPath() {
     return this.config.findDbPath();
   }
@@ -1960,26 +2245,10 @@ var OpenCodeSqliteAgent = class extends DatabaseSessionSource {
     const partData = parseJsonRecord(partRow.data, this.name, "part.data");
     const partType = String(partData.type ?? "");
     if (isInternalEventType(partType)) return null;
-    if (partType === "text" || partType === "reasoning") {
-      const text = cleanInternalText(String(partData.text ?? ""));
-      if (!text) return null;
-      return {
-        type: partType,
-        text,
-        time_created: Number(partRow.time_created ?? 0)
-      };
-    }
-    if (partType === "tool") {
-      return {
-        type: "tool",
-        tool: String(partData.tool ?? ""),
-        callID: String(partData.callID ?? ""),
-        title: cleanInternalText(String(partData.title ?? "")),
-        state: asRecord(partData.state) ?? {},
-        time_created: Number(partRow.time_created ?? 0)
-      };
-    }
-    return null;
+    const [part] = normalizeMessageParts([
+      { ...partData, time_created: Number(partRow.time_created ?? 0) }
+    ]);
+    return part ? cleanMessagePart(part) : null;
   }
   readMessageParts(db, messageId) {
     const partRows = db.prepare("SELECT data, time_created FROM part WHERE message_id = ? ORDER BY time_created ASC").all(messageId);
@@ -2120,6 +2389,7 @@ var OpenCodeSqliteAgent = class extends DatabaseSessionSource {
         if (message.cost_source === "estimated") hasEstimatedCost = true;
       }
       return {
+        reference: { agentName: this.name, sessionId: id },
         id,
         title,
         slug,
@@ -2142,17 +2412,30 @@ var OpenCodeSqliteAgent = class extends DatabaseSessionSource {
     }
   }
 };
+function resolveOpenCodeDataRoot() {
+  return join6(resolveDataHome(), "opencode");
+}
 function findOpenCodeDbPath() {
   if (!isSqliteAvailable()) return null;
-  const roots = resolveProviderRoots();
-  return firstExisting(join5(roots.opencodeRoot, "opencode.db"), "data/opencode/opencode.db");
+  return firstExisting(join6(resolveOpenCodeDataRoot(), "opencode.db"), "data/opencode/opencode.db");
+}
+function getOpenCodeSessionWatchPlan() {
+  const dataRoot = resolveOpenCodeDataRoot();
+  return {
+    status: "supported",
+    targets: [
+      { root: dataRoot, path: join6(dataRoot, "opencode.db") },
+      { root: "data/opencode", path: "data/opencode/opencode.db" }
+    ]
+  };
 }
 var OpenCodeAgent = class extends OpenCodeSqliteAgent {
   constructor() {
     super({
       name: "opencode",
       displayName: "OpenCode",
-      findDbPath: findOpenCodeDbPath
+      findDbPath: findOpenCodeDbPath,
+      getSessionWatchPlan: getOpenCodeSessionWatchPlan
     });
   }
 };
@@ -2165,6 +2448,9 @@ var KIMI_TOOL_TITLE_MAP = {
   Shell: "bash"
 };
 var KIMI_IGNORED_TOOLS = /* @__PURE__ */ new Set(["SetTodoList"]);
+function resolveKimiDataRoot() {
+  return resolveHomePath("KIMI_SHARE_DIR", ".kimi");
+}
 function mapToolTitle(toolName) {
   return KIMI_TOOL_TITLE_MAP[toolName] ?? toolName;
 }
@@ -2236,16 +2522,14 @@ function kimiContentText(content) {
 }
 function extractFirstUserTitle(contextFile, wireFile) {
   if (contextFile && existsSync6(contextFile)) {
-    const content = readFileSync3(contextFile, "utf-8");
-    for (const record of parseJsonlLines(content)) {
+    for (const record of readJsonlFile(contextFile)) {
       if (record.role !== "user") continue;
       const title = normalizeTitleText(kimiContentText(record.content));
       if (title) return title;
     }
   }
   if (wireFile && existsSync6(wireFile)) {
-    const content = readFileSync3(wireFile, "utf-8");
-    for (const record of parseJsonlLines(content)) {
+    for (const record of readJsonlFile(wireFile)) {
       const message = asRecord(record.message) ?? {};
       if (message.type !== "TurnBegin") continue;
       const payload = asRecord(message.payload) ?? {};
@@ -2264,14 +2548,20 @@ var KimiAgent = class extends FileSystemSessionSource {
   projectMap = /* @__PURE__ */ new Map();
   defaultModel = null;
   findBasePath() {
-    const roots = resolveProviderRoots();
-    return firstExisting(join6(roots.kimiRoot, "sessions"), "data/kimi");
+    return firstExisting(join7(resolveKimiDataRoot(), "sessions"), "data/kimi");
+  }
+  getSessionWatchPlan() {
+    const dataRoot = resolveKimiDataRoot();
+    return {
+      status: "supported",
+      targets: [{ root: dataRoot, path: join7(dataRoot, "sessions") }, { path: "data/kimi" }]
+    };
   }
   /** Parse kimi.json and build md5(project_path) → cwd mapping */
   loadKimiConfig() {
-    const roots = resolveProviderRoots();
-    const configPath = join6(roots.kimiRoot, "kimi.json");
-    const tomlPath = join6(roots.kimiRoot, "config.toml");
+    const dataRoot = resolveKimiDataRoot();
+    const configPath = join7(dataRoot, "kimi.json");
+    const tomlPath = join7(dataRoot, "config.toml");
     if (existsSync6(tomlPath)) {
       const configText = readFileSync3(tomlPath, "utf-8");
       this.defaultModel = configText.match(/^default_model\s*=\s*"([^"]+)"/m)?.[1] ?? null;
@@ -2305,14 +2595,14 @@ var KimiAgent = class extends FileSystemSessionSource {
     if (!this.basePath) return [];
     const dirs = [];
     try {
-      for (const hashEntry of readdirSync2(this.basePath, { withFileTypes: true })) {
+      for (const hashEntry of readdirSync3(this.basePath, { withFileTypes: true })) {
         if (!hashEntry.isDirectory()) continue;
-        const hashPath = join6(this.basePath, hashEntry.name);
+        const hashPath = join7(this.basePath, hashEntry.name);
         try {
-          for (const sessionEntry of readdirSync2(hashPath, { withFileTypes: true })) {
+          for (const sessionEntry of readdirSync3(hashPath, { withFileTypes: true })) {
             if (!sessionEntry.isDirectory()) continue;
-            const sessionPath = join6(hashPath, sessionEntry.name);
-            if (existsSync6(join6(sessionPath, "metadata.json")) || existsSync6(join6(sessionPath, "state.json"))) {
+            const sessionPath = join7(hashPath, sessionEntry.name);
+            if (existsSync6(join7(sessionPath, "metadata.json")) || existsSync6(join7(sessionPath, "state.json"))) {
               dirs.push(sessionPath);
             }
           }
@@ -2323,64 +2613,73 @@ var KimiAgent = class extends FileSystemSessionSource {
     }
     return dirs;
   }
-  /** Parse session directory, preferring state.json over metadata.json */
-  parseSessionDir(sessionDir) {
-    return getParsedSession(this.parseSessionDirResult(sessionDir));
-  }
-  parseSessionDirResult(sessionDir) {
+  /**
+   * 解析会话源，优先 state.json 而非 metadata.json。
+   * 只读小 JSON 文件与 statSync，不触碰 transcript——枚举路径依赖这一点。
+   */
+  resolveSessionSourceResult(sessionDir) {
     try {
       const sessionId = basename4(sessionDir);
       const projectHash = basename4(dirname3(sessionDir));
-      const contextFile = join6(sessionDir, "context.jsonl");
-      const wireFile = join6(sessionDir, "wire.jsonl");
-      if (!existsSync6(contextFile) && !existsSync6(wireFile)) {
+      const contextFile = join7(sessionDir, "context.jsonl");
+      const wireFile = join7(sessionDir, "wire.jsonl");
+      const existingContextFile = existsSync6(contextFile) ? contextFile : null;
+      const existingWireFile = existsSync6(wireFile) ? wireFile : null;
+      if (!existingContextFile && !existingWireFile) {
         return skippedSession("missing transcript");
       }
-      const statePath = join6(sessionDir, "state.json");
-      const metaPath = join6(sessionDir, "metadata.json");
-      let title = "";
+      const statePath = join7(sessionDir, "state.json");
+      const metaPath = join7(sessionDir, "metadata.json");
+      let explicitTitle = "";
       let wireMtime = null;
       let metaFile = "";
       if (existsSync6(statePath)) {
         const state = asRecord(JSON.parse(readFileSync3(statePath, "utf-8"))) ?? {};
-        title = String(state.custom_title ?? "");
+        explicitTitle = String(state.custom_title ?? "");
         wireMtime = readWireMtime(state);
         metaFile = statePath;
       } else if (existsSync6(metaPath)) {
         const meta = asRecord(JSON.parse(readFileSync3(metaPath, "utf-8"))) ?? {};
-        title = String(meta.title ?? "");
+        explicitTitle = String(meta.title ?? "");
         wireMtime = readWireMtime(meta);
         metaFile = metaPath;
       }
-      const cwd = this.projectMap.get(projectHash) || "";
-      const existingContextFile = existsSync6(contextFile) ? contextFile : null;
-      const existingWireFile = existsSync6(wireFile) ? wireFile : null;
-      const messageTitle = extractFirstUserTitle(existingContextFile, existingWireFile);
       const createdAt = wireMtime !== null ? wireMtime * 1e3 : metaFile ? statSync3(metaFile).mtimeMs : statSync3(sessionDir).mtimeMs;
       return parsedSession({
         id: sessionId,
-        title: resolveSessionTitle(title, messageTitle, null),
         sourcePath: sessionDir,
-        cwd,
+        cwd: this.projectMap.get(projectHash) || "",
         contextFile: existingContextFile,
         wireFile: existingWireFile,
         createdAt,
-        metaFile
+        metaFile,
+        explicitTitle
       });
     } catch {
       return skippedSession("malformed metadata");
     }
   }
+  /**
+   * 在会话源之上补齐 title。仅当 state/metadata 里没有可用标题时才回退去读
+   * transcript 找首条用户消息，所以标题解析的成本只在真正需要重解析时付出。
+   */
+  parseSessionDirResult(sessionDir) {
+    const result = this.resolveSessionSourceResult(sessionDir);
+    if (result.status !== "parsed") return result;
+    const source = result.data;
+    const title = normalizeTitleText(source.explicitTitle) ?? resolveSessionTitle(null, extractFirstUserTitle(source.contextFile, source.wireFile), null);
+    return parsedSession({ ...source, title, sourceMtimeMs: source.createdAt });
+  }
   listSessionSources(options) {
     if (!this.basePath) return [];
     const refs = [];
     for (const dir of this.listSessionDirs()) {
-      const meta = getParsedSession(this.parseSessionDirResult(dir));
-      if (!meta || !matchesScanWindow(meta.createdAt, options)) continue;
+      const source = getParsedSession(this.resolveSessionSourceResult(dir));
+      if (!source || !matchesScanWindow(source.createdAt, options)) continue;
       refs.push({
-        sessionId: meta.id,
-        sourcePath: meta.sourcePath,
-        fingerprint: this.sourceFingerprint(meta)
+        sessionId: source.id,
+        sourcePath: source.sourcePath,
+        fingerprint: this.sourceFingerprint(source)
       });
     }
     return refs;
@@ -2411,12 +2710,11 @@ var KimiAgent = class extends FileSystemSessionSource {
   }
   getSessionDataFromContext(meta) {
     if (!meta.contextFile) throw new Error("context.jsonl is missing");
-    const content = readFileSync3(meta.contextFile, "utf-8");
     const builder = new TranscriptBuilder();
     const ignoredToolCallIds = /* @__PURE__ */ new Set();
     let seq = 0;
     const fallbackTs = meta.createdAt;
-    for (const record of parseJsonlLines(content)) {
+    for (const record of readJsonlFile(meta.contextFile)) {
       seq++;
       try {
         const role = String(record.role ?? "");
@@ -2467,15 +2765,14 @@ var KimiAgent = class extends FileSystemSessionSource {
     return this.buildSessionData(meta, builder, stats);
   }
   getSessionDataFromWire(meta) {
-    const wirePath = meta.wireFile ?? join6(meta.sourcePath, "wire.jsonl");
+    const wirePath = meta.wireFile ?? join7(meta.sourcePath, "wire.jsonl");
     if (!existsSync6(wirePath)) throw new Error("wire.jsonl is missing");
-    const content = readFileSync3(wirePath, "utf-8");
     const builder = new TranscriptBuilder();
     const ignoredToolCallIds = /* @__PURE__ */ new Set();
     const openToolArgumentBuffer = /* @__PURE__ */ new Map();
     let openToolCallId = null;
     let seq = 0;
-    for (const record of parseJsonlLines(content)) {
+    for (const record of readJsonlFile(wirePath)) {
       seq++;
       try {
         const message = asRecord(record.message) ?? {};
@@ -2555,7 +2852,7 @@ var KimiAgent = class extends FileSystemSessionSource {
             tool: toolName,
             callID: callId,
             title: mapToolTitle(toolName),
-            state: { arguments: normalizedArgs, output: null },
+            state: { status: "running", input: normalizedArgs, output: null },
             time_created: timestampMs
           };
           builder.appendToolCall(
@@ -2605,18 +2902,10 @@ var KimiAgent = class extends FileSystemSessionSource {
   }
   // --- Helpers ---
   sourceFingerprint(meta) {
-    const fileMtime = (path2) => {
-      if (!path2) return null;
-      try {
-        return statSync3(path2).mtimeMs;
-      } catch {
-        return null;
-      }
-    };
     return JSON.stringify([
-      fileMtime(meta.metaFile),
-      fileMtime(meta.contextFile),
-      fileMtime(meta.wireFile)
+      this.readFileMtimeMs(meta.metaFile),
+      this.readFileMtimeMs(meta.contextFile),
+      this.readFileMtimeMs(meta.wireFile)
     ]);
   }
   buildContextAssistantMessage(record, seq, ignoredToolCallIds, fallbackTs) {
@@ -2654,7 +2943,11 @@ var KimiAgent = class extends FileSystemSessionSource {
           tool: toolName,
           callID: callId,
           title: mapToolTitle(toolName),
-          state: { arguments: normalizeToolArguments(function_.arguments), output: null },
+          state: {
+            status: "running",
+            input: normalizeToolArguments(function_.arguments),
+            output: null
+          },
           time_created: fallbackTs
         };
         parts.push(part);
@@ -2680,8 +2973,7 @@ var KimiAgent = class extends FileSystemSessionSource {
     try {
       const parsed = JSON.parse(combined);
       if (builder.updateToolCall(openCallId, (part) => {
-        const state = part.state ?? (part.state = {});
-        state.arguments = parsed;
+        part.state.input = parsed;
       })) {
         buffer.delete(openCallId);
       }
@@ -2693,6 +2985,16 @@ var KimiAgent = class extends FileSystemSessionSource {
     if (!outputParts.length || !callId) return false;
     return builder.resolveToolCall(callId, { output: [...outputParts] });
   }
+  /** Applies a `_usage` record's running total; other records are ignored. */
+  applyUsageTotal(record, stats) {
+    if (record.role !== "_usage") return;
+    const tokenCount = asNumber(record.token_count);
+    if (tokenCount === void 0) {
+      reportFieldMismatch("kimi", "usage.token_count");
+      return;
+    }
+    stats.total_tokens = tokenCount;
+  }
   extractStats(sessionDir) {
     let totalCost = 0;
     const stats = {
@@ -2702,15 +3004,14 @@ var KimiAgent = class extends FileSystemSessionSource {
       total_tokens: 0,
       message_count: 0
     };
-    const wirePath = join6(sessionDir, "wire.jsonl");
+    const wirePath = join7(sessionDir, "wire.jsonl");
     if (!existsSync6(wirePath)) return stats;
+    const contextPath = join7(sessionDir, "context.jsonl");
+    const hasContext = existsSync6(contextPath);
     try {
-      const content = readFileSync3(wirePath, "utf-8");
-      for (const line of content.split("\n").filter((l) => l.trim())) {
-        try {
-          const data = asRecord(JSON.parse(line));
-          const tokenUsage = asRecord(asRecord(data?.message)?.usage);
-          if (!tokenUsage) continue;
+      for (const record of readJsonlFile(wirePath)) {
+        const tokenUsage = asRecord(asRecord(record.message)?.usage);
+        if (tokenUsage) {
           const inputTokens = extractTokenField(tokenUsage, "input_tokens");
           const outputTokens = extractTokenField(tokenUsage, "output_tokens");
           stats.total_input_tokens += inputTokens;
@@ -2720,30 +3021,16 @@ var KimiAgent = class extends FileSystemSessionSource {
             output: outputTokens
           });
           if (cost !== null) totalCost += cost;
-        } catch {
         }
+        if (!hasContext) this.applyUsageTotal(record, stats);
       }
     } catch {
     }
-    const contextPath = join6(sessionDir, "context.jsonl");
-    const rawPath = existsSync6(contextPath) ? contextPath : wirePath;
-    if (!existsSync6(rawPath)) return stats;
-    try {
-      const rawContent = readFileSync3(rawPath, "utf-8");
-      for (const line of rawContent.split("\n").filter((l) => l.trim())) {
-        try {
-          const data = asRecord(JSON.parse(line));
-          if (data?.role !== "_usage") continue;
-          const tokenCount = asNumber(data.token_count);
-          if (tokenCount === void 0) {
-            reportFieldMismatch("kimi", "usage.token_count");
-            continue;
-          }
-          stats.total_tokens = tokenCount;
-        } catch {
-        }
+    if (hasContext) {
+      try {
+        for (const record of readJsonlFile(contextPath)) this.applyUsageTotal(record, stats);
+      } catch {
       }
-    } catch {
     }
     stats.total_cost = Number(totalCost.toFixed(8));
     if (stats.total_cost > 0) {
@@ -2754,6 +3041,7 @@ var KimiAgent = class extends FileSystemSessionSource {
   buildSessionData(meta, builder, stats) {
     const transcript = builder.finish(stats);
     return {
+      reference: { agentName: this.name, sessionId: meta.id },
       id: meta.id,
       title: meta.title,
       slug: `kimi/${meta.id}`,
@@ -3027,6 +3315,9 @@ var PLAN_APPROVAL_PREFIX = "PLEASE IMPLEMENT THIS PLAN";
 var SUBAGENT_NOTIFICATION_PATTERN = /<subagent_notification>\s*([\s\S]*?)\s*<\/subagent_notification>/;
 var HEAD_INDEX_VERSION2 = "codex-head-v1";
 var PARSER_VERSION = "codex-parser-v4";
+function resolveCodexDataRoot() {
+  return resolveHomePath("CODEX_HOME", ".codex");
+}
 var DEVELOPER_LIKE_USER_MARKERS = [
   "agents.md instructions for",
   "<instructions>",
@@ -3209,26 +3500,31 @@ function extractPatchContent(lines, startIndex) {
   }
   return { text: contentLines.join("\n"), nextLineIndex: i };
 }
-var CodexAgent = class extends FileSystemSessionSource {
+var CodexAgent = class extends SingleFileSessionSource {
   name = "codex";
   displayName = "Codex";
   basePath = null;
   sessionIndexCache = /* @__PURE__ */ new Map();
-  sessionIndexMtime = null;
+  sessionIndexMtime;
+  sessionIndexPath;
   // ---- BaseAgent implementation ----
   findBasePath() {
-    const roots = resolveProviderRoots();
-    return firstExisting(join7(roots.codexRoot, "sessions"));
+    return firstExisting(join8(resolveCodexDataRoot(), "sessions"));
+  }
+  getSessionWatchPlan() {
+    const dataRoot = resolveCodexDataRoot();
+    return {
+      status: "supported",
+      targets: [
+        { path: join8(dataRoot, "sessions") },
+        { path: join8(dataRoot, "session_index.jsonl") }
+      ]
+    };
   }
   isAvailable() {
     this.basePath = this.findBasePath();
     if (!this.basePath) return false;
-    try {
-      const files = this.walkDirForRolloutFiles(this.basePath);
-      return files.length > 0;
-    } catch {
-      return false;
-    }
+    return this.listRolloutFiles().length > 0;
   }
   listSessionSources(options) {
     if (!this.basePath) return [];
@@ -3239,14 +3535,6 @@ var CodexAgent = class extends FileSystemSessionSource {
       fingerprint: this.sourceFingerprint(file, stat)
     }));
   }
-  scanSessionSource(sourcePath, options) {
-    this.loadSessionIndex();
-    const head = getParsedSession(this.parseSessionHeadResult(sourcePath, options));
-    if (head) {
-      this.sessionMetaMap.set(head.id, this.buildSessionMeta(head, sourcePath));
-    }
-    return head;
-  }
   getSessionData(sessionId) {
     const meta = this.sessionMetaMap.get(sessionId);
     if (!meta) throw new Error(`Session not found: ${sessionId}`);
@@ -3334,6 +3622,7 @@ var CodexAgent = class extends FileSystemSessionSource {
       cost_source: totalCost > 0 ? "estimated" : void 0
     });
     return {
+      reference: { agentName: this.name, sessionId: meta.id },
       id: meta.id,
       title: meta.title,
       slug: `codex/${meta.id}`,
@@ -3347,54 +3636,27 @@ var CodexAgent = class extends FileSystemSessionSource {
   // ---- File listing ----
   listRolloutFiles(options) {
     if (!this.basePath) return [];
-    try {
-      return this.walkDirForRolloutFiles(this.basePath, options);
-    } catch {
-      return [];
-    }
-  }
-  /** Stats each rollout file once during the walk; caller reuses it for the scan window check and the fingerprint. */
-  walkDirForRolloutFiles(dir, options) {
-    const files = [];
-    try {
-      for (const entry of readdirSync3(dir, { withFileTypes: true })) {
-        const fullPath = join7(dir, entry.name);
-        if (entry.isDirectory()) {
-          files.push(...this.walkDirForRolloutFiles(fullPath, options));
-        } else if (entry.name.endsWith(".jsonl") && entry.name.startsWith("rollout-")) {
-          let stat;
-          try {
-            stat = statSync4(fullPath);
-          } catch {
-            continue;
-          }
-          if (!matchesScanWindow(stat.mtimeMs, options)) continue;
-          files.push({ file: fullPath, stat });
-        }
-      }
-    } catch {
-    }
-    return files;
+    return this.walkFiles(
+      this.basePath,
+      (entry) => entry.name.endsWith(".jsonl") && entry.name.startsWith("rollout-"),
+      { scanWindow: options }
+    );
   }
-  buildSessionMeta(head, file) {
+  createFileSessionMeta(head, source) {
     const indexPath = this.getSessionIndexPath();
-    const stat = statSync4(file);
-    return {
-      id: head.id,
-      title: head.title,
-      sourcePath: file,
-      sourceFingerprint: this.sourceFingerprint(file, stat),
-      sourceMtimeMs: stat.mtimeMs,
-      indexPath: existsSync7(indexPath) ? indexPath : null,
-      indexMtimeMs: this.getFileMtimeMs(indexPath),
-      headIndexVersion: HEAD_INDEX_VERSION2,
-      parserVersion: PARSER_VERSION,
-      directory: head.directory,
-      model: null,
-      messageCount: head.stats.message_count,
-      createdAt: head.time_created,
-      updatedAt: head.time_updated ?? head.time_created
-    };
+    const indexMtime = this.sessionIndexMtime ?? null;
+    return this.buildFileSessionMeta({
+      head,
+      source,
+      fingerprint: this.sourceFingerprint(source.file, source.stat),
+      extras: {
+        indexPath: indexMtime === null ? null : indexPath,
+        indexMtimeMs: indexMtime,
+        headIndexVersion: HEAD_INDEX_VERSION2,
+        parserVersion: PARSER_VERSION,
+        model: null
+      }
+    });
   }
   /** Fingerprint depends on an already-fetched stat to avoid re-statting the same file. */
   sourceFingerprint(file, stat) {
@@ -3408,38 +3670,37 @@ var CodexAgent = class extends FileSystemSessionSource {
     ]);
   }
   getSessionIndexPath() {
-    const roots = resolveProviderRoots();
-    return join7(roots.codexRoot, "session_index.jsonl");
-  }
-  getFileMtimeMs(filePath) {
-    try {
-      return statSync4(filePath).mtimeMs;
-    } catch {
-      return null;
-    }
+    this.sessionIndexPath ??= join8(resolveCodexDataRoot(), "session_index.jsonl");
+    return this.sessionIndexPath;
   }
   // ---- Session index ----
   loadSessionIndex() {
     const indexPath = this.getSessionIndexPath();
-    const mtime = this.getFileMtimeMs(indexPath);
-    if (this.sessionIndexCache.size > 0 && this.sessionIndexMtime === mtime) return;
-    this.sessionIndexCache.clear();
-    this.sessionIndexMtime = mtime;
-    if (mtime === null) return;
+    const mtime = this.readFileMtimeMs(indexPath);
+    if (this.sessionIndexMtime !== void 0 && this.sessionIndexMtime === mtime) return;
+    if (mtime === null) {
+      this.sessionIndexCache.clear();
+      this.sessionIndexMtime = null;
+      return;
+    }
     try {
       const content = readFileSync4(indexPath, "utf-8");
+      const cache = /* @__PURE__ */ new Map();
       for (const record of parseJsonlLines(content)) {
         const sid = String(record["id"] ?? "").trim();
         const threadName = String(record["thread_name"] ?? "").trim();
         if (sid && threadName) {
-          this.sessionIndexCache.set(sid, threadName);
+          cache.set(sid, threadName);
         }
       }
+      this.sessionIndexCache = cache;
+      this.sessionIndexMtime = mtime;
     } catch {
+      this.sessionIndexCache.clear();
+      this.sessionIndexMtime = void 0;
     }
   }
   getTitleForSession(sessionId) {
-    this.loadSessionIndex();
     return this.sessionIndexCache.get(sessionId) ?? null;
   }
   // ---- Session head parsing ----
@@ -3453,6 +3714,10 @@ var CodexAgent = class extends FileSystemSessionSource {
       closeSync2(fd);
     }
   }
+  parseFileSessionHead(filePath, options) {
+    this.loadSessionIndex();
+    return this.parseSessionHead(filePath, options);
+  }
   parseSessionHead(filePath, options) {
     return getParsedSession(this.parseSessionHeadResult(filePath, options));
   }
@@ -3735,10 +4000,10 @@ var CodexAgent = class extends FileSystemSessionSource {
     const fullText = textParts.join("\n");
     const planMatch = fullText.match(PROPOSED_PLAN_PATTERN);
     if (planMatch) {
-      const planText = planMatch[1].trim();
+      const planText2 = planMatch[1].trim();
       const planPart = {
         type: "plan",
-        text: planText,
+        text: planText2,
         approval_status: "success",
         time_created: timestampMs
       };
@@ -3854,7 +4119,8 @@ var CodexAgent = class extends FileSystemSessionSource {
       callID: callId,
       title: `Tool: ${toolIdentity.tool}`,
       state: {
-        arguments: arguments_,
+        status: "running",
+        input: arguments_,
         output: null,
         metadata: toolIdentity.metadata
       },
@@ -3899,7 +4165,8 @@ var CodexAgent = class extends FileSystemSessionSource {
       callID: callId,
       title: `Tool: ${toolIdentity.tool}`,
       state: {
-        arguments: normalizedInput,
+        status: "running",
+        input: normalizedInput,
         output: null,
         metadata: toolIdentity.metadata
       },
@@ -3929,7 +4196,8 @@ var CodexAgent = class extends FileSystemSessionSource {
       callID: callId,
       title: `Tool: ${toolIdentity.tool}`,
       state: {
-        arguments: arguments_,
+        status: "running",
+        input: arguments_,
         output: null,
         metadata: toolIdentity.metadata
       },
@@ -4016,6 +4284,23 @@ var PerfTracer = class {
   }
 };
 var perf = new PerfTracer();
+function resolveCursorDataRoot() {
+  const override = readEnvPath("CURSOR_DATA_PATH");
+  if (override) return override;
+  const currentPlatform = platform2();
+  if (currentPlatform === "darwin") {
+    return firstExisting(join9(homedir3(), "Library", "Application Support", "Cursor", "User"));
+  }
+  if (currentPlatform === "linux") {
+    const configRoot = readEnvPath("XDG_CONFIG_HOME") ?? join9(homedir3(), ".config");
+    return firstExisting(join9(configRoot, "Cursor", "User"));
+  }
+  if (currentPlatform === "win32") {
+    const appData = readEnvPath("APPDATA") ?? join9(homedir3(), "AppData", "Roaming");
+    return firstExisting(join9(appData, "Cursor", "User"));
+  }
+  return null;
+}
 function narrowString(field, value) {
   return narrowField("cursor", field, value, asString);
 }
@@ -4163,29 +4448,22 @@ function isInternalBubble(bubble) {
   return ["eventType", "kind", "subtype", "name"].some((key) => isInternalEventType(bubble[key]));
 }
 function buildToolState(action) {
-  const state = {};
-  if (action.input) {
-    state.input = action.input;
-  }
+  let output = action.output;
   if (action.output != null) {
     const ts = 0;
     const outputParts = normalizeToolOutputParts2(action.output, ts);
-    state.output = outputParts.length > 0 ? outputParts : action.output;
-  }
-  if (action.state) {
-    Object.assign(state, action.state);
+    output = outputParts.length > 0 ? outputParts : action.output;
   }
-  if (!state.status) {
-    if (typeof action.output === "object" && action.output !== null) {
-      const out = asRecord(action.output);
-      if (out?.success === true) state.status = "completed";
-      else if (out?.success === false) state.status = "error";
-      else state.status = "completed";
-    } else if (action.output != null) {
-      state.status = "completed";
+  const [part] = normalizeMessageParts([
+    {
+      type: "tool",
+      tool: action.tool ?? "unknown",
+      input: action.input,
+      output,
+      state: action.state
     }
-  }
-  return state;
+  ]);
+  return part?.type === "tool" ? part.state : { status: "running" };
 }
 function buildToolPart(action, timestampMs) {
   const toolName = action.tool ?? "unknown";
@@ -4201,15 +4479,15 @@ function buildToolPart(action, timestampMs) {
 function buildTerminalToolPart(action, timestampMs) {
   const command = String(action.input?.command ?? "");
   const description = cleanInternalText(String(action.input?.commandDescription ?? ""));
+  const state = buildToolState(action);
+  state.input = { command };
+  state.output = typeof action.output === "string" ? [{ type: "text", text: action.output, time_created: timestampMs }] : normalizeToolOutputParts2(action.output, timestampMs);
   return {
     type: "tool",
     tool: "bash",
     callID: "",
     title: description || `bash: ${command.slice(0, 60)}`,
-    state: {
-      input: { command },
-      output: typeof action.output === "string" ? [{ type: "text", text: action.output, time_created: timestampMs }] : normalizeToolOutputParts2(action.output, timestampMs)
-    },
+    state,
     time_created: timestampMs
   };
 }
@@ -4237,9 +4515,22 @@ var CursorAgent = class extends DatabaseSessionSource {
   }
   findDbPath() {
     if (!isSqliteAvailable()) return null;
-    const dataPath = getCursorDataPath();
+    const dataPath = resolveCursorDataRoot();
     if (!dataPath) return null;
-    return join8(dataPath, "globalStorage", "state.vscdb");
+    return join9(dataPath, "globalStorage", "state.vscdb");
+  }
+  getSessionWatchPlan() {
+    const dataPath = resolveCursorDataRoot();
+    return {
+      status: "supported",
+      targets: dataPath ? [
+        {
+          root: dataPath,
+          path: join9(dataPath, "globalStorage", "state.vscdb")
+        },
+        { root: dataPath, path: join9(dataPath, "workspaceStorage") }
+      ] : []
+    };
   }
   /**
    * Build a map of composerId → workspace folder path by reading
@@ -4247,9 +4538,9 @@ var CursorAgent = class extends DatabaseSessionSource {
    */
   buildWorkspacePathMap() {
     const map = /* @__PURE__ */ new Map();
-    const dataPath = getCursorDataPath();
+    const dataPath = resolveCursorDataRoot();
     if (!dataPath) return map;
-    const wsStoragePath = join8(dataPath, "workspaceStorage");
+    const wsStoragePath = join9(dataPath, "workspaceStorage");
     if (!existsSync8(wsStoragePath)) return map;
     let entryNames;
     try {
@@ -4258,13 +4549,13 @@ var CursorAgent = class extends DatabaseSessionSource {
       return map;
     }
     for (const name of entryNames) {
-      const wsDir = join8(wsStoragePath, name);
+      const wsDir = join9(wsStoragePath, name);
       try {
         if (!statSync5(wsDir).isDirectory()) continue;
       } catch {
         continue;
       }
-      const wsJsonPath = join8(wsDir, "workspace.json");
+      const wsJsonPath = join9(wsDir, "workspace.json");
       if (!existsSync8(wsJsonPath)) continue;
       let workspacePath;
       try {
@@ -4275,7 +4566,7 @@ var CursorAgent = class extends DatabaseSessionSource {
       } catch {
         continue;
       }
-      const wsDbPath = join8(wsDir, "state.vscdb");
+      const wsDbPath = join9(wsDir, "state.vscdb");
       if (!existsSync8(wsDbPath)) continue;
       const wsDb = openDbReadOnly(wsDbPath);
       if (!wsDb) continue;
@@ -4490,6 +4781,7 @@ var CursorAgent = class extends DatabaseSessionSource {
       const cachedDir = this.composerCache.get(`__dir__${composerId}`);
       const directory = cachedDir?.directory ?? this.buildWorkspacePathMap().get(composerId) ?? "";
       return {
+        reference: { agentName: this.name, sessionId: resolvedSessionId },
         id: resolvedSessionId,
         title,
         slug: `cursor/${resolvedSessionId}`,
@@ -4675,15 +4967,15 @@ var CursorAgent = class extends DatabaseSessionSource {
       }
     }
     if (toolName === "create_plan") {
-      const planText = asRecord(state.input)?.plan;
-      return {
-        type: "plan",
-        title: "Plan",
-        input: planText,
-        approval_status: state.status === "completed" ? "success" : "fail",
-        state,
-        time_created: timestampMs
-      };
+      const planText2 = String(asRecord(state.input)?.plan ?? "").trim();
+      if (planText2) {
+        return {
+          type: "plan",
+          text: planText2,
+          approval_status: state.status === "completed" ? "success" : "fail",
+          time_created: timestampMs
+        };
+      }
     }
     return {
       type: "tool",
@@ -4749,6 +5041,9 @@ var CursorAgent = class extends DatabaseSessionSource {
 };
 var HEAD_INDEX_VERSION3 = "pi-head-v1";
 var PARSER_VERSION2 = "pi-parser-v1";
+function resolvePiDataRoot() {
+  return resolveHomePath("PI_HOME", ".pi");
+}
 function parseTimestampMs3(value) {
   if (typeof value === "number") return Number.isFinite(value) ? value : 0;
   const text = String(value ?? "").trim();
@@ -4819,13 +5114,22 @@ function buildCurrentPathEntries(entries) {
   }
   return path2.reverse();
 }
-var PiAgent = class extends FileSystemSessionSource {
+var PiAgent = class extends SingleFileSessionSource {
   name = "pi";
   displayName = "Pi";
   basePath = null;
   findBasePath() {
-    const roots = resolveProviderRoots();
-    return firstExisting(join9(roots.piRoot, "agent", "sessions"), "data/pi");
+    return firstExisting(join10(resolvePiDataRoot(), "agent", "sessions"), "data/pi");
+  }
+  getSessionWatchPlan() {
+    const dataRoot = resolvePiDataRoot();
+    return {
+      status: "supported",
+      targets: [
+        { root: dataRoot, path: join10(dataRoot, "agent", "sessions") },
+        { root: "data/pi", path: "data/pi" }
+      ]
+    };
   }
   isAvailable() {
     this.basePath = this.findBasePath();
@@ -4834,19 +5138,12 @@ var PiAgent = class extends FileSystemSessionSource {
   }
   listSessionSources(options) {
     if (!this.basePath) return [];
-    return this.walkJsonlFiles(this.basePath, options).map(({ file, stat }) => ({
+    return this.listSessionFiles(options).map(({ file, stat }) => ({
       sessionId: extractSessionIdFromFilename(file),
       sourcePath: file,
       fingerprint: this.sourceFingerprint(stat)
     }));
   }
-  scanSessionSource(sourcePath) {
-    const head = getParsedSession(this.parseSessionHeadResult(sourcePath));
-    if (head) {
-      this.sessionMetaMap.set(head.id, this.buildSessionMeta(head, sourcePath));
-    }
-    return head;
-  }
   getSessionData(sessionId) {
     const meta = this.sessionMetaMap.get(sessionId);
     if (!meta) throw new Error(`Session not found: ${sessionId}`);
@@ -4854,6 +5151,7 @@ var PiAgent = class extends FileSystemSessionSource {
     const parsed = this.parsePiFile(meta.sourcePath);
     const state = this.convertEntries(parsed.pathEntries);
     return {
+      reference: { agentName: this.name, sessionId: meta.id },
       id: meta.id,
       title: meta.title,
       slug: `pi/${meta.id}`,
@@ -4874,52 +5172,30 @@ var PiAgent = class extends FileSystemSessionSource {
   }
   listSessionFiles(options) {
     if (!this.basePath) return [];
-    return this.walkJsonlFiles(this.basePath, options).map(({ file }) => file);
+    return this.walkFiles(
+      this.basePath,
+      (entry) => entry.isFile() && entry.name.endsWith(".jsonl"),
+      { scanWindow: options }
+    );
   }
-  /** Stats each file once during the walk; caller reuses it for both the scan window check and the fingerprint. */
-  walkJsonlFiles(dir, options) {
-    const files = [];
-    try {
-      for (const entry of readdirSync5(dir, { withFileTypes: true })) {
-        const fullPath = join9(dir, entry.name);
-        if (entry.isDirectory()) {
-          files.push(...this.walkJsonlFiles(fullPath, options));
-          continue;
-        }
-        if (!entry.isFile() || !entry.name.endsWith(".jsonl")) continue;
-        let stat;
-        try {
-          stat = statSync6(fullPath);
-        } catch {
-          continue;
-        }
-        if (!matchesScanWindow(stat.mtimeMs, options)) continue;
-        files.push({ file: fullPath, stat });
+  createFileSessionMeta(head, source) {
+    return this.buildFileSessionMeta({
+      head,
+      source,
+      fingerprint: this.sourceFingerprint(source.stat),
+      extras: {
+        headIndexVersion: HEAD_INDEX_VERSION3,
+        parserVersion: PARSER_VERSION2
       }
-    } catch {
-    }
-    return files;
-  }
-  buildSessionMeta(head, file) {
-    const stat = statSync6(file);
-    return {
-      id: head.id,
-      title: head.title,
-      sourcePath: file,
-      sourceFingerprint: this.sourceFingerprint(stat),
-      sourceMtimeMs: stat.mtimeMs,
-      headIndexVersion: HEAD_INDEX_VERSION3,
-      parserVersion: PARSER_VERSION2,
-      directory: head.directory,
-      messageCount: head.stats.message_count,
-      createdAt: head.time_created,
-      updatedAt: head.time_updated ?? head.time_created
-    };
+    });
   }
   /** Fingerprint depends on an already-fetched stat to avoid re-statting the same file. */
   sourceFingerprint(stat) {
     return JSON.stringify([HEAD_INDEX_VERSION3, PARSER_VERSION2, stat.mtimeMs, stat.size]);
   }
+  parseFileSessionHead(filePath) {
+    return getParsedSession(this.parseSessionHeadResult(filePath));
+  }
   parseSessionHeadResult(filePath) {
     const parsed = this.parsePiFile(filePath);
     const state = this.convertEntries(parsed.pathEntries);
@@ -4946,16 +5222,24 @@ var PiAgent = class extends FileSystemSessionSource {
     });
   }
   parsePiFile(filePath) {
-    const records = Array.from(parseJsonlLines(readFileSync6(filePath, "utf-8")));
-    if (records.length === 0) throw new Error("empty file");
-    const header = records.find((record) => record["type"] === "session");
+    let header = null;
+    let recordCount = 0;
+    const entries = [];
+    for (const record of readJsonlFile(filePath)) {
+      recordCount += 1;
+      if (record["type"] === "session") {
+        header ??= record;
+        continue;
+      }
+      entries.push(record);
+    }
+    if (recordCount === 0) throw new Error("empty file");
     if (!header) throw new Error("missing session header");
-    const entries = records.filter((record) => record["type"] !== "session");
     const pathEntries = buildCurrentPathEntries(entries);
     if (pathEntries.length === 0) throw new Error("empty session tree");
     const sessionId = String(header["id"] ?? extractSessionIdFromFilename(filePath)).trim();
     if (!sessionId) throw new Error("missing session id");
-    const stat = statSync6(filePath);
+    const stat = this.sessionSourceFile(filePath).stat;
     const directory = String(header["cwd"] ?? "").trim() || basename6(filePath, ".jsonl");
     const createdAt = narrowTimestampMs("session.timestamp", header["timestamp"]) || stat.mtimeMs;
     const updatedAt = pathEntries.reduce(
@@ -5203,48 +5487,82 @@ var PiAgent = class extends FileSystemSessionSource {
     };
   }
 };
+function resolveZCodeDataRoot() {
+  const currentPlatform = platform3();
+  if (currentPlatform !== "darwin" && currentPlatform !== "win32") return null;
+  return join11(homedir4(), ".zcode");
+}
 function findZCodeDbPath() {
   if (!isSqliteAvailable()) return null;
-  const roots = resolveProviderRoots();
-  if (!roots.zcodeRoot) return null;
-  return firstExisting(join10(roots.zcodeRoot, "cli", "db", "db.sqlite"));
+  const dataRoot = resolveZCodeDataRoot();
+  if (!dataRoot) return null;
+  return firstExisting(join11(dataRoot, "cli", "db", "db.sqlite"));
+}
+function getZCodeSessionWatchPlan() {
+  const dataRoot = resolveZCodeDataRoot();
+  return {
+    status: "supported",
+    targets: dataRoot ? [{ root: dataRoot, path: join11(dataRoot, "cli", "db", "db.sqlite") }] : []
+  };
 }
 var ZCodeAgent = class extends OpenCodeSqliteAgent {
   constructor() {
     super({
       name: "zcode",
       displayName: "ZCode",
-      findDbPath: findZCodeDbPath
+      findDbPath: findZCodeDbPath,
+      getSessionWatchPlan: getZCodeSessionWatchPlan
     });
   }
 };
 registerAgent({
   icon: "/icon/agent/claudecode.svg",
   iconColored: true,
+  resolveDataRoot: resolveClaudeCodeDataRoot,
+  resumeCommandPrefix: "claude --resume",
+  toolStrategy: "custom",
   create: () => new ClaudeCodeAgent()
 });
 registerAgent({
   icon: "/icon/agent/opencode.svg",
+  resolveDataRoot: resolveOpenCodeDataRoot,
+  resumeCommandPrefix: "opencode -s",
+  toolStrategy: "custom",
   create: () => new OpenCodeAgent()
 });
 registerAgent({
   icon: "/icon/agent/zcode.svg",
+  resolveDataRoot: resolveZCodeDataRoot,
+  resumeCommandPrefix: null,
+  toolStrategy: "custom",
   create: () => new ZCodeAgent()
 });
 registerAgent({
   icon: "/icon/agent/kimi.svg",
+  resolveDataRoot: resolveKimiDataRoot,
+  resumeCommandPrefix: "kimi -r",
+  toolStrategy: "custom",
   create: () => new KimiAgent()
 });
 registerAgent({
   icon: "/icon/agent/codex.svg",
+  resolveDataRoot: resolveCodexDataRoot,
+  resumeCommandPrefix: "codex resume",
+  toolStrategy: "custom",
   create: () => new CodexAgent()
 });
 registerAgent({
   icon: "/icon/agent/pi.svg",
+  resolveDataRoot: resolvePiDataRoot,
+  resumeCommandPrefix: "pi --session",
+  toolStrategy: "custom",
   create: () => new PiAgent()
 });
 registerAgent({
   icon: "/icon/agent/cursor.svg",
+  resolveDataRoot: resolveCursorDataRoot,
+  resumeCommandPrefix: null,
+  toolStrategy: "custom",
   create: () => new CursorAgent()
 });
 function fallbackDisplayName(input) {
@@ -5259,7 +5577,7 @@ var realFs = {
   },
   readText(path2) {
     try {
-      return readFileSync7(path2, "utf8");
+      return readFileSync6(path2, "utf8");
     } catch {
       return null;
     }
@@ -5312,9 +5630,6 @@ function normalizeGitRemote(url) {
 }
 var IDENTITY_CACHE_TTL_MS = 10 * 60 * 1e3;
 var identityCache = /* @__PURE__ */ new Map();
-function clearIdentityCache() {
-  identityCache.clear();
-}
 function computeIdentity(cwd, fs) {
   if (fs !== realFs) return resolveIdentity(cwd, fs);
   const key = cwd ?? "";
@@ -5447,9 +5762,6 @@ function parseManifestName(file, text) {
   }
   return null;
 }
-function getAgentName(session) {
-  return session.slug.split("/")[0]?.toLowerCase() || "unknown";
-}
 function buildProjectGroups(sessions) {
   const groups = /* @__PURE__ */ new Map();
   for (const session of sessions) {
@@ -5459,13 +5771,13 @@ function buildProjectGroups(sessions) {
     const groupKey = getProjectIdentityKey(identity);
     const current = groups.get(groupKey);
     if (current) {
-      current.sources.add(getAgentName(session));
+      current.sources.add(getSessionAgentKey(session));
       current.sessionCount += 1;
       current.lastActivity = Math.max(current.lastActivity, activity);
     } else {
       groups.set(groupKey, {
         identity,
-        sources: /* @__PURE__ */ new Set([getAgentName(session)]),
+        sources: /* @__PURE__ */ new Set([getSessionAgentKey(session)]),
         sessionCount: 1,
         lastActivity: activity
       });
@@ -5548,7 +5860,7 @@ function classifySessionTags(session) {
     for (const part of message.parts) {
       if (part.type === "plan") tags.add("planning");
       if (part.type !== "tool") continue;
-      const toolName = `${part.tool ?? ""} ${part.title ?? ""}`;
+      const toolName = `${part.tool} ${part.title ?? ""}`;
       const toolPayload = stringifyToolPayload(part);
       if (PLAN_TOOL_RE.test(toolName)) tags.add("planning");
       if (READ_TOOL_RE.test(toolName)) readToolCount += 1;
@@ -5556,7 +5868,7 @@ function classifySessionTags(session) {
       if (TESTING_COMMAND_RE.test(toolPayload)) tags.add("testing");
       if (GIT_COMMAND_RE.test(toolPayload)) tags.add("git-ops");
       if (BUILD_DEPLOY_COMMAND_RE.test(toolPayload)) tags.add("build-deploy");
-      if (hasEditedDocPath(part.state?.arguments) || hasEditedDocPath(part.state?.input)) {
+      if (hasEditedDocPath(part.state.input)) {
         tags.add("docs");
       }
     }
@@ -5567,16 +5879,10 @@ function classifySessionTags(session) {
   return TAG_ORDER.filter((tag) => tags.has(tag));
 }
 function partText(part) {
-  return typeof part.text === "string" ? part.text : "";
+  return part.type === "text" || part.type === "reasoning" || part.type === "plan" ? part.text : "";
 }
 function stringifyToolPayload(part) {
-  return [
-    part.tool,
-    part.title,
-    valueToText(part.input),
-    valueToText(part.output),
-    valueToText(part.state)
-  ].filter(Boolean).join("\n");
+  return [part.tool, part.title, valueToText(part.state)].filter(Boolean).join("\n");
 }
 function valueToText(value) {
   if (value == null) return "";
@@ -5600,7 +5906,7 @@ function hasEditedDocPath(value) {
   }
   return Object.values(record).some(hasEditedDocPath);
 }
-function toRecord(value) {
+function toRecord2(value) {
   if (value && typeof value === "object" && !Array.isArray(value)) {
     return value;
   }
@@ -5610,10 +5916,10 @@ function toStringValue(value) {
   return typeof value === "string" ? value : "";
 }
 function normalizeToolLabel(part) {
-  if (typeof part.title === "string" && part.title.trim()) {
+  if (part.title?.trim()) {
     return part.title.trim().replace(/^tool:\s*/i, "");
   }
-  if (typeof part.tool === "string" && part.tool.trim()) return part.tool.trim();
+  if (part.tool.trim()) return part.tool.trim();
   return "tool";
 }
 function normalizeToolName(part) {
@@ -5664,7 +5970,7 @@ function extractPathsFromToolInput(inputValue) {
   return [...paths];
 }
 function getToolInputValue(part) {
-  return part.state?.arguments ?? part.state?.input ?? part.input ?? null;
+  return part.state.input ?? null;
 }
 function classifyToolKind(part) {
   const toolName = normalizeToolName(part);
@@ -5681,7 +5987,7 @@ function classifyToolKind(part) {
   return null;
 }
 function normalizeCodexPatchEntry(entry) {
-  const record = toRecord(entry);
+  const record = toRecord2(entry);
   const type = toStringValue(record.type);
   if (!type) return null;
   return {
@@ -5691,7 +5997,7 @@ function normalizeCodexPatchEntry(entry) {
   };
 }
 function getCodexPatchEntries(inputValue) {
-  const input = toRecord(inputValue);
+  const input = toRecord2(inputValue);
   const rawContent = Array.isArray(inputValue) ? inputValue : Array.isArray(input.content) ? input.content : [];
   return rawContent.map((entry) => normalizeCodexPatchEntry(entry)).filter((entry) => entry != null);
 }
@@ -5750,21 +6056,20 @@ function summarizeFileActivity(agentName, sessionId, projectIdentityKey, occurre
     const current = grouped.get(key);
     if (current) {
       current.count += 1;
-      current.latest_time = Math.max(current.latest_time, occurrence.time);
+      current.latestTime = Math.max(current.latestTime, occurrence.time);
       continue;
     }
     grouped.set(key, {
-      agent_name: agentName,
-      session_id: sessionId,
-      project_identity_key: projectIdentityKey,
+      reference: { agentName, sessionId },
+      projectIdentityKey,
       path: occurrence.path,
       kind: occurrence.kind,
       count: 1,
-      latest_time: occurrence.time
+      latestTime: occurrence.time
     });
   }
   return [...grouped.values()].sort((a, b) => {
-    if (b.latest_time !== a.latest_time) return b.latest_time - a.latest_time;
+    if (b.latestTime !== a.latestTime) return b.latestTime - a.latestTime;
     return a.path.localeCompare(b.path);
   });
 }
@@ -5779,13 +6084,6 @@ function extractSessionFileActivity(agentName, sessionId, projectIdentityKey, me
 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;
-}
 var schemaEnsuredPath = null;
 function getSchemaEnsuredPath() {
   return schemaEnsuredPath;
@@ -5794,13 +6092,13 @@ function setSchemaEnsuredPath(path2) {
   schemaEnsuredPath = path2;
 }
 function getCacheDir2() {
-  return join11(homedir4(), ".cache", "codesesh");
+  return join12(homedir6(), ".cache", "codesesh");
 }
 function getCachePath2() {
-  return join11(getCacheDir2(), CACHE_FILENAME);
+  return join12(getCacheDir2(), CACHE_FILENAME);
 }
 function getLegacyCachePath() {
-  return join11(getCacheDir2(), LEGACY_CACHE_FILENAME);
+  return join12(getCacheDir2(), LEGACY_CACHE_FILENAME);
 }
 function hasCacheStorage() {
   return existsSync11(getCachePath2());
@@ -5819,6 +6117,7 @@ function escapeRegExp(value) {
 function normalizeFilePathSearch(value) {
   return value.trim().replace(/^"|"$/g, "");
 }
+var MESSAGE_PARTS_FORMAT_VERSION = 1;
 function stringifyOptionalJson(value) {
   return value == null ? null : JSON.stringify(value);
 }
@@ -5833,34 +6132,6 @@ function sourcePathFromMetaJson(metaJson) {
   const meta = JSON.parse(metaJson);
   return sourcePathFromMeta(meta);
 }
-function prepareUpsertCachedSession(db) {
-  return db.prepare(`
-    INSERT INTO cached_sessions(agent_name, session_id, session_json, meta_json)
-    VALUES (?, ?, ?, ?)
-    ON CONFLICT(agent_name, session_id) DO UPDATE SET
-      session_json = excluded.session_json,
-      meta_json = excluded.meta_json
-  `);
-}
-function prepareUpsertProjectSession(db) {
-  return db.prepare(`
-    INSERT INTO project_sessions(
-      agent_name,
-      session_id,
-      identity_kind,
-      identity_key,
-      display_name,
-      directory,
-      activity_time
-    ) VALUES (?, ?, ?, ?, ?, ?, ?)
-    ON CONFLICT(agent_name, session_id) DO UPDATE SET
-      identity_kind = excluded.identity_kind,
-      identity_key = excluded.identity_key,
-      display_name = excluded.display_name,
-      directory = excluded.directory,
-      activity_time = excluded.activity_time
-  `);
-}
 function prepareUpsertSession(db) {
   return db.prepare(`
     INSERT INTO sessions(
@@ -6025,27 +6296,16 @@ function prepareInsertMessageTool(db) {
 function writeFileActivityRows(statement, activities) {
   for (const activity of activities) {
     statement.run(
-      activity.agent_name,
-      activity.session_id,
-      activity.project_identity_key,
+      activity.reference.agentName,
+      activity.reference.sessionId,
+      activity.projectIdentityKey,
       activity.path,
       activity.kind,
       activity.count,
-      activity.latest_time
+      activity.latestTime
     );
   }
 }
-function writeProjectSessionRow(statement, agentName, session, identity) {
-  statement.run(
-    agentName,
-    session.id,
-    identity.kind,
-    identity.key,
-    identity.displayName,
-    session.directory,
-    session.time_updated ?? session.time_created
-  );
-}
 function sessionFromRow(row) {
   const session = {
     id: String(row.session_id),
@@ -6095,7 +6355,7 @@ function sessionFromRow(row) {
   }
   return session;
 }
-function messageFromBackfillRow(row) {
+function messageMetadataFromBackfillRow(row) {
   const role = row.role === "assistant" || row.role === "tool" ? row.role : "user";
   return {
     id: String(row.message_id ?? ""),
@@ -6106,13 +6366,12 @@ function messageFromBackfillRow(row) {
     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 messageFromCachedRow(row) {
-  const message = messageFromBackfillRow(row);
+function messageMetadataFromCachedRow(row) {
+  const message = messageMetadataFromBackfillRow(row);
   const tokens = parseOptionalJson(row.tokens_json);
   if (tokens) {
     message.tokens = tokens;
@@ -6125,6 +6384,44 @@ function messageFromCachedRow(row) {
   }
   return message;
 }
+function messageFromBackfillRow(row) {
+  return {
+    ...messageMetadataFromBackfillRow(row),
+    parts: messagePartsFromJson(row.parts_json)
+  };
+}
+function messageFromCachedRow(row) {
+  return {
+    ...messageMetadataFromCachedRow(row),
+    parts: messagePartsFromJson(row.parts_json)
+  };
+}
+function messagePartsFromJson(value) {
+  try {
+    return normalizeMessageParts(JSON.parse(String(value ?? "[]")));
+  } catch {
+    return [];
+  }
+}
+function normalizeMessagePartsJson(value) {
+  return JSON.stringify(messagePartsFromJson(value));
+}
+function messageJsonFromCachedRow(row) {
+  const metadataJson = JSON.stringify(messageMetadataFromBackfillRow(row));
+  const fields = [];
+  if (row.tokens_json != null) {
+    fields.push(`"tokens":${String(row.tokens_json)}`);
+  }
+  if (row.cost != null) {
+    fields.push(`"cost":${JSON.stringify(Number(row.cost))}`);
+  }
+  if (row.cost_source) {
+    fields.push(`"cost_source":${JSON.stringify(row.cost_source)}`);
+  }
+  const partsJson = Number(row.parts_format_version) >= MESSAGE_PARTS_FORMAT_VERSION ? String(row.parts_json ?? "[]") : normalizeMessagePartsJson(row.parts_json);
+  fields.push(`"parts":${partsJson}`);
+  return `${metadataJson.slice(0, -1)},${fields.join(",")}}`;
+}
 function appendPlainText(value, chunks) {
   if (value == null) return;
   if (typeof value === "string") {
@@ -6184,7 +6481,7 @@ function toolNamesFromMessage(message) {
   return [...tools];
 }
 function summarizeToolPart(part) {
-  const state = part.state == null ? void 0 : compactRecord({
+  const state = compactRecord({
     status: part.state.status,
     error: part.state.error,
     metadata: part.state.metadata
@@ -6193,9 +6490,7 @@ function summarizeToolPart(part) {
     type: part.type,
     tool: part.tool,
     title: part.title,
-    nickname: part.nickname,
     callID: part.callID,
-    approval_status: part.approval_status,
     state
   });
 }
@@ -6206,13 +6501,13 @@ function buildMessageText(message) {
   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 (part.type === "text" || part.type === "reasoning" || part.type === "plan") {
+      appendPlainText(part.text, chunks);
+    } else if (part.type === "tool") {
+      appendPlainText(part.title, chunks);
+      appendPlainText(part.tool, chunks);
+      appendPlainText(part.state, chunks);
+    }
   }
   return chunks.join("\n");
 }
@@ -6249,7 +6544,7 @@ function buildSessionContentFromMessages(title, messages) {
   }
   return chunks.join("\n");
 }
-var CACHE_SCHEMA_VERSION = 14;
+var CACHE_SCHEMA_VERSION = 17;
 function withCacheDb(fn) {
   const cachePath = getCachePath2();
   const db = openDb(cachePath);
@@ -6280,6 +6575,31 @@ function withCacheDbReadOnly(fn) {
     db.close();
   }
 }
+function withSearchDb(fn) {
+  return withCacheDb((db) => runWithFtsRecovery(db, fn));
+}
+function withSearchIndexDb(fn) {
+  return withCacheDb((db) => runWithFtsRecovery(db, fn));
+}
+function runSearchIndexWrite(db, rebuild, write) {
+  return db.transaction(() => {
+    if (rebuild) {
+      dropSearchTriggers(db);
+      dropMessageSearchTriggers(db);
+    }
+    const value = write();
+    let rebuildDurationMs;
+    if (rebuild) {
+      const rebuildStartedAt = performance.now();
+      rebuildSearchIndex(db);
+      rebuildMessageSearchIndex(db);
+      rebuildDurationMs = performance.now() - rebuildStartedAt;
+      createSearchTriggers(db);
+      createMessageSearchTriggers(db);
+    }
+    return { value, rebuildDurationMs };
+  })();
+}
 function createCacheTables(db) {
   db.exec(`
     CREATE TABLE IF NOT EXISTS cache_meta (
@@ -6367,6 +6687,7 @@ function createSessionTables(db) {
       cost REAL,
       cost_source TEXT,
       parts_json TEXT NOT NULL,
+      parts_format_version INTEGER NOT NULL DEFAULT 0,
       subagent_id TEXT,
       nickname TEXT,
       content_text TEXT NOT NULL,
@@ -6523,12 +6844,7 @@ function createSearchTables(db) {
       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_message_count INTEGER NOT NULL,
@@ -6590,28 +6906,27 @@ function dropSearchTriggers(db) {
     DROP TRIGGER IF EXISTS session_documents_au;
   `);
 }
-function ensureProjectColumns(db) {
+var LEGACY_SESSION_DOCUMENT_COLUMNS = [
+  ["slug", "TEXT NOT NULL DEFAULT ''"],
+  ["directory", "TEXT NOT NULL DEFAULT ''"],
+  ["time_created", "INTEGER NOT NULL DEFAULT 0"],
+  ["time_updated", "INTEGER"],
+  ["activity_time", "INTEGER NOT NULL DEFAULT 0"],
+  ["project_identity_kind", "TEXT NOT NULL DEFAULT 'path'"],
+  ["project_identity_key", "TEXT NOT NULL DEFAULT ''"],
+  ["project_display_name", "TEXT NOT NULL DEFAULT ''"]
+];
+function ensureLegacySessionDocumentColumns(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 ''"
-    );
+  for (const [name, definition] of LEGACY_SESSION_DOCUMENT_COLUMNS) {
+    if (!columnExists(db, "session_documents", name)) {
+      db.exec(`ALTER TABLE session_documents ADD COLUMN ${name} ${definition}`);
+    }
   }
 }
 function createProjectTables(db) {
-  ensureProjectColumns(db);
   db.exec(`
     CREATE TABLE IF NOT EXISTS project_sessions (
       agent_name TEXT NOT NULL,
@@ -6665,10 +6980,9 @@ function recreateProjectGroupsView(db) {
 function createLatestCacheSchema(db) {
   createCacheTables(db);
   createSessionTables(db);
-  createMessageSearchTables(db);
   createFileActivityTables(db);
-  createSearchTables(db);
   createProjectTables(db);
+  ensureFtsReady(db);
 }
 function recreateSearchIndexSchema(db) {
   db.exec(`
@@ -6689,7 +7003,7 @@ function readLegacyCacheVersion(db) {
 }
 function inferCacheSchemaVersion(db) {
   if (columnExists(db, "session_documents", "indexed_message_count")) {
-    return 14;
+    return columnExists(db, "session_documents", "slug") ? 14 : 15;
   }
   if (tableExists(db, "message_tools")) {
     return 11;
@@ -6802,6 +7116,7 @@ function backfillSessionDocumentProjects(db) {
   }
 }
 function migrateProjectIdentity(db) {
+  ensureLegacySessionDocumentColumns(db);
   createProjectTables(db);
   backfillProjectSessions(db);
   backfillSessionDocumentProjects(db);
@@ -7009,6 +7324,49 @@ function invalidateSearchContentHashes(db) {
     db.exec("UPDATE session_documents SET content_hash = ''");
   }
 }
+function compactSessionDocuments(db) {
+  if (!tableExists(db, "session_documents")) {
+    createSearchTables(db);
+    return;
+  }
+  dropSearchTriggers(db);
+  db.exec(`
+    DROP TABLE IF EXISTS session_documents_fts;
+    DROP TABLE IF EXISTS session_documents_legacy_v14;
+    ALTER TABLE session_documents RENAME TO session_documents_legacy_v14;
+  `);
+  createSearchTables(db);
+  db.exec(`
+    INSERT INTO session_documents(
+      id,
+      agent_name,
+      session_id,
+      title,
+      content_text,
+      content_hash,
+      indexed_message_count,
+      indexed_at
+    )
+    SELECT
+      id,
+      agent_name,
+      session_id,
+      title,
+      content_text,
+      content_hash,
+      indexed_message_count,
+      indexed_at
+    FROM session_documents_legacy_v14;
+
+    DROP TABLE session_documents_legacy_v14;
+  `);
+}
+function addMessagePartsFormatVersion(db) {
+  if (!tableExists(db, "messages") || columnExists(db, "messages", "parts_format_version")) {
+    return;
+  }
+  db.exec("ALTER TABLE messages ADD COLUMN parts_format_version INTEGER NOT NULL DEFAULT 0");
+}
 var CODEX_EXEC_DECODE_MIGRATION_KEY = "codex_exec_decode_migrated_v3";
 function migrateCodexExecDecode(db) {
   if (!tableExists(db, "cache_meta")) return;
@@ -7035,33 +7393,84 @@ function rebuildMessageSearchIndex(db) {
   }
   db.exec("INSERT INTO messages_fts(messages_fts) VALUES ('rebuild')");
 }
-function ensureFtsReady(db) {
-  if (!tableExists(db, "session_documents_fts")) {
-    createSearchTables(db);
+var SEARCH_FTS_INDEXES = ["session_documents_fts", "messages_fts"];
+function triggerExists(db, triggerName) {
+  return db.prepare("SELECT 1 AS value FROM sqlite_master WHERE name = ? AND type = 'trigger' LIMIT 1").get(triggerName) !== void 0;
+}
+function hasAllTriggers(db, triggerNames) {
+  return triggerNames.every((triggerName) => triggerExists(db, triggerName));
+}
+function rebuildSearchFtsIndexes(db, indexes, reason) {
+  if (indexes.length === 0) return;
+  const startedAt = performance.now();
+  getCoreDiagnostics()?.info?.("sqlite.fts_rebuild.started", { indexes, reason });
+  try {
+    for (const index of indexes) {
+      if (index === "session_documents_fts") rebuildSearchIndex(db);
+      else rebuildMessageSearchIndex(db);
+    }
+    getCoreDiagnostics()?.info?.("sqlite.fts_rebuild.completed", {
+      indexes,
+      reason,
+      duration_ms: Math.round(performance.now() - startedAt)
+    });
+  } catch (error) {
+    getCoreDiagnostics()?.warn("sqlite.fts_rebuild.failed", {
+      indexes,
+      reason,
+      duration_ms: Math.round(performance.now() - startedAt),
+      message: error instanceof Error ? error.message : String(error)
+    });
+    throw error;
   }
-  createSearchTriggers(db);
-  const needsMessageSearchRebuild = !tableExists(db, "messages_fts");
+}
+function ensureFtsReady(db) {
+  const needsSearchRebuild = !tableExists(db, "session_documents_fts") || !hasAllTriggers(db, ["session_documents_ai", "session_documents_ad", "session_documents_au"]);
+  const needsMessageSearchRebuild = !tableExists(db, "messages_fts") || !hasAllTriggers(db, ["messages_ai", "messages_ad", "messages_au"]);
+  createSearchTables(db);
   createMessageSearchTables(db);
-  if (needsMessageSearchRebuild) {
-    rebuildMessageSearchIndex(db);
-  }
+  const indexes = [];
+  if (needsSearchRebuild) indexes.push("session_documents_fts");
+  if (needsMessageSearchRebuild) indexes.push("messages_fts");
+  rebuildSearchFtsIndexes(db, indexes, "schema_missing");
 }
 function ensureFtsConsistency(db) {
-  ensureFtsReady(db);
-  const cachePath = getCachePath2();
-  if (getFtsIntegrityCheckedPath() === cachePath) {
-    return;
-  }
+  const startedAt = performance.now();
+  getCoreDiagnostics()?.info?.("sqlite.fts_integrity.started", {
+    indexes: 2
+  });
   try {
     db.exec(
       "INSERT INTO session_documents_fts(session_documents_fts, rank) VALUES ('integrity-check', 1)"
     );
     db.exec("INSERT INTO messages_fts(messages_fts, rank) VALUES ('integrity-check', 1)");
-    setFtsIntegrityCheckedPath(cachePath);
-  } catch {
-    rebuildSearchIndex(db);
-    rebuildMessageSearchIndex(db);
-    setFtsIntegrityCheckedPath(cachePath);
+    getCoreDiagnostics()?.info?.("sqlite.fts_integrity.completed", {
+      indexes: 2,
+      duration_ms: Math.round(performance.now() - startedAt)
+    });
+  } catch (error) {
+    getCoreDiagnostics()?.warn("sqlite.fts_integrity.failed", {
+      indexes: 2,
+      duration_ms: Math.round(performance.now() - startedAt),
+      message: error instanceof Error ? error.message : String(error)
+    });
+    rebuildSearchFtsIndexes(db, [...SEARCH_FTS_INDEXES], "corruption");
+  }
+}
+function isFtsCorruptionError(error) {
+  return typeof error === "object" && error !== null && "code" in error && error.code === "SQLITE_CORRUPT_VTAB";
+}
+function runWithFtsRecovery(db, fn) {
+  ensureFtsReady(db);
+  try {
+    return fn(db);
+  } catch (error) {
+    if (!isFtsCorruptionError(error)) throw error;
+    getCoreDiagnostics()?.warn("sqlite.fts_corruption.detected", {
+      message: error instanceof Error ? error.message : String(error)
+    });
+    ensureFtsConsistency(db);
+    return fn(db);
   }
 }
 function setCacheSchemaVersion(db) {
@@ -7141,7 +7550,9 @@ function ensureSchema(db, dbPath) {
         }
       },
       { version: 13, migrate: createCacheTables },
-      { version: 14, migrate: addIndexedMessageCount }
+      { version: 14, migrate: addIndexedMessageCount },
+      { version: 15, destructive: true, migrate: compactSessionDocuments },
+      { version: 17, migrate: addMessagePartsFormatVersion }
     ]
   });
   createLatestCacheSchema(db);
@@ -7357,7 +7768,6 @@ function loadSearchIndexEntry(agentName, change, loadSessionData) {
     const identity = change.session.project_identity ?? data.project_identity ?? computeIdentity(change.session.directory, realFs);
     return {
       session: change.session,
-      identity,
       messages,
       contentText: buildSessionContentFromMessages(data.title ?? change.session.title, messages),
       contentHash: sessionContentHash(change.session),
@@ -7412,11 +7822,12 @@ function writeSearchIndexRows(db, agentName, removedSessionIds, entries) {
       cost,
       cost_source,
       parts_json,
+      parts_format_version,
       subagent_id,
       nickname,
       content_text,
       tool_metadata_json
-    ) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
+    ) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
     ON CONFLICT(agent_name, session_id, message_index) DO UPDATE SET
       message_id = excluded.message_id,
       role = excluded.role,
@@ -7430,6 +7841,7 @@ function writeSearchIndexRows(db, agentName, removedSessionIds, entries) {
       cost = excluded.cost,
       cost_source = excluded.cost_source,
       parts_json = excluded.parts_json,
+      parts_format_version = excluded.parts_format_version,
       subagent_id = excluded.subagent_id,
       nickname = excluded.nickname,
       content_text = excluded.content_text,
@@ -7439,30 +7851,14 @@ function writeSearchIndexRows(db, agentName, removedSessionIds, entries) {
     INSERT INTO session_documents(
       agent_name,
       session_id,
-      slug,
       title,
-      directory,
-      project_identity_kind,
-      project_identity_key,
-      project_display_name,
-      time_created,
-      time_updated,
-      activity_time,
       content_text,
       content_hash,
       indexed_message_count,
       indexed_at
-    ) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
+    ) VALUES (?, ?, ?, ?, ?, ?, ?)
     ON CONFLICT(agent_name, session_id) DO UPDATE SET
-      slug = excluded.slug,
       title = excluded.title,
-      directory = excluded.directory,
-      project_identity_kind = excluded.project_identity_kind,
-      project_identity_key = excluded.project_identity_key,
-      project_display_name = excluded.project_display_name,
-      time_created = excluded.time_created,
-      time_updated = excluded.time_updated,
-      activity_time = excluded.activity_time,
       content_text = excluded.content_text,
       content_hash = excluded.content_hash,
       indexed_message_count = excluded.indexed_message_count,
@@ -7480,7 +7876,6 @@ function writeSearchIndexRows(db, agentName, removedSessionIds, entries) {
   }
   let indexed = 0;
   for (const entry of entries) {
-    const activityTime = entry.session.time_updated ?? entry.session.time_created;
     upsertSessionRow(upsertIndexedSession, agentName, entry.session, null, entry.sortIndex, null);
     deleteFileActivity.run(agentName, entry.session.id);
     deleteMessageTools.run(agentName, entry.session.id, 0);
@@ -7503,6 +7898,7 @@ function writeSearchIndexRows(db, agentName, removedSessionIds, entries) {
         message.cost ?? null,
         message.costSource ?? null,
         message.partsJson,
+        MESSAGE_PARTS_FORMAT_VERSION,
         message.subagentId ?? null,
         message.nickname ?? null,
         message.contentText,
@@ -7516,15 +7912,7 @@ function writeSearchIndexRows(db, agentName, removedSessionIds, entries) {
     upsertRow.run(
       agentName,
       entry.session.id,
-      entry.session.slug,
       entry.session.title,
-      entry.session.directory,
-      entry.identity.kind,
-      entry.identity.key,
-      entry.identity.displayName,
-      entry.session.time_created,
-      entry.session.time_updated ?? null,
-      activityTime,
       entry.contentText,
       entry.contentHash,
       entry.messages.length,
@@ -7535,8 +7923,7 @@ function writeSearchIndexRows(db, agentName, removedSessionIds, entries) {
   return indexed;
 }
 function syncSessionSearchIndex(agentName, sessions, loadSessionData, options = {}) {
-  return withCacheDb((db) => {
-    ensureFtsConsistency(db);
+  return withSearchIndexDb((db) => {
     const startedAt = performance.now();
     const existingRows = db.prepare(
       "SELECT session_id, content_hash, indexed_message_count FROM session_documents WHERE agent_name = ? ORDER BY id"
@@ -7570,23 +7957,8 @@ function syncSessionSearchIndex(agentName, sessions, loadSessionData, options =
         loadSearchIndexEntries(agentName, changes, loadSessionData)
       );
     };
-    let rebuildDurationMs;
     const needsRebuild = isBulk && changedCount > 0;
-    if (needsRebuild) {
-      db.transaction(() => {
-        dropSearchTriggers(db);
-        dropMessageSearchTriggers(db);
-        writeRows();
-        const rebuildStartedAt = performance.now();
-        rebuildSearchIndex(db);
-        rebuildMessageSearchIndex(db);
-        rebuildDurationMs = performance.now() - rebuildStartedAt;
-        createSearchTriggers(db);
-        createMessageSearchTriggers(db);
-      })();
-    } else {
-      db.transaction(writeRows)();
-    }
+    const { rebuildDurationMs } = runSearchIndexWrite(db, needsRebuild, writeRows);
     return {
       agentName,
       mode: isBulk ? "bulk" : "incremental",
@@ -7613,8 +7985,7 @@ function syncSessionSearchIndexChanges(agentName, changes, removedSessionIds, lo
       durationMs: 0
     };
   }
-  return withCacheDb((db) => {
-    ensureFtsConsistency(db);
+  return withSearchIndexDb((db) => {
     const startedAt = performance.now();
     const searchIndexState = readSearchIndexState(
       db,
@@ -7636,23 +8007,8 @@ function syncSessionSearchIndexChanges(agentName, changes, removedSessionIds, lo
         loadSearchIndexEntries(agentName, toUpsert, loadSessionData)
       );
     };
-    let rebuildDurationMs;
     const needsRebuild = isBulk && changedCount > 0;
-    if (needsRebuild) {
-      db.transaction(() => {
-        dropSearchTriggers(db);
-        dropMessageSearchTriggers(db);
-        writeRows();
-        const rebuildStartedAt = performance.now();
-        rebuildSearchIndex(db);
-        rebuildMessageSearchIndex(db);
-        rebuildDurationMs = performance.now() - rebuildStartedAt;
-        createSearchTriggers(db);
-        createMessageSearchTriggers(db);
-      })();
-    } else {
-      db.transaction(writeRows)();
-    }
+    const { rebuildDurationMs } = runSearchIndexWrite(db, needsRebuild, writeRows);
     return {
       agentName,
       mode: isBulk ? "bulk" : "incremental",
@@ -7794,6 +8150,32 @@ function buildSessionSearchFilters(options) {
     params
   };
 }
+var SQLITE_REFERENCE_BATCH_SIZE = 200;
+function filterIndexedSessionReferences(references, options) {
+  if (references.length === 0 || !hasCacheStorage()) return /* @__PURE__ */ new Set();
+  const matches = withSearchDb((db) => {
+    const filters = buildSessionSearchFilters(options);
+    const result = /* @__PURE__ */ new Set();
+    for (let offset = 0; offset < references.length; offset += SQLITE_REFERENCE_BATCH_SIZE) {
+      const batch = references.slice(offset, offset + SQLITE_REFERENCE_BATCH_SIZE);
+      const referenceClauses = batch.map(() => "(s.agent_name = ? AND s.session_id = ?)");
+      const referenceParams = batch.flatMap(({ agentName, sessionId }) => [agentName, sessionId]);
+      const rows = db.prepare(
+        `
+            SELECT s.agent_name, s.session_id
+            FROM sessions s
+            WHERE (${referenceClauses.join(" OR ")})
+              ${filters.where}
+          `
+      ).all(...referenceParams, ...filters.params);
+      for (const row of rows) {
+        result.add(searchResultRowKey(row));
+      }
+    }
+    return result;
+  });
+  return matches ?? /* @__PURE__ */ new Set();
+}
 function searchSessionColumns() {
   return `
     s.agent_name,
@@ -7919,7 +8301,10 @@ function rowsToSearchResults(db, rows, textQuery, ftsQuery = toFtsQuery(textQuer
   return rows.map((row) => {
     const match = resolveSearchMatch(row, terms, messageMatches);
     return {
-      agentName: String(row.agent_name),
+      reference: {
+        agentName: String(row.agent_name),
+        sessionId: String(row.session_id)
+      },
       session: sessionHeadFromSearchRow(row),
       snippet: match.snippet,
       matchType: match.matchType
@@ -7932,8 +8317,7 @@ function searchSessions(query, options = {}) {
   if (!hasCacheStorage()) {
     return [];
   }
-  const results = withCacheDb((db) => {
-    ensureFtsReady(db);
+  const results = withSearchDb((db) => {
     const filters = buildSessionSearchFilters(search.options);
     if (!normalizedQuery) {
       const rows2 = db.prepare(
@@ -7989,13 +8373,15 @@ function fileActivityFilters(options) {
 }
 function fileActivityFromRow(row) {
   return {
-    agent_name: String(row.agent_name),
-    session_id: String(row.session_id),
-    project_identity_key: String(row.project_identity_key ?? ""),
+    reference: {
+      agentName: String(row.agent_name),
+      sessionId: String(row.session_id)
+    },
+    projectIdentityKey: 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)
+    latestTime: Number(row.latest_time ?? 0)
   };
 }
 function buildFileActivityWhere(options) {
@@ -8060,10 +8446,19 @@ function buildFileActivityWhere(options) {
   };
 }
 function listFileActivity(options = {}) {
+  return queryFileActivity(options);
+}
+function queryFileActivity(options, sessionSearchOptions) {
   if (!hasCacheStorage()) {
     return [];
   }
   const filters = buildFileActivityWhere(options);
+  const sessionFilters = sessionSearchOptions ? buildSessionSearchFilters(sessionSearchOptions) : { where: "", params: [] };
+  const whereClauses = [
+    filters.where.replace(/^WHERE /, ""),
+    sessionFilters.where.replace(/^ AND /, "")
+  ].filter(Boolean);
+  const where = whereClauses.length > 0 ? `WHERE ${whereClauses.join(" AND ")}` : "";
   const queryRows = (db) => db.prepare(
     `
           SELECT
@@ -8088,14 +8483,17 @@ function listFileActivity(options = {}) {
             s.total_cache_create_tokens,
             s.total_cost,
             s.cost_source,
-            s.total_tokens
+            s.total_tokens,
+            s.model_usage_json,
+            s.smart_tags_json,
+            s.smart_tags_source_updated_at
           FROM session_file_activity fa
           JOIN sessions s ON s.agent_name = fa.agent_name AND s.session_id = fa.session_id
-          ${filters.where}
+          ${where}
           ORDER BY fa.latest_time DESC, fa.count DESC, fa.path
           LIMIT ?
         `
-  ).all(...filters.params, options.limit ?? 50);
+  ).all(...filters.params, ...sessionFilters.params, options.limit ?? 50);
   let rows = withCacheDbReadOnly(queryRows);
   if (rows == null && options.path) {
     rows = withCacheDb(queryRows);
@@ -8124,27 +8522,22 @@ 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,
-    projectKind: search.options.projectKind,
-    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 rows = queryFileActivity(
+    {
+      path: path2,
+      kind: search.options.fileKind,
+      limit: (search.options.limit ?? 50) * 3
+    },
+    search.options
+  );
   const seen = /* @__PURE__ */ new Set();
   const results = [];
   for (const row of rows) {
-    const key = `${row.agent_name}/${row.session_id}`;
+    const key = `${row.reference.agentName}/${row.reference.sessionId}`;
     if (seen.has(key)) continue;
-    if (!sessionMatchesSearchCost(row.session, search.options)) continue;
     seen.add(key);
     results.push({
-      agentName: row.agent_name,
+      reference: row.reference,
       session: row.session,
       snippet: `${row.kind} ${highlightFilePath(row.path, path2)} \xB7 ${row.count} events`,
       matchType: "file_path"
@@ -8280,7 +8673,7 @@ function markAgentFullSyncCompleted(agentName) {
     ).run(Date.now(), agentName);
   });
 }
-function loadCachedSessionDataEntry(agentName, sessionId) {
+function loadCachedSessionRawEntry(agentName, sessionId) {
   if (!hasCacheStorage()) {
     return null;
   }
@@ -8334,6 +8727,7 @@ function loadCachedSessionDataEntry(agentName, sessionId) {
             cost,
             cost_source,
             parts_json,
+            parts_format_version,
             subagent_id,
             nickname
           FROM messages
@@ -8354,20 +8748,16 @@ function loadCachedSessionDataEntry(agentName, sessionId) {
     return {
       data: {
         ...head,
-        messages: messageRows.map((messageRow) => messageFromCachedRow(messageRow)),
+        reference: { agentName, sessionId },
         file_activity: fileActivityRows.map((activityRow) => fileActivityFromRow(activityRow))
       },
+      messageRows,
       meta: parseCachedSessionMeta(row.meta_json)
     };
   });
 }
-function loadCachedSessionData(agentName, sessionId) {
-  return loadCachedSessionDataEntry(agentName, sessionId)?.data ?? null;
-}
 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 = ?"
     );
@@ -8383,25 +8773,16 @@ function saveCachedSessions(agentName, sessions, meta = {}) {
     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);
@@ -8410,15 +8791,12 @@ function saveCachedSessions(agentName, sessions, meta = {}) {
           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,
@@ -8427,7 +8805,6 @@ function saveCachedSessions(agentName, sessions, meta = {}) {
           index,
           sourcePathFromMeta(sessionMeta)
         );
-        writeProjectSessionRow(upsertProjectSession, agentName, session, identity);
       });
     });
     write();
@@ -8439,9 +8816,6 @@ function saveCachedSessionChanges(agentName, changes, removedSessionIds, meta =
     return;
   }
   withCacheDb((db) => {
-    const deleteLegacySession = db.prepare(
-      "DELETE FROM cached_sessions WHERE agent_name = ? AND session_id = ?"
-    );
     const deleteSession = db.prepare(
       "DELETE FROM sessions WHERE agent_name = ? AND session_id = ?"
     );
@@ -8457,33 +8831,24 @@ function saveCachedSessionChanges(agentName, changes, removedSessionIds, meta =
     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,
@@ -8492,7 +8857,6 @@ function saveCachedSessionChanges(agentName, changes, removedSessionIds, meta =
           sortIndex,
           sourcePathFromMeta(sessionMeta)
         );
-        writeProjectSessionRow(upsertProjectSession, agentName, session, identity);
       }
     });
     write();
@@ -8500,7 +8864,6 @@ function saveCachedSessionChanges(agentName, changes, removedSessionIds, meta =
   });
 }
 function clearCache() {
-  setFtsIntegrityCheckedPath(null);
   setSchemaEnsuredPath(null);
   if (!hasCacheStorage()) {
     deleteLegacyCacheFile();
@@ -8533,49 +8896,6 @@ function clearCache() {
     }
   }
 }
-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 listCachedProjectGroups(sessions) {
-  if (sessions) {
-    return buildProjectGroups(sessions);
-  }
-  if (!hasCacheStorage()) {
-    return [];
-  }
-  const queryRows = (db) => db.prepare(
-    `
-          SELECT identity_kind, identity_key, display_name, sources_csv, session_count, last_activity
-          FROM project_groups_v
-          ORDER BY
-            CASE identity_kind WHEN 'loose' THEN 1 ELSE 0 END,
-            last_activity IS NULL,
-            last_activity DESC
-        `
-  ).all();
-  let rows = withCacheDbReadOnly(queryRows);
-  if (rows == null) {
-    rows = withCacheDb(queryRows);
-  }
-  return (rows ?? []).map((row) => ({
-    identityKind: row.identity_kind ?? "path",
-    identityKey: String(row.identity_key ?? ""),
-    displayName: String(row.display_name ?? ""),
-    sources: String(row.sources_csv ?? "").split(",").filter(Boolean).sort(),
-    sessionCount: Number(row.session_count ?? 0),
-    lastActivity: row.last_activity == null ? null : Number(row.last_activity)
-  }));
-}
 function attachMissingProjectIdentities(sessions) {
   return sessions.map((session) => {
     if (session.project_identity) return session;
@@ -8965,8 +9285,140 @@ async function scanSessions(options = {}, onProgress) {
     cacheTimestamps: Object.keys(cacheTimestamps).length > 0 ? cacheTimestamps : void 0
   };
 }
-async function scanSessionsAsync(options = {}, onProgress) {
-  return scanSessions(options, onProgress);
+var sessionDetailLookups = /* @__PURE__ */ new WeakMap();
+function sessionReferenceKey(agentName, sessionId) {
+  return `${agentName}\0${sessionId}`;
+}
+function getSessionDetailLookup(scanResult) {
+  const cached = sessionDetailLookups.get(scanResult.sessions);
+  if (cached) return cached;
+  const agentsByName = /* @__PURE__ */ new Map();
+  for (const agent of scanResult.agents) {
+    if (!agentsByName.has(agent.name)) agentsByName.set(agent.name, agent);
+  }
+  const headsByReference = /* @__PURE__ */ new Map();
+  for (const [agentName, sessions] of Object.entries(scanResult.byAgent)) {
+    for (const session of sessions) {
+      const key = sessionReferenceKey(agentName, session.id);
+      if (!headsByReference.has(key)) headsByReference.set(key, session);
+    }
+  }
+  const lookup = { agentsByName, headsByReference };
+  sessionDetailLookups.set(scanResult.sessions, lookup);
+  return lookup;
+}
+function getSessionDetailContext(scanResult, reference) {
+  const lookup = getSessionDetailLookup(scanResult);
+  const agent = lookup.agentsByName.get(reference.agentName);
+  if (!agent) return null;
+  return {
+    agent,
+    head: lookup.headsByReference.get(
+      sessionReferenceKey(reference.agentName, reference.sessionId)
+    )
+  };
+}
+function cacheMatchesCurrentSource(cachedMeta, currentMeta) {
+  const currentFingerprint = currentMeta?.sourceFingerprint;
+  if (typeof currentFingerprint !== "string") return true;
+  return cachedMeta?.sourceFingerprint === currentFingerprint;
+}
+function cacheHasCompleteDetail(cachedEntry, currentMeta) {
+  if (!cachedEntry || !cacheMatchesCurrentSource(cachedEntry.meta, currentMeta)) {
+    return false;
+  }
+  return cachedEntry.messageRows.length > 0 || cachedEntry.data.stats.message_count === 0;
+}
+function getProjectIdentity(data, head) {
+  return data.project_identity ?? head?.project_identity ?? computeIdentity(data.directory, realFs);
+}
+function materializeStructuredSessionDetail(context, reference, cachedEntry = loadCachedSessionRawEntry(reference.agentName, reference.sessionId)) {
+  const { agent, head } = context;
+  const currentMeta = head ? agent.getSessionMetaMap().get(reference.sessionId) : void 0;
+  const useCache = cacheHasCompleteDetail(cachedEntry, currentMeta);
+  const data = useCache ? {
+    ...cachedEntry.data,
+    messages: cachedEntry.messageRows.map((messageRow) => messageFromCachedRow(messageRow))
+  } : head ? agent.getSessionData(reference.sessionId) : null;
+  if (!data) {
+    return { status: "not-ready" };
+  }
+  const projectIdentity = getProjectIdentity(data, head);
+  const fileActivity = data.file_activity ?? (useCache ? listSessionFileActivity(reference.agentName, reference.sessionId) : extractSessionFileActivity(
+    reference.agentName,
+    reference.sessionId,
+    projectIdentity.key,
+    data.messages
+  ));
+  return {
+    status: "found",
+    data: {
+      ...data,
+      reference,
+      project_identity: projectIdentity,
+      smart_tags: data.smart_tags ?? classifySessionTags(data),
+      smart_tags_source_updated_at: getSmartTagSourceTimestamp(data),
+      file_activity: fileActivity
+    }
+  };
+}
+function* serializeCachedMessages(entry) {
+  for (const messageRow of entry.messageRows) {
+    yield messageJsonFromCachedRow(messageRow);
+  }
+}
+function materializeSessionDetailResponse(scanResult, reference) {
+  const context = getSessionDetailContext(scanResult, reference);
+  if (!context) return { status: "unknown-agent" };
+  const cachedEntry = loadCachedSessionRawEntry(reference.agentName, reference.sessionId);
+  const currentMeta = context.head ? context.agent.getSessionMetaMap().get(reference.sessionId) : void 0;
+  const useCache = cacheHasCompleteDetail(cachedEntry, currentMeta);
+  if (!useCache || cachedEntry.data.smart_tags == null) {
+    return materializeStructuredSessionDetail(context, reference, cachedEntry);
+  }
+  const data = cachedEntry.data;
+  return {
+    status: "found-json",
+    data: {
+      ...data,
+      reference,
+      project_identity: getProjectIdentity(data, context.head),
+      smart_tags_source_updated_at: getSmartTagSourceTimestamp(data),
+      file_activity: data.file_activity ?? listSessionFileActivity(reference.agentName, reference.sessionId)
+    },
+    messages: serializeCachedMessages(cachedEntry),
+    messageCount: cachedEntry.messageRows.length
+  };
+}
+function listCachedProjectGroups(sessions) {
+  if (sessions) {
+    return buildProjectGroups(sessions);
+  }
+  if (!hasCacheStorage()) {
+    return [];
+  }
+  const queryRows = (db) => db.prepare(
+    `
+          SELECT identity_kind, identity_key, display_name, sources_csv, session_count, last_activity
+          FROM project_groups_v
+          ORDER BY
+            CASE identity_kind WHEN 'loose' THEN 1 ELSE 0 END,
+            last_activity IS NULL,
+            last_activity DESC
+        `
+  ).all();
+  let rows = withCacheDbReadOnly(queryRows);
+  if (rows == null) {
+    rows = withCacheDb(queryRows);
+  }
+  return (rows ?? []).map((row) => ({
+    identityKind: row.identity_kind ?? "path",
+    identityKey: String(row.identity_key ?? ""),
+    displayName: String(row.display_name ?? ""),
+    sources: String(row.sources_csv ?? "").split(",").filter(Boolean).sort(),
+    sessionCount: Number(row.session_count ?? 0),
+    lastActivity: row.last_activity == null ? null : Number(row.last_activity)
+  }));
 }
 var STATE_DB_FILENAME = "state.db";
 var STATE_SCHEMA_VERSION = 2;
@@ -8986,18 +9438,18 @@ var StateStorageUnavailableError = class extends Error {
 };
 function getStateDir() {
   if (process.env.CODESESH_STATE_DIR) return process.env.CODESESH_STATE_DIR;
-  const currentPlatform = platform2();
+  const currentPlatform = platform4();
   if (currentPlatform === "darwin") {
-    return join12(homedir5(), "Library", "Application Support", "codesesh");
+    return join13(homedir7(), "Library", "Application Support", "codesesh");
   }
   if (currentPlatform === "win32") {
     const appData = process.env.APPDATA ?? process.env.LOCALAPPDATA;
-    return join12(appData ?? join12(homedir5(), "AppData", "Roaming"), "codesesh");
+    return join13(appData ?? join13(homedir7(), "AppData", "Roaming"), "codesesh");
   }
-  return join12(process.env.XDG_DATA_HOME ?? join12(homedir5(), ".local", "share"), "codesesh");
+  return join13(process.env.XDG_DATA_HOME ?? join13(homedir7(), ".local", "share"), "codesesh");
 }
 function getStateDbPath() {
-  return join12(getStateDir(), STATE_DB_FILENAME);
+  return join13(getStateDir(), STATE_DB_FILENAME);
 }
 function useMemoryStateStore() {
   return process.env.CODESESH_STATE_STORE === MEMORY_STATE_STORE;
@@ -9103,41 +9555,59 @@ function withStateDb(fn) {
   }
 }
 var memoryBookmarks = /* @__PURE__ */ new Map();
-function getBookmarkKey(agentKey, sessionId) {
-  return JSON.stringify([agentKey, sessionId]);
+function getBookmarkKey(reference) {
+  const normalized = normalizeSessionReference(reference);
+  return JSON.stringify([normalized.agentName, normalized.sessionId]);
 }
 function getActivityTime(bookmark) {
-  return bookmark.time_updated ?? bookmark.time_created;
+  return bookmark.session.time_updated ?? bookmark.session.time_created;
 }
 function sortBookmarks(bookmarks) {
   return bookmarks.sort((a, b) => {
     const activityDelta = getActivityTime(b) - getActivityTime(a);
-    return activityDelta || b.bookmarked_at - a.bookmarked_at;
+    return activityDelta || b.bookmarkedAt - a.bookmarkedAt;
   });
 }
 function listMemoryBookmarks() {
   return sortBookmarks(Array.from(memoryBookmarks.values()));
 }
+function normalizeBookmark(bookmark) {
+  const reference = normalizeSessionReference(bookmark.reference);
+  return {
+    reference,
+    session: {
+      ...bookmark.session,
+      id: reference.sessionId,
+      slug: formatSessionReference(reference)
+    }
+  };
+}
 function upsertMemoryBookmark(bookmark) {
-  const key = getBookmarkKey(bookmark.agentKey, bookmark.sessionId);
+  const key = getBookmarkKey(bookmark.reference);
   const saved = {
     ...bookmark,
-    bookmarked_at: memoryBookmarks.get(key)?.bookmarked_at ?? Date.now()
+    bookmarkedAt: memoryBookmarks.get(key)?.bookmarkedAt ?? Date.now()
   };
   memoryBookmarks.set(key, saved);
   return saved;
 }
 function toBookmarkRecord(row) {
+  const reference = normalizeSessionReference({
+    agentName: String(row.agent_name ?? ""),
+    sessionId: String(row.session_id ?? "")
+  });
   return {
-    agentKey: String(row.agent_name ?? ""),
-    sessionId: String(row.session_id ?? ""),
-    fullPath: String(row.slug ?? ""),
-    title: String(row.title ?? ""),
-    directory: String(row.directory ?? ""),
-    time_created: Number(row.time_created ?? 0),
-    time_updated: row.time_updated == null ? void 0 : Number(row.time_updated),
-    stats: JSON.parse(String(row.stats_json ?? "{}")),
-    bookmarked_at: Number(row.bookmarked_at ?? 0)
+    reference,
+    session: {
+      id: reference.sessionId,
+      slug: formatSessionReference(reference),
+      title: String(row.title ?? ""),
+      directory: String(row.directory ?? ""),
+      time_created: Number(row.time_created ?? 0),
+      time_updated: row.time_updated == null ? void 0 : Number(row.time_updated),
+      stats: JSON.parse(String(row.stats_json ?? "{}"))
+    },
+    bookmarkedAt: Number(row.bookmarked_at ?? 0)
   };
 }
 function listBookmarks() {
@@ -9150,7 +9620,6 @@ function listBookmarks() {
           SELECT
             agent_name,
             session_id,
-            slug,
             title,
             directory,
             time_created,
@@ -9165,8 +9634,9 @@ function listBookmarks() {
   });
 }
 function upsertBookmark(bookmark) {
+  const normalized = normalizeBookmark(bookmark);
   if (useMemoryStateStore()) {
-    return upsertMemoryBookmark(bookmark);
+    return upsertMemoryBookmark(normalized);
   }
   return withStateDb((db) => {
     const existing = db.prepare(
@@ -9175,7 +9645,7 @@ function upsertBookmark(bookmark) {
           FROM bookmarks
           WHERE agent_name = ? AND session_id = ?
         `
-    ).get(bookmark.agentKey, bookmark.sessionId);
+    ).get(normalized.reference.agentName, normalized.reference.sessionId);
     const bookmarkedAt = Number(existing?.bookmarked_at ?? Date.now());
     db.prepare(
       `
@@ -9199,22 +9669,23 @@ function upsertBookmark(bookmark) {
           stats_json = excluded.stats_json
       `
     ).run(
-      bookmark.agentKey,
-      bookmark.sessionId,
-      bookmark.fullPath,
-      bookmark.title,
-      bookmark.directory,
-      bookmark.time_created,
-      bookmark.time_updated ?? null,
-      JSON.stringify(bookmark.stats),
+      normalized.reference.agentName,
+      normalized.reference.sessionId,
+      formatSessionReference(normalized.reference),
+      normalized.session.title,
+      normalized.session.directory,
+      normalized.session.time_created,
+      normalized.session.time_updated ?? null,
+      JSON.stringify(normalized.session.stats),
       bookmarkedAt
     );
-    return { ...bookmark, bookmarked_at: bookmarkedAt };
+    return { ...normalized, bookmarkedAt };
   });
 }
 function importBookmarks(bookmarks) {
+  const normalizedBookmarks = bookmarks.map(normalizeBookmark);
   if (useMemoryStateStore()) {
-    for (const bookmark of bookmarks) {
+    for (const bookmark of normalizedBookmarks) {
       upsertMemoryBookmark(bookmark);
     }
     return listMemoryBookmarks();
@@ -9223,7 +9694,10 @@ function importBookmarks(bookmarks) {
     const existingRows = db.prepare("SELECT agent_name, session_id, bookmarked_at FROM bookmarks").all();
     const existingTimes = new Map(
       existingRows.map((row) => [
-        `${String(row.agent_name ?? "")}:${String(row.session_id ?? "")}`,
+        getBookmarkKey({
+          agentName: String(row.agent_name ?? ""),
+          sessionId: String(row.session_id ?? "")
+        }),
         Number(row.bookmarked_at ?? 0)
       ])
     );
@@ -9250,17 +9724,17 @@ function importBookmarks(bookmarks) {
       `
     );
     const write = db.transaction(() => {
-      for (const bookmark of bookmarks) {
-        const key = `${bookmark.agentKey}:${bookmark.sessionId}`;
+      for (const bookmark of normalizedBookmarks) {
+        const key = getBookmarkKey(bookmark.reference);
         upsert.run(
-          bookmark.agentKey,
-          bookmark.sessionId,
-          bookmark.fullPath,
-          bookmark.title,
-          bookmark.directory,
-          bookmark.time_created,
-          bookmark.time_updated ?? null,
-          JSON.stringify(bookmark.stats),
+          bookmark.reference.agentName,
+          bookmark.reference.sessionId,
+          formatSessionReference(bookmark.reference),
+          bookmark.session.title,
+          bookmark.session.directory,
+          bookmark.session.time_created,
+          bookmark.session.time_updated ?? null,
+          JSON.stringify(bookmark.session.stats),
           existingTimes.get(key) ?? Date.now()
         );
       }
@@ -9271,7 +9745,6 @@ function importBookmarks(bookmarks) {
           SELECT
             agent_name,
             session_id,
-            slug,
             title,
             directory,
             time_created,
@@ -9285,9 +9758,10 @@ function importBookmarks(bookmarks) {
     return rows.map(toBookmarkRecord);
   });
 }
-function deleteBookmark(agentKey, sessionId) {
+function deleteBookmark(reference) {
+  const normalized = normalizeSessionReference(reference);
   if (useMemoryStateStore()) {
-    memoryBookmarks.delete(getBookmarkKey(agentKey, sessionId));
+    memoryBookmarks.delete(getBookmarkKey(normalized));
     return;
   }
   withStateDb((db) => {
@@ -9296,20 +9770,30 @@ function deleteBookmark(agentKey, sessionId) {
         DELETE FROM bookmarks
         WHERE agent_name = ? AND session_id = ?
       `
-    ).run(agentKey, sessionId);
+    ).run(normalized.agentName, normalized.sessionId);
   });
 }
 var SESSION_ALIAS_MAX_LENGTH = 160;
+var SessionAliasValidationError = class extends Error {
+  constructor() {
+    super("Invalid session alias");
+    this.name = "SessionAliasValidationError";
+  }
+};
 var memoryAliases = /* @__PURE__ */ new Map();
-function getAliasKey(agentKey, sessionId) {
-  return JSON.stringify([agentKey, sessionId]);
+function getAliasKey(reference) {
+  const normalized = normalizeSessionReference(reference);
+  return JSON.stringify([normalized.agentName, normalized.sessionId]);
 }
 function toSessionAlias(row) {
+  const reference = normalizeSessionReference({
+    agentName: String(row.agent_name ?? ""),
+    sessionId: String(row.session_id ?? "")
+  });
   return {
-    agentKey: String(row.agent_name ?? ""),
-    sessionId: String(row.session_id ?? ""),
+    reference,
     alias: String(row.alias ?? ""),
-    updated_at: Number(row.updated_at ?? 0)
+    updatedAt: Number(row.updated_at ?? 0)
   };
 }
 function normalizeSessionAlias(value) {
@@ -9329,19 +9813,19 @@ function listSessionAliases() {
     ).all().map(toSessionAlias)
   );
 }
-function upsertSessionAlias(agentKey, sessionId, alias) {
+function upsertSessionAlias(reference, alias) {
   const normalizedAlias = normalizeSessionAlias(alias);
   if (!normalizedAlias) {
-    throw new TypeError("Invalid session alias");
+    throw new SessionAliasValidationError();
   }
+  const normalizedReference = normalizeSessionReference(reference);
   const saved = {
-    agentKey,
-    sessionId,
+    reference: normalizedReference,
     alias: normalizedAlias,
-    updated_at: Date.now()
+    updatedAt: Date.now()
   };
   if (useMemoryStateStore()) {
-    memoryAliases.set(getAliasKey(agentKey, sessionId), saved);
+    memoryAliases.set(getAliasKey(normalizedReference), saved);
     return saved;
   }
   return withStateDb((db) => {
@@ -9353,13 +9837,14 @@ function upsertSessionAlias(agentKey, sessionId, alias) {
           alias = excluded.alias,
           updated_at = excluded.updated_at
       `
-    ).run(saved.agentKey, saved.sessionId, saved.alias, saved.updated_at);
+    ).run(saved.reference.agentName, saved.reference.sessionId, saved.alias, saved.updatedAt);
     return saved;
   });
 }
-function deleteSessionAlias(agentKey, sessionId) {
+function deleteSessionAlias(reference) {
+  const normalizedReference = normalizeSessionReference(reference);
   if (useMemoryStateStore()) {
-    memoryAliases.delete(getAliasKey(agentKey, sessionId));
+    memoryAliases.delete(getAliasKey(normalizedReference));
     return;
   }
   withStateDb((db) => {
@@ -9368,7 +9853,7 @@ function deleteSessionAlias(agentKey, sessionId) {
         DELETE FROM session_aliases
         WHERE agent_name = ? AND session_id = ?
       `
-    ).run(agentKey, sessionId);
+    ).run(normalizedReference.agentName, normalizedReference.sessionId);
   });
 }
 var DASHBOARD_RECENT_LIMIT = 10;
@@ -9376,7 +9861,7 @@ 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";
+  return getSessionAgentKey(session);
 }
 function getSessionActivityTime(session) {
   return session.time_updated ?? session.time_created;
@@ -9510,7 +9995,10 @@ function buildDashboard(sessions, options) {
   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 {
+      reference: { agentName: agentKey, sessionId: session.id },
+      session
+    };
   });
   return {
     totals: {
@@ -9528,6 +10016,58 @@ function buildDashboard(sessions, options) {
     recentSessions
   };
 }
+function getProjectGroupKey(identityKind, identityKey) {
+  return `${identityKind}:${identityKey}`;
+}
+function emptyMetrics() {
+  return { messages: 0, tokens: 0, cost: 0, hasEstimatedCost: false, agentStats: /* @__PURE__ */ new Map() };
+}
+function attachProjectMetrics(projects, sessions) {
+  const metrics = /* @__PURE__ */ new Map();
+  for (const session of sessions) {
+    const identity = session.project_identity;
+    if (!identity) continue;
+    const key = getProjectGroupKey(identity.kind, identity.key);
+    let current = metrics.get(key);
+    if (!current) {
+      current = emptyMetrics();
+      metrics.set(key, current);
+    }
+    const tokens = getTotalTokens(session.stats);
+    const cost = session.stats.total_cost ?? 0;
+    current.messages += session.stats.message_count;
+    current.tokens += tokens;
+    current.cost += cost;
+    if (session.stats.cost_source === "estimated") current.hasEstimatedCost = true;
+    const agentName = getSessionAgentName(session);
+    const agent = current.agentStats.get(agentName);
+    if (agent) {
+      agent.sessions += 1;
+      agent.messages += session.stats.message_count;
+      agent.tokens += tokens;
+      agent.cost += cost;
+    } else {
+      current.agentStats.set(agentName, {
+        name: agentName,
+        sessions: 1,
+        messages: session.stats.message_count,
+        tokens,
+        cost
+      });
+    }
+  }
+  return projects.map((project) => {
+    const metric = metrics.get(getProjectGroupKey(project.identityKind, project.identityKey));
+    return {
+      ...project,
+      messages: metric?.messages ?? 0,
+      tokens: metric?.tokens ?? 0,
+      cost: metric?.cost ?? 0,
+      cost_source: metric && metric.cost > 0 ? metric.hasEstimatedCost ? "estimated" : "recorded" : void 0,
+      agentStats: [...metric?.agentStats.values() ?? []].sort((a, b) => b.sessions - a.sessions)
+    };
+  });
+}
 function executeSessionSearch(query, options, snapshot) {
   const merged = mergeSearchQueryOptions(query, options);
   if (!needsIndexedSearch(merged.text, merged.options)) {
@@ -9570,15 +10110,49 @@ function matchesSessionSearchFilters(agentName, session, options, projectScope =
   if (options.to != null && activity > options.to) return false;
   return matchesRecentSearchFilters(session, options, projectScope);
 }
+function sessionReferenceKey2(agentName, sessionId) {
+  return `${agentName}\0${sessionId}`;
+}
+function filterSessionSearchCandidates(candidates, options) {
+  const projectScope = options.cwd ? createProjectScopeMatcher(options.cwd) : null;
+  const headMatches = candidates.filter(
+    (candidate) => matchesSessionSearchFilters(
+      candidate.reference.agentName,
+      candidate.session,
+      options,
+      projectScope
+    )
+  );
+  if (!options.file && !options.fileKind && !options.tools?.length) return headMatches;
+  const indexedMatches = filterIndexedSessionReferences(
+    headMatches.map((candidate) => ({
+      agentName: candidate.reference.agentName,
+      sessionId: candidate.reference.sessionId
+    })),
+    {
+      file: options.file,
+      fileKind: options.fileKind,
+      tools: options.tools
+    }
+  );
+  return headMatches.filter(
+    (candidate) => indexedMatches.has(
+      sessionReferenceKey2(candidate.reference.agentName, candidate.reference.sessionId)
+    )
+  );
+}
 function searchRecentSessions(snapshot, options) {
   const projectScope = options.cwd ? createProjectScopeMatcher(options.cwd) : null;
   const entries = options.agent ? [[options.agent, snapshot.byAgent[options.agent] ?? []]] : Object.entries(snapshot.byAgent);
   return entries.flatMap(
-    ([agentName, sessions]) => sessions.filter((session) => matchesSessionSearchFilters(agentName, session, options, projectScope)).map((session) => ({ agentName, session }))
+    ([agentName, sessions]) => sessions.filter((session) => matchesSessionSearchFilters(agentName, session, options, projectScope)).map((session) => ({
+      reference: { agentName, sessionId: session.id },
+      session
+    }))
   ).sort(
     (a, b) => (b.session.time_updated ?? b.session.time_created) - (a.session.time_updated ?? a.session.time_created)
-  ).slice(0, options.limit ?? 50).map(({ agentName, session }) => ({
-    agentName,
+  ).slice(0, options.limit ?? 50).map(({ reference, session }) => ({
+    reference,
     session,
     snippet: `Recent session \xB7 ${session.directory}`,
     matchType: "recent"
@@ -9591,7 +10165,7 @@ function mergeSearchResultSources(results, limit) {
   const seen = /* @__PURE__ */ new Set();
   const merged = [];
   for (const result of results) {
-    const key = `${result.agentName}/${result.session.id}`;
+    const key = sessionReferenceKey2(result.reference.agentName, result.reference.sessionId);
     if (seen.has(key)) continue;
     seen.add(key);
     merged.push(result);
@@ -9599,133 +10173,83 @@ function mergeSearchResultSources(results, limit) {
   }
   return merged;
 }
-function canSkipSessionsSearch(fileQuery, textQuery, options) {
-  return Boolean(
-    fileQuery && !textQuery && !options.tools?.length && !options.tags?.length && options.from == null && options.to == null
-  );
+function canSkipSessionsSearch(fileQuery, textQuery) {
+  return Boolean(fileQuery && !textQuery);
 }
 function searchIndexedSessions(query, textQuery, parsed, options) {
   const fileQuery = deriveFileQuery(query, parsed, options);
   const fileResults = fileQuery ? searchFileActivitySessions(fileQuery, options) : [];
-  const sessionResults = canSkipSessionsSearch(fileQuery, textQuery, options) ? [] : searchSessions(query, options);
-  return mergeSearchResultSources([...fileResults, ...sessionResults], options.limit ?? 50);
+  const sessionResults = canSkipSessionsSearch(fileQuery, textQuery) ? [] : searchSessions(query, options);
+  const textMatchReferences = textQuery && options.file ? new Set(
+    sessionResults.map(
+      (result) => sessionReferenceKey2(result.reference.agentName, result.reference.sessionId)
+    )
+  ) : null;
+  const matchingFileResults = textMatchReferences ? fileResults.filter(
+    (result) => textMatchReferences.has(
+      sessionReferenceKey2(result.reference.agentName, result.reference.sessionId)
+    )
+  ) : fileResults;
+  return mergeSearchResultSources([...matchingFileResults, ...sessionResults], options.limit ?? 50);
 }
 
 export {
+  normalizeSessionReference,
+  formatSessionReference,
+  getSessionAgentKey,
+  mergeSortedSessions,
   registerAgent,
   createRegisteredAgents,
   getRegisteredAgents,
   getAgentInfoMap,
-  getAgentByName,
   setCoreDiagnostics,
-  parsedSession,
-  skippedSession,
-  filteredSession,
-  getParsedSession,
-  matchesScanWindow,
+  diffSessionSources,
   BaseAgent,
   FileSystemSessionSource,
-  DatabaseSessionSource,
-  firstExisting,
-  resolveProviderRoots,
-  getCursorDataPath,
-  parseJsonlLines,
-  readJsonlFile,
-  cleanDisplayText,
-  firstVisibleLine,
-  normalizeTitleText,
-  basenameTitle,
-  resolveSessionTitle,
-  cleanInternalText,
-  cleanMessagePart,
-  cleanMessageParts,
-  cleanParsedMessage,
-  cleanParsedMessages,
-  firstUserMessageTitle,
-  getPricingRegistry,
-  hasBillablePricing,
   refreshPricingCache,
-  pricingResolver,
-  estimateCostForTokens,
-  applyMessageCost,
-  applyMessageCosts,
-  withEstimatedSessionCost,
-  estimateTokenCost,
-  asRecord,
-  asString,
-  asNumber,
-  asArray,
-  reportFieldMismatch,
-  openDbReadOnly,
-  openDb,
-  isSqliteAvailable,
   perf,
-  fallbackDisplayName,
-  realFs,
   isProjectIdentityKind,
-  getProjectIdentityKey,
   matchesProjectIdentity,
-  normalizeGitRemote,
-  clearIdentityCache,
-  computeIdentity,
-  buildProjectGroups,
   createProjectScopeMatcher,
   matchesProjectScope,
-  filterSessionsByProjectScope,
   getSmartTagSourceTimestamp,
   classifySessionTags,
-  extractFileActivityOccurrences,
-  summarizeFileActivity,
-  extractSessionFileActivity,
-  setFtsIntegrityCheckedPath,
   getCachePath2,
-  parseSearchQuery,
   syncSessionSearchIndex,
   syncSessionSearchIndexChanges,
   mergeSearchQueryOptions,
-  searchSessions,
   listFileActivity,
-  listSessionFileActivity,
-  searchFileActivitySessions,
   loadCachedSessions,
   isAgentCacheInitialized,
   markAgentCacheInitialized,
   getAgentLastFullSyncAt,
   markAgentFullSyncCompleted,
-  loadCachedSessionDataEntry,
-  loadCachedSessionData,
   saveCachedSessions,
   saveCachedSessionChanges,
   clearCache,
-  getCacheInfo,
-  listCachedProjectGroups,
   attachMissingProjectIdentities,
   buildAgentCacheMeta,
   sessionSignature,
   sortSessions,
   computeSessionDiff,
-  filterSessions,
   ensureSessionTagsSync,
   scanSessions,
-  scanSessionsAsync,
+  materializeSessionDetailResponse,
+  listCachedProjectGroups,
   StateStorageUnavailableError,
   listBookmarks,
   upsertBookmark,
   importBookmarks,
   deleteBookmark,
-  SESSION_ALIAS_MAX_LENGTH,
-  normalizeSessionAlias,
+  SessionAliasValidationError,
   listSessionAliases,
   upsertSessionAlias,
   deleteSessionAlias,
-  DASHBOARD_RECENT_LIMIT,
-  getTotalTokens,
-  getSessionAgentName,
   getSessionActivityTime,
-  toLocalDateKey,
   startOfLocalDay,
   buildDashboard,
+  attachProjectMetrics,
   executeSessionSearch,
-  matchesSessionSearchFilters
+  filterSessionSearchCandidates
 };
-//# sourceMappingURL=chunk-MWSJTNOW.js.map
+//# sourceMappingURL=chunk-7APNDHQ6.js.map