@cortexkit/opencode-magic-context 0.49.19 → 0.49.21

package/dist/v2/{server-46neh5fa.js → server-62g58aaz.js}

@@ -1,19 +1,19 @@
 import {
   getTokenEstimatorFingerprint,
   estimateTokens
-} from "./server-tgnbmwah.js";
+} from "./server-3mz2qh5a.js";
 import {
   getHarness2
 } from "./server-pavzsdc6.js";
 import {
   log2
-} from "./server-f2xf5gcb.js";
+} from "./server-6495nmn9.js";
 import {
   isSynapseEmbeddingTruncated
-} from "./server-6tmj0s7j.js";
+} from "./server-ab1g0wn9.js";
 import {
   messageFtsOrdinalRangeIsMapped2
-} from "./server-1wy7b9de.js";
+} from "./server-dtp8hcjh.js";
 
 // src/features/magic-context/compartment-chunk-embedding.ts
 import { createHash } from "node:crypto";
@@ -104,8 +104,8 @@ function recursiveCharacterSplit(text, options) {
 }
 
 // src/features/magic-context/compartment-chunk-embedding.ts
-var DEFAULT_COMPARTMENT_CHUNK_MAX_INPUT_TOKENS = 512;
-var CHUNK_WINDOW_SAFETY_RATIO = 0.9;
+var DEFAULT_COMPARTMENT_CHUNK_MAX_INPUT_TOKENS2 = 512;
+var CHUNK_WINDOW_SAFETY_RATIO2 = 0.9;
 var SEARCH_SCOPE_METADATA_FIELDS = [
   "rowId",
   "compartmentId",
@@ -142,9 +142,11 @@ var existingHashByProjectStatements = new WeakMap;
 var deleteByCompartmentStatements = new WeakMap;
 var insertEmbeddingStatements = new WeakMap;
 var renumberEmbeddingWindowStatements = new WeakMap;
-var searchRowsStatements = new WeakMap;
-var searchRowsByModelStatements = new WeakMap;
+var searchRowsByIdStatements = new WeakMap;
 var searchPoolProbeStatements = new WeakMap;
+var sessionSignatureStatements = new WeakMap;
+var sessionPrefixStatements = new WeakMap;
+var revisionStatements = new WeakMap;
 var pendingSearchPools = new WeakMap;
 var backfillCandidateStatements = new WeakMap;
 var shadowBackfillCandidateStatements = new WeakMap;
@@ -152,7 +154,17 @@ var DECODED_SEARCH_POOL_CACHE_MAX_BYTES = 256 * 1024 * 1024;
 var decodedSearchPools = new WeakMap;
 var decodedSearchPoolLru = new Map;
 var decodedSearchPoolBytes = 0;
-var searchPoolStats = { fullRebuilds: 0, appends: 0, probes: 0, probeMs: 0, probePages: 0 };
+var searchPoolStats = {
+  fullRebuilds: 0,
+  appends: 0,
+  partialRefreshes: 0,
+  rowsDecoded: 0,
+  probes: 0,
+  tailProbes: 0,
+  endProbes: 0,
+  probeMs: 0,
+  probePages: 0
+};
 function getLoadFtsRowsStatement(db) {
   let stmt = loadFtsRowsStatements.get(db);
   if (!stmt) {
@@ -239,18 +251,22 @@ function sameScopeMetadata(left, right) {
   }
   return true;
 }
-async function probeSearchScope(db, sessionId, projectPath, modelId, previous) {
+async function probeSearchScope(db, sessionId, projectPath, modelId, previous, options = {}) {
   const started = performance.now();
-  searchPoolStats.probes++;
+  const tailOnly = options.tailOnly === true && previous !== undefined;
+  if (tailOnly)
+    searchPoolStats.tailProbes++;
+  else
+    searchPoolStats.probes++;
   const probe = {
-    rowCount: 0,
-    maxRowId: 0,
-    rowIdSum: 0,
+    rowCount: tailOnly ? previous.rowCount : 0,
+    maxRowId: tailOnly ? previous.maxRowId : 0,
+    rowIdSum: tailOnly ? previous.rowIdSum : 0,
     metadata: previous?.metadata ?? new Map,
     ids: previous?.ids ?? []
   };
   let copied = previous === undefined;
-  let oldIndex = 0;
+  let oldIndex = tailOnly ? previous.ids.length : 0;
   const writable = () => {
     if (!copied) {
       probe.metadata = new Map(probe.metadata);
@@ -260,6 +276,7 @@ async function probeSearchScope(db, sessionId, projectPath, modelId, previous) {
   };
   await yieldSearchPool();
   for (;; ) {
+    options.signal?.throwIfAborted();
     const rows = getSearchPoolProbeStatement(db).all(sessionId, projectPath, modelId, probe.maxRowId);
     searchPoolStats.probePages++;
     if (rows.length === 0) {
@@ -293,22 +310,54 @@ async function probeSearchScope(db, sessionId, projectPath, modelId, previous) {
     await yieldSearchPool();
   }
 }
-function sameSearchScope(left, right) {
-  return left.rowCount === right.rowCount && left.maxRowId === right.maxRowId && left.rowIdSum === right.rowIdSum && (left.metadata === right.metadata || [...left.metadata].every(([id, value]) => right.metadata.get(id) === value));
+function getSessionSignatureStatement(db) {
+  let stmt = sessionSignatureStatements.get(db);
+  if (!stmt) {
+    stmt = db.prepare(`SELECT COUNT(*) AS rowCount, COALESCE(MAX(id), 0) AS maxRowId,
+                    COALESCE(SUM(id), 0) AS rowIdSum
+             FROM compartment_chunk_embeddings WHERE session_id = ?`);
+    sessionSignatureStatements.set(db, stmt);
+  }
+  return stmt;
 }
-function scopeOnlyAppended(cached, probe) {
-  if (probe.rowCount <= cached.rowCount)
-    return false;
-  let addedCount = 0;
-  let addedSum = 0;
-  for (const [id, fingerprint] of probe.metadata) {
-    if (id > cached.maxRowId) {
-      addedCount++;
-      addedSum += id;
-    } else if (cached.metadata.get(id) !== fingerprint)
-      return false;
+function readSessionChunkSignature(db, sessionId) {
+  const row = getSessionSignatureStatement(db).get(sessionId);
+  return {
+    rowCount: Number(row?.rowCount ?? 0),
+    maxRowId: Number(row?.maxRowId ?? 0),
+    rowIdSum: Number(row?.rowIdSum ?? 0)
+  };
+}
+function sameSessionSignature(left, right) {
+  return left.rowCount === right.rowCount && left.maxRowId === right.maxRowId && left.rowIdSum === right.rowIdSum;
+}
+function sessionPrefixUnchanged(db, sessionId, signature) {
+  let stmt = sessionPrefixStatements.get(db);
+  if (!stmt) {
+    stmt = db.prepare(`SELECT COUNT(*) AS rowCount, COALESCE(SUM(id), 0) AS rowIdSum
+             FROM compartment_chunk_embeddings WHERE session_id = ? AND id <= ?`);
+    sessionPrefixStatements.set(db, stmt);
+  }
+  const row = stmt.get(sessionId, signature.maxRowId);
+  return Number(row?.rowCount ?? 0) === signature.rowCount && Number(row?.rowIdSum ?? 0) === signature.rowIdSum;
+}
+function readDatabaseRevision(db) {
+  let statements = revisionStatements.get(db);
+  if (!statements) {
+    statements = {
+      version: db.prepare("PRAGMA data_version"),
+      changes: db.prepare("SELECT total_changes() AS changes")
+    };
+    revisionStatements.set(db, statements);
   }
-  return addedCount === probe.rowCount - cached.rowCount && cached.rowIdSum + addedSum === probe.rowIdSum;
+  const version = statements.version.get();
+  const changes = statements.changes.get();
+  if (typeof version?.data_version !== "number" || typeof changes?.changes !== "number")
+    return null;
+  return `${version.data_version}:${changes.changes}`;
+}
+function sameSearchScope(left, right) {
+  return left.rowCount === right.rowCount && left.maxRowId === right.maxRowId && left.rowIdSum === right.rowIdSum && (left.metadata === right.metadata || [...left.metadata].every(([id, value]) => right.metadata.get(id) === value));
 }
 function filterSearchPoolDates(rows, dateRange) {
   if (dateRange === null)
@@ -318,9 +367,9 @@ function filterSearchPoolDates(rows, dateRange) {
     return compartment !== undefined && compartment.startTime !== null && compartment.endTime !== null && compartment.startTime <= dateRange.to && compartment.endTime >= dateRange.from;
   });
 }
-function getSearchRowsStatement(db, withModel) {
-  const map = withModel ? searchRowsByModelStatements : searchRowsStatements;
-  let stmt = map.get(db);
+var SEARCH_READ_BATCH = 16;
+function getSearchRowsByIdStatement(db) {
+  let stmt = searchRowsByIdStatements.get(db);
   if (!stmt) {
     stmt = db.prepare(`SELECT e.id AS rowId, e.compartment_id AS compartmentId,
                     start_map.message_time_ms AS startTime, end_map.message_time_ms AS endTime,
@@ -343,10 +392,10 @@ function getSearchRowsStatement(db, withModel) {
                 ON end_map.session_id = c.session_id AND end_map.message_ordinal = c.end_message
              WHERE e.session_id = ?
                AND e.project_path = ?
-                ${withModel ? "AND e.model_id = ?" : ""}
-                AND e.id > ? AND e.id <= ?
-              ORDER BY e.id ASC LIMIT 16`);
-    map.set(db, stmt);
+               AND e.model_id = ?
+               AND e.id IN (${Array.from({ length: SEARCH_READ_BATCH }, () => "?").join(", ")})
+             ORDER BY e.id ASC`);
+    searchRowsByIdStatements.set(db, stmt);
   }
   return stmt;
 }
@@ -427,7 +476,7 @@ function estimateDecodedSearchPoolBytes(rows) {
   }
   return bytes;
 }
-function cacheDecodedSearchPool(pool, key, probe, rows) {
+function cacheDecodedSearchPool(pool, key, probe, rows, decodedById, sessionSignature, fullProbeAt) {
   const existing = pool.get(key);
   if (existing)
     removeDecodedSearchPoolEntry(existing);
@@ -436,9 +485,12 @@ function cacheDecodedSearchPool(pool, key, probe, rows) {
     key,
     ...probe,
     rows,
+    decodedById,
+    sessionSignature,
+    fullProbeAt,
     byteSize: estimateDecodedSearchPoolBytes(rows)
   };
-  entry.byteSize += probe.ids.length * 8;
+  entry.byteSize += probe.ids.length * 24;
   for (const metadata of probe.metadata.values()) {
     entry.byteSize += 320;
     for (const key of SEARCH_SCOPE_METADATA_FIELDS) {
@@ -460,9 +512,9 @@ function cacheDecodedSearchPool(pool, key, probe, rows) {
 function isFinitePositiveInteger(value) {
   return typeof value === "number" && Number.isFinite(value) && value > 0;
 }
-function normalizeCompartmentChunkMaxInputTokens(value) {
+function normalizeCompartmentChunkMaxInputTokens2(value) {
   if (!isFinitePositiveInteger(value)) {
-    return DEFAULT_COMPARTMENT_CHUNK_MAX_INPUT_TOKENS;
+    return DEFAULT_COMPARTMENT_CHUNK_MAX_INPUT_TOKENS2;
   }
   return Math.max(1, Math.floor(value));
 }
@@ -511,7 +563,7 @@ function toFloat32Array(blob) {
   }
   return new Float32Array(blob.slice(0));
 }
-function buildCanonicalChunkTextFromFts(db, sessionId, startOrdinal, endOrdinal) {
+function buildCanonicalChunkTextFromFts2(db, sessionId, startOrdinal, endOrdinal) {
   if (endOrdinal < startOrdinal)
     return "";
   if (!messageFtsOrdinalRangeIsMapped2(db, sessionId, startOrdinal, endOrdinal))
@@ -543,7 +595,7 @@ function buildCanonicalChunkTextFromFts(db, sessionId, startOrdinal, endOrdinal)
   return lines.join(`
 `);
 }
-function buildCompartmentSummaryFallbackText(db, compartmentId) {
+function buildCompartmentSummaryFallbackText2(db, compartmentId) {
   const row = db.prepare("SELECT title, p1, content FROM compartments WHERE id = ?").get(compartmentId);
   if (!row)
     return "";
@@ -553,7 +605,7 @@ function buildCompartmentSummaryFallbackText(db, compartmentId) {
   return [title, body].filter((s) => s.length > 0).join(`
 `);
 }
-function canonicalizeInMemoryChunkTextForEmbedding(chunkText, startOrdinal, endOrdinal) {
+function canonicalizeInMemoryChunkTextForEmbedding2(chunkText, startOrdinal, endOrdinal) {
   const lines = [];
   for (const rawLine of chunkText.split(/\r?\n/)) {
     const line = rawLine.trim();
@@ -598,7 +650,7 @@ function canonicalizeInMemoryChunkTextForEmbedding(chunkText, startOrdinal, endO
   return lines.join(`
 `);
 }
-function chunkCanonicalText(canonicalText, startOrdinal, endOrdinal, maxInputTokens) {
+function chunkCanonicalText2(canonicalText, startOrdinal, endOrdinal, maxInputTokens) {
   const lines = canonicalText.split(/\r?\n/).map((line) => line.trim()).filter((line) => line.length > 0);
   if (lines.length === 0 || endOrdinal < startOrdinal)
     return [];
@@ -608,8 +660,8 @@ function chunkCanonicalText(canonicalText, startOrdinal, endOrdinal, maxInputTok
       assertOrdinalRangeWithinCompartment(range.start, range.end, startOrdinal, endOrdinal);
     }
   }
-  const normalizedMax = normalizeCompartmentChunkMaxInputTokens(maxInputTokens);
-  const effectiveMax = Math.max(1, Math.floor(normalizedMax * CHUNK_WINDOW_SAFETY_RATIO));
+  const normalizedMax = normalizeCompartmentChunkMaxInputTokens2(maxInputTokens);
+  const effectiveMax = Math.max(1, Math.floor(normalizedMax * CHUNK_WINDOW_SAFETY_RATIO2));
   const fullText = lines.join(`
 `);
   if (estimateTokens(fullText) <= effectiveMax) {
@@ -733,13 +785,13 @@ function getExistingChunkHashes(db, compartmentId, modelId, projectPath) {
   const rows = scoped ? getExistingHashStatement(db, true).all(compartmentId, modelId, projectPath) : getExistingHashStatement(db, false).all(compartmentId, modelId);
   return new Map(rows.filter((row) => typeof row.windowIndex === "number" && typeof row.chunkHash === "string").map((row) => [row.windowIndex, row.chunkHash]));
 }
-function chunkEmbeddingWindowsAreCurrent(db, compartmentId, modelId, windows, projectPath) {
+function chunkEmbeddingWindowsAreCurrent2(db, compartmentId, modelId, windows, projectPath) {
   const existing = getExistingChunkHashes(db, compartmentId, modelId, projectPath);
   if (existing.size !== windows.length)
     return false;
   return windows.every((window) => existing.get(window.windowIndex) === window.chunkHash);
 }
-function replaceCompartmentChunkEmbeddings(db, rows, windowSourceKey) {
+function replaceCompartmentChunkEmbeddings2(db, rows, windowSourceKey) {
   if (rows.length === 0 || rows.some((row) => isSynapseEmbeddingTruncated(row.vector)))
     return;
   const compartmentId = rows[0].compartmentId;
@@ -761,104 +813,239 @@ function searchPoolInTransaction(db) {
   const connection = db;
   return connection.inTransaction === true || connection.isTransaction === true;
 }
-async function refreshDecodedSearchPool(db, sessionId, projectPath, modelId) {
+function emptyRefreshTimings() {
+  return { probeMs: 0, readMs: 0, decodeMs: 0, probedRows: 0, decodedRows: 0, attempts: 0 };
+}
+function decodeSearchRow(row) {
+  if (typeof row.compartmentId !== "number" || typeof row.sessionId !== "string" || typeof row.title !== "string" || typeof row.compartmentStart !== "number" || typeof row.compartmentEnd !== "number" || typeof row.windowIndex !== "number" || typeof row.windowStart !== "number" || typeof row.windowEnd !== "number" || typeof row.chunkHash !== "string" || typeof row.modelId !== "string" || typeof row.dims !== "number" || !(row.vector instanceof Uint8Array || row.vector instanceof ArrayBuffer))
+    return null;
+  const decoded = {
+    compartmentId: row.compartmentId,
+    sessionId: row.sessionId,
+    title: row.title,
+    startOrdinal: row.compartmentStart,
+    endOrdinal: row.compartmentEnd,
+    windowIndex: row.windowIndex,
+    windowStartOrdinal: row.windowStart,
+    windowEndOrdinal: row.windowEnd,
+    chunkHash: row.chunkHash,
+    modelId: row.modelId,
+    dims: row.dims,
+    vector: toFloat32Array(row.vector)
+  };
+  searchPoolDates.set(decoded, { startTime: row.startTime, endTime: row.endTime });
+  return decoded;
+}
+async function refreshDecodedSearchPool(db, sessionId, projectPath, modelId, options = {}) {
   const key = searchPoolKey(sessionId, projectPath, modelId);
   const pool = getDecodedSearchPool(db);
+  const timings = options.timings ?? emptyRefreshTimings();
+  const { signal } = options;
   for (;; ) {
+    signal?.throwIfAborted();
+    timings.attempts++;
     const inTransaction = searchPoolInTransaction(db);
+    const revision = readDatabaseRevision(db);
+    const sessionSignature = readSessionChunkSignature(db, sessionId);
     const previous = pool.get(key);
-    const probe = await probeSearchScope(db, sessionId, projectPath, modelId, previous);
-    const rowCount = probe.rowCount;
-    const maxRowId = probe.maxRowId;
+    const tailOnly = options.background === true && !inTransaction && previous !== undefined && sessionPrefixUnchanged(db, sessionId, previous.sessionSignature);
+    const probeStarted = performance.now();
+    const probe = await probeSearchScope(db, sessionId, projectPath, modelId, previous, {
+      tailOnly,
+      signal
+    });
+    timings.probeMs += performance.now() - probeStarted;
+    timings.probedRows = probe.rowCount;
+    const fullProbeAt = tailOnly && previous ? previous.fullProbeAt : probeStarted;
     const cached = pool.get(key);
     if (!inTransaction && cached && sameSearchScope(cached, probe)) {
+      cached.sessionSignature = sessionSignature;
+      cached.fullProbeAt = Math.max(cached.fullProbeAt, fullProbeAt);
       touchDecodedSearchPoolEntry(cached);
       return cached.rows;
     }
-    const append = !inTransaction && cached && scopeOnlyAppended(cached, probe);
-    if (append)
+    const reusable = inTransaction ? undefined : previous;
+    const decodedById = new Map;
+    const missing = [];
+    for (const id of probe.ids) {
+      const prior = reusable !== undefined && reusable.metadata.get(id) === probe.metadata.get(id) ? reusable.decodedById.get(id) : undefined;
+      if (prior === undefined)
+        missing.push(id);
+      else
+        decodedById.set(id, prior);
+    }
+    if (!reusable || missing.length === probe.ids.length)
+      searchPoolStats.fullRebuilds++;
+    else if (probe.ids.length - missing.length === reusable.ids.length && missing.every((id) => id > reusable.maxRowId))
       searchPoolStats.appends++;
     else
-      searchPoolStats.fullRebuilds++;
-    let afterId = append ? cached.maxRowId : 0;
-    const added = [];
-    let appendedCount = 0;
+      searchPoolStats.partialRefreshes++;
     await yieldSearchPool();
-    for (;; ) {
-      const rows = getSearchRowsStatement(db, true).all(sessionId, projectPath, modelId, afterId, maxRowId);
-      if (rows.length === 0)
-        break;
-      afterId = rows[rows.length - 1].rowId;
-      appendedCount += rows.length;
-      for (const row of rows) {
-        if (typeof row.compartmentId !== "number" || typeof row.sessionId !== "string" || typeof row.title !== "string" || typeof row.compartmentStart !== "number" || typeof row.compartmentEnd !== "number" || typeof row.windowIndex !== "number" || typeof row.windowStart !== "number" || typeof row.windowEnd !== "number" || typeof row.chunkHash !== "string" || typeof row.modelId !== "string" || typeof row.dims !== "number" || !(row.vector instanceof Uint8Array || row.vector instanceof ArrayBuffer))
-          continue;
-        added.push({
-          compartmentId: row.compartmentId,
-          sessionId: row.sessionId,
-          title: row.title,
-          startOrdinal: row.compartmentStart,
-          endOrdinal: row.compartmentEnd,
-          windowIndex: row.windowIndex,
-          windowStartOrdinal: row.windowStart,
-          windowEndOrdinal: row.windowEnd,
-          chunkHash: row.chunkHash,
-          modelId: row.modelId,
-          dims: row.dims,
-          vector: toFloat32Array(row.vector)
-        });
-        searchPoolDates.set(added[added.length - 1], {
-          startTime: row.startTime,
-          endTime: row.endTime
-        });
-      }
+    const read = getSearchRowsByIdStatement(db);
+    for (let start = 0;start < missing.length; start += SEARCH_READ_BATCH) {
+      signal?.throwIfAborted();
+      const batch = missing.slice(start, start + SEARCH_READ_BATCH);
+      const ids = batch.concat(Array(SEARCH_READ_BATCH - batch.length).fill(-1));
+      const readStarted = performance.now();
+      const rows = read.all(sessionId, projectPath, modelId, ...ids);
+      const decodeStarted = performance.now();
+      timings.readMs += decodeStarted - readStarted;
+      for (const id of batch)
+        decodedById.set(id, null);
+      for (const row of rows)
+        decodedById.set(row.rowId, decodeSearchRow(row));
+      timings.decodeMs += performance.now() - decodeStarted;
+      timings.decodedRows += rows.length;
+      searchPoolStats.rowsDecoded += rows.length;
       await yieldSearchPool();
     }
-    const endProbe = await probeSearchScope(db, sessionId, projectPath, modelId, probe);
-    if (!sameSearchScope(probe, endProbe) || searchPoolInTransaction(db) !== inTransaction) {
-      continue;
+    let unchanged;
+    if (options.background) {
+      unchanged = sameSessionSignature(readSessionChunkSignature(db, sessionId), sessionSignature);
+    } else if (revision !== null && readDatabaseRevision(db) === revision) {
+      unchanged = true;
+    } else {
+      searchPoolStats.endProbes++;
+      unchanged = sameSearchScope(probe, await probeSearchScope(db, sessionId, projectPath, modelId, probe, { signal }));
     }
-    if (append && appendedCount !== rowCount - cached.rowCount) {
-      removeDecodedSearchPoolEntry(cached);
+    if (!unchanged || searchPoolInTransaction(db) !== inTransaction)
       continue;
+    const decoded = [];
+    for (const id of probe.ids) {
+      const row = decodedById.get(id);
+      if (row)
+        decoded.push(row);
     }
-    const decoded = append ? cached.rows.concat(added) : added;
     decoded.sort((a, b) => a.compartmentId - b.compartmentId || a.windowIndex - b.windowIndex);
     if (!inTransaction)
-      cacheDecodedSearchPool(pool, key, probe, decoded);
+      cacheDecodedSearchPool(pool, key, probe, decoded, decodedById, sessionSignature, fullProbeAt);
     return decoded;
   }
 }
-async function loadCompartmentChunkEmbeddingsForSearch(db, sessionId, projectPath, modelId, dateRange = null) {
-  if (!modelId) {
-    throw new Error("loadCompartmentChunkEmbeddingsForSearch requires a current model id");
-  }
+async function refreshSearchPoolOnce(db, sessionId, projectPath, modelId, options) {
   const key = searchPoolKey(sessionId, projectPath, modelId);
   let pending = pendingSearchPools.get(db);
   if (!pending) {
     pending = new Map;
     pendingSearchPools.set(db, pending);
   }
-  for (;; ) {
-    while (pending.has(key))
-      await pending.get(key);
-    const operation = refreshDecodedSearchPool(db, sessionId, projectPath, modelId);
-    const completion = operation.then(() => {});
-    pending.set(key, completion);
-    try {
-      const rows = await operation;
-      return filterSearchPoolDates(rows, dateRange);
-    } finally {
+  while (pending.has(key))
+    await pending.get(key);
+  const operation = refreshDecodedSearchPool(db, sessionId, projectPath, modelId, options);
+  const completion = operation.then(() => {}, () => {});
+  pending.set(key, completion);
+  try {
+    return await operation;
+  } finally {
+    if (pending.get(key) === completion)
       pending.delete(key);
-      completion.catch(() => {});
+  }
+}
+async function loadCompartmentChunkEmbeddingsForSearch2(db, sessionId, projectPath, modelId, dateRange = null, signal) {
+  if (!modelId) {
+    throw new Error("loadCompartmentChunkEmbeddingsForSearch requires a current model id");
+  }
+  const rows = await refreshSearchPoolOnce(db, sessionId, projectPath, modelId, { signal });
+  return filterSearchPoolDates(rows, dateRange);
+}
+var CHUNK_POOL_FULL_PROBE_INTERVAL_MS = 60000;
+var TRACKED_SEARCH_POOL_LIMIT = 8;
+var trackedSearchPools = new WeakMap;
+function trackSearchPool(db, sessionId, projectPath, modelId) {
+  let tracked = trackedSearchPools.get(db);
+  if (!tracked) {
+    tracked = new Map;
+    trackedSearchPools.set(db, tracked);
+  }
+  const key = searchPoolKey(sessionId, projectPath, modelId);
+  tracked.delete(key);
+  tracked.set(key, { sessionId, projectPath, modelId });
+  while (tracked.size > TRACKED_SEARCH_POOL_LIMIT) {
+    const oldest = tracked.keys().next().value;
+    if (oldest === undefined)
+      break;
+    tracked.delete(oldest);
+  }
+}
+var lastChunkPoolWarm = null;
+var unretainedSearchPools = new WeakMap;
+function getLastCompartmentChunkPoolWarm2() {
+  return lastChunkPoolWarm;
+}
+function peekCompartmentChunkSearchPool2(db, sessionId, projectPath, modelId, dateRange = null) {
+  if (!modelId)
+    return null;
+  trackSearchPool(db, sessionId, projectPath, modelId);
+  const entry = getDecodedSearchPool(db).get(searchPoolKey(sessionId, projectPath, modelId));
+  if (!entry || searchPoolInTransaction(db))
+    return null;
+  if (!sameSessionSignature(readSessionChunkSignature(db, sessionId), entry.sessionSignature))
+    return null;
+  touchDecodedSearchPoolEntry(entry);
+  return filterSearchPoolDates(entry.rows, dateRange);
+}
+async function warmCompartmentChunkSearchPool2(db, sessionId, projectPath, modelId) {
+  const started = performance.now();
+  const timings = emptyRefreshTimings();
+  const report = (outcome) => ({
+    ...timings,
+    outcome,
+    totalMs: performance.now() - started,
+    finishedAtUnixMs: Date.now()
+  });
+  if (!modelId)
+    return report("current");
+  trackSearchPool(db, sessionId, projectPath, modelId);
+  const key = searchPoolKey(sessionId, projectPath, modelId);
+  try {
+    if (pendingSearchPools.get(db)?.has(key))
+      return report("in-progress");
+    const unretained = unretainedSearchPools.get(db)?.get(key);
+    if (unretained && sameSessionSignature(readSessionChunkSignature(db, sessionId), unretained))
+      return report("too-large");
+    const entry = getDecodedSearchPool(db).get(key);
+    const fullProbeDue = entry !== undefined && performance.now() - entry.fullProbeAt >= CHUNK_POOL_FULL_PROBE_INTERVAL_MS;
+    if (entry && !fullProbeDue && !searchPoolInTransaction(db) && sameSessionSignature(readSessionChunkSignature(db, sessionId), entry.sessionSignature))
+      return report("current");
+    const signature = readSessionChunkSignature(db, sessionId);
+    await refreshSearchPoolOnce(db, sessionId, projectPath, modelId, {
+      background: !fullProbeDue,
+      timings
+    });
+    let unretainedPools = unretainedSearchPools.get(db);
+    if (!getDecodedSearchPool(db).has(key)) {
+      if (!unretainedPools) {
+        unretainedPools = new Map;
+        unretainedSearchPools.set(db, unretainedPools);
+      }
+      unretainedPools.set(key, signature);
+      const tooLarge = report("too-large");
+      lastChunkPoolWarm = tooLarge;
+      return tooLarge;
     }
+    unretainedPools?.delete(key);
+    const refreshed = report("refreshed");
+    lastChunkPoolWarm = refreshed;
+    return refreshed;
+  } catch {
+    const failed = report("failed");
+    lastChunkPoolWarm = failed;
+    return failed;
+  }
+}
+async function maintainCompartmentChunkSearchPools2(db) {
+  const tracked = trackedSearchPools.get(db);
+  if (!tracked)
+    return;
+  for (const scope of [...tracked.values()]) {
+    await warmCompartmentChunkSearchPool2(db, scope.sessionId, scope.projectPath, scope.modelId);
   }
 }
-function loadUnembeddedShadowChunkCandidates(db, projectPath, primaryModelId, shadowModelId, limit, shadowMaxInputTokens) {
+function loadUnembeddedShadowChunkCandidates2(db, projectPath, primaryModelId, shadowModelId, limit, shadowMaxInputTokens) {
   const rows = getShadowBackfillCandidateStatement(db).all(projectPath, projectPath, primaryModelId);
   return selectHashIncompleteChunkCandidates(db, projectPath, shadowModelId, mapBackfillCandidateRows(rows), Math.max(1, limit), shadowMaxInputTokens);
 }
-async function loadUnembeddedCompartmentChunkCandidatesPolite(db, projectPath, modelId, limit, maxInputTokens = DEFAULT_COMPARTMENT_CHUNK_MAX_INPUT_TOKENS, leaseHeldRenumber = false, isEligible) {
+async function loadUnembeddedCompartmentChunkCandidatesPolite2(db, projectPath, modelId, limit, maxInputTokens = DEFAULT_COMPARTMENT_CHUNK_MAX_INPUT_TOKENS2, leaseHeldRenumber = false, isEligible) {
   const rows = getBackfillCandidateStatement(db).all(projectPath);
   const candidates = mapBackfillCandidateRows(rows);
   const missing = [];
@@ -900,7 +1087,7 @@ var BACKOFF_PREFIX = "chunk_embed_backoff:";
 function backoffKey(compartmentId) {
   return `${BACKOFF_PREFIX}${compartmentId}`;
 }
-function deleteChunkEmbedBackoffForSession(db, sessionId, limit) {
+function deleteChunkEmbedBackoffForSession2(db, sessionId, limit) {
   if (limit !== undefined)
     return db.prepare(`DELETE FROM schema_migrations_meta WHERE key IN (
         SELECT key FROM schema_migrations_meta JOIN compartments
@@ -913,11 +1100,11 @@ function deleteChunkEmbedBackoffForSession(db, sessionId, limit) {
         SELECT ? || id FROM compartments WHERE session_id = ?
     )`).run(BACKOFF_PREFIX, sessionId, WINDOW_SOURCE_PREFIX, sessionId).changes;
 }
-function recordChunkEmbedBackoff(db, candidate, projectPath, modelId) {
-  const mapped = buildCanonicalChunkTextFromFts(db, candidate.sessionId, candidate.startMessage, candidate.endMessage);
+function recordChunkEmbedBackoff2(db, candidate, projectPath, modelId) {
+  const mapped = buildCanonicalChunkTextFromFts2(db, candidate.sessionId, candidate.startMessage, candidate.endMessage);
   if (mapped === null)
     return;
-  const text = mapped || buildCompartmentSummaryFallbackText(db, candidate.id);
+  const text = mapped || buildCompartmentSummaryFallbackText2(db, candidate.id);
   const hash = createHash("sha256").update(text).digest("hex");
   const key = backoffKey(candidate.id);
   const prior = db.prepare("SELECT value FROM schema_migrations_meta WHERE key = ?").get(key);
@@ -959,13 +1146,13 @@ function windowSourceKeyFromTextHash(textHash, startOrdinal, endOrdinal, maxInpu
   return hashChunkText(JSON.stringify([
     CHUNKER_VERSION,
     getTokenEstimatorFingerprint(),
-    normalizeCompartmentChunkMaxInputTokens(maxInputTokens),
+    normalizeCompartmentChunkMaxInputTokens2(maxInputTokens),
     startOrdinal,
     endOrdinal,
     textHash
   ]));
 }
-function chunkWindowSourceKey(canonicalText, startOrdinal, endOrdinal, maxInputTokens) {
+function chunkWindowSourceKey2(canonicalText, startOrdinal, endOrdinal, maxInputTokens) {
   return windowSourceKeyFromTextHash(hashChunkText(canonicalText), startOrdinal, endOrdinal, maxInputTokens);
 }
 function windowSetDigest(windows) {
@@ -1019,7 +1206,7 @@ function memoizedCoverageWindows(candidate, canonicalText, sourceKey, modelId, m
     cachedCoverageWindows.set(key, cached);
     return cached;
   }
-  const windows = chunkCanonicalText(canonicalText, candidate.startMessage, candidate.endMessage, maxInputTokens);
+  const windows = chunkCanonicalText2(canonicalText, candidate.startMessage, candidate.endMessage, maxInputTokens);
   cachedCoverageWindows.set(key, windows);
   if (cachedCoverageWindows.size > COVERAGE_MEMO_LIMIT) {
     const oldest = cachedCoverageWindows.keys().next().value;
@@ -1049,14 +1236,14 @@ function renumberOneBasedChunkWindows(db, candidate, projectPath, modelId, windo
   }).immediate();
 }
 function classifyChunkCoverageDefect(db, projectPath, modelId, candidate, maxInputTokens) {
-  const mappedText = buildCanonicalChunkTextFromFts(db, candidate.sessionId, candidate.startMessage, candidate.endMessage);
+  const mappedText = buildCanonicalChunkTextFromFts2(db, candidate.sessionId, candidate.startMessage, candidate.endMessage);
   if (mappedText === null)
     return { defect: "deferred", windows: [] };
-  const canonicalText = mappedText || buildCompartmentSummaryFallbackText(db, candidate.id);
+  const canonicalText = mappedText || buildCompartmentSummaryFallbackText2(db, candidate.id);
   if (!canonicalText || chunkEmbedBackoffActive(db, candidate, projectPath, modelId, canonicalText)) {
     return { defect: "deferred", windows: [] };
   }
-  const sourceKey = chunkWindowSourceKey(canonicalText, candidate.startMessage, candidate.endMessage, maxInputTokens);
+  const sourceKey = chunkWindowSourceKey2(canonicalText, candidate.startMessage, candidate.endMessage, maxInputTokens);
   const existing = getExistingChunkHashes(db, candidate.id, modelId, projectPath);
   if (storedWindowsMatchRecordedSource(db, candidate.id, sourceKey, existing)) {
     return { defect: null, windows: [], sourceKey, confirmedByRecord: true };
@@ -1103,7 +1290,7 @@ function selectHashIncompleteChunkCandidates(db, projectPath, modelId, candidate
   return [...missing, ...stale].slice(0, limit);
 }
 var sessionBackfillCandidateStatements = new WeakMap;
-function loadUnembeddedSessionChunkCandidates(db, projectPath, sessionId, modelId, limit, excludeIds, maxInputTokens = DEFAULT_COMPARTMENT_CHUNK_MAX_INPUT_TOKENS, leaseHeldRenumber = false) {
+function loadUnembeddedSessionChunkCandidates2(db, projectPath, sessionId, modelId, limit, excludeIds, maxInputTokens = DEFAULT_COMPARTMENT_CHUNK_MAX_INPUT_TOKENS2, leaseHeldRenumber = false) {
   const exclusions = excludeIds && excludeIds.length > 0 ? excludeIds : [];
   const exclusionSql = exclusions.length > 0 ? `AND c.id NOT IN (${exclusions.map(() => "?").join(", ")})` : "";
   const stmt = exclusions.length > 0 ? db.prepare(`SELECT c.id AS id,
@@ -1144,7 +1331,7 @@ function loadUnembeddedSessionChunkCandidates(db, projectPath, sessionId, modelI
   const rows = stmt.all(projectPath, sessionId, ...exclusions);
   return selectHashIncompleteChunkCandidates(db, projectPath, modelId, mapBackfillCandidateRows(rows), Math.max(1, limit), maxInputTokens, leaseHeldRenumber);
 }
-async function loadUnembeddedSessionChunkCandidatesPolite(db, projectPath, sessionId, modelId, limit, excludeIds = [], maxInputTokens = DEFAULT_COMPARTMENT_CHUNK_MAX_INPUT_TOKENS, leaseHeldRenumber = false) {
+async function loadUnembeddedSessionChunkCandidatesPolite2(db, projectPath, sessionId, modelId, limit, excludeIds = [], maxInputTokens = DEFAULT_COMPARTMENT_CHUNK_MAX_INPUT_TOKENS2, leaseHeldRenumber = false) {
   const excluded = new Set(excludeIds);
   const missing = [];
   const stale = [];
@@ -1166,7 +1353,7 @@ async function loadUnembeddedSessionChunkCandidatesPolite(db, projectPath, sessi
   }
   return [...missing, ...stale].slice(0, Math.max(1, limit));
 }
-function countUnembeddedSessionCompartments(db, projectPath, sessionId, modelId, maxInputTokens = DEFAULT_COMPARTMENT_CHUNK_MAX_INPUT_TOKENS) {
+function countUnembeddedSessionCompartments2(db, projectPath, sessionId, modelId, maxInputTokens = DEFAULT_COMPARTMENT_CHUNK_MAX_INPUT_TOKENS2) {
   const rows = getSessionBackfillRows(db, projectPath, sessionId);
   let count = 0;
   for (const candidate of rows) {
@@ -1176,7 +1363,7 @@ function countUnembeddedSessionCompartments(db, projectPath, sessionId, modelId,
   }
   return count;
 }
-function countSessionCompartmentEmbedCoverage(db, projectPath, sessionId, modelId, maxInputTokens = DEFAULT_COMPARTMENT_CHUNK_MAX_INPUT_TOKENS) {
+function countSessionCompartmentEmbedCoverage2(db, projectPath, sessionId, modelId, maxInputTokens = DEFAULT_COMPARTMENT_CHUNK_MAX_INPUT_TOKENS2) {
   const candidates = getSessionBackfillRows(db, projectPath, sessionId);
   let embedded = 0;
   for (const candidate of candidates) {
@@ -1203,7 +1390,7 @@ function getSessionBackfillRows(db, projectPath, sessionId) {
              ORDER BY c.start_message ASC, c.id ASC`).all(projectPath, sessionId);
   return mapBackfillCandidateRows(rows);
 }
-async function countSessionCompartmentEmbedCoveragePolite(db, projectPath, sessionId, modelId, maxInputTokens = DEFAULT_COMPARTMENT_CHUNK_MAX_INPUT_TOKENS) {
+async function countSessionCompartmentEmbedCoveragePolite2(db, projectPath, sessionId, modelId, maxInputTokens = DEFAULT_COMPARTMENT_CHUNK_MAX_INPUT_TOKENS2) {
   const candidates = getSessionBackfillRows(db, projectPath, sessionId);
   let embedded = 0;
   let started = performance.now();
@@ -1215,7 +1402,7 @@ async function countSessionCompartmentEmbedCoveragePolite(db, projectPath, sessi
   }
   return { embedded, total: candidates.length };
 }
-async function countUnembeddedSessionCompartmentsPolite(db, projectPath, sessionId, modelId, maxInputTokens = DEFAULT_COMPARTMENT_CHUNK_MAX_INPUT_TOKENS) {
+async function countUnembeddedSessionCompartmentsPolite2(db, projectPath, sessionId, modelId, maxInputTokens = DEFAULT_COMPARTMENT_CHUNK_MAX_INPUT_TOKENS2) {
   const candidates = getSessionBackfillRows(db, projectPath, sessionId);
   let count = 0;
   let started = performance.now();
@@ -1228,4 +1415,4 @@ async function countUnembeddedSessionCompartmentsPolite(db, projectPath, session
   return count;
 }
 
-export { DEFAULT_COMPARTMENT_CHUNK_MAX_INPUT_TOKENS, CHUNK_WINDOW_SAFETY_RATIO, normalizeCompartmentChunkMaxInputTokens, buildCanonicalChunkTextFromFts, buildCompartmentSummaryFallbackText, canonicalizeInMemoryChunkTextForEmbedding, chunkCanonicalText, chunkEmbeddingWindowsAreCurrent, replaceCompartmentChunkEmbeddings, loadCompartmentChunkEmbeddingsForSearch, loadUnembeddedShadowChunkCandidates, loadUnembeddedCompartmentChunkCandidatesPolite, deleteChunkEmbedBackoffForSession, recordChunkEmbedBackoff, chunkWindowSourceKey, loadUnembeddedSessionChunkCandidates, loadUnembeddedSessionChunkCandidatesPolite, countUnembeddedSessionCompartments, countSessionCompartmentEmbedCoverage, countSessionCompartmentEmbedCoveragePolite, countUnembeddedSessionCompartmentsPolite };
+export { DEFAULT_COMPARTMENT_CHUNK_MAX_INPUT_TOKENS2, CHUNK_WINDOW_SAFETY_RATIO2, normalizeCompartmentChunkMaxInputTokens2, buildCanonicalChunkTextFromFts2, buildCompartmentSummaryFallbackText2, canonicalizeInMemoryChunkTextForEmbedding2, chunkCanonicalText2, chunkEmbeddingWindowsAreCurrent2, replaceCompartmentChunkEmbeddings2, loadCompartmentChunkEmbeddingsForSearch2, getLastCompartmentChunkPoolWarm2, peekCompartmentChunkSearchPool2, warmCompartmentChunkSearchPool2, maintainCompartmentChunkSearchPools2, loadUnembeddedShadowChunkCandidates2, loadUnembeddedCompartmentChunkCandidatesPolite2, deleteChunkEmbedBackoffForSession2, recordChunkEmbedBackoff2, chunkWindowSourceKey2, loadUnembeddedSessionChunkCandidates2, loadUnembeddedSessionChunkCandidatesPolite2, countUnembeddedSessionCompartments2, countSessionCompartmentEmbedCoverage2, countSessionCompartmentEmbedCoveragePolite2, countUnembeddedSessionCompartmentsPolite2 };