@cortexkit/opencode-magic-context 0.46.1 → 0.47.0

package/dist/index-92bp57hg.js

@@ -0,0 +1,2063 @@
+import {
+  log
+} from "./index-hybnrwq0.js";
+import {
+  resolveWorkspaceShareCategories,
+  resolveWorkspaceIdentitySet,
+  expandWorkspaceIdentitySetWithAliases,
+  resolveStoredPathWorkspaceIdentity,
+  sourceNameForMemory
+} from "./index-x3kwrmqk.js";
+import {
+  loadCompartmentChunkEmbeddingsForSearch,
+  getIndexedMessageCorpusSize,
+  recordEmbeddingMeasurement,
+  getNotes,
+  getActivePrimers,
+  cosineSimilarity,
+  saveCommitEmbedding,
+  loadProjectCommitEmbeddings,
+  loadUnembeddedCommits,
+  countEmbeddedCommits,
+  upsertCommits,
+  getLatestIndexedCommitSha,
+  enforceProjectCap,
+  getProjectEmbeddings,
+  contentSha256,
+  getShadowEmbeddingMeasurementCohort,
+  getPrimaryEmbeddingMeasurementCohort,
+  embedShadowTextForProject,
+  enqueueShadowEmbeddingItems,
+  getProjectEmbeddingSnapshot,
+  embedItemsForProject,
+  isEmbeddingEnabled,
+  embedText,
+  ensureMemoryEmbeddings,
+  ModuleMemoryAuthorityError,
+  getMemoriesByProject,
+  getMemoriesByProjects,
+  updateMemoryRetrievalCount,
+  relaxedFtsQuery,
+  sanitizeFtsQuery,
+  searchMemoriesFTS,
+  searchMemoriesFTSUnion
+} from "./index-fnn5pjtt.js";
+import {
+  isKnownAutocommit
+} from "./index-b35pxds2.js";
+
+// src/features/magic-context/git-commits/git-log-reader.ts
+import { execFile } from "node:child_process";
+import { promisify } from "node:util";
+var execFileAsync = promisify(execFile);
+var GIT_TIMEOUT_MS = 1e4;
+var DEFAULT_MAX_COMMITS = 5000;
+var RECORD_SEPARATOR = "\x1E";
+var FIELD_SEPARATOR = "\x1F";
+var FULL_OBJECT_NAME = /^(?:[0-9a-f]{40}|[0-9a-f]{64})$/;
+function classifyGitLogFailure(message) {
+  if (message.includes("not a git repository"))
+    return "not_a_repo";
+  if (message.includes("unknown revision or path not in the working tree") || message.includes("does not have any commits yet") || message.includes("bad revision")) {
+    return "no_head";
+  }
+  return "transient";
+}
+async function readGitCommitsResult(directory, options = {}) {
+  const revision = options.branch ?? "HEAD";
+  if (revision.startsWith("-")) {
+    throw new Error(`readGitCommits: refusing revision that looks like an option: "${revision}"`);
+  }
+  const projectLabel = options.projectIdentity ?? "<project>";
+  const exclusion = options.excludeReachableFrom && FULL_OBJECT_NAME.test(options.excludeReachableFrom) ? options.excludeReachableFrom : null;
+  const args = [
+    "log",
+    revision,
+    ...exclusion ? [`^${exclusion}`] : [],
+    "--no-merges",
+    `--max-count=${options.maxCommits ?? DEFAULT_MAX_COMMITS}`,
+    `--format=%H${FIELD_SEPARATOR}%s${FIELD_SEPARATOR}%ae${FIELD_SEPARATOR}%ct${FIELD_SEPARATOR}%b${RECORD_SEPARATOR}`
+  ];
+  if (options.sinceMs !== undefined && options.sinceMs > 0) {
+    const iso = new Date(options.sinceMs).toISOString();
+    args.push(`--since=${iso}`);
+  }
+  args.push("--");
+  let stdout;
+  try {
+    const result = await execFileAsync("git", args, {
+      windowsHide: true,
+      cwd: directory,
+      timeout: GIT_TIMEOUT_MS,
+      maxBuffer: 32 * 1024 * 1024,
+      encoding: "utf8"
+    });
+    stdout = result.stdout;
+  } catch (error) {
+    const message = error instanceof Error ? error.message : String(error);
+    if (exclusion && message.includes("bad object")) {
+      log(`[git-commits] indexed tip ${exclusion.slice(0, 7)} is missing for ${projectLabel}; reading the full window`);
+      return readGitCommitsResult(directory, { ...options, excludeReachableFrom: undefined });
+    }
+    const failure = classifyGitLogFailure(message);
+    if (failure === "transient") {
+      log(`[git-commits] readGitCommits failed for ${projectLabel}: ${message.slice(0, 500)}`);
+    } else {
+      log(`[git-commits] ${projectLabel} is not indexable (${failure})`);
+    }
+    return { commits: [], failure };
+  }
+  if (stdout.trim().length === 0) {
+    log(`[git-commits] readGitCommits returned empty stdout for ${projectLabel} (sinceMs=${options.sinceMs ?? "none"} args=${args.slice(0, 4).join(" ")})`);
+  }
+  return { commits: parseGitLogOutput(stdout), failure: null };
+}
+function parseGitLogOutput(stdout) {
+  const commits = [];
+  const records = stdout.split(RECORD_SEPARATOR);
+  for (const rawRecord of records) {
+    const record = rawRecord.replace(/^\s+/, "");
+    if (!record)
+      continue;
+    const fields = [];
+    let remaining = record;
+    for (let i = 0;i < 4; i++) {
+      const idx = remaining.indexOf(FIELD_SEPARATOR);
+      if (idx < 0)
+        break;
+      fields.push(remaining.slice(0, idx));
+      remaining = remaining.slice(idx + FIELD_SEPARATOR.length);
+    }
+    fields.push(remaining);
+    if (fields.length < 5)
+      continue;
+    const sha = fields[0].trim();
+    const subject = fields[1].trim();
+    const author = fields[2].trim();
+    const timeSec = Number.parseInt(fields[3].trim(), 10);
+    const body = fields[4].trim();
+    if (!FULL_OBJECT_NAME.test(sha) || !Number.isFinite(timeSec) || timeSec <= 0) {
+      continue;
+    }
+    const message = body.length > 0 ? `${subject}
+
+${body}` : subject;
+    commits.push({
+      sha,
+      shortSha: sha.slice(0, 7),
+      message,
+      author: author.length > 0 ? author : null,
+      committedAtMs: timeSec * 1000
+    });
+  }
+  return commits;
+}
+// src/features/magic-context/git-commits/indexer.ts
+var MS_PER_DAY = 24 * 60 * 60 * 1000;
+var EMBED_BATCH_SIZE = 16;
+var EMBED_MAX_PER_SWEEP = 500;
+var EMBED_SWEEP_MAX_WALL_CLOCK_MS = 5 * 60 * 1000;
+var indexInProgress = new Set;
+var embedInProgress = new Set;
+async function indexCommitsForProject(db, projectPath, directory, options) {
+  const result = {
+    scanned: 0,
+    inserted: 0,
+    updated: 0,
+    evicted: 0,
+    embedded: 0,
+    nonIndexable: false
+  };
+  if (indexInProgress.has(projectPath)) {
+    log(`[git-commits] index already in progress for ${projectPath}, skipping`);
+    return result;
+  }
+  indexInProgress.add(projectPath);
+  try {
+    const latestIndexed = getLatestIndexedCommitSha(db, projectPath);
+    const sinceMs = Date.now() - options.sinceDays * MS_PER_DAY;
+    const read = await readGitCommitsResult(directory, {
+      sinceMs,
+      maxCommits: options.maxCommits,
+      projectIdentity: projectPath,
+      excludeReachableFrom: latestIndexed ?? undefined
+    });
+    const commits = read.commits;
+    result.scanned = commits.length;
+    if (read.failure === "not_a_repo" || read.failure === "no_head") {
+      result.nonIndexable = true;
+      return result;
+    }
+    if (commits.length === 0) {
+      result.evicted = enforceProjectCap(db, projectPath, options.maxCommits);
+      log(`[git-commits] no new commits for ${projectPath} (sinceMs=${sinceMs} latestIndexed=${latestIndexed?.slice(0, 7) ?? "none"} evicted=${result.evicted})`);
+      return result;
+    }
+    log(`[git-commits] read ${commits.length} commits for ${projectPath} (sinceMs=${sinceMs} latestIndexed=${latestIndexed?.slice(0, 7) ?? "none"})`);
+    const upsert = upsertCommits(db, projectPath, commits);
+    result.inserted = upsert.inserted;
+    result.updated = upsert.updated;
+    result.evicted = enforceProjectCap(db, projectPath, options.maxCommits);
+    const snapshot = getProjectEmbeddingSnapshot(projectPath);
+    if (options.skipEmbed || !snapshot?.gitCommitEnabled) {
+      log(`[git-commits] indexed ${projectPath}: scanned=${result.scanned} inserted=${result.inserted} updated=${result.updated} evicted=${result.evicted} embedded=0 (embedding skipped: skipEmbed=${options.skipEmbed === true} gitCommitEnabled=${snapshot?.gitCommitEnabled === true})`);
+      return result;
+    }
+    result.embedded = await embedUnembeddedCommits(db, projectPath);
+    log(`[git-commits] indexed ${projectPath}: scanned=${result.scanned} inserted=${result.inserted} updated=${result.updated} evicted=${result.evicted} embedded=${result.embedded}`);
+    return result;
+  } finally {
+    indexInProgress.delete(projectPath);
+  }
+}
+async function embedUnembeddedCommits(db, projectPath) {
+  if (embedInProgress.has(projectPath)) {
+    return 0;
+  }
+  const snapshot = getProjectEmbeddingSnapshot(projectPath);
+  if (!snapshot?.gitCommitEnabled) {
+    return 0;
+  }
+  embedInProgress.add(projectPath);
+  const startedAt = Date.now();
+  const deadline = startedAt + EMBED_SWEEP_MAX_WALL_CLOCK_MS;
+  let total = 0;
+  try {
+    while (Date.now() < deadline && total < EMBED_MAX_PER_SWEEP) {
+      const rows = loadUnembeddedCommits(db, projectPath, snapshot.modelId, EMBED_BATCH_SIZE);
+      if (rows.length === 0)
+        break;
+      let embeddedThisBatch = 0;
+      try {
+        const result = await embedItemsForProject(projectPath, rows.map((row) => ({
+          id: `commit:${row.sha}`,
+          text: row.message,
+          contentSha256: contentSha256(row.message)
+        })), undefined, db, projectPath);
+        if (!result)
+          break;
+        db.transaction(() => {
+          for (const row of rows) {
+            const embedding = result.vectors.get(`commit:${row.sha}`);
+            if (!embedding)
+              continue;
+            saveCommitEmbedding(db, row.sha, embedding, result.modelId);
+            embeddedThisBatch += 1;
+          }
+        }).immediate();
+        enqueueShadowEmbeddingItems(projectPath, "commit", rows.filter((row) => result.vectors.has(`commit:${row.sha}`)).map((row) => row.sha));
+      } catch (error) {
+        log(`[git-commits] embed batch failed for ${projectPath}: ${error instanceof Error ? error.message : String(error)}`);
+        break;
+      }
+      if (embeddedThisBatch === 0)
+        break;
+      total += embeddedThisBatch;
+      if (embeddedThisBatch < rows.length)
+        break;
+    }
+    if (total > 0) {
+      const totalEmbedded = countEmbeddedCommits(db, projectPath, snapshot.modelId);
+      log(`[git-commits] embedded ${total} commits for ${projectPath} (total embedded: ${totalEmbedded})`);
+    }
+    return total;
+  } finally {
+    embedInProgress.delete(projectPath);
+  }
+}
+// src/features/magic-context/git-commits/search-git-commits.ts
+var ftsStatements = new WeakMap;
+var datedFtsStatements = new WeakMap;
+var ftsPlainStatements = new WeakMap;
+var datedFtsPlainStatements = new WeakMap;
+var getBySHAsStatements = new WeakMap;
+var datedGetBySHAsStatements = new WeakMap;
+var embeddingCache = new WeakMap;
+function getSearchEmbeddings(db, projectPath, modelId) {
+  if (!isKnownAutocommit(db)) {
+    embeddingCache.delete(db);
+    return loadProjectCommitEmbeddings(db, projectPath, modelId);
+  }
+  let cache = embeddingCache.get(db);
+  if (!cache) {
+    cache = {
+      revisionStatement: db.prepare(`SELECT total_changes() AS writes,
+                (SELECT data_version FROM pragma_data_version) AS dataVersion,
+                (SELECT schema_version FROM pragma_schema_version) AS schemaVersion`),
+      revision: "",
+      entries: new Map
+    };
+    embeddingCache.set(db, cache);
+  }
+  const revision = JSON.stringify(cache.revisionStatement.get());
+  if (revision !== cache.revision) {
+    cache.entries.clear();
+    cache.revision = revision;
+  }
+  const key = JSON.stringify([projectPath, modelId]);
+  const cached = cache.entries.get(key);
+  if (cached) {
+    cache.entries.delete(key);
+    cache.entries.set(key, cached);
+    return cached;
+  }
+  const vectors = loadProjectCommitEmbeddings(db, projectPath, modelId);
+  const size = (entries) => [...entries.values()].reduce((sum, vector) => sum + vector.byteLength, 0);
+  if (size(vectors) <= 32 * 1024 * 1024)
+    cache.entries.set(key, vectors);
+  while (cache.entries.size > 16 || [...cache.entries.values()].reduce((sum, entry) => sum + size(entry), 0) > 32 * 1024 * 1024) {
+    const oldest = cache.entries.keys().next().value;
+    if (oldest === undefined)
+      break;
+    cache.entries.delete(oldest);
+  }
+  return vectors;
+}
+function rowToCommit(row) {
+  return {
+    sha: row.sha,
+    shortSha: row.short_sha,
+    projectPath: row.project_path,
+    message: row.message,
+    author: row.author,
+    committedAtMs: row.committed_at,
+    indexedAtMs: row.indexed_at
+  };
+}
+function getFtsStatement(db, dated = false) {
+  const statements = dated ? datedFtsStatements : ftsStatements;
+  let stmt = statements.get(db);
+  if (!stmt) {
+    stmt = db.prepare(`SELECT c.sha AS sha, c.project_path AS project_path, c.short_sha AS short_sha,
+                    c.message AS message, c.author AS author,
+                    c.committed_at AS committed_at, c.indexed_at AS indexed_at
+             FROM git_commits_fts
+             INNER JOIN git_commits c ON c.sha = git_commits_fts.sha
+             WHERE c.project_path = ?
+               ${dated ? "AND c.committed_at BETWEEN ? AND ?" : ""}
+               AND git_commits_fts MATCH ?
+             ORDER BY bm25(git_commits_fts) LIMIT ?`);
+    statements.set(db, stmt);
+  }
+  return stmt;
+}
+function escapeLikePattern(text) {
+  return text.replace(/[\\%_]/g, (char) => `\\${char}`);
+}
+function getLikeFallbackStatement(db, dated = false) {
+  const statements = dated ? datedFtsPlainStatements : ftsPlainStatements;
+  let stmt = statements.get(db);
+  if (!stmt) {
+    stmt = db.prepare(`SELECT sha, project_path, short_sha, message, author, committed_at, indexed_at
+             FROM git_commits
+             WHERE project_path = ?
+               ${dated ? "AND committed_at BETWEEN ? AND ?" : ""}
+               AND lower(message) LIKE '%' || lower(?) || '%' ESCAPE '\\'
+             ORDER BY committed_at DESC LIMIT ?`);
+    statements.set(db, stmt);
+  }
+  return stmt;
+}
+function getBySHAsStatement(db, dated = false) {
+  const statements = dated ? datedGetBySHAsStatements : getBySHAsStatements;
+  let stmt = statements.get(db);
+  if (!stmt) {
+    stmt = db.prepare(`SELECT sha, project_path, short_sha, message, author, committed_at, indexed_at
+               FROM git_commits
+               WHERE project_path = ?
+                 ${dated ? "AND committed_at BETWEEN ? AND ?" : ""}
+                 AND sha IN (SELECT value FROM json_each(?))`);
+    statements.set(db, stmt);
+  }
+  return stmt;
+}
+function clamp01(value) {
+  if (!Number.isFinite(value))
+    return 0;
+  return Math.min(1, Math.max(0, value));
+}
+function searchGitCommitsSync(db, projectPath, query, options) {
+  const trimmed = query.trim();
+  if (trimmed.length === 0 || options.limit <= 0)
+    return [];
+  const semanticWeight = options.semanticWeight ?? 0.7;
+  const ftsWeight = options.ftsWeight ?? 0.3;
+  const singleSourcePenalty = options.singleSourcePenalty ?? 0.8;
+  const fetchLimit = Math.max(options.limit * 3, 30);
+  const dated = options.from !== undefined || options.to !== undefined;
+  const from = options.from ?? Number.MIN_SAFE_INTEGER;
+  const to = options.to ?? Number.MAX_SAFE_INTEGER;
+  const ftsCandidates = [];
+  const sanitized = sanitizeFtsQuery(trimmed);
+  if (sanitized.length > 0) {
+    try {
+      for (const row of getFtsStatement(db, dated).all(projectPath, ...dated ? [from, to] : [], sanitized, fetchLimit)) {
+        ftsCandidates.push(rowToCommit(row));
+      }
+    } catch (error) {
+      log(`[git-commits] FTS query failed for "${trimmed}": ${error instanceof Error ? error.message : String(error)}`);
+    }
+  }
+  if (ftsCandidates.length === 0) {
+    for (const row of getLikeFallbackStatement(db, dated).all(projectPath, ...dated ? [from, to] : [], escapeLikePattern(trimmed), fetchLimit)) {
+      ftsCandidates.push(rowToCommit(row));
+    }
+  }
+  const ftsScores = new Map;
+  ftsCandidates.forEach((commit, rank) => {
+    ftsScores.set(commit.sha, 1 / (rank + 1));
+  });
+  const semanticScores = new Map;
+  if (options.queryEmbedding && options.queryModelId && options.queryModelId !== "off") {
+    const embeddings = getSearchEmbeddings(db, projectPath, options.queryModelId);
+    for (const [sha, embedding] of embeddings.entries()) {
+      const similarity = clamp01(cosineSimilarity(options.queryEmbedding, embedding));
+      if (similarity > 0) {
+        semanticScores.set(sha, similarity);
+      }
+    }
+  }
+  const bySha = new Map;
+  for (const commit of ftsCandidates)
+    bySha.set(commit.sha, commit);
+  const semanticOnlyShas = [...semanticScores.keys()].filter((sha) => !bySha.has(sha));
+  if (semanticOnlyShas.length > 0) {
+    const rows = getBySHAsStatement(db, dated).all(projectPath, ...dated ? [from, to] : [], JSON.stringify(semanticOnlyShas));
+    for (const row of rows)
+      bySha.set(row.sha, rowToCommit(row));
+  }
+  const results = [];
+  for (const [sha, commit] of bySha.entries()) {
+    const sem = semanticScores.get(sha);
+    const fts = ftsScores.get(sha);
+    let score = 0;
+    let matchType = "fts";
+    if (sem !== undefined && fts !== undefined) {
+      score = semanticWeight * sem + ftsWeight * fts;
+      matchType = "hybrid";
+    } else if (sem !== undefined) {
+      score = sem * singleSourcePenalty;
+      matchType = "semantic";
+    } else if (fts !== undefined) {
+      score = fts * singleSourcePenalty;
+      matchType = "fts";
+    }
+    if (score <= 0)
+      continue;
+    results.push({ commit, score, matchType });
+  }
+  results.sort((left, right) => {
+    if (right.score !== left.score)
+      return right.score - left.score;
+    return right.commit.committedAtMs - left.commit.committedAtMs;
+  });
+  return results.slice(0, options.limit);
+}
+// src/features/magic-context/literal-probes.ts
+var MAX_PROBES = 5;
+var MIN_PROBE_LENGTH = 3;
+var SLASH_COMMAND_RE = /\/[a-z][a-z0-9]*(?:-[a-z0-9]+)+/gi;
+var KEBAB_SNAKE_RE = /[a-z][a-z0-9]*(?:[-_][a-z0-9]+)+/gi;
+var DOTTED_RE = /[a-z0-9][a-z0-9_-]*(?:\.[a-z0-9_-]+)+/gi;
+var CAMEL_RE = /\b[a-zA-Z][a-z0-9]*(?:[A-Z][a-z0-9]*)+\b/g;
+var SHA_RE = /\b[0-9a-f]{7,40}\b/gi;
+var ERROR_CODE_RE = /\b(?:TS\d{4,}|ERR_[A-Z][A-Z0-9_]*)\b/g;
+var QUOTED_RE = /["`]([^"`]{3,80})["`]/g;
+function looksLikeSha(token) {
+  return /[0-9]/.test(token) && /^[0-9a-f]{7,40}$/i.test(token);
+}
+function extractLiteralProbes(query) {
+  const trimmed = query.trim();
+  if (trimmed.length === 0)
+    return [];
+  const ordered = [];
+  const seen = new Set;
+  const add = (raw) => {
+    if (!raw)
+      return;
+    const probe = raw.trim();
+    if (probe.length < MIN_PROBE_LENGTH)
+      return;
+    const key = probe.toLowerCase();
+    if (seen.has(key))
+      return;
+    seen.add(key);
+    ordered.push(probe);
+  };
+  for (const m of trimmed.matchAll(QUOTED_RE))
+    add(m[1]);
+  for (const m of trimmed.matchAll(SLASH_COMMAND_RE))
+    add(m[0]);
+  for (const m of trimmed.matchAll(ERROR_CODE_RE))
+    add(m[0]);
+  for (const m of trimmed.matchAll(DOTTED_RE))
+    add(m[0]);
+  for (const m of trimmed.matchAll(KEBAB_SNAKE_RE))
+    add(m[0]);
+  for (const m of trimmed.matchAll(CAMEL_RE))
+    add(m[0]);
+  for (const m of trimmed.matchAll(SHA_RE)) {
+    if (looksLikeSha(m[0]))
+      add(m[0]);
+  }
+  return ordered.slice(0, MAX_PROBES);
+}
+function containsProbeVerbatim(text, probes) {
+  if (probes.length === 0)
+    return false;
+  const haystack = text.toLowerCase();
+  return probes.some((probe) => haystack.includes(probe.toLowerCase()));
+}
+
+// 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/search-measurement.ts
+import { createHash } from "node:crypto";
+function resultId(result) {
+  switch (result.source) {
+    case "memory":
+      return `memory:${result.memoryId}`;
+    case "message":
+      return `message:${result.messageId}`;
+    case "compartment":
+      return `chunk:${result.compartmentId}`;
+    case "git_commit":
+      return `commit:${result.sha}`;
+    case "primer":
+      return `primer:${result.primerId}`;
+    case "note":
+      return `note:${result.noteId}`;
+  }
+}
+async function recordShadowMeasurement(args) {
+  try {
+    const shadowCohort = getShadowEmbeddingMeasurementCohort(args.projectPath);
+    if (!shadowCohort)
+      return;
+    const primaryCohort = getPrimaryEmbeddingMeasurementCohort(args.projectPath);
+    const shadowStartedAt = Date.now();
+    let shadowFailed = false;
+    let shadowResults = [];
+    try {
+      const vector = await embedShadowTextForProject(args.projectPath, args.query);
+      if (!vector) {
+        shadowFailed = true;
+      } else {
+        shadowResults = await args.search(args.db, args.sessionId, args.projectPath, args.query, {
+          ...args.options,
+          embedQuery: async () => vector,
+          isEmbeddingRuntimeEnabled: () => true,
+          embeddingEnabled: true,
+          embeddingModelIdOverride: shadowCohort.modelId,
+          chunkModelIdOverride: shadowCohort.chunkModelId,
+          measurementDisabled: true,
+          countRetrievals: false
+        });
+      }
+    } catch {
+      shadowFailed = true;
+    }
+    const primaryModelId = args.primaryQuery?.modelId ?? primaryCohort?.modelId ?? "";
+    const primaryFingerprint = primaryCohort?.fingerprint ?? "";
+    const primaryEpoch = primaryCohort?.epoch ?? 0;
+    const cohortKey = JSON.stringify({
+      primaryFingerprint,
+      primaryEpoch,
+      shadowFingerprint: shadowCohort.fingerprint,
+      shadowEpoch: shadowCohort.epoch
+    });
+    const primaryIds = args.primaryResults.map(resultId);
+    const shadowIds = shadowResults.map(resultId);
+    const corpusHash = sha256(JSON.stringify({ query: args.query, primaryIds, shadowIds }));
+    recordEmbeddingMeasurement(args.db, {
+      sessionId: args.sessionId,
+      projectPath: args.projectPath,
+      queryText: args.query,
+      cohortKey,
+      primaryResultIds: primaryIds,
+      shadowResultIds: shadowIds,
+      primaryLatencyMs: args.primaryLatencyMs,
+      shadowLatencyMs: Date.now() - shadowStartedAt,
+      primaryFailed: args.primaryQuery === null,
+      shadowFailed,
+      primaryModelId,
+      shadowModelId: shadowCohort.modelId,
+      primaryFingerprint,
+      shadowFingerprint: shadowCohort.fingerprint,
+      primaryEpoch,
+      shadowEpoch: shadowCohort.epoch,
+      corpusHash,
+      coverage: {
+        primaryResultCount: primaryIds.length,
+        shadowResultCount: shadowIds.length,
+        primaryAnswered: args.primaryQuery !== null,
+        shadowAnswered: !shadowFailed
+      }
+    });
+  } catch (error) {
+    log("[magic-context] shadow embedding measurement failed:", error);
+  }
+}
+function sha256(value) {
+  return createHash("sha256").update(value).digest("hex");
+}
+
+// src/features/magic-context/search.ts
+var DEFAULT_UNIFIED_SEARCH_LIMIT = 10;
+var MAX_UNIFIED_SEARCH_LIMIT = 25;
+var FTS_SEMANTIC_CANDIDATE_LIMIT = 50;
+var SEMANTIC_WEIGHT = 0.7;
+var FTS_WEIGHT = 0.3;
+var SINGLE_SOURCE_PENALTY = 0.8;
+var RESULT_PREVIEW_LIMIT = 220;
+var MEMORY_SOURCE_BOOST = 1.3;
+var MESSAGE_SOURCE_BOOST = 1.275;
+var GIT_COMMIT_SOURCE_BOOST = 1.2;
+var PRIMER_SOURCE_BOOST = 1.25;
+var messageSearchStatements = new WeakMap;
+var sessionFirstMessageSearchStatements = new WeakMap;
+var messageSearchStatementsWithCutoff = new WeakMap;
+var sessionFirstMessageSearchStatementsWithCutoff = new WeakMap;
+var messageSearchStatementsWithDateRange = new WeakMap;
+var messageSearchDiagnosticStatements = new WeakMap;
+var sessionFirstMessageSearchDiagnosticStatements = new WeakMap;
+var messageSearchDiagnosticStatementsWithDateRange = new WeakMap;
+var batchedMessageSearchStatements = new WeakMap;
+var batchedFtsCountStatements = new WeakMap;
+function createUnifiedSearchDiagnostics() {
+  return {
+    suppressedVisibleMemoryIds: [],
+    suppressedLiveMessageMatches: 0,
+    gitCommitUnavailable: null
+  };
+}
+function normalizeLimit(limit) {
+  if (typeof limit !== "number" || !Number.isFinite(limit)) {
+    return DEFAULT_UNIFIED_SEARCH_LIMIT;
+  }
+  return Math.min(MAX_UNIFIED_SEARCH_LIMIT, Math.max(1, Math.floor(limit)));
+}
+function normalizeDateRange(from, to) {
+  if (from === undefined && to === undefined)
+    return null;
+  return {
+    from: typeof from === "number" && Number.isSafeInteger(from) ? from : Number.MIN_SAFE_INTEGER,
+    to: typeof to === "number" && Number.isSafeInteger(to) ? to : Number.MAX_SAFE_INTEGER
+  };
+}
+function timestampIsInRange(timestamp, range) {
+  return range === null || timestamp >= range.from && timestamp <= range.to;
+}
+var ID_SHAPED_QUERY_MAX_TOKENS = 5;
+var ID_SHAPED_TOKEN = /^#?\d+$/;
+function parseIdShapedQuery(query) {
+  const trimmed = query.trim();
+  if (trimmed.length === 0) {
+    return null;
+  }
+  const tokens = trimmed.split(/[\s,]+/).filter((token) => token.length > 0);
+  if (tokens.length === 0 || tokens.length > ID_SHAPED_QUERY_MAX_TOKENS) {
+    return null;
+  }
+  const ids = [];
+  for (const token of tokens) {
+    if (!ID_SHAPED_TOKEN.test(token)) {
+      return null;
+    }
+    const parsed = Number.parseInt(token.replace(/^#/, ""), 10);
+    if (!Number.isFinite(parsed) || parsed <= 0) {
+      return null;
+    }
+    ids.push(parsed);
+  }
+  return ids;
+}
+function normalizeCosineScore(score) {
+  if (!Number.isFinite(score)) {
+    return 0;
+  }
+  return Math.min(1, Math.max(0, score));
+}
+function previewText(text) {
+  const normalized = text.replace(/\s+/g, " ").trim();
+  if (normalized.length <= RESULT_PREVIEW_LIMIT) {
+    return normalized;
+  }
+  return `${normalized.slice(0, RESULT_PREVIEW_LIMIT - 1).trimEnd()}…`;
+}
+function resolveSearchWorkspaceContext(db, projectPath, identitySet) {
+  const resolved = identitySet ?? resolveWorkspaceIdentitySet(db, projectPath);
+  const isWorkspaced = resolved.identities.length > 1;
+  const expanded = expandWorkspaceIdentitySetWithAliases(db, resolved.identities);
+  const expandedIdentities = isWorkspaced ? expanded.expandedIdentities : resolved.identities;
+  const canonicalIdentityByStoredPath = isWorkspaced ? expanded.canonicalIdentityByStoredPath : new Map(resolved.identities.map((identity) => [identity, identity]));
+  const ownIdentities = expandedIdentities.filter((identity) => canonicalIdentityByStoredPath.get(identity) === projectPath);
+  return {
+    identities: resolved.identities,
+    expandedIdentities,
+    ownIdentities,
+    shareCategories: isWorkspaced ? resolveWorkspaceShareCategories(db, projectPath) : null,
+    namesByIdentity: resolved.namesByIdentity,
+    canonicalIdentityByStoredPath,
+    isWorkspaced
+  };
+}
+function memoryWorkspaceIdentity(memory, workspace) {
+  return resolveStoredPathWorkspaceIdentity(memory.projectPath, workspace.identities, workspace.canonicalIdentityByStoredPath);
+}
+function sourceNamesForSearchMemories(args) {
+  if (!args.workspace.isWorkspaced)
+    return;
+  const sourceNames = new Map;
+  for (const memory of args.memories) {
+    const source = sourceNameForMemory(memory.projectPath, args.projectPath, args.workspace.identities, args.workspace.namesByIdentity, args.workspace.canonicalIdentityByStoredPath);
+    if (source)
+      sourceNames.set(memory.id, source);
+  }
+  return sourceNames.size > 0 ? sourceNames : undefined;
+}
+function getMessageSearchStatement(db, sessionFirst) {
+  const statements = sessionFirst ? sessionFirstMessageSearchStatements : messageSearchStatements;
+  let stmt = statements.get(db);
+  if (!stmt) {
+    stmt = db.prepare(`SELECT message_ordinal AS messageOrdinal, message_id AS messageId, role, content FROM message_history_fts WHERE ${sessionFirst ? MESSAGE_FTS_SESSION_FILTER_SQL : ""}session_id = ?1 AND message_history_fts MATCH ? ORDER BY bm25(message_history_fts), CAST(message_ordinal AS INTEGER) ASC LIMIT ?`);
+    statements.set(db, stmt);
+  }
+  return stmt;
+}
+function getMessageSearchStatementWithCutoff(db, sessionFirst) {
+  const statements = sessionFirst ? sessionFirstMessageSearchStatementsWithCutoff : messageSearchStatementsWithCutoff;
+  let stmt = statements.get(db);
+  if (!stmt) {
+    stmt = db.prepare(`SELECT message_ordinal AS messageOrdinal, message_id AS messageId, role, content FROM message_history_fts WHERE ${sessionFirst ? MESSAGE_FTS_SESSION_FILTER_SQL : ""}session_id = ?1 AND message_history_fts MATCH ? AND CAST(message_ordinal AS INTEGER) <= ? ORDER BY bm25(message_history_fts), CAST(message_ordinal AS INTEGER) ASC LIMIT ?`);
+    statements.set(db, stmt);
+  }
+  return stmt;
+}
+function getMessageSearchStatementWithDateRange(db, withCutoff) {
+  let statements = messageSearchStatementsWithDateRange.get(db);
+  if (!statements) {
+    statements = new Map;
+    messageSearchStatementsWithDateRange.set(db, statements);
+  }
+  const key = withCutoff ? "cutoff" : "all";
+  let statement = statements.get(key);
+  if (!statement) {
+    statement = db.prepare(`SELECT message_history_fts.message_ordinal AS messageOrdinal,
+                    message_history_fts.message_id AS messageId,
+                    message_history_fts.role AS role,
+                    message_history_fts.content AS content
+               FROM message_history_fts
+               JOIN message_fts_rowid_map AS map
+                 ON map.session_id = message_history_fts.session_id
+                AND map.fts_rowid = message_history_fts.rowid
+              WHERE ${MESSAGE_FTS_SESSION_FILTER_SQL}message_history_fts.session_id = ?1
+                 AND message_history_fts MATCH ?
+                 AND map.message_time_ms BETWEEN ? AND ?
+                ${withCutoff ? "AND CAST(message_history_fts.message_ordinal AS INTEGER) <= ?" : ""}
+              ORDER BY bm25(message_history_fts),
+                       CAST(message_history_fts.message_ordinal AS INTEGER) ASC
+              LIMIT ?`);
+    statements.set(key, statement);
+  }
+  return statement;
+}
+function getMessageSearchDiagnosticStatement(db, sessionFirst) {
+  const statements = sessionFirst ? sessionFirstMessageSearchDiagnosticStatements : messageSearchDiagnosticStatements;
+  let stmt = statements.get(db);
+  if (!stmt) {
+    stmt = db.prepare(`
+            WITH matches AS MATERIALIZED (
+                SELECT
+                    message_ordinal AS messageOrdinal,
+                    message_id AS messageId,
+                    role,
+                    content,
+                    CAST(message_ordinal AS INTEGER) AS ordinalValue,
+                    bm25(message_history_fts) AS ftsRank
+                FROM message_history_fts
+                WHERE ${sessionFirst ? MESSAGE_FTS_SESSION_FILTER_SQL : ""}session_id = ?1 AND message_history_fts MATCH ?
+            ),
+            eligible AS (
+                SELECT * FROM matches
+                WHERE ordinalValue <= ?
+                ORDER BY ftsRank, ordinalValue ASC
+                LIMIT ?
+            ),
+            summary AS (
+                SELECT COUNT(*) AS suppressedCount
+                FROM matches
+                WHERE ordinalValue > ?
+            )
+            SELECT
+                eligible.messageOrdinal,
+                eligible.messageId,
+                eligible.role,
+                eligible.content,
+                eligible.ftsRank,
+                summary.suppressedCount,
+                0 AS summaryOnly
+            FROM eligible CROSS JOIN summary
+            UNION ALL
+            SELECT NULL, NULL, NULL, NULL, NULL, summary.suppressedCount, 1
+            FROM summary
+            WHERE NOT EXISTS (SELECT 1 FROM eligible)
+            ORDER BY summaryOnly ASC, ftsRank ASC, messageOrdinal ASC
+        `);
+    statements.set(db, stmt);
+  }
+  return stmt;
+}
+function getMessageSearchDiagnosticStatementWithDateRange(db) {
+  let statement = messageSearchDiagnosticStatementsWithDateRange.get(db);
+  if (!statement) {
+    statement = db.prepare(`
+            WITH matches AS MATERIALIZED (
+                SELECT
+                    message_history_fts.message_ordinal AS messageOrdinal,
+                    message_history_fts.message_id AS messageId,
+                    message_history_fts.role AS role,
+                    message_history_fts.content AS content,
+                    CAST(message_history_fts.message_ordinal AS INTEGER) AS ordinalValue,
+                    bm25(message_history_fts) AS ftsRank
+                FROM message_history_fts
+                JOIN message_fts_rowid_map AS map
+                  ON map.session_id = message_history_fts.session_id
+                 AND map.fts_rowid = message_history_fts.rowid
+                WHERE ${MESSAGE_FTS_SESSION_FILTER_SQL}message_history_fts.session_id = ?1
+                   AND message_history_fts MATCH ?
+                   AND map.message_time_ms BETWEEN ? AND ?
+            ),
+            eligible AS (
+                SELECT * FROM matches
+                WHERE ordinalValue <= ?
+                ORDER BY ftsRank, ordinalValue ASC
+                LIMIT ?
+            ),
+            summary AS (
+                SELECT COUNT(*) AS suppressedCount
+                FROM matches
+                WHERE ordinalValue > ?
+            )
+            SELECT
+                eligible.messageOrdinal,
+                eligible.messageId,
+                eligible.role,
+                eligible.content,
+                eligible.ftsRank,
+                summary.suppressedCount,
+                0 AS summaryOnly
+            FROM eligible CROSS JOIN summary
+            UNION ALL
+            SELECT NULL, NULL, NULL, NULL, NULL, summary.suppressedCount, 1
+            FROM summary
+            WHERE NOT EXISTS (SELECT 1 FROM eligible)
+            ORDER BY summaryOnly ASC, ftsRank ASC, messageOrdinal ASC
+        `);
+    messageSearchDiagnosticStatementsWithDateRange.set(db, statement);
+  }
+  return statement;
+}
+function getBatchedFtsCountStatement(db, queryCount, cutoff, dateRange, sessionFirst) {
+  let statements = batchedFtsCountStatements.get(db);
+  if (!statements) {
+    statements = new Map;
+    batchedFtsCountStatements.set(db, statements);
+  }
+  const key = `${queryCount}:${cutoff === null ? "all" : "cutoff"}:${dateRange === null ? "all-dates" : "dated"}:${sessionFirst}`;
+  let statement = statements.get(key);
+  if (!statement) {
+    const cutoffSql = cutoff === null ? "" : " AND CAST(message_history_fts.message_ordinal AS INTEGER) <= ?";
+    const joinSql = dateRange === null ? "" : ` JOIN message_fts_rowid_map AS map
+                         ON map.session_id = message_history_fts.session_id
+                        AND map.fts_rowid = message_history_fts.rowid`;
+    const dateSql = dateRange === null ? "" : " AND map.message_time_ms BETWEEN ? AND ?";
+    statement = db.prepare(Array.from({ length: queryCount }, (_, index) => `SELECT ${index} AS queryIndex, COUNT(*) AS count
+                       FROM message_history_fts${joinSql}
+                      WHERE ${sessionFirst || dateRange !== null ? MESSAGE_FTS_SESSION_FILTER_SQL : ""}message_history_fts.session_id = ${index === 0 ? "?1" : "?"}
+                         AND message_history_fts MATCH ?${dateSql}${cutoffSql}`).join(`
+UNION ALL
+`));
+    statements.set(key, statement);
+  }
+  return statement;
+}
+function contentOnlyMessageQuery(ftsQuery) {
+  return ftsQuery.length === 0 ? "" : `content : (${ftsQuery})`;
+}
+function countSessionFtsMatchesBatch(db, sessionId, ftsQueries, cutoff, dateRange, sessionFirst) {
+  if (ftsQueries.length === 0)
+    return [];
+  const bindings = [];
+  for (const query of ftsQueries) {
+    bindings.push(sessionId, contentOnlyMessageQuery(query));
+    if (dateRange !== null)
+      bindings.push(dateRange.from, dateRange.to);
+    if (cutoff !== null)
+      bindings.push(cutoff);
+  }
+  try {
+    const rows = getBatchedFtsCountStatement(db, ftsQueries.length, cutoff, dateRange, sessionFirst).all(...bindings);
+    const counts = Array.from({ length: ftsQueries.length }, () => 0);
+    for (const row of rows) {
+      if (typeof row.queryIndex === "number" && row.queryIndex >= 0 && row.queryIndex < counts.length && typeof row.count === "number") {
+        counts[row.queryIndex] = row.count;
+      }
+    }
+    return counts;
+  } catch {
+    return Array.from({ length: ftsQueries.length }, () => 0);
+  }
+}
+function getMessageOrdinal(value) {
+  if (typeof value === "number" && Number.isFinite(value)) {
+    return value;
+  }
+  if (typeof value === "string" && value.trim().length > 0) {
+    const parsed = Number.parseInt(value, 10);
+    return Number.isFinite(parsed) ? parsed : null;
+  }
+  return null;
+}
+async function getSemanticScores(args) {
+  const semanticScores = new Map;
+  if (!args.queryEmbedding || args.memories.length === 0 || !args.queryModelId || args.queryModelId === "off") {
+    return semanticScores;
+  }
+  if (!args.workspace?.isWorkspaced) {
+    const cachedEmbeddings = getProjectEmbeddings(args.db, args.projectPath, args.queryModelId);
+    const embeddings = args.backfillMemoryEmbeddings === false ? cachedEmbeddings : await ensureMemoryEmbeddings({
+      db: args.db,
+      projectIdentity: args.projectPath,
+      memories: args.memories,
+      existingEmbeddings: cachedEmbeddings
+    });
+    for (const memory of args.memories) {
+      const memoryEmbedding = embeddings.get(memory.id);
+      if (!memoryEmbedding) {
+        continue;
+      }
+      semanticScores.set(memory.id, normalizeCosineScore(cosineSimilarity(args.queryEmbedding, memoryEmbedding.embedding)));
+    }
+    return semanticScores;
+  }
+  const workspace = args.workspace;
+  const memoriesByIdentity = new Map;
+  for (const memory of args.memories) {
+    const identity = memoryWorkspaceIdentity(memory, workspace);
+    if (!identity)
+      continue;
+    const list = memoriesByIdentity.get(identity) ?? [];
+    list.push(memory);
+    memoriesByIdentity.set(identity, list);
+  }
+  const ownMemories = memoriesByIdentity.get(args.projectPath) ?? [];
+  if (ownMemories.length > 0 && args.backfillMemoryEmbeddings !== false) {
+    const ownEmbeddings = getProjectEmbeddings(args.db, args.projectPath, args.queryModelId);
+    await ensureMemoryEmbeddings({
+      db: args.db,
+      projectIdentity: args.projectPath,
+      memories: ownMemories,
+      existingEmbeddings: ownEmbeddings
+    });
+  }
+  for (const identity of workspace.identities) {
+    const memberMemories = memoriesByIdentity.get(identity) ?? [];
+    if (memberMemories.length === 0)
+      continue;
+    const cachedEmbeddings = getProjectEmbeddings(args.db, identity, args.queryModelId);
+    for (const memory of memberMemories) {
+      const memoryEmbedding = cachedEmbeddings.get(memory.id);
+      if (!memoryEmbedding || memoryEmbedding.modelId !== args.queryModelId)
+        continue;
+      semanticScores.set(memory.id, normalizeCosineScore(cosineSimilarity(args.queryEmbedding, memoryEmbedding.embedding)));
+    }
+  }
+  return semanticScores;
+}
+function getFtsMatches(args) {
+  try {
+    return args.workspace?.isWorkspaced ? searchMemoriesFTSUnion(args.db, args.workspace.expandedIdentities, args.query, args.limit, args.workspace.ownIdentities, args.workspace.shareCategories, args.dateRange) : searchMemoriesFTS(args.db, args.projectPath, args.query, args.limit, args.dateRange);
+  } catch (error) {
+    log(`[search] FTS query failed for "${args.query}": ${error instanceof Error ? error.message : String(error)}`);
+    return [];
+  }
+}
+function getFtsScores(matches) {
+  return new Map(matches.map((memory, rank) => [memory.id, 1 / (rank + 1)]));
+}
+function selectSemanticCandidates(args) {
+  if (args.ftsMatches.length === 0) {
+    return args.memories;
+  }
+  const candidateIds = new Set(args.ftsMatches.map((memory) => memory.id));
+  if (args.queryModelId && args.queryModelId !== "off") {
+    const embeddingProjects = args.workspace?.isWorkspaced ? args.workspace.identities : [args.projectPath];
+    for (const projectPath of embeddingProjects) {
+      const storedEmbeddings = getProjectEmbeddings(args.db, projectPath, args.queryModelId);
+      for (const memoryId of storedEmbeddings.keys()) {
+        candidateIds.add(memoryId);
+      }
+    }
+  }
+  return args.memories.filter((memory) => candidateIds.has(memory.id));
+}
+function mergeMemoryResults(args) {
+  const memoryById = new Map(args.memories.map((memory) => [memory.id, memory]));
+  const candidateIds = new Set([...args.semanticScores.keys(), ...args.ftsScores.keys()]);
+  const results = [];
+  const suppressedVisibleIds = [];
+  for (const id of candidateIds) {
+    const memory = memoryById.get(id);
+    if (!memory) {
+      continue;
+    }
+    const semanticScore = args.semanticScores.get(id);
+    const ftsScore = args.ftsScores.get(id);
+    let score = 0;
+    let matchType = "fts";
+    if (semanticScore !== undefined && ftsScore !== undefined) {
+      score = SEMANTIC_WEIGHT * semanticScore + FTS_WEIGHT * ftsScore;
+      matchType = "hybrid";
+    } else if (semanticScore !== undefined) {
+      score = semanticScore * SINGLE_SOURCE_PENALTY;
+      matchType = "semantic";
+    } else if (ftsScore !== undefined) {
+      score = ftsScore * SINGLE_SOURCE_PENALTY;
+      matchType = "fts";
+    }
+    if (score <= 0) {
+      continue;
+    }
+    if (args.visibleMemoryIds?.has(id)) {
+      suppressedVisibleIds.push(id);
+      continue;
+    }
+    results.push({
+      source: "memory",
+      content: previewText(memory.content),
+      score,
+      memoryId: memory.id,
+      category: memory.category,
+      matchType,
+      sourceName: args.sourceNameByMemoryId?.get(memory.id)
+    });
+  }
+  return {
+    results: results.sort((left, right) => {
+      if (right.score !== left.score) {
+        return right.score - left.score;
+      }
+      return left.memoryId - right.memoryId;
+    }).slice(0, args.limit),
+    suppressedVisibleIds: suppressedVisibleIds.sort((left, right) => left - right)
+  };
+}
+async function searchMemories(args) {
+  if (!args.memoryEnabled) {
+    return { results: [], suppressedVisibleIds: [] };
+  }
+  const unfilteredMemories = args.workspace?.isWorkspaced ? getMemoriesByProjects(args.db, args.workspace.expandedIdentities, ["active", "permanent"], Date.now(), args.workspace.ownIdentities, args.workspace.shareCategories) : getMemoriesByProject(args.db, args.projectPath);
+  const memories = unfilteredMemories.filter((memory) => timestampIsInRange(memory.createdAt, args.dateRange));
+  if (memories.length === 0) {
+    return { results: [], suppressedVisibleIds: [] };
+  }
+  const ftsMatches = getFtsMatches({
+    db: args.db,
+    projectPath: args.projectPath,
+    query: args.query,
+    limit: FTS_SEMANTIC_CANDIDATE_LIMIT,
+    workspace: args.workspace,
+    dateRange: args.dateRange
+  });
+  const ftsScores = getFtsScores(ftsMatches);
+  const semanticCandidates = selectSemanticCandidates({
+    db: args.db,
+    memories,
+    projectPath: args.projectPath,
+    ftsMatches,
+    queryModelId: args.queryModelId,
+    workspace: args.workspace
+  });
+  const semanticScores = await getSemanticScores({
+    db: args.db,
+    projectPath: args.projectPath,
+    memories: semanticCandidates,
+    backfillMemoryEmbeddings: args.backfillMemoryEmbeddings,
+    queryEmbedding: args.queryEmbedding,
+    queryModelId: args.queryModelId,
+    workspace: args.workspace
+  });
+  return mergeMemoryResults({
+    memories,
+    semanticScores,
+    ftsScores,
+    limit: args.limit,
+    visibleMemoryIds: args.visibleMemoryIds,
+    sourceNameByMemoryId: sourceNamesForSearchMemories({
+      memories,
+      projectPath: args.projectPath,
+      workspace: args.workspace ?? {
+        identities: [args.projectPath],
+        expandedIdentities: [args.projectPath],
+        namesByIdentity: new Map,
+        canonicalIdentityByStoredPath: new Map([[args.projectPath, args.projectPath]]),
+        ownIdentities: [args.projectPath],
+        shareCategories: null,
+        isWorkspaced: false
+      }
+    })
+  });
+}
+function linearDecayScore(rank, total) {
+  if (total <= 0)
+    return 0;
+  return Math.max(0, 1 - rank / total);
+}
+function normalizeMessageSearchRow(row, cutoff) {
+  const messageOrdinal = getMessageOrdinal(row.messageOrdinal);
+  if (messageOrdinal === null || typeof row.messageId !== "string" || typeof row.role !== "string" || typeof row.content !== "string") {
+    return null;
+  }
+  if (cutoff !== null && messageOrdinal > cutoff)
+    return null;
+  return {
+    messageOrdinal,
+    messageId: row.messageId,
+    role: row.role,
+    content: row.content
+  };
+}
+function runMessageFtsQuery(db, sessionId, ftsQuery, fetchLimit, cutoff, dateRange, sessionFirst) {
+  if (ftsQuery.length === 0)
+    return [];
+  let rawRows;
+  const matchQuery = contentOnlyMessageQuery(ftsQuery);
+  if (dateRange !== null) {
+    const bindings = [sessionId, matchQuery, dateRange.from, dateRange.to];
+    if (cutoff !== null)
+      bindings.push(cutoff);
+    bindings.push(fetchLimit);
+    rawRows = getMessageSearchStatementWithDateRange(db, cutoff !== null).all(...bindings);
+  } else {
+    rawRows = cutoff !== null ? getMessageSearchStatementWithCutoff(db, sessionFirst).all(sessionId, matchQuery, cutoff, fetchLimit) : getMessageSearchStatement(db, sessionFirst).all(sessionId, matchQuery, fetchLimit);
+  }
+  const rows = rawRows.map((row) => row);
+  const result = [];
+  for (const row of rows) {
+    const normalized = normalizeMessageSearchRow(row, cutoff);
+    if (normalized)
+      result.push(normalized);
+  }
+  return result;
+}
+function runMessageFtsQueryWithDiagnostics(args) {
+  if (args.ftsQuery.length === 0)
+    return { rows: [], suppressedCount: 0 };
+  const matchQuery = contentOnlyMessageQuery(args.ftsQuery);
+  const rawRows = (args.dateRange === null ? getMessageSearchDiagnosticStatement(args.db, args.sessionFirst).all(args.sessionId, matchQuery, args.cutoff, args.fetchLimit, args.cutoff) : getMessageSearchDiagnosticStatementWithDateRange(args.db).all(args.sessionId, matchQuery, args.dateRange.from, args.dateRange.to, args.cutoff, args.fetchLimit, args.cutoff)).map((row) => row);
+  const suppressedCount = rawRows[0]?.suppressedCount ?? 0;
+  const rows = [];
+  for (const row of rawRows) {
+    if (row.summaryOnly === 1)
+      continue;
+    const normalized = normalizeMessageSearchRow(row, args.cutoff);
+    if (normalized)
+      rows.push(normalized);
+  }
+  return { rows, suppressedCount };
+}
+function getBatchedMessageSearchStatement(db, queryCount, cutoff, dateRange, sessionFirst) {
+  let statements = batchedMessageSearchStatements.get(db);
+  if (!statements) {
+    statements = new Map;
+    batchedMessageSearchStatements.set(db, statements);
+  }
+  const key = `${queryCount}:${cutoff === null ? "all" : "cutoff"}:${dateRange === null ? "all-dates" : "dated"}:${sessionFirst}`;
+  let statement = statements.get(key);
+  if (!statement) {
+    const cutoffSql = cutoff === null ? "" : " AND CAST(message_history_fts.message_ordinal AS INTEGER) <= ?";
+    const joinSql = dateRange === null ? "" : ` JOIN message_fts_rowid_map AS map
+                         ON map.session_id = message_history_fts.session_id
+                        AND map.fts_rowid = message_history_fts.rowid`;
+    const dateSql = dateRange === null ? "" : " AND map.message_time_ms BETWEEN ? AND ?";
+    const branches = Array.from({ length: queryCount }, (_, index) => `SELECT * FROM (
+                SELECT ${index} AS queryIndex,
+                       message_history_fts.message_ordinal AS messageOrdinal,
+                       message_history_fts.message_id AS messageId,
+                       message_history_fts.role AS role,
+                       message_history_fts.content AS content,
+                       bm25(message_history_fts) AS ftsRank
+                  FROM message_history_fts${joinSql}
+                 WHERE ${sessionFirst || dateRange !== null ? MESSAGE_FTS_SESSION_FILTER_SQL : ""}message_history_fts.session_id = ${index === 0 ? "?1" : "?"}
+                    AND message_history_fts MATCH ?${dateSql}${cutoffSql}
+                 ORDER BY ftsRank
+                 LIMIT ?
+            )`);
+    statement = db.prepare(`${branches.join(`
+UNION ALL
+`)}
+ORDER BY queryIndex ASC, ftsRank ASC`);
+    statements.set(key, statement);
+  }
+  return statement;
+}
+function runMessageFtsQueriesBatch(db, sessionId, ftsQueries, fetchLimit, cutoff, dateRange, sessionFirst) {
+  if (ftsQueries.length === 0)
+    return [];
+  const bindings = [];
+  for (const query of ftsQueries) {
+    bindings.push(sessionId, contentOnlyMessageQuery(query));
+    if (dateRange !== null)
+      bindings.push(dateRange.from, dateRange.to);
+    if (cutoff !== null)
+      bindings.push(cutoff);
+    bindings.push(fetchLimit);
+  }
+  const rows = getBatchedMessageSearchStatement(db, ftsQueries.length, cutoff, dateRange, sessionFirst).all(...bindings);
+  const result = Array.from({ length: ftsQueries.length }, () => []);
+  for (const row of rows) {
+    if (typeof row.queryIndex !== "number" || row.queryIndex < 0 || row.queryIndex >= result.length) {
+      continue;
+    }
+    const normalized = normalizeMessageSearchRow(row, cutoff);
+    if (normalized)
+      result[row.queryIndex].push(normalized);
+  }
+  return result;
+}
+var RRF_K = 60;
+var VERBATIM_RANK_BONUS = 1 / RRF_K;
+var IDF_FALLOFF = 100;
+function probeDiscriminationWeight(df, corpusSize) {
+  if (corpusSize <= 0 || df <= 0)
+    return 1;
+  return 1 / (1 + IDF_FALLOFF * df / corpusSize);
+}
+function searchMessages(args) {
+  return withMessageFtsSessionFilter(args.db, args.sessionId, (sessionFirst) => searchMessagesInSnapshot(args, sessionFirst));
+}
+function searchMessagesInSnapshot(args, sessionFirst) {
+  const cutoff = args.maxOrdinal != null && args.maxOrdinal >= 0 ? args.maxOrdinal : null;
+  const fetchLimit = args.maxOrdinal != null && args.maxOrdinal >= 0 ? args.limit * 3 : args.limit;
+  const baseQuery = sanitizeFtsQuery(args.query.trim());
+  const probes = args.probes ?? [];
+  if (probes.length === 0) {
+    const outcome = args.diagnostics && cutoff !== null ? runMessageFtsQueryWithDiagnostics({
+      db: args.db,
+      sessionId: args.sessionId,
+      ftsQuery: baseQuery,
+      fetchLimit,
+      cutoff,
+      dateRange: args.dateRange,
+      sessionFirst
+    }) : {
+      rows: runMessageFtsQuery(args.db, args.sessionId, baseQuery, fetchLimit, cutoff, args.dateRange, sessionFirst),
+      suppressedCount: 0
+    };
+    if (args.diagnostics) {
+      args.diagnostics.suppressedLiveMessageMatches = outcome.suppressedCount;
+    }
+    const rows = outcome.rows.length > 0 || !args.relaxedRecall ? outcome.rows : runMessageFtsQuery(args.db, args.sessionId, relaxedFtsQuery(args.query), fetchLimit, cutoff, args.dateRange, sessionFirst);
+    const filtered = rows.slice(0, args.limit);
+    return filtered.map((row, rank) => ({
+      source: "message",
+      content: previewText(row.content),
+      score: linearDecayScore(rank, filtered.length),
+      messageOrdinal: row.messageOrdinal,
+      messageId: row.messageId,
+      role: row.role
+    }));
+  }
+  const sanitizedProbes = probes.map((probe) => ({ probe, query: sanitizeFtsQuery(probe) })).filter((entry) => entry.query.length > 0);
+  const corpusSize = getIndexedMessageCorpusSize(args.db, args.sessionId, cutoff);
+  const probeCounts = countSessionFtsMatchesBatch(args.db, args.sessionId, sanitizedProbes.map((entry) => entry.query), cutoff, args.dateRange, sessionFirst);
+  const collectBaseDiagnostics = args.diagnostics !== undefined && cutoff !== null;
+  const baseOutcome = collectBaseDiagnostics && baseQuery.length > 0 ? runMessageFtsQueryWithDiagnostics({
+    db: args.db,
+    sessionId: args.sessionId,
+    ftsQuery: baseQuery,
+    fetchLimit,
+    cutoff,
+    dateRange: args.dateRange,
+    sessionFirst
+  }) : null;
+  if (args.diagnostics) {
+    args.diagnostics.suppressedLiveMessageMatches = baseOutcome?.suppressedCount ?? 0;
+  }
+  const searchQueries = [
+    ...!collectBaseDiagnostics && baseQuery.length > 0 ? [baseQuery] : [],
+    ...sanitizedProbes.map((entry) => entry.query)
+  ];
+  const rowsByQuery = runMessageFtsQueriesBatch(args.db, args.sessionId, searchQueries, fetchLimit, cutoff, args.dateRange, sessionFirst);
+  const queryLists = [];
+  let queryIndex = 0;
+  if (baseQuery.length > 0) {
+    queryLists.push({
+      rows: baseOutcome?.rows ?? rowsByQuery[queryIndex] ?? [],
+      weight: 1
+    });
+    if (!collectBaseDiagnostics)
+      queryIndex += 1;
+  }
+  const probeWeights = new Map;
+  sanitizedProbes.forEach((entry, probeIndex) => {
+    const weight = probeDiscriminationWeight(probeCounts[probeIndex] ?? 0, corpusSize);
+    probeWeights.set(entry.probe, weight);
+    queryLists.push({ rows: rowsByQuery[queryIndex] ?? [], weight });
+    queryIndex += 1;
+  });
+  const fused = new Map;
+  for (const list of queryLists) {
+    list.rows.forEach((row, rank) => {
+      const rrf = list.weight / (RRF_K + rank);
+      const existing = fused.get(row.messageId);
+      if (existing) {
+        existing.score += rrf;
+      } else {
+        fused.set(row.messageId, { row, score: rrf });
+      }
+    });
+  }
+  for (const entry of fused.values()) {
+    let best = 0;
+    for (const probe of probes) {
+      const weight = probeWeights.get(probe) ?? 0;
+      if (weight > best && containsProbeVerbatim(entry.row.content, [probe])) {
+        best = weight;
+      }
+    }
+    if (best > 0) {
+      entry.score += best * VERBATIM_RANK_BONUS;
+    }
+  }
+  const ranked = [...fused.values()].sort((a, b) => b.score !== a.score ? b.score - a.score : a.row.messageOrdinal - b.row.messageOrdinal).slice(0, args.limit);
+  return ranked.map((entry, rank) => ({
+    source: "message",
+    content: previewText(entry.row.content),
+    score: linearDecayScore(rank, ranked.length),
+    messageOrdinal: entry.row.messageOrdinal,
+    messageId: entry.row.messageId,
+    role: entry.row.role
+  }));
+}
+var NOTE_SEARCHABLE_STATUSES = ["active", "pending", "ready"];
+var MAX_NOTE_KEYWORD_SCORE = 3.5;
+function noteSearchText(note) {
+  const reason = note.readyReason?.trim();
+  return reason ? `${note.content}
+Reason: ${reason}` : note.content;
+}
+function tokenizeKeywordNeedle(text) {
+  const matches = text.toLowerCase().match(/[a-z0-9/._:-]+/g) ?? [];
+  const seen = new Set;
+  const tokens = [];
+  for (const match of matches) {
+    if (match.length <= 1 || !/[a-z0-9]/.test(match) || seen.has(match)) {
+      continue;
+    }
+    seen.add(match);
+    tokens.push(match);
+  }
+  return tokens;
+}
+function normalizeNoteKeywordScore(score) {
+  return normalizeCosineScore(score / MAX_NOTE_KEYWORD_SCORE) * SINGLE_SOURCE_PENALTY;
+}
+function rankNotesForNeedle(notes, needle) {
+  const normalizedNeedle = needle.trim().toLowerCase();
+  if (normalizedNeedle.length === 0) {
+    return [];
+  }
+  const needleTokens = tokenizeKeywordNeedle(normalizedNeedle);
+  const ranked = [];
+  for (const note of notes) {
+    const text = noteSearchText(note);
+    const normalizedText = text.toLowerCase();
+    const noteTokens = new Set(tokenizeKeywordNeedle(normalizedText));
+    const exact = normalizedText.includes(normalizedNeedle);
+    const matchedTokens = needleTokens.filter((token) => noteTokens.has(token)).length;
+    if (!exact && matchedTokens === 0) {
+      continue;
+    }
+    const matchedUniqueTokens = new Set(needleTokens.filter((token) => noteTokens.has(token))).size;
+    const coverage = needleTokens.length > 0 ? matchedTokens / needleTokens.length : 0;
+    const density = noteTokens.size > 0 ? matchedUniqueTokens / noteTokens.size : 0;
+    const exactPhrase = exact && (needleTokens.length > 1 || normalizedText.trim() === normalizedNeedle);
+    const allTokens = needleTokens.length > 1 && matchedTokens === needleTokens.length;
+    const score = (exactPhrase ? 2 : 0) + coverage * density + (allTokens ? 0.5 * density : 0);
+    ranked.push({ note, score, text });
+  }
+  return ranked.sort((left, right) => {
+    if (right.score !== left.score) {
+      return right.score - left.score;
+    }
+    if (right.note.createdAt !== left.note.createdAt) {
+      return right.note.createdAt - left.note.createdAt;
+    }
+    return left.note.id - right.note.id;
+  });
+}
+function searchNotes(args) {
+  if (args.limit <= 0) {
+    return [];
+  }
+  const notes = [
+    ...getNotes(args.db, {
+      sessionId: args.sessionId,
+      type: "session",
+      status: NOTE_SEARCHABLE_STATUSES
+    }),
+    ...getNotes(args.db, {
+      projectPath: args.projectPath,
+      type: "smart",
+      status: NOTE_SEARCHABLE_STATUSES
+    })
+  ].filter((note) => timestampIsInRange(note.createdAt, args.dateRange));
+  if (notes.length === 0) {
+    return [];
+  }
+  const baseList = rankNotesForNeedle(notes, args.query);
+  const probes = args.probes ?? [];
+  if (probes.length === 0) {
+    const ranked = baseList.slice(0, args.limit);
+    return ranked.map((entry) => ({
+      source: "note",
+      content: previewText(entry.text),
+      score: normalizeNoteKeywordScore(entry.score),
+      noteId: entry.note.id,
+      status: entry.note.status,
+      createdAt: entry.note.createdAt,
+      anchorOrdinal: entry.note.anchorOrdinal,
+      sourceSessionId: entry.note.sessionId
+    }));
+  }
+  const queryLists = [];
+  if (baseList.length > 0) {
+    queryLists.push({ rows: baseList, weight: 1 });
+  }
+  for (const probe of probes) {
+    const rows = rankNotesForNeedle(notes, probe);
+    if (rows.length === 0) {
+      continue;
+    }
+    const weight = probeDiscriminationWeight(rows.length, notes.length);
+    queryLists.push({ rows, weight });
+  }
+  const fused = new Map;
+  for (const list of queryLists) {
+    for (const row of list.rows) {
+      const relevance = row.score * list.weight;
+      const existing = fused.get(row.note.id);
+      if (existing) {
+        if (relevance > existing.score) {
+          existing.entry = row;
+          existing.score = relevance;
+        }
+      } else {
+        fused.set(row.note.id, { entry: row, score: relevance });
+      }
+    }
+  }
+  const ranked = [...fused.values()].sort((left, right) => {
+    if (right.score !== left.score) {
+      return right.score - left.score;
+    }
+    if (right.entry.note.createdAt !== left.entry.note.createdAt) {
+      return right.entry.note.createdAt - left.entry.note.createdAt;
+    }
+    return left.entry.note.id - right.entry.note.id;
+  }).slice(0, args.limit);
+  return ranked.map((entry) => ({
+    source: "note",
+    content: previewText(entry.entry.text),
+    score: normalizeNoteKeywordScore(entry.score),
+    noteId: entry.entry.note.id,
+    status: entry.entry.note.status,
+    createdAt: entry.entry.note.createdAt,
+    anchorOrdinal: entry.entry.note.anchorOrdinal,
+    sourceSessionId: entry.entry.note.sessionId
+  }));
+}
+function searchCompartmentChunks(args) {
+  if (!args.queryEmbedding || args.limit <= 0 || !args.modelId || args.modelId === "off")
+    return [];
+  const cutoff = args.maxOrdinal != null && args.maxOrdinal >= 0 ? args.maxOrdinal : null;
+  const rows = loadCompartmentChunkEmbeddingsForSearch(args.db, args.sessionId, args.projectPath, args.modelId, args.dateRange);
+  if (rows.length === 0)
+    return [];
+  const byCompartment = new Map;
+  for (const row of rows) {
+    if (cutoff !== null && row.endOrdinal > cutoff) {
+      continue;
+    }
+    const score = normalizeCosineScore(cosineSimilarity(args.queryEmbedding, row.vector));
+    if (score <= 0)
+      continue;
+    const existing = byCompartment.get(row.compartmentId);
+    if (!existing || score > existing.score) {
+      byCompartment.set(row.compartmentId, { row, score });
+    }
+  }
+  return [...byCompartment.values()].sort((left, right) => right.score !== left.score ? right.score - left.score : left.row.startOrdinal - right.row.startOrdinal).slice(0, args.limit).map(({ row, score }) => ({
+    source: "compartment",
+    content: previewText(row.title),
+    score: score * SINGLE_SOURCE_PENALTY,
+    compartmentId: row.compartmentId,
+    sessionId: row.sessionId,
+    title: row.title,
+    startOrdinal: row.startOrdinal,
+    endOrdinal: row.endOrdinal,
+    matchType: "semantic"
+  }));
+}
+function mergeMessageAndCompartmentResults(args) {
+  if (args.compartments.length === 0)
+    return args.messages;
+  if (args.messages.length === 0)
+    return args.compartments;
+  const fused = new Map;
+  const add = (key, result, score, tieOrdinal) => {
+    const existing = fused.get(key);
+    if (existing) {
+      existing.score += score;
+      return existing;
+    }
+    const entry = { result, score, tieOrdinal, snippetScore: -1 };
+    fused.set(key, entry);
+    return entry;
+  };
+  args.compartments.forEach((compartment, rank) => {
+    add(`compartment:${compartment.compartmentId}`, compartment, 1 / (RRF_K + rank), compartment.startOrdinal);
+  });
+  for (const [rank, message] of args.messages.entries()) {
+    const containing = args.compartments.find((compartment) => message.messageOrdinal >= compartment.startOrdinal && message.messageOrdinal <= compartment.endOrdinal);
+    const contribution = 1 / (RRF_K + rank);
+    if (!containing) {
+      add(`message:${message.messageId}`, message, contribution, message.messageOrdinal);
+      continue;
+    }
+    const entry = add(`compartment:${containing.compartmentId}`, containing, contribution, containing.startOrdinal);
+    if (message.score > entry.snippetScore && entry.result.source === "compartment") {
+      entry.snippetScore = message.score;
+      entry.result = {
+        ...entry.result,
+        matchType: "hybrid",
+        snippet: message.content
+      };
+    }
+  }
+  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)
+  }));
+}
+function getSourceBoost(result) {
+  switch (result.source) {
+    case "memory":
+      return MEMORY_SOURCE_BOOST;
+    case "message":
+    case "compartment":
+      return MESSAGE_SOURCE_BOOST;
+    case "git_commit":
+      return GIT_COMMIT_SOURCE_BOOST;
+    case "primer":
+      return PRIMER_SOURCE_BOOST;
+    case "note":
+      return 1;
+  }
+}
+function compareUnifiedResults(left, right) {
+  const leftEffective = left.score * getSourceBoost(left);
+  const rightEffective = right.score * getSourceBoost(right);
+  if (rightEffective !== leftEffective) {
+    return rightEffective - leftEffective;
+  }
+  if (left.source === "memory" && right.source === "memory") {
+    return left.memoryId - right.memoryId;
+  }
+  if (left.source === "message" && right.source === "message") {
+    return left.messageOrdinal - right.messageOrdinal;
+  }
+  if (left.source === "compartment" && right.source === "compartment") {
+    return left.startOrdinal - right.startOrdinal;
+  }
+  if (left.source === "git_commit" && right.source === "git_commit") {
+    return right.committedAtMs - left.committedAtMs;
+  }
+  if (left.source === "primer" && right.source === "primer") {
+    return right.support - left.support || left.primerId - right.primerId;
+  }
+  if (left.source === "note" && right.source === "note") {
+    return right.createdAt - left.createdAt || left.noteId - right.noteId;
+  }
+  return 0;
+}
+function toGitCommitResult(hit) {
+  return {
+    source: "git_commit",
+    content: previewText(hit.commit.message),
+    score: hit.score,
+    sha: hit.commit.sha,
+    shortSha: hit.commit.shortSha,
+    author: hit.commit.author,
+    committedAtMs: hit.commit.committedAtMs,
+    matchType: hit.matchType
+  };
+}
+function searchGitCommits(args) {
+  if (args.limit <= 0)
+    return [];
+  const hits = searchGitCommitsSync(args.db, args.projectPath, args.query, {
+    limit: args.limit,
+    queryEmbedding: args.queryEmbedding,
+    queryModelId: args.queryModelId,
+    from: args.dateRange?.from,
+    to: args.dateRange?.to
+  });
+  return hits.map(toGitCommitResult);
+}
+function primerText(primer) {
+  const answer = primer.answer.trim();
+  return answer ? `Q: ${primer.question}
+A: ${answer}` : `Q: ${primer.question}`;
+}
+function searchPrimers(args) {
+  const primers = getActivePrimers(args.db, args.projectPath).filter((primer) => timestampIsInRange(primer.createdAt, args.dateRange));
+  if (primers.length === 0 || args.limit <= 0)
+    return [];
+  const ftsQuery = sanitizeFtsQuery(args.query);
+  const ftsRanks = new Map;
+  if (ftsQuery) {
+    const rows = args.db.prepare(`SELECT p.id AS id, bm25(primers_fts) AS rank
+                 FROM primers_fts
+                 JOIN primers p ON p.id = primers_fts.rowid
+                  WHERE primers_fts MATCH ? AND p.project_path = ? AND p.status = 'active'
+                    ${args.dateRange === null ? "" : "AND p.created_at BETWEEN ? AND ?"}
+                  ORDER BY rank ASC
+                  LIMIT ?`).all(ftsQuery, args.projectPath, ...args.dateRange === null ? [] : [args.dateRange.from, args.dateRange.to], args.limit * 3);
+    rows.forEach((row, index) => {
+      ftsRanks.set(row.id, linearDecayScore(index, rows.length));
+    });
+  }
+  const scored = primers.map((primer) => {
+    const semantic = args.queryEmbedding && primer.questionEmbedding && primer.questionEmbeddingModelId === args.queryModelId ? normalizeCosineScore(cosineSimilarity(args.queryEmbedding, primer.questionEmbedding)) : 0;
+    const fts = ftsRanks.get(primer.id) ?? 0;
+    if (semantic <= 0 && fts <= 0)
+      return null;
+    const score = semantic > 0 && fts > 0 ? semantic * SEMANTIC_WEIGHT + fts * FTS_WEIGHT : Math.max(semantic, fts);
+    return {
+      source: "primer",
+      content: previewText(primerText(primer)),
+      score,
+      primerId: primer.id,
+      question: primer.question,
+      support: primer.totalSupport,
+      lastObservedAt: primer.lastObservedAt,
+      matchType: semantic > 0 && fts > 0 ? "hybrid" : semantic > 0 ? "semantic" : "fts"
+    };
+  }).filter((result) => result !== null).sort((a, b) => b.score - a.score || b.support - a.support || a.primerId - b.primerId).slice(0, args.limit);
+  return scored;
+}
+function resolveSources(sources) {
+  if (sources === undefined) {
+    return new Set(["memory", "message", "git_commit", "primer", "note"]);
+  }
+  const set = new Set;
+  for (const source of sources) {
+    if (source === "memory" || source === "message" || source === "git_commit" || source === "primer" || source === "note") {
+      set.add(source);
+    }
+  }
+  return set;
+}
+function memoriesToIdLookupResults(args) {
+  const ordered = args.memories.slice(0, args.limit);
+  return ordered.map((memory, rank) => ({
+    source: "memory",
+    content: previewText(memory.content),
+    score: 1 - rank * 0.01,
+    memoryId: memory.id,
+    category: memory.category,
+    matchType: "fts",
+    sourceName: args.sourceNameByMemoryId?.get(memory.id)
+  }));
+}
+function resolveMemoriesByIdsForSearch(args) {
+  if (args.diagnostics) {
+    args.diagnostics.suppressedVisibleMemoryIds = [];
+  }
+  if (args.ids.length === 0) {
+    return null;
+  }
+  const workspace = resolveSearchWorkspaceContext(args.db, args.projectPath);
+  const fetched = workspace.isWorkspaced ? getMemoriesByProjects(args.db, workspace.expandedIdentities, ["active", "permanent", "archived"], Date.now(), workspace.ownIdentities, workspace.shareCategories) : getMemoriesByProject(args.db, args.projectPath, ["active", "permanent", "archived"]);
+  if (fetched.length === 0) {
+    return null;
+  }
+  const dateRange = normalizeDateRange(args.from, args.to);
+  const memoriesById = new Map(fetched.filter((memory) => timestampIsInRange(memory.createdAt, dateRange)).map((memory) => [memory.id, memory]));
+  const ordered = [];
+  const suppressedVisibleIds = new Set;
+  for (const id of args.ids) {
+    const memory = memoriesById.get(id);
+    if (!memory)
+      continue;
+    if (args.visibleMemoryIds?.has(id)) {
+      suppressedVisibleIds.add(id);
+      continue;
+    }
+    ordered.push(memory);
+    if (ordered.length >= args.limit)
+      break;
+  }
+  if (args.diagnostics) {
+    args.diagnostics.suppressedVisibleMemoryIds = [...suppressedVisibleIds].sort((left, right) => left - right);
+  }
+  if (ordered.length === 0) {
+    return null;
+  }
+  return memoriesToIdLookupResults({
+    memories: ordered,
+    limit: args.limit,
+    sourceNameByMemoryId: sourceNamesForSearchMemories({
+      memories: ordered,
+      projectPath: args.projectPath,
+      workspace
+    })
+  });
+}
+async function unifiedSearch(db, sessionId, projectPath, query, options = {}) {
+  const trimmedQuery = query.trim();
+  const measurementStartedAt = Date.now();
+  if (trimmedQuery.length === 0 || options.signal?.aborted) {
+    return [];
+  }
+  const limit = normalizeLimit(options.limit);
+  const dateRange = normalizeDateRange(options.from, options.to);
+  const tierLimit = Math.max(limit * 3, DEFAULT_UNIFIED_SEARCH_LIMIT);
+  if (options.diagnostics) {
+    options.diagnostics.suppressedVisibleMemoryIds = [];
+    options.diagnostics.suppressedLiveMessageMatches = 0;
+    options.diagnostics.gitCommitUnavailable = null;
+  }
+  const embeddingEnabled = options.embeddingEnabled ?? true;
+  const embedQuery = options.embedQuery ?? embedText;
+  const isEmbeddingRuntimeEnabled = options.isEmbeddingRuntimeEnabled ?? isEmbeddingEnabled;
+  const gitCommitsEnabled = options.gitCommitsEnabled ?? false;
+  const activeSources = resolveSources(options.sources);
+  const memoryFeatureEnabled = options.memoryEnabled ?? true;
+  const runMemory = activeSources.has("memory") && memoryFeatureEnabled;
+  const runMessages = activeSources.has("message");
+  const runGitCommits = activeSources.has("git_commit") && gitCommitsEnabled;
+  if (options.diagnostics && activeSources.has("git_commit") && options.gitRepositoryAvailable === false) {
+    options.diagnostics.gitCommitUnavailable = "no_git_repository";
+  }
+  const runPrimers = activeSources.has("primer") && memoryFeatureEnabled;
+  const runNotes = activeSources.has("note");
+  const runCompartmentChunks = runMessages && embeddingEnabled;
+  const needsEmbedding = (runMemory || runGitCommits || runCompartmentChunks || runPrimers) && embeddingEnabled && isEmbeddingRuntimeEnabled();
+  const queryEmbeddingPromise = needsEmbedding ? embedQuery(trimmedQuery, options.signal).catch((error) => {
+    log(`[search] query embedding failed: ${error instanceof Error ? error.message : String(error)}`);
+    return null;
+  }) : Promise.resolve(null);
+  await Promise.resolve();
+  if (options.signal?.aborted)
+    return [];
+  const messageProbes = options.explicitSearch ? extractLiteralProbes(trimmedQuery) : [];
+  const messageResults = runMessages ? searchMessages({
+    db,
+    sessionId,
+    query: trimmedQuery,
+    limit: tierLimit,
+    maxOrdinal: options.maxMessageOrdinal,
+    probes: messageProbes,
+    relaxedRecall: options.explicitSearch,
+    diagnostics: options.diagnostics,
+    dateRange
+  }) : [];
+  const capturedQuery = await queryEmbeddingPromise;
+  if (options.signal?.aborted)
+    return [];
+  const embeddingSnapshot = getProjectEmbeddingSnapshot(projectPath);
+  const queryContract = capturedQuery instanceof Float32Array || capturedQuery === null ? null : capturedQuery;
+  const generationIsCurrent = queryContract === null || embeddingSnapshot !== null && embeddingSnapshot.generation === queryContract.generation;
+  const queryEmbedding = generationIsCurrent ? queryContract?.vector ?? (capturedQuery instanceof Float32Array ? capturedQuery : null) : null;
+  const workspace = resolveSearchWorkspaceContext(db, projectPath);
+  const embeddingModelId = queryContract?.modelId ?? options.embeddingModelIdOverride ?? embeddingSnapshot?.modelId;
+  const chunkModelId = queryContract?.chunkModelId ?? options.chunkModelIdOverride ?? embeddingSnapshot?.chunkModelId;
+  const compartmentResults = runCompartmentChunks ? searchCompartmentChunks({
+    db,
+    sessionId,
+    projectPath,
+    queryEmbedding,
+    limit: tierLimit,
+    maxOrdinal: options.maxMessageOrdinal,
+    modelId: chunkModelId && chunkModelId !== "off" ? chunkModelId : null,
+    dateRange
+  }) : [];
+  const messageLikeResults = mergeMessageAndCompartmentResults({
+    messages: messageResults,
+    compartments: compartmentResults,
+    limit: tierLimit
+  });
+  const [memoryOutcome, gitCommitResults, primerResults, noteResults] = await Promise.all([
+    runMemory ? searchMemories({
+      db,
+      projectPath,
+      query: trimmedQuery,
+      limit: tierLimit,
+      memoryEnabled: true,
+      queryEmbedding,
+      queryModelId: embeddingModelId && embeddingModelId !== "off" ? embeddingModelId : null,
+      workspace,
+      visibleMemoryIds: options.visibleMemoryIds,
+      backfillMemoryEmbeddings: options.backfillMemoryEmbeddings,
+      dateRange
+    }) : Promise.resolve({
+      results: [],
+      suppressedVisibleIds: []
+    }),
+    runGitCommits ? Promise.resolve(searchGitCommits({
+      db,
+      projectPath,
+      query: trimmedQuery,
+      limit: tierLimit,
+      queryEmbedding,
+      queryModelId: embeddingModelId && embeddingModelId !== "off" ? embeddingModelId : null,
+      dateRange
+    })) : Promise.resolve([]),
+    runPrimers ? Promise.resolve(searchPrimers({
+      db,
+      projectPath,
+      query: trimmedQuery,
+      limit: tierLimit,
+      queryEmbedding,
+      queryModelId: embeddingModelId && embeddingModelId !== "off" ? embeddingModelId : null,
+      dateRange
+    })) : Promise.resolve([]),
+    runNotes ? Promise.resolve(searchNotes({
+      db,
+      sessionId,
+      projectPath,
+      query: trimmedQuery,
+      limit: tierLimit,
+      probes: messageProbes,
+      dateRange
+    })) : Promise.resolve([])
+  ]);
+  if (options.diagnostics) {
+    options.diagnostics.suppressedVisibleMemoryIds = memoryOutcome.suppressedVisibleIds;
+  }
+  const results = [
+    ...memoryOutcome.results,
+    ...primerResults,
+    ...messageLikeResults,
+    ...gitCommitResults,
+    ...noteResults
+  ].sort(compareUnifiedResults).slice(0, limit);
+  if (!options.measurementDisabled) {
+    recordShadowMeasurement({
+      db,
+      sessionId,
+      projectPath,
+      query: trimmedQuery,
+      options,
+      primaryResults: results,
+      primaryQuery: queryContract,
+      primaryLatencyMs: Date.now() - measurementStartedAt,
+      search: unifiedSearch
+    });
+  }
+  const countRetrievals = options.countRetrievals ?? true;
+  if (countRetrievals) {
+    const memoryIds = results.filter((result) => result.source === "memory").map((result) => result.memoryId);
+    if (memoryIds.length > 0) {
+      db.transaction(() => {
+        for (const memoryId of memoryIds) {
+          try {
+            updateMemoryRetrievalCount(db, memoryId);
+          } catch (error) {
+            if (error instanceof ModuleMemoryAuthorityError)
+              continue;
+            throw error;
+          }
+        }
+      }).immediate();
+    }
+  }
+  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.";
+function formatSearchAge(timestampMs) {
+  const ageMs = Date.now() - timestampMs;
+  if (ageMs < 0)
+    return "future";
+  const days = Math.floor(ageMs / (24 * 60 * 60 * 1000));
+  if (days <= 0)
+    return "today";
+  if (days === 1)
+    return "1d ago";
+  if (days < 30)
+    return `${days}d ago`;
+  const months = Math.floor(days / 30);
+  if (months === 1)
+    return "1mo ago";
+  if (months < 12)
+    return `${months}mo ago`;
+  const years = Math.floor(days / 365);
+  return years === 1 ? "1y ago" : `${years}y ago`;
+}
+function formatUnifiedSearchResult(result, index, currentSessionId) {
+  if (result.source === "memory") {
+    const source = result.sourceName ? ` source=${result.sourceName}` : "";
+    return [
+      `[${index}] [memory] score=${result.score.toFixed(2)} id=${result.memoryId} category=${result.category}${source} match=${result.matchType}`,
+      result.content
+    ].join(`
+`);
+  }
+  if (result.source === "git_commit") {
+    return [
+      `[${index}] [git_commit] score=${result.score.toFixed(2)} sha=${result.shortSha} ${formatSearchAge(result.committedAtMs)} match=${result.matchType}`,
+      result.content
+    ].join(`
+`);
+  }
+  if (result.source === "primer") {
+    return [
+      `[${index}] [primer] score=${result.score.toFixed(2)} id=${result.primerId} support=${result.support} match=${result.matchType}`,
+      result.content
+    ].join(`
+`);
+  }
+  if (result.source === "note") {
+    const anchor = result.anchorOrdinal !== null && result.sourceSessionId === currentSessionId ? ` @msg ${result.anchorOrdinal}` : "";
+    return [
+      `[${index}] [note] score=${result.score.toFixed(2)} id=#${result.noteId} status=${result.status} ${formatSearchAge(result.createdAt)}${anchor}`,
+      result.content
+    ].join(`
+`);
+  }
+  if (result.source === "compartment") {
+    return [
+      `[${index}] [message] score=${result.score.toFixed(2)} compartment_id=${result.compartmentId} range=${result.startOrdinal}-${result.endOrdinal} match=${result.matchType} title=${result.title}`,
+      result.snippet ? `Snippet: ${result.snippet}` : result.content
+    ].join(`
+`);
+  }
+  const expandStart = Math.max(1, result.messageOrdinal - 3);
+  const expandEnd = result.messageOrdinal + 3;
+  return [
+    `[${index}] [message] score=${result.score.toFixed(2)} ordinal=${result.messageOrdinal} range=${expandStart}-${expandEnd} role=${result.role}`,
+    result.content
+  ].join(`
+`);
+}
+function formatSearchDiagnosticLines(results, diagnostics) {
+  if (!diagnostics)
+    return [];
+  const lines = [];
+  const visibleIds = [...diagnostics.suppressedVisibleMemoryIds].sort((left, right) => left - right);
+  if (visibleIds.length > 0) {
+    const count = visibleIds.length;
+    const noun = count === 1 ? "match" : "matches";
+    const ids = visibleIds.join(", ");
+    if (results.some((result) => result.source === "memory")) {
+      lines.push(`Memories: ${count} additional ${noun} suppressed because ${count === 1 ? "it is" : "they are"} already visible in your project-memory block (ids ${ids}).`);
+    } else {
+      lines.push(`Memories: ${count} ${noun} found, all already visible in your project-memory block (ids ${ids}).`);
+    }
+  }
+  if (diagnostics.suppressedLiveMessageMatches > 0) {
+    const count = diagnostics.suppressedLiveMessageMatches;
+    lines.push(`Message history: ${count} raw-message ${count === 1 ? "match is" : "matches are"} newer than the last compartment boundary (already in your context).`);
+  }
+  if (diagnostics.gitCommitUnavailable === "no_git_repository") {
+    lines.push("Git commits: no git repository — commit search unavailable for this project.");
+  }
+  return lines;
+}
+function formatSearchResults(query, results, currentSessionId, diagnostics) {
+  const diagnosticLines = formatSearchDiagnosticLines(results, diagnostics);
+  if (results.length === 0) {
+    if (diagnosticLines.length > 0) {
+      return `No hidden results found for "${query}".
+
+${diagnosticLines.join(`
+`)}`;
+    }
+    return `No results found for "${query}" across notes, memories, primers, git commits, or message history.`;
+  }
+  const bodyParts = results.map((result, index) => formatUnifiedSearchResult(result, index + 1, currentSessionId));
+  if (diagnosticLines.length > 0)
+    bodyParts.push(diagnosticLines.join(`
+`));
+  if (results.some((result) => result.source === "message" || result.source === "compartment")) {
+    bodyParts.push("Use ctx_expand(start, end) with the range from any message result above to read the full conversation context.");
+  }
+  if (results.some((result) => result.source === "note" && result.anchorOrdinal !== null && result.sourceSessionId === currentSessionId)) {
+    bodyParts.push(SEARCH_NOTE_EXPAND_HINT);
+  }
+  return `Found ${results.length} result${results.length === 1 ? "" : "s"} for "${query}":
+
+${bodyParts.join(`
+
+`)}`;
+}
+
+export { indexCommitsForProject, embedUnembeddedCommits, createUnifiedSearchDiagnostics, parseIdShapedQuery, resolveMemoriesByIdsForSearch, unifiedSearch, formatSearchResults };