codesesh 0.17.0 → 0.18.0

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

@@ -1,6 +1,6 @@
 #!/usr/bin/env node
 
-// ../core/dist/chunk-BOTICQC6.mjs
+// ../core/dist/chunk-DKIXFG56.mjs
 function toRecord(value) {
   return value !== null && typeof value === "object" && !Array.isArray(value) ? value : null;
 }
@@ -120,6 +120,76 @@ function normalizeMessageParts(value) {
     return normalized ? [normalized] : [];
   });
 }
+function mergeSessionsUpdatedEvents(previous, next) {
+  const changedSessionHeads = /* @__PURE__ */ new Map();
+  const removedSessionRefs = /* @__PURE__ */ new Map();
+  const sessionKey = (agentName, sessionId) => `${agentName}\0${sessionId}`;
+  const addChanged = (item) => {
+    const key = sessionKey(item.reference.agentName, item.reference.sessionId);
+    removedSessionRefs.delete(key);
+    changedSessionHeads.set(key, item);
+  };
+  const addRemoved = (item) => {
+    const key = sessionKey(item.agentName, item.sessionId);
+    changedSessionHeads.delete(key);
+    removedSessionRefs.set(key, item);
+  };
+  for (const item of previous.changedSessionHeads) addChanged(item);
+  for (const item of previous.removedSessionRefs) addRemoved(item);
+  for (const item of next.changedSessionHeads) addChanged(item);
+  for (const item of next.removedSessionRefs) addRemoved(item);
+  return {
+    type: "sessions-updated",
+    changedAgents: Array.from(/* @__PURE__ */ new Set([...previous.changedAgents, ...next.changedAgents])),
+    newSessions: previous.newSessions + next.newSessions,
+    updatedSessions: previous.updatedSessions + next.updatedSessions,
+    removedSessions: previous.removedSessions + next.removedSessions,
+    totalSessions: next.totalSessions,
+    timestamp: next.timestamp,
+    changedSessionHeads: [...changedSessionHeads.values()],
+    removedSessionRefs: [...removedSessionRefs.values()]
+  };
+}
+function startOfCalendarDay(timestamp) {
+  const date = new Date(timestamp);
+  return new Date(date.getFullYear(), date.getMonth(), date.getDate()).getTime();
+}
+function addCalendarDays(timestamp, days) {
+  const date = new Date(timestamp);
+  return new Date(date.getFullYear(), date.getMonth(), date.getDate() + days).getTime();
+}
+function toCalendarDayNumber(timestamp) {
+  const date = new Date(timestamp);
+  return Date.UTC(date.getFullYear(), date.getMonth(), date.getDate()) / 864e5;
+}
+function countCalendarDays(from, to) {
+  return Math.max(1, toCalendarDayNumber(to) - toCalendarDayNumber(from) + 1);
+}
+function toCalendarDayKey(timestamp) {
+  const date = new Date(timestamp);
+  return `${String(date.getFullYear()).padStart(4, "0")}-${String(date.getMonth() + 1).padStart(
+    2,
+    "0"
+  )}-${String(date.getDate()).padStart(2, "0")}`;
+}
+var PROJECT_IDENTITY_KINDS = [
+  "git_remote",
+  "git_common_dir",
+  "manifest_path",
+  "synthetic",
+  "path",
+  "loose"
+];
+var KIND_LOOKUP = new Set(PROJECT_IDENTITY_KINDS);
+function isProjectIdentityKind(value) {
+  return KIND_LOOKUP.has(value);
+}
+function getProjectIdentityKey(identity) {
+  return `${identity.kind}:${identity.key}`;
+}
+function matchesProjectIdentity(identity, expected) {
+  return identity?.kind === expected.kind && identity.key === expected.key;
+}
 var UNKNOWN_AGENT_NAME = "unknown";
 function normalizeSessionReference(reference) {
   return {
@@ -144,6 +214,13 @@ function formatSessionReference(reference) {
 function getSessionAgentKey(session) {
   return parseSessionReference(session.slug)?.agentName ?? UNKNOWN_AGENT_NAME;
 }
+function agentRoutePath(agentName) {
+  return `/${encodeURIComponent(agentName.trim().toLowerCase())}`;
+}
+function sessionRoutePath(reference) {
+  const normalized = normalizeSessionReference(reference);
+  return `${agentRoutePath(normalized.agentName)}/${encodeURIComponent(normalized.sessionId)}`;
+}
 function compareSessionActivityDesc(a, b) {
   return (b.time_updated ?? b.time_created) - (a.time_updated ?? a.time_created);
 }
@@ -253,8 +330,8 @@ var SAMPLE_DASHBOARD_DATA = {
 };
 
 // ../core/dist/index.mjs
-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 as existsSync5, readdirSync as readdirSync3, readFileSync as readFileSync2, statSync as statSync3 } from "fs";
+import { join as join5, basename as basename3, dirname as dirname2 } from "path";
 import { existsSync, readdirSync, statSync } from "fs";
 import { join } from "path";
 import { existsSync as existsSync2 } from "fs";
@@ -263,38 +340,40 @@ 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 { existsSync as existsSync4, readFileSync, renameSync, rmSync, writeFileSync } from "fs";
 import { homedir as homedir2 } from "os";
-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 join5 } from "path";
+import { join as join4 } from "path";
+import { chmodSync, existsSync as existsSync3, mkdirSync, readdirSync as readdirSync2, statSync as statSync2 } from "fs";
+import { basename as basename2, dirname, join as join3 } from "path";
+import { join as join7 } from "path";
+import { existsSync as existsSync6 } from "fs";
+import { basename as basename4, dirname as dirname3, join as join6 } from "path";
 import { createRequire } from "module";
 import { createHash } from "crypto";
-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 { existsSync as existsSync7, readFileSync as readFileSync3, readdirSync as readdirSync4, statSync as statSync4 } from "fs";
+import { join as join8, basename as basename5, dirname as dirname4 } from "path";
+import { closeSync as closeSync2, existsSync as existsSync8, openSync as openSync2, readFileSync as readFileSync4, readSync as readSync2, statSync as statSync5 } from "fs";
+import { join as join9, basename as basename6 } from "path";
+import { existsSync as existsSync9, readdirSync as readdirSync5, readFileSync as readFileSync5, statSync as statSync6 } from "fs";
 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 { join as join10, normalize } from "path";
+import { existsSync as existsSync10 } from "fs";
+import { basename as basename7, join as join11 } from "path";
 import { homedir as homedir4, platform as platform3 } from "os";
-import { join as join11 } from "path";
+import { join as join12 } from "path";
 import { availableParallelism } from "os";
 import { Worker } from "worker_threads";
-import { existsSync as existsSync10, readFileSync as readFileSync6 } from "fs";
+import { existsSync as existsSync11, 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 existsSync12, rmSync, unlinkSync } from "fs";
-import { existsSync as existsSync11 } from "fs";
-import { join as join12 } from "path";
+import { existsSync as existsSync13, rmSync as rmSync2, unlinkSync } from "fs";
+import { existsSync as existsSync12 } from "fs";
+import { join as join13 } from "path";
 import { homedir as homedir6 } from "os";
 import { homedir as homedir7, platform as platform4 } from "os";
-import { join as join13 } from "path";
+import { join as join14 } from "path";
 var registrations = [];
 function registerAgent(reg) {
   registrations.push(reg);
@@ -547,8 +626,41 @@ var SingleFileSessionSource = class extends FileSystemSessionSource {
     };
   }
 };
+var SessionScanError = class extends Error {
+  constructor(agentName, stage, options) {
+    super(`${agentName} session scan failed while ${stage}`, options);
+    this.agentName = agentName;
+    this.stage = stage;
+    this.name = "SessionScanError";
+  }
+  agentName;
+  stage;
+};
+function sqliteSourceFiles(dbPath) {
+  return [dbPath, `${dbPath}-wal`];
+}
+function statOrNull(path2) {
+  try {
+    return statSync(path2);
+  } catch {
+    return null;
+  }
+}
+function sqliteSourceFingerprint(dbPath) {
+  return sqliteSourceFiles(dbPath).map((path2) => {
+    const stats = statOrNull(path2);
+    return stats ? `${stats.size}:${Math.round(stats.mtimeMs)}` : "-";
+  }).join("|");
+}
+function latestSqliteSourceMtime(dbPath) {
+  return sqliteSourceFiles(dbPath).reduce((latest, path2) => {
+    const stats = statOrNull(path2);
+    return stats && stats.mtimeMs > latest ? stats.mtimeMs : latest;
+  }, 0);
+}
 var DatabaseSessionSource = class extends BaseAgent {
   sessionMetaMap = /* @__PURE__ */ new Map();
+  lastSourceFingerprint = null;
   /** 记录单个会话的缓存 meta（sourcePath = dbPath）。 */
   rememberSession(sessionId) {
     const dbPath = this.getDatabasePath();
@@ -562,7 +674,12 @@ var DatabaseSessionSource = class extends BaseAgent {
     this.sessionMetaMap = meta;
   }
   /**
-   * 变更检测：数据库内部变更难以按行定位，按库文件 mtime 判定。
+   * 变更检测：数据库内部变更难以按行定位，按库文件集合的指纹判定。
+   *
+   * In WAL mode a commit appends to the sidecar and leaves the main file
+   * untouched until checkpoint, so watching the database alone misses recent
+   * writes entirely. Size is part of the fingerprint because an uncheckpointed
+   * commit may land in the same millisecond as the previous one.
    */
   checkForChanges(sinceTimestamp, _cachedSessions) {
     const dbPath = this.getDatabasePath();
@@ -570,7 +687,10 @@ var DatabaseSessionSource = class extends BaseAgent {
       return { hasChanges: false, timestamp: Date.now() };
     }
     try {
-      const hasChanges = statSync(dbPath).mtimeMs > sinceTimestamp;
+      const fingerprint = sqliteSourceFingerprint(dbPath);
+      const previous = this.lastSourceFingerprint;
+      this.lastSourceFingerprint = fingerprint;
+      const hasChanges = previous == null ? latestSqliteSourceMtime(dbPath) > sinceTimestamp : fingerprint !== previous;
       return {
         hasChanges,
         timestamp: Date.now()
@@ -630,17 +750,17 @@ function* readJsonlFileLines(filePath, chunkBytes = READ_CHUNK_BYTES) {
   try {
     const buffer = Buffer.alloc(chunkBytes);
     const decoder = new StringDecoder("utf8");
-    let pending = [];
+    let pending2 = [];
     let bytesRead = readSync(fd, buffer, 0, chunkBytes, -1);
     while (bytesRead > 0) {
       const decoded = decoder.write(buffer.subarray(0, bytesRead));
       const lastBreak = decoded.lastIndexOf("\n");
       if (lastBreak === -1) {
-        if (decoded) pending.push(decoded);
+        if (decoded) pending2.push(decoded);
       } else {
-        pending.push(decoded.slice(0, lastBreak));
-        const complete = pending.join("");
-        pending = [decoded.slice(lastBreak + 1)];
+        pending2.push(decoded.slice(0, lastBreak));
+        const complete = pending2.join("");
+        pending2 = [decoded.slice(lastBreak + 1)];
         for (const line of complete.split("\n")) {
           const trimmed = line.trim();
           if (trimmed) yield trimmed;
@@ -648,8 +768,8 @@ function* readJsonlFileLines(filePath, chunkBytes = READ_CHUNK_BYTES) {
       }
       bytesRead = readSync(fd, buffer, 0, chunkBytes, -1);
     }
-    pending.push(decoder.end());
-    const tail = pending.join("").trim();
+    pending2.push(decoder.end());
+    const tail = pending2.join("").trim();
     if (tail) yield tail;
   } finally {
     closeSync(fd);
@@ -833,6 +953,56 @@ var aliases_default = {
   "gpt-5.1-codex-high": "gpt-5.3-codex",
   "gpt-5.2-low": "gpt-5.2"
 };
+var PRIVATE_DIR_MODE = 448;
+var PRIVATE_FILE_MODE = 384;
+var SQLITE_SIDECAR_SUFFIXES = ["-wal", "-shm", "-journal"];
+var isPosix = process.platform !== "win32";
+function reportChmodFailure(path2, error) {
+  getCoreDiagnostics()?.warn("storage.permissions_failed", {
+    path: path2,
+    message: error instanceof Error ? error.message : String(error)
+  });
+}
+function restrict(path2, mode) {
+  if (!isPosix || !existsSync3(path2)) return;
+  try {
+    if ((statSync2(path2).mode & 511) === mode) return;
+    chmodSync(path2, mode);
+  } catch (error) {
+    reportChmodFailure(path2, error);
+  }
+}
+function ensurePrivateDirectory(path2) {
+  mkdirSync(path2, { recursive: true, mode: PRIVATE_DIR_MODE });
+  restrict(path2, PRIVATE_DIR_MODE);
+}
+function restrictPrivateFile(path2) {
+  restrict(path2, PRIVATE_FILE_MODE);
+}
+function restrictExistingPrivateFiles(directory, owns) {
+  try {
+    for (const entry of readdirSync2(directory)) {
+      if (owns(entry)) restrictPrivateFile(join3(directory, entry));
+    }
+  } catch (error) {
+    reportChmodFailure(directory, error);
+  }
+}
+var sweptBackupsFor = /* @__PURE__ */ new Set();
+function restrictExistingBackups(dbPath) {
+  if (sweptBackupsFor.has(dbPath)) return;
+  sweptBackupsFor.add(dbPath);
+  const prefix = `${basename2(dbPath)}.`;
+  restrictExistingPrivateFiles(
+    dirname(dbPath),
+    (name) => name.startsWith(prefix) && name.endsWith(".bak")
+  );
+}
+function restrictPrivateDatabase(dbPath) {
+  restrictPrivateFile(dbPath);
+  for (const suffix of SQLITE_SIDECAR_SUFFIXES) restrictPrivateFile(`${dbPath}${suffix}`);
+  restrictExistingBackups(dbPath);
+}
 var snapshot_default = {
   "claude-3-5-haiku": [8e-7, 4e-6, 1e-6, 8e-8],
   "claude-3-5-sonnet": [3e-6, 15e-6, 375e-8, 3e-7],
@@ -879,7 +1049,9 @@ var snapshot_default = {
 var LITELLM_URL = "https://raw.githubusercontent.com/BerriAI/litellm/main/model_prices_and_context_window.json";
 var CACHE_TTL_MS = 24 * 60 * 60 * 1e3;
 var WEB_SEARCH_COST = 0.01;
-var pricingCache = loadSnapshot();
+var REFRESH_TIMEOUT_MS = 1e4;
+var published = { id: 1, pricing: loadSnapshot() };
+var pending = null;
 loadDiskCache();
 function normalizeKey(key) {
   return key.trim().toLowerCase();
@@ -888,10 +1060,10 @@ function costNumber(value, fallback) {
   return typeof value === "number" && Number.isFinite(value) ? value : fallback;
 }
 function getCacheDir() {
-  return join3(homedir2(), ".cache", "codesesh");
+  return join4(homedir2(), ".cache", "codesesh");
 }
 function getCachePath() {
-  return join3(getCacheDir(), "litellm-pricing.json");
+  return join4(getCacheDir(), "litellm-pricing.json");
 }
 function loadSnapshot() {
   const map = /* @__PURE__ */ new Map();
@@ -957,7 +1129,7 @@ function parseLiteLLMData(data) {
 }
 function loadDiskCache() {
   const path2 = getCachePath();
-  if (!existsSync3(path2)) return;
+  if (!existsSync4(path2)) return;
   try {
     const cached = JSON.parse(readFileSync(path2, "utf-8"));
     if (Date.now() - cached.timestamp <= CACHE_TTL_MS) {
@@ -967,20 +1139,51 @@ function loadDiskCache() {
         if (!pricing) continue;
         next.set(normalizeKey(name), pricing);
       }
-      pricingCache = next;
+      published = { id: published.id + 1, pricing: next };
     }
   } catch {
   }
 }
 function getPricingRegistry() {
-  return pricingCache;
+  return published.pricing;
+}
+function getPricingGeneration() {
+  return published;
+}
+function publishPendingPricing() {
+  if (!pending) return false;
+  published = { id: published.id + 1, pricing: pending };
+  pending = null;
+  getCoreDiagnostics()?.info?.("pricing.generation.published", {
+    generation: published.id,
+    models: published.pricing.size
+  });
+  return true;
+}
+function hasPendingPricing() {
+  return pending !== null;
 }
 function hasBillablePricing(pricing) {
   return pricing.inputCostPerToken > 0 || pricing.outputCostPerToken > 0 || pricing.cacheReadCostPerToken > 0 || pricing.cacheCreateCostPerToken > 0;
 }
-async function refreshPricingCache() {
+function writeDiskCacheAtomically(path2, pricing) {
+  const temporaryPath = `${path2}.${process.pid}.tmp`;
+  const payload = JSON.stringify({ timestamp: Date.now(), data: Object.fromEntries(pricing) });
+  try {
+    ensurePrivateDirectory(getCacheDir());
+    writeFileSync(temporaryPath, payload);
+    restrictPrivateFile(temporaryPath);
+    renameSync(temporaryPath, path2);
+  } catch (error) {
+    rmSync(temporaryPath, { force: true });
+    getCoreDiagnostics()?.warn("pricing.cache_write_failed", {
+      message: error instanceof Error ? error.message : String(error)
+    });
+  }
+}
+async function refreshPricingCache(options = {}) {
   const path2 = getCachePath();
-  if (existsSync3(path2)) {
+  if (existsSync4(path2)) {
     try {
       const cached = JSON.parse(readFileSync(path2, "utf-8"));
       if (typeof cached.timestamp === "number" && Date.now() - cached.timestamp <= CACHE_TTL_MS) {
@@ -989,8 +1192,11 @@ async function refreshPricingCache() {
     } catch {
     }
   }
+  const timeout = AbortSignal.timeout(options.timeoutMs ?? REFRESH_TIMEOUT_MS);
+  const signal = options.signal ? AbortSignal.any([options.signal, timeout]) : timeout;
+  getCoreDiagnostics()?.info?.("pricing.refresh.started", { generation: published.id });
   try {
-    const response = await fetch(LITELLM_URL);
+    const response = await fetch(LITELLM_URL, { signal });
     if (!response.ok) return false;
     const data = await response.json();
     const remote = parseLiteLLMData(data);
@@ -999,11 +1205,19 @@ async function refreshPricingCache() {
     for (const [name, pricing] of remote.entries()) {
       next.set(name, pricing);
     }
-    pricingCache = next;
-    mkdirSync(getCacheDir(), { recursive: true });
-    writeFileSync(path2, JSON.stringify({ timestamp: Date.now(), data: Object.fromEntries(next) }));
+    pending = next;
+    writeDiskCacheAtomically(path2, next);
+    getCoreDiagnostics()?.info?.("pricing.refresh.completed", {
+      generation: published.id,
+      models: next.size
+    });
     return true;
-  } catch {
+  } catch (error) {
+    getCoreDiagnostics()?.warn("pricing.refresh.failed", {
+      generation: published.id,
+      aborted: signal.aborted,
+      message: error instanceof Error ? error.message : String(error)
+    });
     return false;
   }
 }
@@ -1370,22 +1584,22 @@ var ClaudeCodeAgent = class extends SingleFileSessionSource {
   sessionsIndexCache = {};
   sessionsIndexMtime = {};
   findBasePath() {
-    return firstExisting(join4(resolveClaudeCodeDataRoot(), "projects"), "data/claudecode");
+    return firstExisting(join5(resolveClaudeCodeDataRoot(), "projects"), "data/claudecode");
   }
   getSessionWatchPlan() {
     const dataRoot = resolveClaudeCodeDataRoot();
     return {
       status: "supported",
-      targets: [{ root: dataRoot, path: join4(dataRoot, "projects") }, { path: "data/claudecode" }]
+      targets: [{ root: dataRoot, path: join5(dataRoot, "projects") }, { path: "data/claudecode" }]
     };
   }
   isAvailable() {
     this.basePath = this.findBasePath();
     if (!this.basePath) return false;
     try {
-      for (const entry of readdirSync2(this.basePath)) {
-        const dir = join4(this.basePath, entry);
-        if (existsSync4(dir) && readdirSync2(dir).some((f) => f.endsWith(".jsonl"))) {
+      for (const entry of readdirSync3(this.basePath)) {
+        const dir = join5(this.basePath, entry);
+        if (existsSync5(dir) && readdirSync3(dir).some((f) => f.endsWith(".jsonl"))) {
           return true;
         }
       }
@@ -1405,13 +1619,13 @@ var ClaudeCodeAgent = class extends SingleFileSessionSource {
       recursive: false,
       scanWindow: options
     }).map(({ file, stat }) => ({
-      sessionId: basename2(file, ".jsonl"),
+      sessionId: basename3(file, ".jsonl"),
       sourcePath: file,
-      fingerprint: this.sourceFingerprint(stat, indexMtimes.get(dirname(file)) ?? null)
+      fingerprint: this.sourceFingerprint(stat, indexMtimes.get(dirname2(file)) ?? null)
     }));
   }
   parseFileSessionHead(sourcePath) {
-    const projectDir = dirname(sourcePath);
+    const projectDir = dirname2(sourcePath);
     return getParsedSession(this.parseSessionHeadResult(sourcePath, projectDir));
   }
   getSessionData(sessionId) {
@@ -1419,7 +1633,7 @@ var ClaudeCodeAgent = class extends SingleFileSessionSource {
     if (!meta) {
       throw new Error(`Session not found: ${sessionId}`);
     }
-    if (!existsSync4(meta.sourcePath)) {
+    if (!existsSync5(meta.sourcePath)) {
       throw new Error(`Session file missing: ${meta.sourcePath}`);
     }
     const builder = new TranscriptBuilder();
@@ -1449,13 +1663,13 @@ var ClaudeCodeAgent = class extends SingleFileSessionSource {
   listProjectDirs() {
     if (!this.basePath) return [];
     try {
-      return readdirSync2(this.basePath).map((e) => join4(this.basePath, e)).filter((p) => existsSync4(p));
+      return readdirSync3(this.basePath).map((e) => join5(this.basePath, e)).filter((p) => existsSync5(p));
     } catch {
       return [];
     }
   }
   createFileSessionMeta(head, source) {
-    const projectDir = dirname(source.file);
+    const projectDir = dirname2(source.file);
     const indexPath = this.getSessionsIndexPath(projectDir);
     const indexMtime = this.readFileMtimeMs(indexPath);
     return this.buildFileSessionMeta({
@@ -1475,17 +1689,17 @@ var ClaudeCodeAgent = class extends SingleFileSessionSource {
     return JSON.stringify([HEAD_INDEX_VERSION, stat.mtimeMs, stat.size, indexMtime]);
   }
   getSessionsIndexPath(projectDir) {
-    return join4(projectDir, "sessions-index.json");
+    return join5(projectDir, "sessions-index.json");
   }
   loadSessionsIndex(projectDir) {
-    const cacheKey = basename2(projectDir);
+    const cacheKey = basename3(projectDir);
     const indexPath = this.getSessionsIndexPath(projectDir);
     const mtime = this.readFileMtimeMs(indexPath);
     if (cacheKey in this.sessionsIndexCache && this.sessionsIndexMtime[cacheKey] === mtime) {
       return this.sessionsIndexCache[cacheKey];
     }
     const map = /* @__PURE__ */ new Map();
-    if (existsSync4(indexPath)) {
+    if (existsSync5(indexPath)) {
       try {
         const data = JSON.parse(readFileSync2(indexPath, "utf-8"));
         const entries = data?.entries ?? [];
@@ -1503,7 +1717,7 @@ var ClaudeCodeAgent = class extends SingleFileSessionSource {
     return map;
   }
   parseSessionHeadResult(filePath, projectDir) {
-    const sessionId = basename2(filePath, ".jsonl");
+    const sessionId = basename3(filePath, ".jsonl");
     const index = this.loadSessionsIndex(projectDir);
     const indexEntry = index.get(sessionId);
     const explicitTitle = indexEntry?.summary ? String(indexEntry.summary) : null;
@@ -1531,7 +1745,7 @@ var ClaudeCodeAgent = class extends SingleFileSessionSource {
         continue;
       }
       if (lineIndex === 0) {
-        createdAt = parseTimestampMs(data) || statSync2(filePath).mtimeMs;
+        createdAt = parseTimestampMs(data) || statSync3(filePath).mtimeMs;
         updatedAt = createdAt;
       }
       const recordIndex = lineIndex;
@@ -1967,11 +2181,12 @@ function backupDatabase(db, dbPath, label) {
     return null;
   }
   const timestamp = new Date(Date.now()).toISOString().replaceAll(":", "").replaceAll(".", "-");
-  let backupPath = join5(dirname2(dbPath), `${basename3(dbPath)}.${timestamp}.${label}.bak`);
-  for (let counter = 1; existsSync5(backupPath); counter += 1) {
-    backupPath = join5(dirname2(dbPath), `${basename3(dbPath)}.${timestamp}.${label}.${counter}.bak`);
+  let backupPath = join6(dirname3(dbPath), `${basename4(dbPath)}.${timestamp}.${label}.bak`);
+  for (let counter = 1; existsSync6(backupPath); counter += 1) {
+    backupPath = join6(dirname3(dbPath), `${basename4(dbPath)}.${timestamp}.${label}.${counter}.bak`);
   }
   db.exec(`VACUUM INTO ${quoteSqlString(backupPath)}`);
+  restrictPrivateFile(backupPath);
   return backupPath;
 }
 function backupDatabaseIfPopulated(db, dbPath, label, tables) {
@@ -2066,8 +2281,9 @@ function openDb(dbPath) {
     return null;
   }
   try {
-    mkdirSync2(dirname2(dbPath), { recursive: true });
+    ensurePrivateDirectory(dirname3(dbPath));
     const db = DatabaseConstructor(dbPath);
+    restrictPrivateDatabase(dbPath);
     try {
       db.pragma("journal_mode = WAL");
       db.pragma("synchronous = NORMAL");
@@ -2138,7 +2354,7 @@ var OpenCodeSqliteAgent = class extends DatabaseSessionSource {
   scan(options) {
     if (!this.dbPath) return [];
     const db = openDbReadOnly(this.dbPath);
-    if (!db) return [];
+    if (!db) throw new SessionScanError(this.name, "opening the database");
     try {
       const cutoffTime = options?.from ?? Date.now() - 3650 * 24 * 60 * 60 * 1e3;
       const hasMessageTable = Boolean(
@@ -2187,8 +2403,8 @@ var OpenCodeSqliteAgent = class extends DatabaseSessionSource {
         options?.onProgress?.({ total: rows.length, processed, sessions: heads.length });
       }
       return heads;
-    } catch {
-      return [];
+    } catch (error) {
+      throw new SessionScanError(this.name, "reading sessions", { cause: error });
     } finally {
       db.close();
     }
@@ -2237,7 +2453,7 @@ var OpenCodeSqliteAgent = class extends DatabaseSessionSource {
           JOIN message m ON m.id = p.message_id
           JOIN session s ON s.id = m.session_id
           WHERE COALESCE(s.time_updated, s.time_created) >= ?
-          ORDER BY p.message_id, p.time_created ASC
+          ORDER BY p.message_id, p.time_created ASC, p.id ASC
         `
     ).all(cutoffTime);
   }
@@ -2250,9 +2466,21 @@ var OpenCodeSqliteAgent = class extends DatabaseSessionSource {
     ]);
     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);
-    return partRows.map((partRow) => this.parsePartRow(partRow)).filter((part) => part !== null);
+  /**
+   * Every part of one session in a single read. Fetching per message turned a
+   * detail into M+2 queries, and without an index on part(message_id) each one
+   * scanned the whole table.
+   */
+  readSessionPartRows(db, sessionId) {
+    return db.prepare(
+      `
+          SELECT p.message_id, p.data, p.time_created
+          FROM part p
+          JOIN message m ON m.id = p.message_id
+          WHERE m.session_id = ?
+          ORDER BY p.message_id, p.time_created ASC, p.id ASC
+        `
+    ).all(sessionId);
   }
   buildPartsByMessage(partRows) {
     const partsByMessage = /* @__PURE__ */ new Map();
@@ -2349,7 +2577,8 @@ var OpenCodeSqliteAgent = class extends DatabaseSessionSource {
       let totalInputTokens = 0;
       let totalOutputTokens = 0;
       let hasEstimatedCost = false;
-      const msgRows = db.prepare("SELECT * FROM message WHERE session_id = ? ORDER BY time_created ASC").all(sessionId);
+      const msgRows = db.prepare("SELECT * FROM message WHERE session_id = ? ORDER BY time_created ASC, id ASC").all(sessionId);
+      const partsByMessage = this.buildPartsByMessage(this.readSessionPartRows(db, sessionId));
       for (const msgRow of msgRows) {
         const msgData = parseJsonRecord(msgRow.data, this.name, "message.data");
         if (isInternalEventType(msgData.type)) continue;
@@ -2360,7 +2589,7 @@ var OpenCodeSqliteAgent = class extends DatabaseSessionSource {
         const model = parseModel(msgData.modelID, this.name);
         const estimatedCost = cost > 0 ? null : estimateTokenCost(model, { input: inputTokens, output: outputTokens });
         const resolvedCost = cost || estimatedCost || 0;
-        const parts = this.readMessageParts(db, msgRow.id);
+        const parts = partsByMessage.get(String(msgRow.id ?? "")) ?? [];
         if (parts.length === 0) continue;
         messages.push({
           id: String(msgRow.id ?? ""),
@@ -2413,18 +2642,18 @@ var OpenCodeSqliteAgent = class extends DatabaseSessionSource {
   }
 };
 function resolveOpenCodeDataRoot() {
-  return join6(resolveDataHome(), "opencode");
+  return join7(resolveDataHome(), "opencode");
 }
 function findOpenCodeDbPath() {
   if (!isSqliteAvailable()) return null;
-  return firstExisting(join6(resolveOpenCodeDataRoot(), "opencode.db"), "data/opencode/opencode.db");
+  return firstExisting(join7(resolveOpenCodeDataRoot(), "opencode.db"), "data/opencode/opencode.db");
 }
 function getOpenCodeSessionWatchPlan() {
   const dataRoot = resolveOpenCodeDataRoot();
   return {
     status: "supported",
     targets: [
-      { root: dataRoot, path: join6(dataRoot, "opencode.db") },
+      { root: dataRoot, path: join7(dataRoot, "opencode.db") },
       { root: "data/opencode", path: "data/opencode/opencode.db" }
     ]
   };
@@ -2521,14 +2750,14 @@ function kimiContentText(content) {
   }).join(" ");
 }
 function extractFirstUserTitle(contextFile, wireFile) {
-  if (contextFile && existsSync6(contextFile)) {
+  if (contextFile && existsSync7(contextFile)) {
     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)) {
+  if (wireFile && existsSync7(wireFile)) {
     for (const record of readJsonlFile(wireFile)) {
       const message = asRecord(record.message) ?? {};
       if (message.type !== "TurnBegin") continue;
@@ -2548,25 +2777,25 @@ var KimiAgent = class extends FileSystemSessionSource {
   projectMap = /* @__PURE__ */ new Map();
   defaultModel = null;
   findBasePath() {
-    return firstExisting(join7(resolveKimiDataRoot(), "sessions"), "data/kimi");
+    return firstExisting(join8(resolveKimiDataRoot(), "sessions"), "data/kimi");
   }
   getSessionWatchPlan() {
     const dataRoot = resolveKimiDataRoot();
     return {
       status: "supported",
-      targets: [{ root: dataRoot, path: join7(dataRoot, "sessions") }, { path: "data/kimi" }]
+      targets: [{ root: dataRoot, path: join8(dataRoot, "sessions") }, { path: "data/kimi" }]
     };
   }
   /** Parse kimi.json and build md5(project_path) → cwd mapping */
   loadKimiConfig() {
     const dataRoot = resolveKimiDataRoot();
-    const configPath = join7(dataRoot, "kimi.json");
-    const tomlPath = join7(dataRoot, "config.toml");
-    if (existsSync6(tomlPath)) {
+    const configPath = join8(dataRoot, "kimi.json");
+    const tomlPath = join8(dataRoot, "config.toml");
+    if (existsSync7(tomlPath)) {
       const configText = readFileSync3(tomlPath, "utf-8");
       this.defaultModel = configText.match(/^default_model\s*=\s*"([^"]+)"/m)?.[1] ?? null;
     }
-    if (!existsSync6(configPath)) return;
+    if (!existsSync7(configPath)) return;
     try {
       const raw = asRecord(JSON.parse(readFileSync3(configPath, "utf-8")));
       const workDirs = asArray(raw?.work_dirs);
@@ -2595,14 +2824,14 @@ var KimiAgent = class extends FileSystemSessionSource {
     if (!this.basePath) return [];
     const dirs = [];
     try {
-      for (const hashEntry of readdirSync3(this.basePath, { withFileTypes: true })) {
+      for (const hashEntry of readdirSync4(this.basePath, { withFileTypes: true })) {
         if (!hashEntry.isDirectory()) continue;
-        const hashPath = join7(this.basePath, hashEntry.name);
+        const hashPath = join8(this.basePath, hashEntry.name);
         try {
-          for (const sessionEntry of readdirSync3(hashPath, { withFileTypes: true })) {
+          for (const sessionEntry of readdirSync4(hashPath, { withFileTypes: true })) {
             if (!sessionEntry.isDirectory()) continue;
-            const sessionPath = join7(hashPath, sessionEntry.name);
-            if (existsSync6(join7(sessionPath, "metadata.json")) || existsSync6(join7(sessionPath, "state.json"))) {
+            const sessionPath = join8(hashPath, sessionEntry.name);
+            if (existsSync7(join8(sessionPath, "metadata.json")) || existsSync7(join8(sessionPath, "state.json"))) {
               dirs.push(sessionPath);
             }
           }
@@ -2619,32 +2848,32 @@ var KimiAgent = class extends FileSystemSessionSource {
    */
   resolveSessionSourceResult(sessionDir) {
     try {
-      const sessionId = basename4(sessionDir);
-      const projectHash = basename4(dirname3(sessionDir));
-      const contextFile = join7(sessionDir, "context.jsonl");
-      const wireFile = join7(sessionDir, "wire.jsonl");
-      const existingContextFile = existsSync6(contextFile) ? contextFile : null;
-      const existingWireFile = existsSync6(wireFile) ? wireFile : null;
+      const sessionId = basename5(sessionDir);
+      const projectHash = basename5(dirname4(sessionDir));
+      const contextFile = join8(sessionDir, "context.jsonl");
+      const wireFile = join8(sessionDir, "wire.jsonl");
+      const existingContextFile = existsSync7(contextFile) ? contextFile : null;
+      const existingWireFile = existsSync7(wireFile) ? wireFile : null;
       if (!existingContextFile && !existingWireFile) {
         return skippedSession("missing transcript");
       }
-      const statePath = join7(sessionDir, "state.json");
-      const metaPath = join7(sessionDir, "metadata.json");
+      const statePath = join8(sessionDir, "state.json");
+      const metaPath = join8(sessionDir, "metadata.json");
       let explicitTitle = "";
       let wireMtime = null;
       let metaFile = "";
-      if (existsSync6(statePath)) {
+      if (existsSync7(statePath)) {
         const state = asRecord(JSON.parse(readFileSync3(statePath, "utf-8"))) ?? {};
         explicitTitle = String(state.custom_title ?? "");
         wireMtime = readWireMtime(state);
         metaFile = statePath;
-      } else if (existsSync6(metaPath)) {
+      } else if (existsSync7(metaPath)) {
         const meta = asRecord(JSON.parse(readFileSync3(metaPath, "utf-8"))) ?? {};
         explicitTitle = String(meta.title ?? "");
         wireMtime = readWireMtime(meta);
         metaFile = metaPath;
       }
-      const createdAt = wireMtime !== null ? wireMtime * 1e3 : metaFile ? statSync3(metaFile).mtimeMs : statSync3(sessionDir).mtimeMs;
+      const createdAt = wireMtime !== null ? wireMtime * 1e3 : metaFile ? statSync4(metaFile).mtimeMs : statSync4(sessionDir).mtimeMs;
       return parsedSession({
         id: sessionId,
         sourcePath: sessionDir,
@@ -2765,8 +2994,8 @@ var KimiAgent = class extends FileSystemSessionSource {
     return this.buildSessionData(meta, builder, stats);
   }
   getSessionDataFromWire(meta) {
-    const wirePath = meta.wireFile ?? join7(meta.sourcePath, "wire.jsonl");
-    if (!existsSync6(wirePath)) throw new Error("wire.jsonl is missing");
+    const wirePath = meta.wireFile ?? join8(meta.sourcePath, "wire.jsonl");
+    if (!existsSync7(wirePath)) throw new Error("wire.jsonl is missing");
     const builder = new TranscriptBuilder();
     const ignoredToolCallIds = /* @__PURE__ */ new Set();
     const openToolArgumentBuffer = /* @__PURE__ */ new Map();
@@ -3004,10 +3233,10 @@ var KimiAgent = class extends FileSystemSessionSource {
       total_tokens: 0,
       message_count: 0
     };
-    const wirePath = join7(sessionDir, "wire.jsonl");
-    if (!existsSync6(wirePath)) return stats;
-    const contextPath = join7(sessionDir, "context.jsonl");
-    const hasContext = existsSync6(contextPath);
+    const wirePath = join8(sessionDir, "wire.jsonl");
+    if (!existsSync7(wirePath)) return stats;
+    const contextPath = join8(sessionDir, "context.jsonl");
+    const hasContext = existsSync7(contextPath);
     try {
       for (const record of readJsonlFile(wirePath)) {
         const tokenUsage = asRecord(asRecord(record.message)?.usage);
@@ -3337,7 +3566,7 @@ var CODEX_TOOL_TITLE_MAP = {
   subagent: "subagent"
 };
 function extractSessionId(filename) {
-  const stem = basename5(filename, ".jsonl");
+  const stem = basename6(filename, ".jsonl");
   const parts = stem.split("-");
   if (parts.length >= 5) {
     return parts.slice(-5).join("-");
@@ -3509,15 +3738,15 @@ var CodexAgent = class extends SingleFileSessionSource {
   sessionIndexPath;
   // ---- BaseAgent implementation ----
   findBasePath() {
-    return firstExisting(join8(resolveCodexDataRoot(), "sessions"));
+    return firstExisting(join9(resolveCodexDataRoot(), "sessions"));
   }
   getSessionWatchPlan() {
     const dataRoot = resolveCodexDataRoot();
     return {
       status: "supported",
       targets: [
-        { path: join8(dataRoot, "sessions") },
-        { path: join8(dataRoot, "session_index.jsonl") }
+        { path: join9(dataRoot, "sessions") },
+        { path: join9(dataRoot, "session_index.jsonl") }
       ]
     };
   }
@@ -3538,7 +3767,7 @@ var CodexAgent = class extends SingleFileSessionSource {
   getSessionData(sessionId) {
     const meta = this.sessionMetaMap.get(sessionId);
     if (!meta) throw new Error(`Session not found: ${sessionId}`);
-    if (!existsSync7(meta.sourcePath)) throw new Error(`Session file missing: ${meta.sourcePath}`);
+    if (!existsSync8(meta.sourcePath)) throw new Error(`Session file missing: ${meta.sourcePath}`);
     const transcript = new TranscriptBuilder();
     let totalInputTokens = 0;
     let totalOutputTokens = 0;
@@ -3670,7 +3899,7 @@ var CodexAgent = class extends SingleFileSessionSource {
     ]);
   }
   getSessionIndexPath() {
-    this.sessionIndexPath ??= join8(resolveCodexDataRoot(), "session_index.jsonl");
+    this.sessionIndexPath ??= join9(resolveCodexDataRoot(), "session_index.jsonl");
     return this.sessionIndexPath;
   }
   // ---- Session index ----
@@ -3756,7 +3985,7 @@ var CodexAgent = class extends SingleFileSessionSource {
           return skippedSession("malformed first record");
         }
         firstPayload = extractPayload(firstRecord);
-        createdAt = parseTimestampMs2(firstRecord) || parseTimestampMs2(firstPayload) || statSync4(filePath).mtimeMs;
+        createdAt = parseTimestampMs2(firstRecord) || parseTimestampMs2(firstPayload) || statSync5(filePath).mtimeMs;
         updatedAt = createdAt;
       }
       try {
@@ -3878,7 +4107,7 @@ var CodexAgent = class extends SingleFileSessionSource {
       return skippedSession("malformed first record");
     }
     const payload = extractPayload(firstRecord);
-    const stat = statSync4(filePath);
+    const stat = statSync5(filePath);
     const createdAt = parseTimestampMs2(firstRecord) || parseTimestampMs2(payload) || stat.mtimeMs;
     const indexTitle = this.getTitleForSession(sessionId);
     const messageTitle = this.extractTitleFromLines(lines);
@@ -4289,15 +4518,15 @@ function resolveCursorDataRoot() {
   if (override) return override;
   const currentPlatform = platform2();
   if (currentPlatform === "darwin") {
-    return firstExisting(join9(homedir3(), "Library", "Application Support", "Cursor", "User"));
+    return firstExisting(join10(homedir3(), "Library", "Application Support", "Cursor", "User"));
   }
   if (currentPlatform === "linux") {
-    const configRoot = readEnvPath("XDG_CONFIG_HOME") ?? join9(homedir3(), ".config");
-    return firstExisting(join9(configRoot, "Cursor", "User"));
+    const configRoot = readEnvPath("XDG_CONFIG_HOME") ?? join10(homedir3(), ".config");
+    return firstExisting(join10(configRoot, "Cursor", "User"));
   }
   if (currentPlatform === "win32") {
-    const appData = readEnvPath("APPDATA") ?? join9(homedir3(), "AppData", "Roaming");
-    return firstExisting(join9(appData, "Cursor", "User"));
+    const appData = readEnvPath("APPDATA") ?? join10(homedir3(), "AppData", "Roaming");
+    return firstExisting(join10(appData, "Cursor", "User"));
   }
   return null;
 }
@@ -4358,6 +4587,24 @@ function parseComposerRow(value) {
     chatMessages: parseChatMessages(record.chatMessages)
   };
 }
+function composerIdFromBubbleKey(key) {
+  const start = key.indexOf(":") + 1;
+  const end = key.indexOf(":", start);
+  return end === -1 ? key.slice(start) : key.slice(start, end);
+}
+function groupBubbleRows(rows) {
+  const byKey = [];
+  for (const row of rows) {
+    const bubble = parseBubbleRow(row.value);
+    if (bubble) byKey.push({ rowId: row.row_id, key: row.key, bubble });
+  }
+  byKey.sort((left, right) => left.key.localeCompare(right.key));
+  return {
+    composerId: rows.length > 0 ? composerIdFromBubbleKey(rows[0].key) : "",
+    byKey,
+    byRowId: [...byKey].sort((left, right) => left.rowId - right.rowId)
+  };
+}
 function parseBubbleRow(value) {
   const record = safeParseJsonRecord(value);
   if (!record) return null;
@@ -4517,7 +4764,7 @@ var CursorAgent = class extends DatabaseSessionSource {
     if (!isSqliteAvailable()) return null;
     const dataPath = resolveCursorDataRoot();
     if (!dataPath) return null;
-    return join9(dataPath, "globalStorage", "state.vscdb");
+    return join10(dataPath, "globalStorage", "state.vscdb");
   }
   getSessionWatchPlan() {
     const dataPath = resolveCursorDataRoot();
@@ -4526,9 +4773,9 @@ var CursorAgent = class extends DatabaseSessionSource {
       targets: dataPath ? [
         {
           root: dataPath,
-          path: join9(dataPath, "globalStorage", "state.vscdb")
+          path: join10(dataPath, "globalStorage", "state.vscdb")
         },
-        { root: dataPath, path: join9(dataPath, "workspaceStorage") }
+        { root: dataPath, path: join10(dataPath, "workspaceStorage") }
       ] : []
     };
   }
@@ -4540,23 +4787,23 @@ var CursorAgent = class extends DatabaseSessionSource {
     const map = /* @__PURE__ */ new Map();
     const dataPath = resolveCursorDataRoot();
     if (!dataPath) return map;
-    const wsStoragePath = join9(dataPath, "workspaceStorage");
-    if (!existsSync8(wsStoragePath)) return map;
+    const wsStoragePath = join10(dataPath, "workspaceStorage");
+    if (!existsSync9(wsStoragePath)) return map;
     let entryNames;
     try {
-      entryNames = readdirSync4(wsStoragePath);
+      entryNames = readdirSync5(wsStoragePath);
     } catch {
       return map;
     }
     for (const name of entryNames) {
-      const wsDir = join9(wsStoragePath, name);
+      const wsDir = join10(wsStoragePath, name);
       try {
-        if (!statSync5(wsDir).isDirectory()) continue;
+        if (!statSync6(wsDir).isDirectory()) continue;
       } catch {
         continue;
       }
-      const wsJsonPath = join9(wsDir, "workspace.json");
-      if (!existsSync8(wsJsonPath)) continue;
+      const wsJsonPath = join10(wsDir, "workspace.json");
+      if (!existsSync9(wsJsonPath)) continue;
       let workspacePath;
       try {
         const data = asRecord(JSON.parse(readFileSync5(wsJsonPath, "utf-8")));
@@ -4566,8 +4813,8 @@ var CursorAgent = class extends DatabaseSessionSource {
       } catch {
         continue;
       }
-      const wsDbPath = join9(wsDir, "state.vscdb");
-      if (!existsSync8(wsDbPath)) continue;
+      const wsDbPath = join10(wsDir, "state.vscdb");
+      if (!existsSync9(wsDbPath)) continue;
       const wsDb = openDbReadOnly(wsDbPath);
       if (!wsDb) continue;
       try {
@@ -4590,7 +4837,7 @@ var CursorAgent = class extends DatabaseSessionSource {
   }
   isAvailable() {
     this.dbPath = this.findDbPath();
-    return this.dbPath !== null && existsSync8(this.dbPath);
+    return this.dbPath !== null && existsSync9(this.dbPath);
   }
   scan(options) {
     if (!this.dbPath) return [];
@@ -4598,13 +4845,15 @@ var CursorAgent = class extends DatabaseSessionSource {
     const dbMarker = perf.start("openDatabase");
     const db = this.openDatabase();
     perf.end(dbMarker);
-    if (!db) return [];
+    if (!db) throw new SessionScanError(this.name, "opening the database");
     const wsMarker = perf.start("buildWorkspacePathMap");
     const workspacePathMap = this.buildWorkspacePathMap();
     perf.end(wsMarker);
     try {
       const rows = db.prepare("SELECT key, value FROM cursorDiskKV WHERE key LIKE 'composerData:%'").all();
-      const heads = [];
+      const emitted = /* @__PURE__ */ new Map();
+      const pending2 = [];
+      let order = 0;
       options?.onProgress?.({ total: rows.length, processed: 0, sessions: 0 });
       let processed = 0;
       for (const row of rows) {
@@ -4620,8 +4869,8 @@ var CursorAgent = class extends DatabaseSessionSource {
           const fastMessageCount = composer.chatMessages?.length ?? 0;
           const hasSubagents = Array.isArray(composer.subagentInfos) && composer.subagentInfos.length > 0;
           if (options?.fast) {
-            const directory2 = workspacePathMap.get(composerId) ?? "";
-            const totalCost2 = estimateTokenCost(composer.modelConfig?.modelName ?? composer.model, {
+            const directory = workspacePathMap.get(composerId) ?? "";
+            const totalCost = estimateTokenCost(composer.modelConfig?.modelName ?? composer.model, {
               input: composer.inputTokenCount ?? 0,
               output: composer.outputTokenCount ?? 0
             }) ?? 0;
@@ -4630,20 +4879,21 @@ var CursorAgent = class extends DatabaseSessionSource {
                 id: composerId,
                 slug: `cursor/${composerId}`,
                 title: fastTitle,
-                directory: directory2,
+                directory,
                 time_created: createdAt,
                 time_updated: updatedAt || void 0,
                 stats: {
                   message_count: fastMessageCount,
                   total_input_tokens: composer.inputTokenCount ?? 0,
                   total_output_tokens: composer.outputTokenCount ?? 0,
-                  total_cost: totalCost2,
-                  cost_source: totalCost2 > 0 ? "estimated" : void 0
+                  total_cost: totalCost,
+                  cost_source: totalCost > 0 ? "estimated" : void 0
                 }
               })
             );
             if (!head) continue;
-            heads.push(head);
+            emitted.set(order, head);
+            order += 1;
             this.composerCache.set(composerId, composer);
             this.sessionMetaMap.set(composerId, {
               id: composerId,
@@ -4651,74 +4901,38 @@ var CursorAgent = class extends DatabaseSessionSource {
             });
             continue;
           }
-          const requestId = this.extractRequestIdFromBubbles(db, composerId);
-          const sessionId = requestId || composerId;
-          const parsedMessages = cleanParsedMessages(
-            this.loadMessagesFromBubbles(
-              db,
-              composerId,
-              sessionId,
-              composer.modelConfig?.modelName ?? composer.model ?? null
-            )
-          );
-          const messages = getParsedSession(
-            parsedMessages.length === 0 && !hasSubagents ? filteredSession("no visible messages") : parsedSession(parsedMessages)
-          );
-          if (!messages) continue;
-          const messageCount = messages.length;
-          const title = this.extractTitle(composer, messages);
-          const directory = workspacePathMap.get(composerId) ?? "";
-          const modelUsageMap = {};
-          let totalCost = 0;
-          for (const msg of messages) {
-            totalCost += msg.cost ?? 0;
-            if (msg.model) {
-              const msgTokens = (msg.tokens?.input ?? 0) + (msg.tokens?.output ?? 0);
-              if (msgTokens > 0) {
-                modelUsageMap[msg.model] = (modelUsageMap[msg.model] ?? 0) + msgTokens;
-              }
-            }
-          }
-          const hasModelUsage = Object.keys(modelUsageMap).length > 0;
-          heads.push({
-            id: sessionId,
-            slug: `cursor/${sessionId}`,
-            title,
-            directory,
-            time_created: createdAt,
-            time_updated: updatedAt || void 0,
-            stats: {
-              message_count: messageCount,
-              total_input_tokens: composer.inputTokenCount ?? 0,
-              total_output_tokens: composer.outputTokenCount ?? 0,
-              total_cost: totalCost,
-              cost_source: totalCost > 0 ? "estimated" : void 0
-            },
-            model_usage: hasModelUsage ? modelUsageMap : void 0
-          });
-          this.composerCache.set(sessionId, composer);
-          this.composerCache.set(`__mapping__${composerId}`, {
-            sessionId
-          });
-          if (directory) {
-            this.composerCache.set(`__dir__${composerId}`, {
-              directory
-            });
-          }
-          this.sessionMetaMap.set(sessionId, {
-            id: sessionId,
-            sourcePath: this.dbPath || ""
-          });
+          pending2.push({ composer, composerId, createdAt, updatedAt, hasSubagents, order });
+          order += 1;
         } catch {
         } finally {
           processed += 1;
-          options?.onProgress?.({ total: rows.length, processed, sessions: heads.length });
+          options?.onProgress?.({ total: rows.length, processed, sessions: emitted.size });
         }
       }
+      const bubbleMarker = perf.start("cursor:bubbles");
+      const wanted = new Map(pending2.map((entry) => [entry.composerId, entry]));
+      this.forEachComposerBubbles(db, wanted, (bubbles) => {
+        const entry = wanted.get(bubbles.composerId);
+        if (!entry) return;
+        wanted.delete(bubbles.composerId);
+        const head = this.buildScanHead(entry, bubbles, workspacePathMap);
+        if (head) emitted.set(entry.order, head);
+      });
+      for (const entry of wanted.values()) {
+        const head = this.buildScanHead(
+          entry,
+          { composerId: entry.composerId, byKey: [], byRowId: [] },
+          workspacePathMap
+        );
+        if (head) emitted.set(entry.order, head);
+      }
+      perf.end(bubbleMarker);
+      const heads = [...emitted.entries()].sort(([left], [right]) => left - right).map(([, head]) => head);
+      options?.onProgress?.({ total: rows.length, processed, sessions: heads.length });
       perf.end(scanMarker);
       return heads;
-    } catch {
-      return [];
+    } catch (error) {
+      throw new SessionScanError(this.name, "reading composers", { cause: error });
     } finally {
       db.close();
     }
@@ -4806,20 +5020,90 @@ var CursorAgent = class extends DatabaseSessionSource {
     if (!this.dbPath) return null;
     return openDbReadOnly(this.dbPath);
   }
-  /** Extract requestId from bubbles for a composer (like agent-dump) */
-  extractRequestIdFromBubbles(db, composerId) {
-    try {
-      const rows = db.prepare("SELECT value FROM cursorDiskKV WHERE key LIKE ? ORDER BY key").all(`bubbleId:${composerId}:%`);
-      for (const row of rows) {
-        try {
-          const bubble = parseBubbleRow(row.value);
-          if (bubble?.requestId?.trim()) {
-            return bubble.requestId.trim();
-          }
-        } catch {
+  /**
+   * Streams every bubble row once, in key order, handing each composer's group
+   * to the caller. A key-ordered scan keeps a composer's bubbles contiguous, so
+   * only one group is materialized at a time.
+   */
+  forEachComposerBubbles(db, wanted, onGroup) {
+    if (wanted.size === 0) return;
+    let currentId = null;
+    let group = [];
+    const flush = () => {
+      if (currentId != null && group.length > 0) onGroup(groupBubbleRows(group));
+      group = [];
+    };
+    const rows = db.prepare(
+      "SELECT rowid AS row_id, key, value FROM cursorDiskKV WHERE key LIKE 'bubbleId:%' ORDER BY key"
+    ).iterate();
+    for (const row of rows) {
+      const composerId = composerIdFromBubbleKey(row.key);
+      if (composerId !== currentId) {
+        flush();
+        currentId = composerId;
+      }
+      if (wanted.has(composerId)) group.push(row);
+    }
+    flush();
+  }
+  /** Builds the head for one composer from bubbles that were parsed once. */
+  buildScanHead(entry, bubbles, workspacePathMap) {
+    const { composer, composerId, createdAt, updatedAt, hasSubagents } = entry;
+    const requestId = this.requestIdFromBubbles(bubbles);
+    const sessionId = requestId || composerId;
+    const parsedMessages = cleanParsedMessages(
+      this.messagesFromBubbles(bubbles, composer.modelConfig?.modelName ?? composer.model ?? null)
+    );
+    const messages = getParsedSession(
+      parsedMessages.length === 0 && !hasSubagents ? filteredSession("no visible messages") : parsedSession(parsedMessages)
+    );
+    if (!messages) return null;
+    const title = this.extractTitle(composer, messages);
+    const directory = workspacePathMap.get(composerId) ?? "";
+    const modelUsageMap = {};
+    let totalCost = 0;
+    for (const msg of messages) {
+      totalCost += msg.cost ?? 0;
+      if (msg.model) {
+        const msgTokens = (msg.tokens?.input ?? 0) + (msg.tokens?.output ?? 0);
+        if (msgTokens > 0) {
+          modelUsageMap[msg.model] = (modelUsageMap[msg.model] ?? 0) + msgTokens;
         }
       }
-    } catch {
+    }
+    const hasModelUsage = Object.keys(modelUsageMap).length > 0;
+    this.composerCache.set(sessionId, composer);
+    this.composerCache.set(`__mapping__${composerId}`, {
+      sessionId
+    });
+    if (directory) {
+      this.composerCache.set(`__dir__${composerId}`, {
+        directory
+      });
+    }
+    this.sessionMetaMap.set(sessionId, { id: sessionId, sourcePath: this.dbPath || "" });
+    return {
+      id: sessionId,
+      slug: `cursor/${sessionId}`,
+      title,
+      directory,
+      time_created: createdAt,
+      time_updated: updatedAt || void 0,
+      stats: {
+        message_count: messages.length,
+        total_input_tokens: composer.inputTokenCount ?? 0,
+        total_output_tokens: composer.outputTokenCount ?? 0,
+        total_cost: totalCost,
+        cost_source: totalCost > 0 ? "estimated" : void 0
+      },
+      model_usage: hasModelUsage ? modelUsageMap : void 0
+    };
+  }
+  /** First request id in key order, matching what agent-dump reports. */
+  requestIdFromBubbles(bubbles) {
+    for (const entry of bubbles.byKey) {
+      const requestId = entry.bubble.requestId?.trim();
+      if (requestId) return requestId;
     }
     return null;
   }
@@ -4868,18 +5152,26 @@ var CursorAgent = class extends DatabaseSessionSource {
       return 0;
     }
   }
-  /** Load messages from bubbles (like agent-dump) */
+  /** Load one composer's bubbles, for the detail path that only needs a single session. */
   loadMessagesFromBubbles(db, composerId, _sessionId, initialModelName) {
-    const messages = [];
     try {
-      const rows = db.prepare("SELECT key, value FROM cursorDiskKV WHERE key LIKE ? ORDER BY rowid ASC").all(`bubbleId:${composerId}:%`);
+      const rows = db.prepare("SELECT rowid AS row_id, key, value FROM cursorDiskKV WHERE key LIKE ?").all(`bubbleId:${composerId}:%`);
+      return this.messagesFromBubbles(groupBubbleRows(rows), initialModelName);
+    } catch {
+      return [];
+    }
+  }
+  /** Build messages from bubbles already parsed once, in insertion order. */
+  messagesFromBubbles(bubbles, initialModelName) {
+    const messages = [];
+    {
       let activeModelName = initialModelName;
       let messageIndex = 0;
-      for (const row of rows) {
-        try {
-          const bubble = parseBubbleRow(row.value);
-          if (!bubble || isInternalBubble(bubble)) continue;
-          const bubbleId = row.key.split(":").pop() || String(messageIndex);
+      for (const entry of bubbles.byRowId) {
+        {
+          const bubble = entry.bubble;
+          if (isInternalBubble(bubble)) continue;
+          const bubbleId = entry.key.split(":").pop() || String(messageIndex);
           const role = bubble.type === 2 ? "assistant" : "user";
           let timestampMs = 0;
           if (bubble.timingInfo?.clientRpcSendTime) {
@@ -4910,7 +5202,7 @@ var CursorAgent = class extends DatabaseSessionSource {
           const tokens = { input: inputTokens, output: outputTokens };
           const cost = estimateTokenCost(modelName, tokens);
           messages.push({
-            id: `cursor-${composerId}-${bubbleId}`,
+            id: `cursor-${bubbles.composerId}-${bubbleId}`,
             role,
             agent: "cursor",
             time_created: timestampMs,
@@ -4924,10 +5216,8 @@ var CursorAgent = class extends DatabaseSessionSource {
             parts
           });
           messageIndex++;
-        } catch {
         }
       }
-    } catch {
     }
     return messages;
   }
@@ -5063,7 +5353,7 @@ function narrowTimestampMs(field, value) {
   return shaped === void 0 ? 0 : parseTimestampMs3(shaped);
 }
 function extractSessionIdFromFilename(filePath) {
-  const stem = basename6(filePath, ".jsonl");
+  const stem = basename7(filePath, ".jsonl");
   const underscore = stem.indexOf("_");
   return underscore >= 0 ? stem.slice(underscore + 1) || stem : stem;
 }
@@ -5119,14 +5409,14 @@ var PiAgent = class extends SingleFileSessionSource {
   displayName = "Pi";
   basePath = null;
   findBasePath() {
-    return firstExisting(join10(resolvePiDataRoot(), "agent", "sessions"), "data/pi");
+    return firstExisting(join11(resolvePiDataRoot(), "agent", "sessions"), "data/pi");
   }
   getSessionWatchPlan() {
     const dataRoot = resolvePiDataRoot();
     return {
       status: "supported",
       targets: [
-        { root: dataRoot, path: join10(dataRoot, "agent", "sessions") },
+        { root: dataRoot, path: join11(dataRoot, "agent", "sessions") },
         { root: "data/pi", path: "data/pi" }
       ]
     };
@@ -5147,7 +5437,7 @@ var PiAgent = class extends SingleFileSessionSource {
   getSessionData(sessionId) {
     const meta = this.sessionMetaMap.get(sessionId);
     if (!meta) throw new Error(`Session not found: ${sessionId}`);
-    if (!existsSync9(meta.sourcePath)) throw new Error(`Session file missing: ${meta.sourcePath}`);
+    if (!existsSync10(meta.sourcePath)) throw new Error(`Session file missing: ${meta.sourcePath}`);
     const parsed = this.parsePiFile(meta.sourcePath);
     const state = this.convertEntries(parsed.pathEntries);
     return {
@@ -5240,7 +5530,7 @@ var PiAgent = class extends SingleFileSessionSource {
     const sessionId = String(header["id"] ?? extractSessionIdFromFilename(filePath)).trim();
     if (!sessionId) throw new Error("missing session id");
     const stat = this.sessionSourceFile(filePath).stat;
-    const directory = String(header["cwd"] ?? "").trim() || basename6(filePath, ".jsonl");
+    const directory = String(header["cwd"] ?? "").trim() || basename7(filePath, ".jsonl");
     const createdAt = narrowTimestampMs("session.timestamp", header["timestamp"]) || stat.mtimeMs;
     const updatedAt = pathEntries.reduce(
       (max, entry) => Math.max(max, getEntryTimestamp(entry)),
@@ -5490,19 +5780,19 @@ var PiAgent = class extends SingleFileSessionSource {
 function resolveZCodeDataRoot() {
   const currentPlatform = platform3();
   if (currentPlatform !== "darwin" && currentPlatform !== "win32") return null;
-  return join11(homedir4(), ".zcode");
+  return join12(homedir4(), ".zcode");
 }
 function findZCodeDbPath() {
   if (!isSqliteAvailable()) return null;
   const dataRoot = resolveZCodeDataRoot();
   if (!dataRoot) return null;
-  return firstExisting(join11(dataRoot, "cli", "db", "db.sqlite"));
+  return firstExisting(join12(dataRoot, "cli", "db", "db.sqlite"));
 }
 function getZCodeSessionWatchPlan() {
   const dataRoot = resolveZCodeDataRoot();
   return {
     status: "supported",
-    targets: dataRoot ? [{ root: dataRoot, path: join11(dataRoot, "cli", "db", "db.sqlite") }] : []
+    targets: dataRoot ? [{ root: dataRoot, path: join12(dataRoot, "cli", "db", "db.sqlite") }] : []
   };
 }
 var ZCodeAgent = class extends OpenCodeSqliteAgent {
@@ -5573,7 +5863,7 @@ function fallbackDisplayName(input) {
 }
 var realFs = {
   exists(path2) {
-    return existsSync10(path2);
+    return existsSync11(path2);
   },
   readText(path2) {
     try {
@@ -5602,23 +5892,6 @@ var MANIFESTS = [
 var PARSEABLE_MANIFESTS = ["package.json", "Cargo.toml", "pyproject.toml"];
 var LOOSE_DIRS = /* @__PURE__ */ new Set(["/tmp", "/private/tmp"]);
 var LOOSE_HOME_DIRS = ["Desktop", "Downloads", "Documents"];
-var PROJECT_IDENTITY_KINDS = /* @__PURE__ */ new Set([
-  "git_remote",
-  "git_common_dir",
-  "manifest_path",
-  "synthetic",
-  "path",
-  "loose"
-]);
-function isProjectIdentityKind(value) {
-  return PROJECT_IDENTITY_KINDS.has(value);
-}
-function getProjectIdentityKey(identity) {
-  return `${identity.kind}:${identity.key}`;
-}
-function matchesProjectIdentity(identity, expected) {
-  return identity?.kind === expected.kind && identity.key === expected.key;
-}
 function normalizeGitRemote(url) {
   if (!url) return null;
   let value = url.trim().replace(/\.git$/, "");
@@ -6092,16 +6365,16 @@ function setSchemaEnsuredPath(path2) {
   schemaEnsuredPath = path2;
 }
 function getCacheDir2() {
-  return join12(homedir6(), ".cache", "codesesh");
+  return join13(homedir6(), ".cache", "codesesh");
 }
 function getCachePath2() {
-  return join12(getCacheDir2(), CACHE_FILENAME);
+  return join13(getCacheDir2(), CACHE_FILENAME);
 }
 function getLegacyCachePath() {
-  return join12(getCacheDir2(), LEGACY_CACHE_FILENAME);
+  return join13(getCacheDir2(), LEGACY_CACHE_FILENAME);
 }
 function hasCacheStorage() {
-  return existsSync11(getCachePath2());
+  return existsSync12(getCachePath2());
 }
 function likePattern(value) {
   return `%${value.trim().toLowerCase().replace(/[\\%_]/g, "\\$&")}%`;
@@ -8445,55 +8718,90 @@ function buildFileActivityWhere(options) {
     params
   };
 }
+var FILE_ACTIVITY_COLUMNS = `
+  fa.agent_name,
+  fa.session_id,
+  fa.project_identity_key,
+  fa.path,
+  fa.kind,
+  fa.count,
+  fa.latest_time,
+  s.slug,
+  s.title,
+  s.directory,
+  s.project_identity_kind,
+  s.project_display_name,
+  s.time_created,
+  s.time_updated,
+  s.message_count,
+  s.total_input_tokens,
+  s.total_output_tokens,
+  s.total_cache_read_tokens,
+  s.total_cache_create_tokens,
+  s.total_cost,
+  s.cost_source,
+  s.total_tokens,
+  s.model_usage_json,
+  s.smart_tags_json,
+  s.smart_tags_source_updated_at
+`;
+var FILE_ACTIVITY_JOIN = `
+  FROM session_file_activity fa
+  JOIN sessions s ON s.agent_name = fa.agent_name AND s.session_id = fa.session_id
+`;
+var FILE_ACTIVITY_ORDER = "fa.latest_time DESC, fa.count DESC, fa.path";
 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 = [
+function fileActivityWhere(query) {
+  const filters = buildFileActivityWhere(query.options);
+  const sessionFilters = query.sessionSearchOptions ? buildSessionSearchFilters(query.sessionSearchOptions) : { where: "", params: [] };
+  const clauses = [
     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
-            fa.agent_name,
-            fa.session_id,
-            fa.project_identity_key,
-            fa.path,
-            fa.kind,
-            fa.count,
-            fa.latest_time,
-            s.slug,
-            s.title,
-            s.directory,
-            s.project_identity_kind,
-            s.project_display_name,
-            s.time_created,
-            s.time_updated,
-            s.message_count,
-            s.total_input_tokens,
-            s.total_output_tokens,
-            s.total_cache_read_tokens,
-            s.total_cache_create_tokens,
-            s.total_cost,
-            s.cost_source,
-            s.total_tokens,
-            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
-          ${where}
-          ORDER BY fa.latest_time DESC, fa.count DESC, fa.path
-          LIMIT ?
-        `
-  ).all(...filters.params, ...sessionFilters.params, options.limit ?? 50);
+  return {
+    where: clauses.length > 0 ? `WHERE ${clauses.join(" AND ")}` : "",
+    params: [...filters.params, ...sessionFilters.params]
+  };
+}
+function fileActivitySql(query, where) {
+  if (!query.onePerSession) {
+    return `
+      SELECT ${FILE_ACTIVITY_COLUMNS}
+      ${FILE_ACTIVITY_JOIN}
+      ${where}
+      ORDER BY ${FILE_ACTIVITY_ORDER}
+      LIMIT ?
+    `;
+  }
+  return `
+    SELECT ${FILE_ACTIVITY_COLUMNS}
+    FROM (
+      SELECT
+        fa.rowid AS activity_rowid,
+        ROW_NUMBER() OVER (
+          PARTITION BY fa.agent_name, fa.session_id
+          ORDER BY ${FILE_ACTIVITY_ORDER}
+        ) AS session_rank
+      ${FILE_ACTIVITY_JOIN}
+      ${where}
+    ) ranked
+    JOIN session_file_activity fa ON fa.rowid = ranked.activity_rowid
+    JOIN sessions s ON s.agent_name = fa.agent_name AND s.session_id = fa.session_id
+    WHERE ranked.session_rank = 1
+    ORDER BY ${FILE_ACTIVITY_ORDER}
+    LIMIT ?
+  `;
+}
+function queryFileActivity(options, sessionSearchOptions, onePerSession = false) {
+  if (!hasCacheStorage()) {
+    return [];
+  }
+  const query = { options, sessionSearchOptions, onePerSession };
+  const { where, params } = fileActivityWhere(query);
+  const sql = fileActivitySql(query, where);
+  const queryRows = (db) => db.prepare(sql).all(...params, options.limit ?? 50);
   let rows = withCacheDbReadOnly(queryRows);
   if (rows == null && options.path) {
     rows = withCacheDb(queryRows);
@@ -8526,25 +8834,17 @@ function searchFileActivitySessions(query, options = {}) {
     {
       path: path2,
       kind: search.options.fileKind,
-      limit: (search.options.limit ?? 50) * 3
+      limit: search.options.limit ?? 50
     },
-    search.options
+    search.options,
+    true
   );
-  const seen = /* @__PURE__ */ new Set();
-  const results = [];
-  for (const row of rows) {
-    const key = `${row.reference.agentName}/${row.reference.sessionId}`;
-    if (seen.has(key)) continue;
-    seen.add(key);
-    results.push({
-      reference: row.reference,
-      session: row.session,
-      snippet: `${row.kind} ${highlightFilePath(row.path, path2)} \xB7 ${row.count} events`,
-      matchType: "file_path"
-    });
-    if (results.length >= (search.options.limit ?? 50)) break;
-  }
-  return results;
+  return rows.map((row) => ({
+    reference: row.reference,
+    session: row.session,
+    snippet: `${row.kind} ${highlightFilePath(row.path, path2)} \xB7 ${row.count} events`,
+    matchType: "file_path"
+  }));
 }
 var CACHE_INITIALIZATION_VERSION = "session-cache-v2";
 function parseCachedSessionMeta(value) {
@@ -8557,7 +8857,7 @@ function parseCachedSessionMeta(value) {
 }
 function deleteLegacyCacheFile() {
   const legacyPath = getLegacyCachePath();
-  if (!existsSync12(legacyPath)) {
+  if (!existsSync13(legacyPath)) {
     return;
   }
   try {
@@ -8757,7 +9057,7 @@ function loadCachedSessionRawEntry(agentName, sessionId) {
   });
 }
 function saveCachedSessions(agentName, sessions, meta = {}) {
-  withCacheDb((db) => {
+  const persisted = withCacheDb((db) => {
     const deleteSession = db.prepare(
       "DELETE FROM sessions WHERE agent_name = ? AND session_id = ?"
     );
@@ -8809,13 +9109,15 @@ function saveCachedSessions(agentName, sessions, meta = {}) {
     });
     write();
     deleteLegacyCacheFile();
+    return true;
   });
+  return persisted ?? false;
 }
 function saveCachedSessionChanges(agentName, changes, removedSessionIds, meta = {}) {
   if (changes.length === 0 && removedSessionIds.length === 0) {
-    return;
+    return true;
   }
-  withCacheDb((db) => {
+  const persisted = withCacheDb((db) => {
     const deleteSession = db.prepare(
       "DELETE FROM sessions WHERE agent_name = ? AND session_id = ?"
     );
@@ -8861,7 +9163,9 @@ function saveCachedSessionChanges(agentName, changes, removedSessionIds, meta =
     });
     write();
     deleteLegacyCacheFile();
+    return true;
   });
+  return persisted ?? false;
 }
 function clearCache() {
   setSchemaEnsuredPath(null);
@@ -8887,11 +9191,11 @@ function clearCache() {
   const walPath = `${cachePath}-wal`;
   const shmPath = `${cachePath}-shm`;
   for (const filePath of [walPath, shmPath]) {
-    if (!existsSync12(filePath)) {
+    if (!existsSync13(filePath)) {
       continue;
     }
     try {
-      rmSync(filePath, { force: true });
+      rmSync2(filePath, { force: true });
     } catch {
     }
   }
@@ -9231,11 +9535,17 @@ async function scanAgentFull(agent, options, onProgress, timing = { total: 0 },
     timing.tags = performance.now() - t2;
     const meta = buildAgentCacheMeta(agent);
     if (options.writeCache !== false) {
-      if (options.from == null && options.to == null) {
-        saveCachedSessions(agent.name, tagged.sessions, meta);
-        markAgentFullSyncCompleted(agent.name);
+      const isFullWindow = options.from == null && options.to == null;
+      const persisted = isFullWindow ? saveCachedSessions(agent.name, tagged.sessions, meta) : true;
+      if (persisted) {
+        if (isFullWindow) markAgentFullSyncCompleted(agent.name);
+        markAgentCacheInitialized(agent.name);
+      } else {
+        getCoreDiagnostics()?.warn("cache.save_failed", {
+          agent: agent.name,
+          sessions: tagged.sessions.length
+        });
       }
-      markAgentCacheInitialized(agent.name);
     }
     onProgress?.({ agent: agent.name, phase: "complete", newCount: tagged.sessions.length });
     const filtered = filterSessions(tagged.sessions, options);
@@ -9440,16 +9750,16 @@ function getStateDir() {
   if (process.env.CODESESH_STATE_DIR) return process.env.CODESESH_STATE_DIR;
   const currentPlatform = platform4();
   if (currentPlatform === "darwin") {
-    return join13(homedir7(), "Library", "Application Support", "codesesh");
+    return join14(homedir7(), "Library", "Application Support", "codesesh");
   }
   if (currentPlatform === "win32") {
     const appData = process.env.APPDATA ?? process.env.LOCALAPPDATA;
-    return join13(appData ?? join13(homedir7(), "AppData", "Roaming"), "codesesh");
+    return join14(appData ?? join14(homedir7(), "AppData", "Roaming"), "codesesh");
   }
-  return join13(process.env.XDG_DATA_HOME ?? join13(homedir7(), ".local", "share"), "codesesh");
+  return join14(process.env.XDG_DATA_HOME ?? join14(homedir7(), ".local", "share"), "codesesh");
 }
 function getStateDbPath() {
-  return join13(getStateDir(), STATE_DB_FILENAME);
+  return join14(getStateDir(), STATE_DB_FILENAME);
 }
 function useMemoryStateStore() {
   return process.env.CODESESH_STATE_STORE === MEMORY_STATE_STORE;
@@ -9866,17 +10176,6 @@ function getSessionAgentName(session) {
 function getSessionActivityTime(session) {
   return session.time_updated ?? session.time_created;
 }
-function toLocalDateKey(ts) {
-  const d = new Date(ts);
-  return `${d.getFullYear()}-${String(d.getMonth() + 1).padStart(2, "0")}-${String(
-    d.getDate()
-  ).padStart(2, "0")}`;
-}
-function startOfLocalDay(ts) {
-  const d = new Date(ts);
-  d.setHours(0, 0, 0, 0);
-  return d.getTime();
-}
 function buildDashboard(sessions, options) {
   const { byAgentNames, scope, from, to, agentInfoMap } = options;
   const agentMetrics = /* @__PURE__ */ new Map();
@@ -9897,11 +10196,9 @@ function buildDashboard(sessions, options) {
   const dailyMap = /* @__PURE__ */ new Map();
   const dailyTokenMap = /* @__PURE__ */ new Map();
   if (from != null) {
-    const bucketStart = startOfLocalDay(from);
-    const bucketDays = Math.floor((startOfLocalDay(to) - bucketStart) / 864e5) + 1;
+    const bucketDays = countCalendarDays(from, to);
     for (let i = 0; i < bucketDays; i += 1) {
-      const ts = bucketStart + i * 864e5;
-      const key = toLocalDateKey(ts);
+      const key = toCalendarDayKey(addCalendarDays(from, i));
       dailyMap.set(key, { date: key, sessions: 0, messages: 0 });
       dailyTokenMap.set(key, { date: key, input: 0, output: 0, cache_read: 0, cache_create: 0 });
     }
@@ -9933,7 +10230,7 @@ function buildDashboard(sessions, options) {
       metric.messages += messageCount;
       metric.tokens += sessionTokens;
     }
-    const key = toLocalDateKey(activity);
+    const key = toCalendarDayKey(activity);
     let bucket = dailyMap.get(key);
     if (!bucket) {
       bucket = { date: key, sessions: 0, messages: 0 };
@@ -10016,9 +10313,6 @@ 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() };
 }
@@ -10027,7 +10321,7 @@ function attachProjectMetrics(projects, sessions) {
   for (const session of sessions) {
     const identity = session.project_identity;
     if (!identity) continue;
-    const key = getProjectGroupKey(identity.kind, identity.key);
+    const key = getProjectIdentityKey(identity);
     let current = metrics.get(key);
     if (!current) {
       current = emptyMetrics();
@@ -10057,7 +10351,9 @@ function attachProjectMetrics(projects, sessions) {
     }
   }
   return projects.map((project) => {
-    const metric = metrics.get(getProjectGroupKey(project.identityKind, project.identityKey));
+    const metric = metrics.get(
+      getProjectIdentityKey({ kind: project.identityKind, key: project.identityKey })
+    );
     return {
       ...project,
       messages: metric?.messages ?? 0,
@@ -10194,9 +10490,16 @@ function searchIndexedSessions(query, textQuery, parsed, options) {
 }
 
 export {
+  mergeSessionsUpdatedEvents,
+  startOfCalendarDay,
+  addCalendarDays,
+  countCalendarDays,
+  isProjectIdentityKind,
+  matchesProjectIdentity,
   normalizeSessionReference,
   formatSessionReference,
   getSessionAgentKey,
+  sessionRoutePath,
   mergeSortedSessions,
   registerAgent,
   createRegisteredAgents,
@@ -10206,10 +10509,14 @@ export {
   diffSessionSources,
   BaseAgent,
   FileSystemSessionSource,
+  ensurePrivateDirectory,
+  restrictPrivateFile,
+  restrictExistingPrivateFiles,
+  getPricingGeneration,
+  publishPendingPricing,
+  hasPendingPricing,
   refreshPricingCache,
   perf,
-  isProjectIdentityKind,
-  matchesProjectIdentity,
   createProjectScopeMatcher,
   matchesProjectScope,
   getSmartTagSourceTimestamp,
@@ -10246,10 +10553,9 @@ export {
   upsertSessionAlias,
   deleteSessionAlias,
   getSessionActivityTime,
-  startOfLocalDay,
   buildDashboard,
   attachProjectMetrics,
   executeSessionSearch,
   filterSessionSearchCandidates
 };
-//# sourceMappingURL=chunk-7APNDHQ6.js.map
+//# sourceMappingURL=chunk-HIYT2ZJL.js.map