@cortexkit/opencode-magic-context 0.49.19 → 0.49.21

package/dist/{index-4s3t0nd0.js → index-qgh1qwjj.js}

@@ -3,11 +3,11 @@ import {
 } from "./index-v0p37hm2.js";
 import {
   log2
-} from "./index-j75v2476.js";
+} from "./index-h7tgn49j.js";
 import {
   inRootAsyncContext2,
   getSqliteDatabasePath2
-} from "./index-beht37jy.js";
+} from "./index-gzy5w8ya.js";
 
 // src/features/magic-context/compaction-marker-candidates.ts
 import { existsSync, realpathSync } from "node:fs";

package/dist/{index-y9f76s3f.js → index-rrv26qjz.js}

@@ -1,6 +1,6 @@
 import {
   log2
-} from "./index-j75v2476.js";
+} from "./index-h7tgn49j.js";
 
 // src/shared/safe-notification-target.ts
 var DEFAULT_TITLE_RE = /^(New session - |Child session - )\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}\.\d{3}Z$/;

package/dist/{index-24fezq97.js → index-rxqr723x.js}

@@ -1,21 +1,21 @@
 import {
   DEFAULT_LOCAL_EMBEDDING_MODEL
-} from "./index-wgypt3cs.js";
+} from "./index-nxrsns5x.js";
 import {
   log2
-} from "./index-j75v2476.js";
+} from "./index-h7tgn49j.js";
 import {
   isSynapseEmbeddingTruncated,
   SynapseEmbeddingProvider
-} from "./index-6x57ar45.js";
+} from "./index-wfybj1dw.js";
 import {
   LocalEmbeddingProvider
-} from "./index-bjcnntmz.js";
+} from "./index-51rdvtkz.js";
 import {
   OpenAICompatibleEmbeddingProvider,
   getProjectEmbeddingSnapshot2,
   embedBatchForProject2
-} from "./index-ze7mvk54.js";
+} from "./index-zy67whjr.js";
 import {
   isEmbeddingHostBusy2
 } from "./index-qt1qqasc.js";

package/dist/{index-v10f1rjv.js → index-spwjbkc7.js}

@@ -7,7 +7,7 @@ import {
 import {
   log2,
   sessionLog2
-} from "./index-j75v2476.js";
+} from "./index-h7tgn49j.js";
 import {
   localBudget,
   calibrationForModelKey

package/dist/{index-dxmq29t1.js → index-syaazvy2.js}

@@ -6,7 +6,7 @@ import {
   StaleRouteHandleError,
   SubcClient,
   isConsumerReconnectTransient
-} from "./index-6x57ar45.js";
+} from "./index-wfybj1dw.js";
 import {
   getHarness2
 } from "./index-pavzsdc6.js";
@@ -15,14 +15,16 @@ import {
 } from "./index-g2q4htwp.js";
 import {
   log2
-} from "./index-j75v2476.js";
+} from "./index-h7tgn49j.js";
 import {
   inRootAsyncContext2
-} from "./index-beht37jy.js";
+} from "./index-gzy5w8ya.js";
 import {
-  buildCanonicalChunkTextFromFts,
-  loadCompartmentChunkEmbeddingsForSearch
-} from "./index-b5vqckbw.js";
+  buildCanonicalChunkTextFromFts2,
+  loadCompartmentChunkEmbeddingsForSearch2,
+  peekCompartmentChunkSearchPool2,
+  warmCompartmentChunkSearchPool2
+} from "./index-m32esgmj.js";
 import {
   recordEmbeddingMeasurement,
   saveCommitEmbedding,
@@ -39,7 +41,7 @@ import {
   enqueueShadowEmbeddingItems2,
   getProjectEmbeddingSnapshot2,
   embedItemsForProject2
-} from "./index-ze7mvk54.js";
+} from "./index-zy67whjr.js";
 import {
   getProjectEmbeddings2
 } from "./index-4dhv7mqz.js";
@@ -48,13 +50,13 @@ import {
   isEmbeddingEnabled,
   embedText,
   ensureMemoryEmbeddings2
-} from "./index-24fezq97.js";
+} from "./index-rxqr723x.js";
 import {
   ModuleMemoryAuthorityError2,
   getMemoriesByProject2,
   getMemoriesByProjects2,
   updateMemoryRetrievalCount2
-} from "./index-n37sebck.js";
+} from "./index-jjvbk92s.js";
 import {
   USER_FACING_FAILURES,
   getNotes,
@@ -63,27 +65,27 @@ import {
   sanitizeFtsQuery,
   searchMemoriesFTS,
   searchMemoriesFTSUnion
-} from "./index-3h4dp9wb.js";
+} from "./index-3svaejkh.js";
 import {
   cleanSearchText,
   keywordRelevance,
   matchedSearchSnippet,
   getIndexedMessageCorpusSize2
-} from "./index-se4m2g6w.js";
+} from "./index-mnnkgq0q.js";
 import {
   MESSAGE_FTS_SESSION_FILTER_SQL,
   withMessageFtsSessionFilter
 } from "./index-kaqs6h31.js";
 import {
   isRecord
-} from "./index-cf74k5ak.js";
+} from "./index-whcgcfrv.js";
 import {
   resolveWorkspaceShareCategories,
   resolveWorkspaceIdentitySet,
   expandWorkspaceIdentitySetWithAliases,
   resolveStoredPathWorkspaceIdentity,
   sourceNameForMemory
-} from "./index-63k48rv9.js";
+} from "./index-9q1g3c5q.js";
 import {
   isKnownAutocommit
 } from "./index-8ajstryz.js";
@@ -1427,6 +1429,7 @@ function sha256(value) {
 var RERANK_MODEL = "gte-reranker-modernbert-base-f32";
 var RERANK_LANE_LIMIT = 25;
 var DEADLINE_MS = 1500;
+var DOCUMENT_BYTES = 1024;
 function isProseQuery(query) {
   const text = query.trim();
   if (!text || /[\n;]|^["'`]|["'`]$/.test(text))
@@ -1506,7 +1509,7 @@ function candidateText(location, title, body) {
 ${truncateUtf8(title.replaceAll(`
 `, " "), 120)}
 `;
-  return header + truncateUtf8(body, 1024 - Buffer.byteLength(header));
+  return header + truncateUtf8(body, DOCUMENT_BYTES - Buffer.byteLength(header));
 }
 
 class RerankFailure extends Error {
@@ -1576,7 +1579,79 @@ async function connect(connectionFile) {
   }
   return bounded(connection);
 }
-async function prepareReranker(projectRoot, sessionId, connectionFile, injectedClient) {
+async function remoteScores(config, query, documents, signal) {
+  const controller = new AbortController;
+  let timer;
+  let onAbort;
+  try {
+    const cancelled = new Promise((_, reject) => {
+      const cancel = (reason) => {
+        reject(new RerankFailure(reason));
+        controller.abort();
+      };
+      onAbort = () => cancel("aborted");
+      if (signal?.aborted)
+        onAbort();
+      else
+        signal?.addEventListener("abort", onAbort, { once: true });
+      timer = setTimeout(() => cancel("timeout"), Math.max(50, Math.min(15000, config.timeout_ms ?? DEADLINE_MS)));
+    });
+    const request = async () => {
+      const tei = config.endpoint?.startsWith("tei+");
+      const endpoint = (tei ? config.endpoint?.slice(4) : config.endpoint)?.replace(/\/+$/, "");
+      if (!endpoint || !/^https?:\/\//.test(endpoint))
+        throw new RerankFailure("invalid_endpoint");
+      const response = await fetch(`${endpoint}/rerank`, {
+        method: "POST",
+        headers: {
+          "Content-Type": "application/json",
+          ...config.api_key ? { Authorization: `Bearer ${config.api_key}` } : {}
+        },
+        body: JSON.stringify(tei ? { query, texts: documents } : {
+          model: config.model,
+          query,
+          documents,
+          top_n: documents.length
+        }),
+        signal: controller.signal,
+        redirect: "error"
+      });
+      if (!response.ok)
+        throw new RerankFailure(`http_${response.status}`);
+      const body = await response.json();
+      const rows = tei ? body : body?.results;
+      if (!Array.isArray(rows) || rows.length !== documents.length)
+        throw new RerankFailure("invalid_reply");
+      const scores = new Array(documents.length);
+      const seen = new Set;
+      for (const row of rows) {
+        const index = row?.index;
+        const score = tei ? row?.score : row?.relevance_score;
+        if (!Number.isInteger(index) || index < 0 || index >= documents.length || seen.has(index) || typeof score !== "number" || !Number.isFinite(score))
+          throw new RerankFailure("invalid_reply");
+        seen.add(index);
+        scores[index] = score;
+      }
+      return scores;
+    };
+    return await Promise.race([cancelled, request()]);
+  } finally {
+    clearTimeout(timer);
+    if (onAbort)
+      signal?.removeEventListener("abort", onAbort);
+  }
+}
+function remoteRerankSkipped(reason, onSkipped) {
+  const safe = /^(?:invalid_reply|invalid_endpoint|validation|timeout|aborted|candidate_validation|http_\d{3})$/.test(reason) ? reason : "remote_error";
+  const line = `Reranking skipped: ${safe}`;
+  logRerankFallback(safe);
+  onSkipped?.(line);
+}
+async function prepareReranker(projectRoot, sessionId, connectionFile, injectedClient, config) {
+  if (config?.provider === "off")
+    return null;
+  if (config?.provider === "remote")
+    return { remote: config };
   try {
     if (injectedClient === null)
       throw new RerankFailure("missing_synapse");
@@ -1593,36 +1668,43 @@ async function prepareReranker(projectRoot, sessionId, connectionFile, injectedC
     return null;
   }
 }
-async function rerankSearchResults(session, query, baseline, pool, texts, limit) {
+async function rerankSearchResults(session, query, baseline, pool, texts, limit, signal, onSkipped) {
   if (!pool.length)
     return baseline;
   try {
-    if (pool.length > 20 || texts.length !== pool.length || texts.some((text) => Buffer.byteLength(text) > 1024))
-      throw new RerankFailure("validation");
-    const body = unwrap(await bounded(session.client.call("synapse", "rerank.score", {
-      model: RERANK_MODEL,
-      query,
-      candidates: texts,
-      required_fingerprint: session.lane.fingerprint,
-      allow_equivalent: false,
-      accept_declared: false,
-      max_queue_ms: 100,
-      deadline_ms: DEADLINE_MS
-    }, {
-      timeoutMs: DEADLINE_MS,
-      targetKind: "management_surface",
-      identity: session.identity
-    })));
-    if (body.fingerprint !== session.lane.fingerprint)
-      throw new RerankFailure("fingerprint_mismatch");
-    if (body.table_epoch !== session.lane.tableEpoch)
-      throw new RerankFailure("epoch_mismatch");
-    if (!Array.isArray(body.scores) || body.scores.length !== pool.length || body.scores.some((score) => typeof score !== "number" || !Number.isFinite(score)))
+    if (pool.length > 20 || texts.length !== pool.length || texts.some((text) => Buffer.byteLength(text) > DOCUMENT_BYTES))
       throw new RerankFailure("validation");
-    const scores = body.scores;
+    let scores;
+    if ("remote" in session) {
+      scores = await remoteScores(session.remote, query, texts, signal);
+    } else {
+      const body = unwrap(await bounded(session.client.call("synapse", "rerank.score", {
+        model: RERANK_MODEL,
+        query,
+        candidates: texts,
+        required_fingerprint: session.lane.fingerprint,
+        allow_equivalent: false,
+        max_queue_ms: 100,
+        deadline_ms: DEADLINE_MS
+      }, {
+        timeoutMs: DEADLINE_MS,
+        targetKind: "management_surface",
+        identity: session.identity
+      })));
+      if (body.fingerprint !== session.lane.fingerprint)
+        throw new RerankFailure("fingerprint_mismatch");
+      if (body.table_epoch !== session.lane.tableEpoch)
+        throw new RerankFailure("epoch_mismatch");
+      if (!Array.isArray(body.scores) || body.scores.length !== pool.length || body.scores.some((score) => typeof score !== "number" || !Number.isFinite(score)))
+        throw new RerankFailure("validation");
+      scores = body.scores;
+    }
     return pool.map((hit, index) => ({ hit, index, score: scores[index] })).sort((a, b) => b.score - a.score || a.index - b.index).slice(0, limit).map((row) => row.hit);
   } catch (error) {
-    logRerankFallback(reasonOf(error));
+    if ("remote" in session)
+      remoteRerankSkipped(error instanceof RerankFailure ? error.reason : "remote_error", onSkipped);
+    else
+      logRerankFallback(reasonOf(error));
     return baseline;
   }
 }
@@ -1677,7 +1759,7 @@ Reason: ${row.reason}` : ""}`;
       case "compartment": {
         title = hit.title;
         location = `compartment ${hit.compartmentId} ${hit.sessionId} @${hit.startOrdinal}-${hit.endOrdinal}`;
-        body = buildCanonicalChunkTextFromFts(db, hit.sessionId, hit.startOrdinal, hit.endOrdinal) ?? "";
+        body = buildCanonicalChunkTextFromFts2(db, hit.sessionId, hit.startOrdinal, hit.endOrdinal) ?? "";
         break;
       }
     }
@@ -2616,10 +2698,42 @@ function searchNotes(args) {
   }));
 }
 async function searchCompartmentChunks(args) {
-  if (!args.queryEmbedding || args.limit <= 0 || !args.modelId || args.modelId === "off")
+  if (args.limit <= 0 || !args.modelId || args.modelId === "off") {
+    if (args.timings)
+      args.timings.chunkPool = "off";
+    return [];
+  }
+  if (!args.queryEmbedding) {
+    if (args.timings)
+      args.timings.chunkPool = "no-vector";
+    if (args.warmOnly)
+      warmCompartmentChunkSearchPool2(args.db, args.sessionId, args.projectPath, args.modelId);
     return [];
+  }
   const cutoff = args.maxOrdinal != null && args.maxOrdinal >= 0 ? args.maxOrdinal : null;
-  const rows = await loadCompartmentChunkEmbeddingsForSearch(args.db, args.sessionId, args.projectPath, args.modelId, args.dateRange);
+  let rows;
+  if (args.warmOnly) {
+    const warm = peekCompartmentChunkSearchPool2(args.db, args.sessionId, args.projectPath, args.modelId, args.dateRange);
+    if (warm === null) {
+      if (args.timings)
+        args.timings.chunkPool = "cold";
+      warmCompartmentChunkSearchPool2(args.db, args.sessionId, args.projectPath, args.modelId);
+      return [];
+    }
+    if (args.timings)
+      args.timings.chunkPool = "warm";
+    rows = warm;
+  } else {
+    try {
+      rows = await loadCompartmentChunkEmbeddingsForSearch2(args.db, args.sessionId, args.projectPath, args.modelId, args.dateRange, args.signal);
+    } catch (error) {
+      if (args.signal?.aborted)
+        return [];
+      throw error;
+    }
+    if (args.timings)
+      args.timings.chunkPool = "loaded";
+  }
   if (rows.length === 0)
     return [];
   const byCompartment = new Map;
@@ -2911,7 +3025,7 @@ async function unifiedSearch2(db, sessionId, projectPath, query, options = {}) {
     return [];
   }
   const limit = normalizeLimit(options.limit);
-  const reranker = options.explicitSearch && options.rerank !== false && isProseQuery(trimmedQuery) ? await prepareReranker(projectPath, sessionId, options.rerankConnectionFile, options.rerankClient) : null;
+  const reranker = options.explicitSearch && options.rerank !== false && isProseQuery(trimmedQuery) ? await prepareReranker(projectPath, sessionId, options.rerankConnectionFile, options.rerankClient, options.rerankConfig) : null;
   const lanes = reranker || options.captureRerankLanes ? emptySearchLanes() : undefined;
   const dateRange = normalizeDateRange(options.from, options.to);
   const tierLimit = Math.max(limit * 3, DEFAULT_UNIFIED_SEARCH_LIMIT);
@@ -2944,6 +3058,8 @@ async function unifiedSearch2(db, sessionId, projectPath, query, options = {}) {
   if (options.signal?.aborted)
     return [];
   const messageProbes = options.explicitSearch ? extractLiteralProbes(trimmedQuery) : [];
+  const timings = options.stepTimings;
+  let stepStartedAt = performance.now();
   let messageResults = [];
   if (runMessages) {
     const messageRequest = {
@@ -2970,8 +3086,13 @@ async function unifiedSearch2(db, sessionId, projectPath, query, options = {}) {
     messageResults = outcome.results.filter((result) => result.messageId !== options.excludeMessageId);
     if (lanes)
       lanes.message_fts = (outcome.laneResults ?? outcome.results).slice(0, 25);
+    if (timings)
+      timings.messageMs = performance.now() - stepStartedAt;
   }
+  stepStartedAt = performance.now();
   const capturedQuery = await queryEmbeddingPromise;
+  if (timings && needsEmbedding)
+    timings.vectorWaitMs = performance.now() - stepStartedAt;
   if (options.signal?.aborted)
     return [];
   const embeddingSnapshot = getProjectEmbeddingSnapshot2(projectPath);
@@ -2981,6 +3102,9 @@ async function unifiedSearch2(db, sessionId, projectPath, query, options = {}) {
   const workspace = resolveSearchWorkspaceContext(db, projectPath);
   const embeddingModelId = queryContract?.modelId ?? options.embeddingModelIdOverride ?? embeddingSnapshot?.modelId;
   const chunkModelId = queryContract?.chunkModelId ?? options.chunkModelIdOverride ?? embeddingSnapshot?.chunkModelId;
+  stepStartedAt = performance.now();
+  if (timings)
+    timings.chunkPool = "off";
   const compartmentResults = runCompartmentChunks ? await searchCompartmentChunks({
     db,
     sessionId,
@@ -2989,8 +3113,14 @@ async function unifiedSearch2(db, sessionId, projectPath, query, options = {}) {
     limit: lanes ? Math.max(tierLimit, 25) : tierLimit,
     maxOrdinal: options.maxMessageOrdinal,
     modelId: chunkModelId && chunkModelId !== "off" ? chunkModelId : null,
-    dateRange
+    dateRange,
+    warmOnly: options.chunkPoolWarmOnly,
+    signal: options.signal,
+    timings
   }) : [];
+  if (timings && runCompartmentChunks)
+    timings.chunkMs = performance.now() - stepStartedAt;
+  stepStartedAt = performance.now();
   if (lanes)
     lanes.chunk_vector = compartmentResults.slice(0, 25);
   const messageLikeResults = mergeMessageAndCompartmentResults({
@@ -3046,6 +3176,8 @@ async function unifiedSearch2(db, sessionId, projectPath, query, options = {}) {
       dateRange
     })) : Promise.resolve([])
   ]);
+  if (timings)
+    timings.otherLanesMs = performance.now() - stepStartedAt;
   if (options.diagnostics) {
     options.diagnostics.suppressedVisibleMemoryIds = memoryOutcome.suppressedVisibleIds;
   }
@@ -3063,11 +3195,14 @@ async function unifiedSearch2(db, sessionId, projectPath, query, options = {}) {
     options.captureRerankLanes?.(lanes);
   }
   if (reranker && lanes) {
-    const pool = fuseSearchLanes(lanes);
+    const pool = fuseSearchLanes(lanes).slice(0, "remote" in reranker ? reranker.remote.top_n : 20);
     try {
-      results = await rerankSearchResults(reranker, trimmedQuery, results, pool, candidateTexts(db, sessionId, projectPath, pool), limit);
+      results = await rerankSearchResults(reranker, trimmedQuery, results, pool, candidateTexts(db, sessionId, projectPath, pool), limit, options.signal, options.onRerankSkipped);
     } catch {
-      logRerankFallback("candidate_validation");
+      if ("remote" in reranker)
+        remoteRerankSkipped("candidate_validation", options.onRerankSkipped);
+      else
+        logRerankFallback("candidate_validation");
     }
   }
   if (!options.measurementDisabled) {

package/dist/{index-k29z4aqh.js → index-t5pck3ss.js}

@@ -1,6 +1,6 @@
 import {
   log2
-} from "./index-j75v2476.js";
+} from "./index-h7tgn49j.js";
 
 // src/shared/write-transaction-timing.ts
 var SLOW_WRITE_TRANSACTION_THRESHOLD_MS = 1000;

package/dist/{index-6x57ar45.js → index-wfybj1dw.js}

@@ -1,15 +1,15 @@
 import {
   estimateTokens
-} from "./index-c5pytzne.js";
+} from "./index-b88dwwrh.js";
 import {
   getHarness2
 } from "./index-pavzsdc6.js";
 import {
   log2
-} from "./index-j75v2476.js";
+} from "./index-h7tgn49j.js";
 import {
   inRootAsyncContext2
-} from "./index-beht37jy.js";
+} from "./index-gzy5w8ya.js";
 
 // ../../node_modules/.bun/@cortexkit+subc-client@0.11.1/node_modules/@cortexkit/subc-client/dist/client.js
 import { promises as fs2 } from "node:fs";
@@ -1786,7 +1786,6 @@ function getSynapseBatchRequestKey(args) {
     required_fingerprint: args.fingerprint,
     required_epoch: args.tableEpoch,
     allow_equivalent: false,
-    accept_declared: false,
     ids: args.items.map((item) => item.id),
     content_sha256: args.items.map((item) => item.contentSha256),
     ...args.purpose === "query" ? { purpose: args.purpose } : {}
@@ -2175,8 +2174,7 @@ class SynapseEmbeddingProvider {
       model: metadata.model,
       required_fingerprint: metadata.fingerprint,
       required_epoch: metadata.table_epoch,
-      allow_equivalent: false,
-      accept_declared: false
+      allow_equivalent: false
     };
   }
   batchRequest(items, requestKey, purpose) {

package/dist/{index-cf74k5ak.js → index-whcgcfrv.js}

@@ -4,23 +4,23 @@ import {
 } from "./index-1zx87sdm.js";
 import {
   estimateTokens
-} from "./index-c5pytzne.js";
+} from "./index-b88dwwrh.js";
 import {
   getHarness2
 } from "./index-pavzsdc6.js";
 import {
   sessionLog2
-} from "./index-j75v2476.js";
+} from "./index-h7tgn49j.js";
 import {
   getTagIdentityWriteGeneration2,
   getSqliteDatabasePath2
-} from "./index-beht37jy.js";
+} from "./index-gzy5w8ya.js";
 import {
   tagIdentityRevisionKey,
   tagOrderConstraintIndex,
   stableStringify,
   stableStringifyHash
-} from "./index-bp5083x2.js";
+} from "./index-x9k3mqrf.js";
 import {
   DEFAULT_PROTECTED_TOOLS,
   normalizeProtectedToolName,
@@ -88,13 +88,16 @@ function stripDanglingTagNotationGlobally(value) {
 function stripTagSectionCharacters(value) {
   return value.replace(STRAY_SECTION_CHAR_REGEX, "");
 }
-function stripPersistedAssistantText(value) {
+function stripPersistedAssistantText(value, acceptsEmpty = true) {
+  if (!acceptsEmpty && !value.includes("§") && !value.trim())
+    return value;
   let text = stripWellFormedLeadingTagPrefix(value);
   text = stripCompleteTagPairsGlobally(text);
   text = stripMalformedTagNotationGlobally(text);
   text = stripDanglingTagNotationGlobally(text);
   text = stripTagSectionCharacters(text);
-  return text.trim();
+  const stripped = text.trim();
+  return !acceptsEmpty && value.trim().length > 0 && stripped.length === 0 ? value : stripped;
 }
 function byteSize(value) {
   return encoder.encode(value).length;

package/dist/{index-a6mc0v4d.js → index-x6cbrv9h.js}

@@ -2,13 +2,13 @@ import {
   getSqliteDatabasePath2,
   withSqliteBackgroundWriter2,
   withoutSqliteTransformPass2
-} from "./index-beht37jy.js";
+} from "./index-gzy5w8ya.js";
 import {
   runSessionWarmupWorker
-} from "./index-s734jcsr.js";
+} from "./index-jfem3dgz.js";
 import {
   logSlowWriteTransaction
-} from "./index-k29z4aqh.js";
+} from "./index-t5pck3ss.js";
 
 // src/features/magic-context/message-fts-rowid-map.ts
 import { createHash } from "node:crypto";

package/dist/{index-bp5083x2.js → index-x9k3mqrf.js}

@@ -1,6 +1,6 @@
 import {
   sessionLog2
-} from "./index-j75v2476.js";
+} from "./index-h7tgn49j.js";
 import {
   isKnownAutocommit
 } from "./index-8ajstryz.js";