@cortexkit/opencode-magic-context 0.49.15 → 0.49.17

package/dist/{index-mmfa86mt.js → index-s734jcsr.js}

@@ -1,163 +1,20 @@
-import {
-  inRootAsyncContext2,
-  getSqliteDatabasePath2,
-  releaseIndexOwner2
-} from "./index-wafzvyhg.js";
 import {
   registerExitAbort
 } from "./index-v0p37hm2.js";
 import {
   log2
 } from "./index-j75v2476.js";
-
-// src/hooks/magic-context/read-session-raw.ts
-import { isMainThread } from "node:worker_threads";
+import {
+  inRootAsyncContext2,
+  getSqliteDatabasePath2,
+  releaseIndexOwner2
+} from "./index-beht37jy.js";
 
 // src/hooks/magic-context/raw-ordinal-warmup.ts
 import { Worker } from "node:worker_threads";
-var ACCEPT_TIMEOUT_MS = 2000;
-var RESULT_TIMEOUT_MS = 10 * 60000;
-var FAILURE_BACKOFF_MS = 5 * 60000;
-var inFlight = new Map;
-var connectionIds = new WeakMap;
-var nextConnectionId = 0;
-var failedAt = new Map;
-var activeWorkers = new Map;
-var failures = new Map;
-var exitHookRegistered = false;
-function stopRawSessionOrdinalWarmups() {
-  for (const stop of [...activeWorkers.values()])
-    stop("stopped");
-}
-function defaultEntry() {
-  return new URL(new URL(import.meta.url).pathname.endsWith(".ts") ? "./raw-ordinal-warmup-worker.ts" : "./raw-ordinal-warmup-worker.js", import.meta.url);
-}
-function ensureExitHook() {
-  if (exitHookRegistered)
-    return;
-  exitHookRegistered = true;
-  const controller = new AbortController;
-  controller.signal.addEventListener("abort", stopRawSessionOrdinalWarmups, { once: true });
-  registerExitAbort(controller);
-}
-function runSessionWarmupWorker(input, options) {
-  ensureExitHook();
-  return new Promise((resolve) => {
-    let worker;
-    let deadline;
-    let settled = false;
-    const finish = (result) => {
-      if (settled)
-        return;
-      settled = true;
-      clearTimeout(deadline);
-      if (worker) {
-        activeWorkers.delete(worker);
-        const stopped = worker.terminate();
-        worker.unref();
-        stopped.finally(() => {
-          releaseIndexOwner2(input);
-          resolve(result);
-        });
-        return;
-      }
-      releaseIndexOwner2(input);
-      resolve(result);
-    };
-    const arm = (failure, ms) => {
-      clearTimeout(deadline);
-      deadline = setTimeout(() => finish({ failure, detail: `no reply within ${ms} ms` }), ms);
-      deadline.unref?.();
-    };
-    try {
-      worker = inRootAsyncContext2(() => new Worker(options.entry ?? defaultEntry(), { workerData: input }));
-    } catch (error) {
-      finish({ failure: "start-failed", detail: String(error) });
-      return;
-    }
-    worker.unref();
-    activeWorkers.set(worker, (failure) => finish({ failure, detail: "stopped" }));
-    arm("not-accepted", options.acceptMs ?? ACCEPT_TIMEOUT_MS);
-    worker.on("message", (reply) => {
-      if (reply.kind === "accepted")
-        arm("no-result", options.resultMs ?? RESULT_TIMEOUT_MS);
-      else if (reply.kind === "scan")
-        finish({ scan: reply.scan });
-      else if (reply.kind === "tag-summary")
-        finish({ summary: reply.summary });
-      else if (reply.kind === "tag-delta")
-        finish({ delta: reply.delta });
-      else if (reply.kind === "indexed")
-        finish({ inserted: reply.inserted, measurements: reply.measurements });
-      else if (reply.kind === "orphan-sweep")
-        finish({ orphanSweep: reply.result });
-      else if (reply.kind === "exact-ordinal-ids")
-        finish({ exactOrdinalIds: reply.ids });
-      else
-        finish({ failure: "worker-error", detail: reply.error });
-    });
-    worker.on("error", (error) => finish({ failure: "worker-error", detail: String(error) }));
-    worker.on("exit", (code) => finish({ failure: "exited", detail: `exit code ${code}` }));
-  });
-}
-function prewarmRawSessionOrdinalsForDb(db, sessionId, options = {}) {
-  if (isRawSessionSummaryWarm2(db, sessionId))
-    return Promise.resolve("warm");
-  if (!db.prepare("SELECT 1 FROM sqlite_master WHERE name = 'message' AND type IN ('table', 'view')").get())
-    return Promise.resolve("warm");
-  const path = getSqliteDatabasePath2(db);
-  if (!path) {
-    countRawSessionMessageOrdinalsFromDb2(db, sessionId);
-    return Promise.resolve("warm");
-  }
-  let connectionId = connectionIds.get(db);
-  if (connectionId === undefined) {
-    connectionId = ++nextConnectionId;
-    connectionIds.set(db, connectionId);
-  }
-  const key = `${path}\x00${sessionId}\x00${connectionId}`;
-  let shared = inFlight.get(key);
-  if (!shared) {
-    const failed = failedAt.get(key);
-    if (failed !== undefined && Date.now() - failed < FAILURE_BACKOFF_MS)
-      return Promise.resolve("failed");
-    const epoch = getRawSessionSummaryEpoch2(sessionId);
-    const started = performance.now();
-    const result = runSessionWarmupWorker({ path, sessionId, previous: rawOrdinalSummarySeed2(db, sessionId) }, options).then((outcome) => {
-      if ("failure" in outcome)
-        recordFailure(key, sessionId, outcome.failure, outcome.detail);
-      return outcome;
-    }).finally(() => {
-      if (inFlight.get(key) === scan)
-        inFlight.delete(key);
-    });
-    const scan = { epoch, started, result };
-    inFlight.set(key, scan);
-    shared = scan;
-  }
-  const awaited = shared;
-  return awaited.result.then((result) => {
-    if (!("scan" in result))
-      return "failed";
-    try {
-      if (installRawSessionSummaryScan2(db, sessionId, result.scan, awaited.epoch, true)) {
-        failedAt.delete(key);
-        log2(`[magic-context] canonical ordinals of ${sessionId} warmed off-thread (${result.scan.sessionRows} messages, ${Math.round(performance.now() - awaited.started)} ms)`);
-        return "warm";
-      }
-    } catch {}
-    recordFailure(key, sessionId, "superseded", `session removed during scan: epoch=${awaited.epoch}/${getRawSessionSummaryEpoch2(sessionId)}`);
-    return "failed";
-  });
-}
-function recordFailure(key, sessionId, failure, detail) {
-  failures.set(failure, (failures.get(failure) ?? 0) + 1);
-  if (failure !== "superseded")
-    failedAt.set(key, Date.now());
-  log2(`[magic-context] WARN canonical ordinal warm-up failed for ${sessionId} (${failure}: ${detail}); counts remain bounded and callers must defer or retry`);
-}
 
 // src/hooks/magic-context/read-session-raw.ts
+import { isMainThread } from "node:worker_threads";
 function isStrictGapHealingMessage2(message) {
   if (message.storeType === "synthetic")
     return true;
@@ -1267,4 +1124,167 @@ function readRawSessionBoundaryEndpointsFromDb2(db, sessionId, ids, blockIds = [
   }
 }
 
+// src/hooks/magic-context/raw-ordinal-warmup.ts
+var ACCEPT_TIMEOUT_MS = 2000;
+var RESULT_TIMEOUT_MS = 10 * 60000;
+var FAILURE_BACKOFF_MS = 5 * 60000;
+var inFlight = new Map;
+var connectionIds = new WeakMap;
+var nextConnectionId = 0;
+var failedAt = new Map;
+var activeWorkers = new Map;
+var failures = new Map;
+var exitHookRegistered = false;
+function stopRawSessionOrdinalWarmups() {
+  for (const stop of [...activeWorkers.values()])
+    stop("stopped");
+}
+function defaultEntry() {
+  return new URL(new URL(import.meta.url).pathname.endsWith(".ts") ? "./raw-ordinal-warmup-worker.ts" : "./raw-ordinal-warmup-worker.js", import.meta.url);
+}
+function ensureExitHook() {
+  if (exitHookRegistered)
+    return;
+  exitHookRegistered = true;
+  const controller = new AbortController;
+  controller.signal.addEventListener("abort", stopRawSessionOrdinalWarmups, { once: true });
+  registerExitAbort(controller);
+}
+function runSessionWarmupWorker(input, options) {
+  ensureExitHook();
+  return new Promise((resolve) => {
+    const openCancellation = new Int32Array(new SharedArrayBuffer(Int32Array.BYTES_PER_ELEMENT));
+    let worker;
+    let deadline;
+    let settled = false;
+    const finish = (result) => {
+      if (settled)
+        return;
+      settled = true;
+      Atomics.store(openCancellation, 0, 1);
+      clearTimeout(deadline);
+      options.signal?.removeEventListener("abort", abort);
+      if (worker) {
+        activeWorkers.delete(worker);
+        const stopped = worker.terminate();
+        worker.unref();
+        stopped.finally(() => {
+          releaseIndexOwner2(input);
+          resolve(result);
+        });
+        return;
+      }
+      releaseIndexOwner2(input);
+      resolve(result);
+    };
+    const arm = (failure, ms) => {
+      clearTimeout(deadline);
+      deadline = setTimeout(() => finish({ failure, detail: `no reply within ${ms} ms` }), ms);
+      deadline.unref?.();
+    };
+    const abort = () => finish({ failure: "stopped", detail: "stopped" });
+    if (options.signal?.aborted) {
+      abort();
+      return;
+    }
+    options.signal?.addEventListener("abort", abort, { once: true });
+    try {
+      worker = inRootAsyncContext2(() => new Worker(options.entry ?? defaultEntry(), {
+        workerData: { ...input, openCancellation: openCancellation.buffer }
+      }));
+    } catch (error) {
+      finish({ failure: "start-failed", detail: String(error) });
+      return;
+    }
+    worker.unref();
+    activeWorkers.set(worker, (failure) => finish({ failure, detail: "stopped" }));
+    arm("not-accepted", options.acceptMs ?? ACCEPT_TIMEOUT_MS);
+    worker.on("message", (reply) => {
+      if (reply.kind === "accepted")
+        arm("no-result", options.resultMs ?? RESULT_TIMEOUT_MS);
+      else if (reply.kind === "scan")
+        finish({ scan: reply.scan });
+      else if (reply.kind === "tag-summary")
+        finish({ summary: reply.summary });
+      else if (reply.kind === "tag-delta")
+        finish({ delta: reply.delta });
+      else if (reply.kind === "indexed")
+        finish({ inserted: reply.inserted, measurements: reply.measurements });
+      else if (reply.kind === "orphan-sweep")
+        finish({ orphanSweep: reply.result });
+      else if (reply.kind === "exact-ordinal-ids")
+        finish({ exactOrdinalIds: reply.ids });
+      else if (reply.kind === "search-archive")
+        finish({ searchArchive: reply.text });
+      else if (reply.kind === "fts-rowid-backfill")
+        finish({ ftsRowidBackfill: true });
+      else
+        finish({
+          failure: "worker-error",
+          detail: reply.error,
+          code: reply.code,
+          errcode: reply.errcode
+        });
+    });
+    worker.on("error", (error) => finish({ failure: "worker-error", detail: String(error) }));
+    worker.on("exit", (code) => finish({ failure: "exited", detail: `exit code ${code}` }));
+  });
+}
+function prewarmRawSessionOrdinalsForDb(db, sessionId, options = {}) {
+  if (isRawSessionSummaryWarm2(db, sessionId))
+    return Promise.resolve("warm");
+  if (!db.prepare("SELECT 1 FROM sqlite_master WHERE name = 'message' AND type IN ('table', 'view')").get())
+    return Promise.resolve("warm");
+  const path = getSqliteDatabasePath2(db);
+  if (!path) {
+    countRawSessionMessageOrdinalsFromDb2(db, sessionId);
+    return Promise.resolve("warm");
+  }
+  let connectionId = connectionIds.get(db);
+  if (connectionId === undefined) {
+    connectionId = ++nextConnectionId;
+    connectionIds.set(db, connectionId);
+  }
+  const key = `${path}\x00${sessionId}\x00${connectionId}`;
+  let shared = inFlight.get(key);
+  if (!shared) {
+    const failed = failedAt.get(key);
+    if (failed !== undefined && Date.now() - failed < FAILURE_BACKOFF_MS)
+      return Promise.resolve("failed");
+    const epoch = getRawSessionSummaryEpoch2(sessionId);
+    const started = performance.now();
+    const result = runSessionWarmupWorker({ path, sessionId, previous: rawOrdinalSummarySeed2(db, sessionId) }, options).then((outcome) => {
+      if ("failure" in outcome)
+        recordFailure(key, sessionId, outcome.failure, outcome.detail);
+      return outcome;
+    }).finally(() => {
+      if (inFlight.get(key) === scan)
+        inFlight.delete(key);
+    });
+    const scan = { epoch, started, result };
+    inFlight.set(key, scan);
+    shared = scan;
+  }
+  const awaited = shared;
+  return awaited.result.then((result) => {
+    if (!("scan" in result))
+      return "failed";
+    try {
+      if (installRawSessionSummaryScan2(db, sessionId, result.scan, awaited.epoch, true)) {
+        failedAt.delete(key);
+        log2(`[magic-context] canonical ordinals of ${sessionId} warmed off-thread (${result.scan.sessionRows} messages, ${Math.round(performance.now() - awaited.started)} ms)`);
+        return "warm";
+      }
+    } catch {}
+    recordFailure(key, sessionId, "superseded", `session removed during scan: epoch=${awaited.epoch}/${getRawSessionSummaryEpoch2(sessionId)}`);
+    return "failed";
+  });
+}
+function recordFailure(key, sessionId, failure, detail) {
+  failures.set(failure, (failures.get(failure) ?? 0) + 1);
+  if (failure !== "superseded")
+    failedAt.set(key, Date.now());
+  log2(`[magic-context] WARN canonical ordinal warm-up failed for ${sessionId} (${failure}: ${detail}); counts remain bounded and callers must defer or retry`);
+}
+
 export { isStrictGapHealingMessage2, isRawCompactionSummaryInfo2, readRawSessionMessagesFromDb2, readRawSessionMessagePageFromDb2, readRawSessionMessageSummaryPageFromDb2, countRawSessionMessageOrdinalsFromDb2, readRawSessionMessageIdOrdinalsForRangeFromDb2, readRawSessionMessageIdsAtOrdinalsFromDb2, readRawSessionMessageOrdinalPageFromDb2, countStoredRawSessionMessagesFromDb2, readRawSessionTailFromDb2, extractInMemoryMessageViews2, buildInMemoryTailRawMessages2, readRawSessionMessagePartsByIdFromDb2, forgetRawSessionOrdinalWatermark2, forgetRawSessionSummaryRows2, noteRawSessionSummaryRowWritten2, RawOrdinalsNotReady2, rawOrdinalSummarySeed2, scanRawSessionSummaryRows2, getRawSessionSummaryEpoch2, installRawSessionSummaryScan2, isRawSessionSummaryWarm2, readRawSessionMessageOrdinalByIdFromDb2, readRawSessionMessageByIdFromDb2, hasRawSessionMessageByIdFromDb2, readRawSeedTailFromDb2, readRawSessionBoundaryEndpointsFromDb2, runSessionWarmupWorker, prewarmRawSessionOrdinalsForDb };

package/dist/{index-dgs16axy.js → index-s74zqahq.js}

@@ -10,7 +10,7 @@ import {
 } from "./index-y9f76s3f.js";
 import {
   shouldHoldIgnoredNotification
-} from "./index-1d289pq2.js";
+} from "./index-kq82mtg0.js";
 import {
   getErrorMessage
 } from "./index-y8v6yerm.js";

package/dist/{index-bxdg2nbt.js → index-v8awdgvd.js}

@@ -7,17 +7,17 @@ import {
 } from "./index-pavzsdc6.js";
 import {
   isTransientSqliteError2
-} from "./index-wafzvyhg.js";
+} from "./index-beht37jy.js";
 import {
   PROMOTABLE_CATEGORIES,
   CATEGORY_DEFAULT_TTL
 } from "./index-fr0wbhdn.js";
 import {
   managedAuthorityNoteRow
-} from "./index-wk0n1cgt.js";
+} from "./index-qn7xstt2.js";
 import {
   embedTextForProject2
-} from "./index-y1qysm3q.js";
+} from "./index-ze7mvk54.js";
 import {
   saveEmbeddingIfHashMatches
 } from "./index-4dhv7mqz.js";
@@ -30,7 +30,7 @@ import {
   buildWorkspaceMemorySqlFilter2,
   getMemoryById2,
   updateMemorySeenCount2
-} from "./index-n78avt2p.js";
+} from "./index-n37sebck.js";
 import {
   computeNormalizedHash
 } from "./index-2bvekkfy.js";

package/dist/{index-xn6q9pg6.js → index-vrzjhftj.js}

@@ -6,7 +6,7 @@ import {
   StaleRouteHandleError,
   SubcClient,
   isConsumerReconnectTransient
-} from "./index-fkx2qnvw.js";
+} from "./index-6x57ar45.js";
 import {
   getHarness2
 } from "./index-pavzsdc6.js";
@@ -18,11 +18,11 @@ import {
 } from "./index-j75v2476.js";
 import {
   inRootAsyncContext2
-} from "./index-wafzvyhg.js";
+} from "./index-beht37jy.js";
 import {
   buildCanonicalChunkTextFromFts,
   loadCompartmentChunkEmbeddingsForSearch
-} from "./index-3kx0kg0f.js";
+} from "./index-b5vqckbw.js";
 import {
   recordEmbeddingMeasurement,
   saveCommitEmbedding,
@@ -39,7 +39,7 @@ import {
   enqueueShadowEmbeddingItems2,
   getProjectEmbeddingSnapshot2,
   embedItemsForProject2
-} from "./index-y1qysm3q.js";
+} from "./index-ze7mvk54.js";
 import {
   getProjectEmbeddings2
 } from "./index-4dhv7mqz.js";
@@ -48,13 +48,13 @@ import {
   isEmbeddingEnabled,
   embedText,
   ensureMemoryEmbeddings2
-} from "./index-3kdm78zp.js";
+} from "./index-24fezq97.js";
 import {
   ModuleMemoryAuthorityError2,
   getMemoriesByProject2,
   getMemoriesByProjects2,
   updateMemoryRetrievalCount2
-} from "./index-n78avt2p.js";
+} from "./index-n37sebck.js";
 import {
   USER_FACING_FAILURES,
   getNotes,
@@ -63,20 +63,27 @@ import {
   sanitizeFtsQuery,
   searchMemoriesFTS,
   searchMemoriesFTSUnion
-} from "./index-bxdg2nbt.js";
-import {
-  isRecord
-} from "./index-mht7bq0z.js";
+} from "./index-v8awdgvd.js";
 import {
+  cleanSearchText,
+  keywordRelevance,
+  matchedSearchSnippet,
   getIndexedMessageCorpusSize2
-} from "./index-thvnpfsv.js";
+} from "./index-cwzfcbtq.js";
+import {
+  MESSAGE_FTS_SESSION_FILTER_SQL,
+  withMessageFtsSessionFilter
+} from "./index-kaqs6h31.js";
+import {
+  isRecord
+} from "./index-hqhm3wke.js";
 import {
   resolveWorkspaceShareCategories,
   resolveWorkspaceIdentitySet,
   expandWorkspaceIdentitySetWithAliases,
   resolveStoredPathWorkspaceIdentity,
   sourceNameForMemory
-} from "./index-wk0n1cgt.js";
+} from "./index-qn7xstt2.js";
 import {
   isKnownAutocommit
 } from "./index-8ajstryz.js";
@@ -966,6 +973,10 @@ async function indexCommitsForProject(db, projectPath, directory, options) {
     embedded: 0,
     nonIndexable: false
   };
+  if (projectPath.startsWith("dir:")) {
+    result.nonIndexable = true;
+    return result;
+  }
   if (indexInProgress.has(projectPath)) {
     log2(`[git-commits] index already in progress for ${projectPath}, skipping`);
     return result;
@@ -1019,6 +1030,7 @@ async function embedUnembeddedCommits(db, projectPath) {
   embedInProgress.add(projectPath);
   const startedAt = Date.now();
   const deadline = startedAt + EMBED_SWEEP_MAX_WALL_CLOCK_MS;
+  const signal = AbortSignal.timeout(EMBED_SWEEP_MAX_WALL_CLOCK_MS);
   let total = 0;
   try {
     while (Date.now() < deadline && total < EMBED_MAX_PER_SWEEP) {
@@ -1031,7 +1043,7 @@ async function embedUnembeddedCommits(db, projectPath) {
           id: `commit:${row.sha}`,
           text: row.message,
           contentSha256: contentSha2562(row.message)
-        })), undefined, db, projectPath);
+        })), signal, db, projectPath);
         if (!result)
           break;
         db.transaction(() => {
@@ -1264,61 +1276,6 @@ function searchGitCommitsSync(db, projectPath, query, options) {
   });
   return results.slice(0, options.limit);
 }
-// src/features/magic-context/message-fts-session-filter.ts
-var MESSAGE_FTS_SESSION_FILTER_SQL = `+message_history_fts.rowid IN (
-    SELECT fts_rowid FROM message_fts_rowid_map WHERE session_id = ?1
-) AND `;
-var coverageCaches = new WeakMap;
-function getCoverageCache(db) {
-  let cache = coverageCaches.get(db);
-  if (!cache) {
-    cache = {
-      pin: db.prepare("SELECT fts_rowid FROM message_fts_rowid_map LIMIT 1"),
-      stamp: db.prepare("SELECT total_changes() AS changes, data_version AS version FROM pragma_data_version"),
-      missing: db.prepare(`SELECT DISTINCT session_id AS sessionId
-                FROM message_history_fts WHERE rowid IN (
-                    SELECT id FROM message_history_fts_docsize
-                    EXCEPT SELECT fts_rowid FROM message_fts_rowid_map
-                )`)
-    };
-    coverageCaches.set(db, cache);
-  }
-  return cache;
-}
-function withMessageFtsSessionFilter(db, sessionId, read) {
-  let cacheable = false;
-  try {
-    const transaction = db;
-    cacheable = transaction.inTransaction === false || transaction.isTransaction === false;
-    if (!cacheable)
-      coverageCaches.delete(db);
-  } catch {
-    coverageCaches.delete(db);
-  }
-  return db.transaction(() => {
-    let sessionFirst = false;
-    try {
-      const cache = getCoverageCache(db);
-      cache.pin.get();
-      const stamp = cache.stamp.get();
-      let incomplete = cache.incompleteSessions;
-      if (!cacheable || !incomplete || cache.version !== stamp.version || cache.changes !== stamp.changes) {
-        const rows = cache.missing.all();
-        incomplete = new Set(rows.map((row) => row.sessionId));
-        if (cacheable) {
-          cache.version = stamp.version;
-          cache.changes = stamp.changes;
-          cache.incompleteSessions = incomplete;
-        }
-      }
-      sessionFirst = !incomplete.has(sessionId);
-    } catch {
-      coverageCaches.delete(db);
-    }
-    return read(sessionFirst);
-  }).deferred();
-}
-
 // src/features/magic-context/literal-probes.ts
 var MAX_PROBES = 5;
 var MIN_PROBE_LENGTH = 3;
@@ -2432,7 +2389,7 @@ function searchMessagesInSnapshot(args, sessionFirst) {
       const filtered = rows.slice(0, limit);
       return filtered.map((row, rank) => ({
         source: "message",
-        content: previewText(row.content),
+        content: matchedSearchSnippet(row.content, args.query) || previewText(row.content),
         score: linearDecayScore(rank, filtered.length),
         messageOrdinal: row.messageOrdinal,
         messageId: row.messageId,
@@ -2509,7 +2466,7 @@ function searchMessagesInSnapshot(args, sessionFirst) {
     const ranked = [...fused.values()].sort((a, b) => b.score !== a.score ? b.score - a.score : a.row.messageOrdinal - b.row.messageOrdinal).slice(0, resultLimit);
     return ranked.map((entry, rank) => ({
       source: "message",
-      content: previewText(entry.row.content),
+      content: matchedSearchSnippet(entry.row.content, args.query) || previewText(entry.row.content),
       score: linearDecayScore(rank, ranked.length),
       messageOrdinal: entry.row.messageOrdinal,
       messageId: entry.row.messageId,
@@ -2732,10 +2689,7 @@ function mergeMessageAndCompartmentResults(args) {
     }
   }
   const ranked = [...fused.values()].sort((left, right) => right.score !== left.score ? right.score - left.score : left.tieOrdinal - right.tieOrdinal).slice(0, args.limit);
-  return ranked.map((entry, rank) => ({
-    ...entry.result,
-    score: linearDecayScore(rank, ranked.length)
-  }));
+  return ranked.map((entry) => entry.result);
 }
 function getSourceBoost(result) {
   switch (result.source) {
@@ -3013,7 +2967,7 @@ async function unifiedSearch2(db, sessionId, projectPath, query, options = {}) {
     if (options.diagnostics) {
       options.diagnostics.suppressedLiveMessageMatches = outcome.suppressedLiveMessageMatches;
     }
-    messageResults = outcome.results;
+    messageResults = outcome.results.filter((result) => result.messageId !== options.excludeMessageId);
     if (lanes)
       lanes.message_fts = (outcome.laneResults ?? outcome.results).slice(0, 25);
   }
@@ -3146,6 +3100,12 @@ async function unifiedSearch2(db, sessionId, projectPath, query, options = {}) {
       }).immediate();
     }
   }
+  if (options.autoHint) {
+    return results.map((result) => ({
+      ...result,
+      relevanceScore: cleanSearchText(result.source === "compartment" ? result.title : result.content).length === 0 ? 0 : result.source === "message" || ("matchType" in result) && result.source !== "compartment" && result.matchType !== "semantic" ? keywordRelevance(trimmedQuery, result.content) : result.score
+    }));
+  }
   return results;
 }
 var SEARCH_NOTE_EXPAND_HINT = "Use ctx_expand(start=N-10, end=N) around any note @msg anchor above to read the surrounding conversation context.";
@@ -3266,4 +3226,4 @@ ${bodyParts.join(`
 `)}`;
 }
 
-export { renderSingleStoreMigrationRequiredRefusal, SingleStoreMigrationRequiredError, singleStoreMigrationRequiredFailure, projectNeedsSingleStoreMigration, STORE_AHEAD_OF_BINARY_CODE, storeAheadOfBinaryFailure, TRANSFORM_PAGE_UPLOAD_TIMEOUT_MS, transformColdStartExecuteTimeoutMs, MAX_WRAPUP_REQUEST_BUDGET_MS, getDefaultSubcConnectionFile, isModuleTransportGenerationChangedResult, SubcModuleTransport, indexCommitsForProject, embedUnembeddedCommits, withMessageFtsSessionFilter, createUnifiedSearchDiagnostics2, searchMessageHistory2, parseIdShapedQuery2, resolveMemoriesByIdsForSearch2, unifiedSearch2, formatSearchResults2 };
+export { renderSingleStoreMigrationRequiredRefusal, SingleStoreMigrationRequiredError, singleStoreMigrationRequiredFailure, projectNeedsSingleStoreMigration, STORE_AHEAD_OF_BINARY_CODE, storeAheadOfBinaryFailure, TRANSFORM_PAGE_UPLOAD_TIMEOUT_MS, transformColdStartExecuteTimeoutMs, MAX_WRAPUP_REQUEST_BUDGET_MS, getDefaultSubcConnectionFile, isModuleTransportGenerationChangedResult, SubcModuleTransport, indexCommitsForProject, embedUnembeddedCommits, createUnifiedSearchDiagnostics2, searchMessageHistory2, parseIdShapedQuery2, resolveMemoriesByIdsForSearch2, unifiedSearch2, formatSearchResults2 };

package/dist/{index-1sarmj9z.js → index-wgypt3cs.js}

@@ -5517,18 +5517,18 @@ var OmpEntryObjectSchema = object({
 }).strict();
 var OmpEntrySchema = union([string(), OmpEntryObjectSchema]);
 var OpenCodeHarnessBlockSchema = object({
-  model: OcEntrySchema.optional().describe("Primary OpenCode model entry."),
-  fallback_models: array(OcEntrySchema).optional().describe("Ordered fallback OpenCode entries. New-shape configuration requires an array; legacy singleton values migrate to a one-element array."),
+  model: OcEntrySchema.optional().describe("Primary historian OpenCode model entry. When set, only this model and fallback_models are used; exhaustion reports failure, never the session model. When absent, OpenCode inherits the session model."),
+  fallback_models: array(OcEntrySchema).optional().describe("Ordered historian fallback OpenCode entries. A configured primary never adds the session model after this list. Requires an array; legacy singleton values migrate to a one-element array."),
   variant: string().optional().describe("OpenCode reasoning variant for the primary entry when it declares none. Fallback entries declare variants per-entry.")
 }).strict().describe("Strict OpenCode model-resolution block. It accepts no Pi vocabulary.");
 var PiHarnessBlockSchema = object({
-  model: PiEntrySchema.optional().describe("Primary Pi model entry."),
-  fallback_models: array(PiEntrySchema).optional().describe("Ordered fallback Pi entries. New-shape configuration requires an array; legacy singleton values migrate to a one-element array."),
+  model: PiEntrySchema.optional().describe("Primary historian Pi model entry. When set, only this model and fallback_models are used; exhaustion reports failure, never the session model. When absent, Pi does not run the historian."),
+  fallback_models: array(PiEntrySchema).optional().describe("Ordered historian fallback Pi entries. The session model is never appended. Requires an array; legacy singleton values migrate to a one-element array."),
   thinking_level: PiThinkingLevelSchema.describe("Pi thinking level for the primary entry when it declares none. Fallback entries declare thinking levels per-entry.")
 }).strict().describe("Strict Pi model-resolution block. It accepts no OpenCode vocabulary.");
 var OmpHarnessBlockSchema = object({
-  model: OmpEntrySchema.optional().describe("Primary OMP model entry."),
-  fallback_models: array(OmpEntrySchema).optional().describe("Ordered fallback OMP entries."),
+  model: OmpEntrySchema.optional().describe("Primary historian OMP model entry. When set, only this model and fallback_models are used; exhaustion reports failure, never the session model. An absent OMP block inherits the Pi block; a selected block without a model does not run the historian."),
+  fallback_models: array(OmpEntrySchema).optional().describe("Ordered historian fallback OMP entries. The session model is never appended."),
   thinking_level: OmpThinkingLevelSchema.describe("OMP thinking level for the primary entry when it declares none. Fallback entries declare thinking levels per-entry.")
 }).strict().describe("Strict OMP model-resolution block. It accepts no OpenCode vocabulary.");
 var OpenCodeTaskExecutionSchema = object({