@cortexkit/opencode-magic-context 0.46.1 → 0.47.0

package/dist/{index-pkbcrdqs.js → index-cwf6s3ay.js}

@@ -6,17 +6,14 @@ import {
   sessionLog
 } from "./index-hybnrwq0.js";
 import {
-  isKnownAutocommit
-} from "./index-b35pxds2.js";
-import {
+  getSqliteDatabasePath,
+  assertTransformWrite,
   isTransientSqliteError
-} from "./index-fg34g6a5.js";
+} from "./index-wx8a6bw3.js";
 import {
   BoundedSessionMap,
   renderUserFacingFailure,
-  loadCompartmentChunkEmbeddingsForSearch,
   getMaxM0MutationId,
-  getIndexedMessageCorpusSize,
   escalationBands,
   MERGED_REASONING_PARTS_PREFIX,
   readFrozenMergedReasoningParts,
@@ -62,42 +59,13 @@ import {
   setPendingCompactionMarkerState,
   replacePendingCompactionMarkerStateIf,
   clearPendingCompactionMarkerStateIf,
-  recordEmbeddingMeasurement,
+  registerAutoSearchWork,
+  cancelAutoSearchWork,
   updateSessionMeta,
   advanceToolReclaimWatermark,
-  getNotes,
-  getActivePrimers,
   saveSourceContent,
   replaceSourceContent,
   getSourceContents,
-  cosineSimilarity,
-  saveCommitEmbedding,
-  loadProjectCommitEmbeddings,
-  loadUnembeddedCommits,
-  countEmbeddedCommits,
-  upsertCommits,
-  getLatestIndexedCommitSha,
-  enforceProjectCap,
-  getProjectEmbeddings,
-  contentSha256,
-  getShadowEmbeddingMeasurementCohort,
-  getPrimaryEmbeddingMeasurementCohort,
-  embedShadowTextForProject,
-  enqueueShadowEmbeddingItems,
-  getProjectEmbeddingSnapshot,
-  embedTextForProject,
-  embedItemsForProject,
-  isEmbeddingEnabled,
-  embedText,
-  ensureMemoryEmbeddings,
-  ModuleMemoryAuthorityError,
-  getMemoriesByProject,
-  getMemoriesByProjects,
-  updateMemoryRetrievalCount,
-  relaxedFtsQuery,
-  sanitizeFtsQuery,
-  searchMemoriesFTS,
-  searchMemoriesFTSUnion,
   compareOpenCodeMessagesByCanonicalOrder,
   MARKER_SUMMARY_TEXT,
   applyDeferredCompactionMarker,
@@ -115,7 +83,7 @@ import {
   peekNoteNudgeText,
   markNoteNudgeDelivered,
   getActiveCompartmentRun
-} from "./index-sjthx78w.js";
+} from "./index-6d9e1m08.js";
 import {
   protectedToolTagNumbers,
   stripWellFormedLeadingTagPrefix,
@@ -124,6 +92,7 @@ import {
   prependTag,
   isThinkingPart,
   isRecord,
+  contentTagOwnerMessageId,
   estimateImageTokensFromDataUrl,
   estimateToolAttachmentImageTokens,
   buildSyntheticTodoPart,
@@ -146,6 +115,7 @@ import {
   AGE_RECLAIM_MIN_TOKENS,
   getOldestActiveUnprotectedToolTags,
   getActiveToolTagsForAgeReclaim,
+  getReasoningTokenEstimatesByMessage,
   tagTokenCountIsNull,
   backfillTagTokenCounts,
   insertTag,
@@ -159,6 +129,7 @@ import {
   getMaxTagNumberBySession,
   getTagNumberByMessageId,
   getAssignableTagNumberByMessageId,
+  getTagsBySession,
   getActiveTagsBySession,
   getTailHygieneTags,
   getTagsByNumbers,
@@ -178,9 +149,11 @@ import {
   toolPartHasUserAnswer,
   isEditTool,
   modelAcceptsEmptyContent,
+  isAnthropicFamilyRoute,
   neutralizeDroppedReasoningPart,
   restoreNeutralizedReasoningPart,
   isNeutralizedReasoningPart,
+  neutralizedReasoningSource,
   makeSentinel,
   makeWholeMessageSentinel,
   isSentinel,
@@ -190,22 +163,21 @@ import {
   extractToolCallObservation,
   ToolMutationBatch,
   createToolDropTarget
-} from "./index-3h0ybwah.js";
+} from "./index-bb36vgr3.js";
 import {
   textMentionsRecentCommit,
   hasMeaningfulUserText2,
   estimateTokens
 } from "./index-5eqk6z3s.js";
 import {
-  isValidLanguageCode
-} from "./index-8x2v7gg9.js";
+  isValidLanguageCode,
+  resolveModelConfigValue
+} from "./index-m5fe6jch.js";
 import {
-  resolveWorkspaceShareCategories,
-  resolveWorkspaceIdentitySet,
-  expandWorkspaceIdentitySetWithAliases,
-  resolveStoredPathWorkspaceIdentity,
-  sourceNameForMemory
-} from "./index-r5hmbx3t.js";
+  getProjectEmbeddingSnapshot,
+  embedTextForProject,
+  embedBatchForProject
+} from "./index-fnn5pjtt.js";
 import {
   getTemporalDecisions,
   freezeTemporalDecisions,
@@ -214,12 +186,15 @@ import {
 import {
   normalizeProtectedToolName,
   mergeProtectedTools
-} from "./index-q4yp4b52.js";
+} from "./index-rrbbspwh.js";
 import {
   openCodeDbExists,
   withReadOnlySessionDb,
   getMessageTimesFromOpenCodeDb
-} from "./index-majxda46.js";
+} from "./index-6wkcswft.js";
+import {
+  isEmbeddingHostBusy
+} from "./index-yr3zj7e7.js";
 import {
   getErrorMessage
 } from "./index-y8v6yerm.js";
@@ -299,6 +274,39 @@ function markDropLeavesReasoning(db, sessionId) {
   });
 }
 
+// src/hooks/magic-context/active-anthropic-turn.ts
+function isInActiveAnthropicTurn(messages, index, anthropic) {
+  if (!anthropic)
+    return false;
+  for (let user = messages.length - 1;user >= 0; user--) {
+    const message = messages[user];
+    if (!isRecord(message))
+      continue;
+    const info = isRecord(message.info) ? message.info : message;
+    if (info.role !== "user" || info.synthetic === true || message.synthetic === true)
+      continue;
+    const id = typeof info.id === "string" ? info.id : "";
+    if (id.startsWith("synth-user-"))
+      continue;
+    const parts = Array.isArray(message.parts) ? message.parts : Array.isArray(message.content) ? message.content : [];
+    if (parts.length > 0 && parts.every((part) => isRecord(part) && (part.synthetic === true || part.ignored === true || ["tool_result", "toolResult", "tool-result"].includes(String(part.type)))))
+      continue;
+    return index > user;
+  }
+  return false;
+}
+function hasAnthropicReasoning(messages) {
+  return messages.some((message) => {
+    if (!isRecord(message))
+      return false;
+    const info = isRecord(message.info) ? message.info : message;
+    if (isAnthropicFamilyRoute(typeof info.providerID === "string" ? info.providerID : typeof info.provider === "string" ? info.provider : undefined, typeof info.modelID === "string" ? info.modelID : typeof info.model === "string" ? info.model : undefined))
+      return true;
+    const parts = Array.isArray(message.parts) ? message.parts : [];
+    return parts.some((part) => isRecord(part) && isRecord(part.metadata) && isRecord(part.metadata.anthropic));
+  });
+}
+
 // src/hooks/magic-context/apply-operations.ts
 var RECENT_TOOL_SKELETON_WINDOW = 20;
 function buildReplacementContent(tagId) {
@@ -440,6 +448,10 @@ function applyPendingOperations(sessionId, db, targets, protectedTagIds, preload
           continue;
         }
         const target = targets.get(pendingOp.tagId);
+        if (target?.thinkingDropProtected) {
+          reject("active_thinking");
+          continue;
+        }
         const isToolTag = tagTypeById.get(pendingOp.tagId) === "tool";
         if (synthetic) {
           if (!isToolTag) {
@@ -541,2070 +553,104 @@ function applyPendingOperations(sessionId, db, targets, protectedTagIds, preload
 }
 function applyFlushedStatuses(sessionId, db, targets, preloadedTags) {
   let didMutateMessage = false;
-  const tags = preloadedTags ?? getDroppedTagsByNumbers(db, sessionId, [...targets.keys()]);
-  for (const tag of tags) {
-    if (tag.status === "dropped") {
-      const target = targets.get(tag.tagNumber);
-      if (tag.type === "tool") {
-        if (tag.dropMode === "edit_marker_stripped") {
-          const result = target?.editMarkerStripped?.() ?? "absent";
-          if (result === "truncated")
-            didMutateMessage = true;
-        } else if (tag.dropMode === "edit_marker") {
-          const markResult = target?.editMarker?.() ?? "absent";
-          if (markResult === "truncated") {
-            didMutateMessage = true;
-          }
-        } else if (tag.dropMode === "skeleton_stripped") {
-          const result = target?.skeletonStripped?.() ?? "absent";
-          if (result === "truncated")
-            didMutateMessage = true;
-        } else if (tag.dropMode === "skeleton_real") {
-          const result = target?.skeletonReal?.() ?? "absent";
-          if (result === "truncated") {
-            didMutateMessage = true;
-          }
-        } else if (tag.dropMode === "truncated") {
-          const truncResult = target?.truncate?.() ?? "absent";
-          if (truncResult === "truncated") {
-            didMutateMessage = true;
-          }
-        } else {
-          const dropResult = target?.drop?.() ?? "absent";
-          if (dropResult === "removed" || dropResult === "truncated") {
-            didMutateMessage = true;
-          }
-        }
-      } else if (target) {
-        const changed = target.setContent(buildReplacementContent(tag.tagNumber));
-        if (changed)
-          didMutateMessage = true;
-      }
-    }
-  }
-  return didMutateMessage;
-}
-
-// 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 = 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) {
-    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,
-    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,
-      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(`
-`)}`;
+  const tags = preloadedTags ?? getDroppedTagsByNumbers(db, sessionId, [...targets.keys()]);
+  for (const tag of tags) {
+    if (tag.status === "dropped") {
+      const target = targets.get(tag.tagNumber);
+      if (tag.type === "tool") {
+        if (tag.dropMode === "edit_marker_stripped") {
+          const result = target?.editMarkerStripped?.() ?? "absent";
+          if (result === "truncated")
+            didMutateMessage = true;
+        } else if (tag.dropMode === "edit_marker") {
+          const markResult = target?.editMarker?.() ?? "absent";
+          if (markResult === "truncated") {
+            didMutateMessage = true;
+          }
+        } else if (tag.dropMode === "skeleton_stripped") {
+          const result = target?.skeletonStripped?.() ?? "absent";
+          if (result === "truncated")
+            didMutateMessage = true;
+        } else if (tag.dropMode === "skeleton_real") {
+          const result = target?.skeletonReal?.() ?? "absent";
+          if (result === "truncated") {
+            didMutateMessage = true;
+          }
+        } else if (tag.dropMode === "truncated") {
+          const truncResult = target?.truncate?.() ?? "absent";
+          if (truncResult === "truncated") {
+            didMutateMessage = true;
+          }
+        } else {
+          const dropResult = target?.drop?.() ?? "absent";
+          if (dropResult === "removed" || dropResult === "truncated") {
+            didMutateMessage = true;
+          }
+        }
+      } else if (target) {
+        const changed = target.setContent(buildReplacementContent(tag.tagNumber));
+        if (changed)
+          didMutateMessage = true;
+      }
     }
-    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(`
-
-`)}`;
+  return didMutateMessage;
 }
 
 // src/hooks/magic-context/auto-search-deadline.ts
 var AUTO_SEARCH_TIMEOUT_MS = 3000;
+var operationDeadlines = new WeakMap;
+function autoSearchDeadlineUnixMs(signal) {
+  const deadline = signal && operationDeadlines.get(signal);
+  return Date.now() + (deadline === undefined ? AUTO_SEARCH_TIMEOUT_MS : Math.max(0, deadline - performance.now()));
+}
+var skippedTurns = new Map;
+function wasAutoSearchSkipped(db, sessionId, messageId) {
+  return skippedTurns.get(sessionId)?.get(db)?.has(messageId) ?? false;
+}
+function clearAutoSearchTimeoutForSession(sessionId) {
+  cancelAutoSearchWork(sessionId);
+  if (sessionId === undefined)
+    skippedTurns.clear();
+  else
+    skippedTurns.delete(sessionId);
+}
+function persistAutoSearchSkip(db, sessionId, messageId, reason = "timeout") {
+  assertTransformWrite();
+  let turns = skippedTurns.get(sessionId);
+  if (!turns) {
+    turns = new WeakMap;
+    skippedTurns.set(sessionId, turns);
+  }
+  let messages = turns.get(db);
+  if (!messages) {
+    messages = new Map;
+    turns.set(db, messages);
+  }
+  const prior = messages.get(messageId);
+  if (prior)
+    return prior;
+  let ok = false;
+  try {
+    const outcome = appendAutoSearchHintDecision(db, sessionId, {
+      messageId,
+      decision: "no-hint",
+      reason
+    });
+    ok = outcome.ok && outcome.decision.decision === "no-hint";
+  } catch {}
+  assertTransformWrite();
+  const persistence = Promise.resolve(ok);
+  messages.set(messageId, persistence);
+  return persistence;
+}
 async function withAutoSearchDeadline(operation, startedAt = performance.now()) {
   const deadline = startedAt + AUTO_SEARCH_TIMEOUT_MS;
   const remaining = deadline - performance.now();
   if (remaining <= 0)
     return null;
   const controller = new AbortController;
+  operationDeadlines.set(controller.signal, deadline);
   const checkDeadline = () => {
     if (!controller.signal.aborted && performance.now() >= deadline)
       controller.abort();
@@ -3080,7 +1126,7 @@ function cavemanCompressAsciiV1(text, level) {
 var MAX_FRAGMENTS = 3;
 var FRAGMENT_CHAR_CAP = 80;
 var MAX_HINT_CHARS = 800;
-var MS_PER_DAY2 = 24 * 60 * 60 * 1000;
+var MS_PER_DAY = 24 * 60 * 60 * 1000;
 function truncate(text, limit) {
   const normalized = text.replace(/\s+/g, " ").trim();
   if (normalized.length <= limit)
@@ -3091,7 +1137,7 @@ function formatAge(committedAtMs) {
   const delta = Date.now() - committedAtMs;
   if (delta < 0)
     return "future";
-  const days = Math.floor(delta / MS_PER_DAY2);
+  const days = Math.floor(delta / MS_PER_DAY);
   if (days <= 0)
     return "today";
   if (days === 1)
@@ -3166,6 +1212,205 @@ ${trimmedBody}…
   return wrapped;
 }
 
+// src/hooks/magic-context/auto-search-worker-client.ts
+import { Worker } from "node:worker_threads";
+var pendingRegistrations = new WeakMap;
+var pendingTurns = new WeakMap;
+async function coalesceAutoSearchTurn(db, sessionId, messageId, operation, replay) {
+  let sessions = pendingTurns.get(db);
+  if (!sessions) {
+    sessions = new Map;
+    pendingTurns.set(db, sessions);
+  }
+  let turns = sessions.get(sessionId);
+  if (!turns) {
+    turns = new Map;
+    sessions.set(sessionId, turns);
+  }
+  const pending = turns.get(messageId);
+  if (pending && !pending.signal.aborted) {
+    const result = await pending.promise;
+    if (!pending.signal.aborted)
+      replay();
+    return result;
+  }
+  const lifecycle = registerAutoSearchWork(sessionId);
+  const work = Promise.resolve().then(() => operation(lifecycle.signal));
+  const turn = { promise: work, signal: lifecycle.signal };
+  turns.set(messageId, turn);
+  try {
+    return await work;
+  } finally {
+    lifecycle.done();
+    if (turns.get(messageId) === turn)
+      turns.delete(messageId);
+    if (turns.size === 0)
+      sessions.delete(sessionId);
+  }
+}
+function queueAutoSearchRegistration(db, projectPath, register) {
+  if (!register)
+    return;
+  let pending = pendingRegistrations.get(db);
+  if (!pending) {
+    pending = new Set;
+    pendingRegistrations.set(db, pending);
+  }
+  if (pending.has(projectPath))
+    return;
+  pending.add(projectPath);
+  const timer = setTimeout(() => {
+    if (getProjectEmbeddingSnapshot(projectPath)) {
+      pending.delete(projectPath);
+      return;
+    }
+    Promise.resolve().then(register).catch((error) => log(`[auto-search] background registration failed: ${error instanceof Error ? error.message : String(error)}`)).finally(() => pending.delete(projectPath));
+  }, 0);
+  timer.unref?.();
+}
+function persistAutoSearchDecision(db, sessionId, decision, startedAt) {
+  if (performance.now() - startedAt >= AUTO_SEARCH_TIMEOUT_MS)
+    return null;
+  return appendAutoSearchHintDecision(db, sessionId, decision);
+}
+async function searchAutoHint(db, sessionId, projectPath, query, options, entry = new URL(new URL(import.meta.url).pathname.endsWith(".ts") ? "./auto-search-worker.ts" : "./auto-search-worker.js", import.meta.url)) {
+  return executeAutoSearchWorker(db, sessionId, projectPath, query, options, entry, "search");
+}
+var pendingBackfills = new WeakMap;
+function queueAutoSearchBackfill(db, sessionId, projectPath, query) {
+  if (isEmbeddingHostBusy())
+    return Promise.resolve();
+  const key = `${sessionId}\x00${projectPath}`;
+  const pending = pendingBackfills.get(db) ?? new Map;
+  pendingBackfills.set(db, pending);
+  const prior = pending.get(key);
+  if (prior)
+    return prior;
+  const lifecycle = registerAutoSearchWork(sessionId);
+  const work = new Promise((resolve) => {
+    const done = () => {
+      lifecycle.done();
+      pending.delete(key);
+      resolve();
+    };
+    const queued = setTimeout(() => {
+      lifecycle.signal.removeEventListener("abort", cancel);
+      if (lifecycle.signal.aborted)
+        return done();
+      const controller = new AbortController;
+      const timeout = setTimeout(() => controller.abort(), 1e4);
+      timeout.unref?.();
+      executeAutoSearchWorker(db, sessionId, projectPath, query, { signal: AbortSignal.any([controller.signal, lifecycle.signal]) }, new URL(new URL(import.meta.url).pathname.endsWith(".ts") ? "./auto-search-worker.ts" : "./auto-search-worker.js", import.meta.url), "backfill").catch((error) => log("[auto-search] background backfill failed:", error)).finally(() => {
+        clearTimeout(timeout);
+        done();
+      });
+    }, 0);
+    const cancel = () => {
+      clearTimeout(queued);
+      done();
+    };
+    lifecycle.signal.addEventListener("abort", cancel, { once: true });
+    queued.unref?.();
+  });
+  pending.set(key, work);
+  return work;
+}
+async function executeAutoSearchWorker(db, sessionId, projectPath, query, options, entry, job) {
+  if (options.signal?.aborted)
+    return [];
+  const path = getSqliteDatabasePath(db);
+  if (!path)
+    throw new Error("auto-search requires a file-backed database for off-thread search");
+  const {
+    embedQuery,
+    isEmbeddingRuntimeEnabled,
+    signal: deadlineSignal,
+    readMessages: _readMessages,
+    ...serializable
+  } = options;
+  const lifecycle = registerAutoSearchWork(sessionId);
+  const signal = deadlineSignal ? AbortSignal.any([deadlineSignal, lifecycle.signal]) : lifecycle.signal;
+  const snapshot = getProjectEmbeddingSnapshot(projectPath);
+  const input = {
+    job,
+    path,
+    harness: getHarness(),
+    sessionId,
+    projectPath,
+    query,
+    options: {
+      ...serializable,
+      backfillMemoryEmbeddings: false,
+      countRetrievals: false,
+      measurementDisabled: true
+    },
+    embeddingRuntimeEnabled: isEmbeddingRuntimeEnabled?.() ?? false,
+    embeddingHostBusy: isEmbeddingHostBusy(),
+    snapshot,
+    deadlineUnixMs: autoSearchDeadlineUnixMs(deadlineSignal)
+  };
+  return new Promise((resolve, reject) => {
+    const worker = new Worker(entry, { workerData: input });
+    let settled = false;
+    const finish = (results, error) => {
+      if (settled)
+        return;
+      settled = true;
+      signal?.removeEventListener("abort", abort);
+      lifecycle.signal.removeEventListener("abort", abort);
+      lifecycle.done();
+      worker.terminate();
+      worker.unref();
+      if (error)
+        reject(error);
+      else
+        resolve(results);
+    };
+    const abort = () => finish([]);
+    signal?.addEventListener("abort", abort, { once: true });
+    lifecycle.signal.addEventListener("abort", abort, { once: true });
+    worker.on("error", (error) => finish([], error));
+    worker.on("exit", (code) => finish([], new Error(`auto-search worker exited (${code})`)));
+    worker.on("message", async (reply) => {
+      if (settled)
+        return;
+      if (reply.kind === "result") {
+        if (snapshot && getProjectEmbeddingSnapshot(projectPath)?.generation !== snapshot.generation)
+          finish([]);
+        else
+          finish(reply.results);
+        return;
+      }
+      if (reply.kind === "error") {
+        finish([], new Error(reply.error));
+        return;
+      }
+      const response = { id: reply.id };
+      try {
+        if (reply.kind === "query")
+          response.result = await (job === "backfill" ? embedTextForProject(projectPath, reply.text, signal, "query") : embedQuery?.(reply.text, signal)) ?? null;
+        else {
+          const passage = await embedBatchForProject(projectPath, reply.texts, signal, reply.purpose);
+          const current = getProjectEmbeddingSnapshot(projectPath);
+          response.passage = passage && current ? {
+            ...passage,
+            providerIdentity: current.providerIdentity,
+            runtimeFingerprint: current.runtimeFingerprint,
+            dimensions: passage.vectors.find((vector) => vector !== null)?.length ?? null
+          } : null;
+        }
+      } catch (error) {
+        response.error = error instanceof Error ? error.message : String(error);
+      }
+      response.embeddingHostBusy = isEmbeddingHostBusy();
+      if (!settled && !signal?.aborted)
+        worker.postMessage(response);
+    });
+    if (signal?.aborted)
+      abort();
+  });
+}
+
 // src/hooks/magic-context/transform-message-helpers.ts
 function isMeaningfulUserMessage(msg) {
   return msg.info.role === "user" && hasMeaningfulUserText2(msg.parts);
@@ -3340,109 +1585,142 @@ async function runAutoSearchHint(args) {
   if (!userMsg || typeof userMsg.info.id !== "string")
     return AUTO_SEARCH_OK;
   const userMsgId = userMsg.info.id;
-  const existing = getAutoSearchHintDecisions(db, sessionId);
-  const existingForMessage = existing.find((decision) => decision.messageId === userMsgId);
-  if (existingForMessage) {
-    if (existingForMessage.decision === "hint") {
-      appendReminderToUserMessageById(messages, userMsgId, existingForMessage.text);
+  return coalesceAutoSearchTurn(db, sessionId, userMsgId, async (lifecycleSignal) => {
+    if (lifecycleSignal.aborted)
+      return AUTO_SEARCH_OK;
+    if (wasAutoSearchSkipped(db, sessionId, userMsgId))
+      return AUTO_SEARCH_OK;
+    const existing = getAutoSearchHintDecisions(db, sessionId);
+    const existingForMessage = existing.find((decision) => decision.messageId === userMsgId);
+    if (existingForMessage) {
+      if (existingForMessage.decision === "hint") {
+        appendReminderToUserMessageById(messages, userMsgId, existingForMessage.text);
+      }
+      return AUTO_SEARCH_OK;
+    }
+    if (messages.length === 0 || messages[messages.length - 1].info.id !== userMsgId) {
+      return AUTO_SEARCH_OK;
+    }
+    const embeddingSnapshot = getProjectEmbeddingSnapshot(options.projectPath);
+    if (!embeddingSnapshot) {
+      queueAutoSearchRegistration(db, options.projectPath, options.directory && options.ensureProjectRegistered ? () => options.ensureProjectRegistered?.(options.directory, db) ?? Promise.resolve() : undefined);
+      persistAutoSearchSkip(db, sessionId, userMsgId, "empty");
+      return AUTO_SEARCH_OK;
+    }
+    const writeNoHintAndReconcile = async (reason) => {
+      const outcome = persistAutoSearchDecision(db, sessionId, {
+        messageId: userMsgId,
+        decision: "no-hint",
+        reason
+      }, startedAt);
+      if (outcome === null) {
+        persistAutoSearchSkip(db, sessionId, userMsgId);
+        return { ok: false, kind: "timeout" };
+      }
+      if (!outcome.ok)
+        return { ok: false, kind: "cas-exhaustion" };
+      if (outcome.kind === "already-present" && outcome.decision.decision === "hint") {
+        appendReminderToUserMessageById(messages, userMsgId, outcome.decision.text);
+      }
+      return AUTO_SEARCH_OK;
+    };
+    const rawPartsText = collectUserPromptParts(userMsg);
+    if (hasStackedAugmentation(rawPartsText)) {
+      sessionLog(sessionId, "auto-search: skipping — user message already carries augmentation/hint");
+      return writeNoHintAndReconcile("stacked");
     }
-    return AUTO_SEARCH_OK;
-  }
-  if (messages.length === 0 || messages[messages.length - 1].info.id !== userMsgId) {
-    return AUTO_SEARCH_OK;
-  }
-  const writeNoHintAndReconcile = (reason) => {
-    const outcome = appendAutoSearchHintDecision(db, sessionId, {
-      messageId: userMsgId,
-      decision: "no-hint",
-      reason
-    });
-    if (!outcome.ok)
-      return { ok: false, kind: "cas-exhaustion" };
-    if (outcome.kind === "already-present" && outcome.decision.decision === "hint") {
-      appendReminderToUserMessageById(messages, userMsgId, outcome.decision.text);
+    const rawPrompt = extractUserPromptText(userMsg);
+    if (rawPrompt.length < options.minPromptChars) {
+      return writeNoHintAndReconcile("too-short");
     }
-    return AUTO_SEARCH_OK;
-  };
-  const rawPartsText = collectUserPromptParts(userMsg);
-  if (hasStackedAugmentation(rawPartsText)) {
-    sessionLog(sessionId, "auto-search: skipping — user message already carries augmentation/hint");
-    return writeNoHintAndReconcile("stacked");
-  }
-  const rawPrompt = extractUserPromptText(userMsg);
-  if (rawPrompt.length < options.minPromptChars) {
-    return writeNoHintAndReconcile("too-short");
-  }
-  let results;
-  try {
-    results = await withAutoSearchDeadline(async (signal, checkDeadline) => {
-      if (options.directory) {
-        await options.ensureProjectRegistered?.(options.directory, db);
+    let results;
+    try {
+      results = await withAutoSearchDeadline(async (signal, checkDeadline) => {
+        if (checkDeadline())
+          return null;
+        const memoryEnabled = embeddingSnapshot?.features.memoryEnabled ?? options.memoryEnabled;
+        const embeddingEnabled = embeddingSnapshot ? embeddingSnapshot.historyEnabled : options.embeddingEnabled;
+        const gitCommitsEnabled = embeddingSnapshot?.gitCommitEnabled ?? options.gitCommitsEnabled ?? false;
+        const searchOptions = {
+          limit: 10,
+          memoryEnabled,
+          embeddingEnabled,
+          gitCommitsEnabled,
+          embedQuery: async (text, signal) => {
+            const result = await embedTextForProject(options.projectPath, text, signal, "query");
+            checkDeadline();
+            return result;
+          },
+          isEmbeddingRuntimeEnabled: () => embeddingEnabled === true,
+          visibleMemoryIds: options.visibleMemoryIds ?? null,
+          sources: ["memory", "message", "git_commit"]
+        };
+        return searchAutoHint(db, sessionId, options.projectPath, rawPrompt, {
+          ...searchOptions,
+          signal,
+          countRetrievals: false
+        });
+      }, startedAt);
+    } catch (error) {
+      log(`[auto-search] unified search failed for session ${sessionId} (will retry next pass): ${error instanceof Error ? error.message : String(error)}`);
+      return { ok: false, kind: "search-failure" };
+    }
+    if (lifecycleSignal.aborted)
+      return AUTO_SEARCH_OK;
+    try {
+      if (results === null) {
+        sessionLog(sessionId, `auto-search: timed out after ${AUTO_SEARCH_TIMEOUT_MS}ms, skipping hint for this turn`);
+        persistAutoSearchSkip(db, sessionId, userMsgId);
+        sessionLog(sessionId, "auto-search: skip frozen; retries for this turn are replay-only");
+        return { ok: false, kind: "timeout" };
       }
-      if (checkDeadline())
-        return null;
-      const embeddingSnapshot = getProjectEmbeddingSnapshot(options.projectPath);
-      const memoryEnabled = embeddingSnapshot?.features.memoryEnabled ?? options.memoryEnabled;
-      const embeddingEnabled = embeddingSnapshot ? embeddingSnapshot.historyEnabled : options.embeddingEnabled;
-      const gitCommitsEnabled = embeddingSnapshot?.gitCommitEnabled ?? options.gitCommitsEnabled ?? false;
-      const searchOptions = {
-        limit: 10,
-        memoryEnabled,
-        embeddingEnabled,
-        gitCommitsEnabled,
-        embedQuery: async (text, signal) => {
-          const result = await embedTextForProject(options.projectPath, text, signal, "query");
-          checkDeadline();
-          return result;
-        },
-        isEmbeddingRuntimeEnabled: () => embeddingEnabled === true,
-        visibleMemoryIds: options.visibleMemoryIds ?? null,
-        sources: ["memory", "message", "git_commit"]
-      };
-      return unifiedSearch(db, sessionId, options.projectPath, rawPrompt, {
-        ...searchOptions,
-        signal,
-        countRetrievals: false
-      });
-    }, startedAt);
-  } catch (error) {
-    log(`[auto-search] unified search failed for session ${sessionId} (will retry next pass): ${error instanceof Error ? error.message : String(error)}`);
-    return { ok: false, kind: "search-failure" };
-  }
-  if (results === null) {
-    sessionLog(sessionId, `auto-search: timed out after ${AUTO_SEARCH_TIMEOUT_MS}ms, skipping hint for this turn (will retry)`);
-    return { ok: false, kind: "timeout" };
-  }
-  if (results.length === 0) {
-    return writeNoHintAndReconcile("empty");
-  }
-  if (results[0].score < options.scoreThreshold) {
-    sessionLog(sessionId, `auto-search: top score ${results[0].score.toFixed(3)} below threshold ${options.scoreThreshold}`);
-    return writeNoHintAndReconcile("below-threshold");
-  }
-  const hintText = buildAutoSearchHint(results, { wordRules: options.wordRules });
-  if (!hintText) {
-    return writeNoHintAndReconcile("empty");
-  }
-  const payload = `
+      if (results.length === 0) {
+        return writeNoHintAndReconcile("empty");
+      }
+      if (results[0].score < options.scoreThreshold) {
+        sessionLog(sessionId, `auto-search: top score ${results[0].score.toFixed(3)} below threshold ${options.scoreThreshold}`);
+        return writeNoHintAndReconcile("below-threshold");
+      }
+      const hintText = buildAutoSearchHint(results, { wordRules: options.wordRules });
+      if (!hintText) {
+        return writeNoHintAndReconcile("empty");
+      }
+      const payload = `
 
 ${hintText}`;
-  const outcome = appendAutoSearchHintDecision(db, sessionId, {
-    messageId: userMsgId,
-    decision: "hint",
-    text: payload
+      const outcome = persistAutoSearchDecision(db, sessionId, {
+        messageId: userMsgId,
+        decision: "hint",
+        text: payload
+      }, startedAt);
+      if (outcome === null) {
+        persistAutoSearchSkip(db, sessionId, userMsgId);
+        return { ok: false, kind: "timeout" };
+      }
+      if (!outcome.ok) {
+        sessionLog(sessionId, `auto-search: CAS exhausted for ${userMsgId}; skipping wire append`);
+        return { ok: false, kind: "cas-exhaustion" };
+      }
+      if (outcome.decision.decision === "hint") {
+        appendReminderToUserMessageById(messages, userMsgId, outcome.decision.text);
+      }
+      sessionLog(sessionId, `auto-search: attached hint to ${userMsgId} (${results.length} fragments, top score ${results[0].score.toFixed(3)})`);
+      return AUTO_SEARCH_OK;
+    } finally {
+      if (!lifecycleSignal.aborted && results !== null)
+        queueAutoSearchBackfill(db, sessionId, options.projectPath, rawPrompt);
+    }
+  }, () => {
+    if (wasAutoSearchSkipped(db, sessionId, userMsgId))
+      return;
+    const decision = getAutoSearchHintDecisions(db, sessionId).find((entry) => entry.messageId === userMsgId);
+    if (decision?.decision === "hint")
+      appendReminderToUserMessageById(messages, userMsgId, decision.text);
   });
-  if (!outcome.ok) {
-    sessionLog(sessionId, `auto-search: CAS exhausted for ${userMsgId}; skipping wire append`);
-    return { ok: false, kind: "cas-exhaustion" };
-  }
-  if (outcome.decision.decision === "hint") {
-    appendReminderToUserMessageById(messages, userMsgId, outcome.decision.text);
-  }
-  sessionLog(sessionId, `auto-search: attached hint to ${userMsgId} (${results.length} fragments, top score ${results[0].score.toFixed(3)})`);
-  return AUTO_SEARCH_OK;
 }
-function clearAutoSearchForSession(_sessionId) {}
+function clearAutoSearchForSession(sessionId) {
+  clearAutoSearchTimeoutForSession(sessionId);
+}
 
 // src/hooks/magic-context/cache-busting-signals.ts
 function canConsumeDeferredOnThisPass(args) {
@@ -4078,7 +2356,7 @@ function applyCavemanCleanup(sessionId, db, targets, tags, config) {
   const eligible = tags.filter((tag) => tag.type === "message" && tag.status === "active" && (protectedCutoff === null || tag.tagNumber < protectedCutoff) && tag.byteSize >= config.minChars).sort((a, b) => a.tagNumber - b.tagNumber);
   const tagsNeedingCompression = eligible.filter((tag, index) => {
     const target = targets.get(tag.tagNumber);
-    if (!target?.getContent || !target.setContent)
+    if (!target?.getContent || !target.setContent || target.thinkingRewriteProtected)
       return false;
     const targetDepth = computeTargetDepth(index, eligible.length);
     return targetDepth > tag.cavemanDepth;
@@ -4087,7 +2365,7 @@ function applyCavemanCleanup(sessionId, db, targets, tags, config) {
   let state = getCavemanReplayState(db, sessionId);
   if (!state.currentRules || state.englishWordRules !== englishWordRules) {
     const compressedBefore = tags.filter((tag) => tag.type === "message" && tag.status === "active" && tag.cavemanDepth > 0);
-    const switched = recordCavemanCurrentRules(db, sessionId, englishWordRules, compressedBefore.map((tag) => tag.tagNumber));
+    const switched = compressedBefore.some((tag) => targets.get(tag.tagNumber)?.thinkingRewriteProtected) ? null : recordCavemanCurrentRules(db, sessionId, englishWordRules, compressedBefore.map((tag) => tag.tagNumber));
     if (switched) {
       state = switched;
       const deepened = new Set(tagsNeedingCompression.map((tag) => tag.tagNumber));
@@ -4309,6 +2587,8 @@ function applyHeuristicCleanup(sessionId, db, targets, messageTagNumbers, config
           continue;
         const strippedSource = stripTagPrefix(stripped);
         if (strippedSource.trim().length === 0) {
+          if (target.thinkingDropProtected)
+            continue;
           const dropResult = target.drop?.() ?? "absent";
           const replacement = `[dropped §${tag.tagNumber}§]`;
           const didReplace = dropResult === "absent" ? target.setContent(replacement) : false;
@@ -4429,147 +2709,41 @@ function extractToolInfo(part) {
   if (part.type === "tool_use" && typeof part.name === "string" && DEDUP_SAFE_TOOLS.has(part.name)) {
     return { toolName: part.name, args: part.input ?? {} };
   }
-  return null;
-}
-function buildToolFingerprints(messages) {
-  const fingerprints = new Map;
-  for (const message of messages) {
-    if (message.info.role !== "assistant")
-      continue;
-    const ownerMsgId = typeof message.info.id === "string" ? message.info.id : null;
-    if (!ownerMsgId)
-      continue;
-    for (const part of message.parts) {
-      const record = part;
-      const info = extractToolInfo(record);
-      if (!info)
-        continue;
-      const callId = extractCallId(record);
-      if (!callId)
-        continue;
-      try {
-        const fingerprint = `${ownerMsgId}:${info.toolName}:${JSON.stringify(info.args)}`;
-        const compositeKey = `${ownerMsgId}\x00${callId}`;
-        fingerprints.set(compositeKey, fingerprint);
-      } catch {}
-    }
-  }
-  return fingerprints;
-}
-function extractCallId(part) {
-  if (part.type === "tool" && typeof part.callID === "string")
-    return part.callID;
-  if (part.type === "tool-invocation" && typeof part.callID === "string")
-    return part.callID;
-  if (part.type === "tool_use" && typeof part.id === "string")
-    return part.id;
-  return null;
-}
-
-// src/hooks/magic-context/note-visibility.ts
-var NOTE_TOOL_NAMES = new Set(["ctx_note"]);
-var READ_ACTION = "read";
-function hasVisibleNoteReadCall(messages) {
-  for (let i = messages.length - 1;i >= 0; i -= 1) {
-    const parts = messages[i]?.parts;
-    if (!Array.isArray(parts))
-      continue;
-    for (const part of parts) {
-      if (isSentinel(part))
-        continue;
-      if (isVisibleNoteReadPart(part))
-        return true;
-    }
-  }
-  return false;
-}
-function isVisibleNoteReadPart(part) {
-  if (!isRecord(part))
-    return false;
-  if (part.type === "tool" && typeof part.tool === "string" && NOTE_TOOL_NAMES.has(part.tool)) {
-    const state = part.state;
-    if (isRecord(state) && isRecord(state.input)) {
-      return state.input.action === READ_ACTION;
-    }
-    return false;
-  }
-  if (part.type === "tool_use" && typeof part.name === "string" && NOTE_TOOL_NAMES.has(part.name)) {
-    if (isRecord(part.input)) {
-      return part.input.action === READ_ACTION;
-    }
-    return false;
-  }
-  if (part.type === "tool-invocation" && typeof part.toolName === "string" && NOTE_TOOL_NAMES.has(part.toolName)) {
-    const argsCandidate = part.args ?? part.input;
-    if (isRecord(argsCandidate)) {
-      return argsCandidate.action === READ_ACTION;
-    }
-    return false;
-  }
-  return false;
-}
-
-// src/hooks/magic-context/postprocess-read-cache.ts
-var connections = new WeakMap;
-function snapshot(db, sessionId) {
-  const transaction = db;
-  try {
-    if (transaction.inTransaction || transaction.isTransaction) {
-      connections.delete(db);
-      return { version: -1, changes: -1 };
-    }
-  } catch {
-    connections.delete(db);
-    return { version: -1, changes: -1 };
-  }
-  let connection = connections.get(db);
-  if (!connection) {
-    connection = {
-      stamp: db.prepare("SELECT total_changes() AS changes, data_version AS version FROM pragma_data_version"),
-      sessions: new BoundedSessionMap(100)
-    };
-    connections.set(db, connection);
-  }
-  const stamp = connection.stamp.get();
-  const previous = connection.sessions.get(sessionId);
-  if (previous?.version === stamp.version && previous.changes === stamp.changes) {
-    return previous;
-  }
-  const value = { ...stamp };
-  connection.sessions.set(sessionId, value);
-  return value;
-}
-function postprocessTailTags(db, sessionId) {
-  const state = snapshot(db, sessionId);
-  return state.tags ??= getTailHygieneTags(db, sessionId);
+  return null;
 }
-function postprocessOldestTags(db, sessionId, protectedNumbers) {
-  const state = snapshot(db, sessionId);
-  const hints = state.hints;
-  if (hints && hints.protectedNumbers.size === protectedNumbers.size && [...protectedNumbers].every((number) => hints.protectedNumbers.has(number))) {
-    return hints.value;
+function buildToolFingerprints(messages) {
+  const fingerprints = new Map;
+  for (const message of messages) {
+    if (message.info.role !== "assistant")
+      continue;
+    const ownerMsgId = typeof message.info.id === "string" ? message.info.id : null;
+    if (!ownerMsgId)
+      continue;
+    for (const part of message.parts) {
+      const record = part;
+      const info = extractToolInfo(record);
+      if (!info)
+        continue;
+      const callId = extractCallId(record);
+      if (!callId)
+        continue;
+      try {
+        const fingerprint = `${ownerMsgId}:${info.toolName}:${JSON.stringify(info.args)}`;
+        const compositeKey = `${ownerMsgId}\x00${callId}`;
+        fingerprints.set(compositeKey, fingerprint);
+      } catch {}
+    }
   }
-  const value = getOldestActiveUnprotectedToolTags(db, sessionId, protectedNumbers);
-  state.hints = { protectedNumbers: new Set(protectedNumbers), value };
-  return value;
+  return fingerprints;
 }
-function postprocessReplaySnapshot(db, sessionId) {
-  const state = snapshot(db, sessionId);
-  const replay = state.replay ??= loadPostprocessReplaySnapshot(db, sessionId);
-  return {
-    ...replay,
-    staleReduceStrippedIds: new Set(replay.staleReduceStrippedIds),
-    processedImageStrippedIds: new Set(replay.processedImageStrippedIds),
-    strippedPlaceholderIds: new Set(replay.strippedPlaceholderIds),
-    hiddenSeamPlaceholderIds: new Set(replay.hiddenSeamPlaceholderIds),
-    mergedReasoningStrippedIds: new Set(replay.mergedReasoningStrippedIds),
-    trailingBlankDecisions: new Map(replay.trailingBlankDecisions),
-    noteNudgeAnchors: structuredClone(replay.noteNudgeAnchors),
-    autoSearchHintDecisions: structuredClone(replay.autoSearchHintDecisions),
-    todoSyntheticAnchor: structuredClone(replay.todoSyntheticAnchor),
-    pendingCompactionMarker: structuredClone(replay.pendingCompactionMarker),
-    compactionMarker: structuredClone(replay.compactionMarker)
-  };
+function extractCallId(part) {
+  if (part.type === "tool" && typeof part.callID === "string")
+    return part.callID;
+  if (part.type === "tool-invocation" && typeof part.callID === "string")
+    return part.callID;
+  if (part.type === "tool_use" && typeof part.id === "string")
+    return part.id;
+  return null;
 }
 
 // src/hooks/magic-context/strip-content.ts
@@ -4752,11 +2926,8 @@ function replayStrippedInlineThinking(messages, messageTagNumbers, persistedWate
   }
   return stripped;
 }
-function clearOldReasoning(messages, reasoningByMessage, messageTagNumbers, clearReasoningAge) {
-  const maxTag = findMaxTag(messageTagNumbers);
-  if (maxTag === 0)
-    return 0;
-  const ageCutoff = maxTag - clearReasoningAge;
+function clearOldReasoning(messages, reasoningByMessage, messageTagNumbers, cutoff) {
+  const ageCutoff = cutoff;
   let cleared = 0;
   for (const message of messages) {
     const msgTag = messageTagNumbers.get(message) ?? 0;
@@ -4780,14 +2951,6 @@ function clearOldReasoning(messages, reasoningByMessage, messageTagNumbers, clea
   }
   return cleared;
 }
-function findMaxTag(messageTagNumbers) {
-  let max = 0;
-  for (const tag of messageTagNumbers.values()) {
-    if (tag > max)
-      max = tag;
-  }
-  return max;
-}
 var CLEARED_REASONING_TYPES = new Set(["thinking", "reasoning"]);
 function stripClearedReasoning(messages) {
   let stripped = 0;
@@ -4815,11 +2978,8 @@ function stripClearedReasoning(messages) {
   return stripped;
 }
 var INLINE_THINKING_PATTERN = /<(?:thinking|think)>[\s\S]*?<\/(?:thinking|think)>\s*/g;
-function stripInlineThinking(messages, messageTagNumbers, clearReasoningAge) {
-  const maxTag = findMaxTag(messageTagNumbers);
-  if (maxTag === 0)
-    return 0;
-  const ageCutoff = maxTag - clearReasoningAge;
+function stripInlineThinking(messages, messageTagNumbers, cutoff) {
+  const ageCutoff = cutoff;
   let stripped = 0;
   for (const message of messages) {
     if (message.info.role !== "assistant")
@@ -4882,7 +3042,7 @@ function findLatestAssistantReasoningMutationExemptMessage(messages) {
   }
   return;
 }
-function planMergedAssistantReasoningStrip(messages, mutationExemptMessage, frozenMessageIds) {
+function planMergedAssistantReasoningStrip(messages, mutationExemptMessage, frozenMessageIds, protectedMessages) {
   const plan = [];
   let prevRole;
   let keptReasoningInRun = false;
@@ -4896,7 +3056,7 @@ function planMergedAssistantReasoningStrip(messages, mutationExemptMessage, froz
     const firstInRun = prevRole !== "assistant";
     if (firstInRun)
       keptReasoningInRun = false;
-    if (message === mutationExemptMessage || frozenMessageIds?.has(message.info.id ?? "")) {
+    if (protectedMessages?.has(message) || message === mutationExemptMessage || frozenMessageIds?.has(message.info.id ?? "")) {
       prevRole = role;
       continue;
     }
@@ -5058,12 +3218,14 @@ function applyFrozenTrailingBlankDecisions(messages, frozenDecisions) {
   }
   return mutations;
 }
-function stripReasoningFromAssistantIds(messages, providerID, messageIds) {
+function stripReasoningFromAssistantIds(messages, providerID, messageIds, protectedMessages) {
   if (messageIds.size === 0)
     return 0;
   const emptySentinels = modelAcceptsEmptyContent(providerID);
   let stripped = 0;
   for (const message of messages) {
+    if (protectedMessages?.has(message))
+      continue;
     const id = message.info.id;
     if (typeof id !== "string" || !messageIds.has(id))
       continue;
@@ -5089,7 +3251,7 @@ function findMergedReasoningStripDecisions(messages, providerID, frozenIds, opti
     return [];
   const frozenParts = readFrozenMergedReasoningParts(frozenIds);
   const decisions = [];
-  for (const entry of planMergedAssistantReasoningStrip(messages, options?.mutationExemptMessage, new Set(frozenParts.keys()))) {
+  for (const entry of planMergedAssistantReasoningStrip(messages, options?.mutationExemptMessage, new Set(frozenParts.keys()), options?.protectedMessages)) {
     const id = entry.message.info.id;
     if (typeof id !== "string" || id.length === 0 || frozenParts.has(id))
       continue;
@@ -5107,7 +3269,7 @@ function stripReasoningFromMergedAssistants(messages, providerID, options) {
   let stripped = 0;
   const frozenParts = readFrozenMergedReasoningParts(options?.frozenMessageIds ?? new Set);
   for (const message of messages) {
-    if (message === options?.mutationExemptMessage || message.info.role !== "assistant")
+    if (message.info.role !== "assistant" || options?.restoreMessages?.has(message))
       continue;
     const parts = frozenParts.get(message.info.id ?? "");
     if (!parts)
@@ -5122,7 +3284,7 @@ function stripReasoningFromMergedAssistants(messages, providerID, options) {
       stripped++;
     }
   }
-  for (const entry of planMergedAssistantReasoningStrip(messages, options?.mutationExemptMessage, new Set(frozenParts.keys()))) {
+  for (const entry of planMergedAssistantReasoningStrip(messages, options?.mutationExemptMessage, new Set(frozenParts.keys()), options?.frozenMessageIds ? options.restoreMessages : options?.protectedMessages)) {
     if (options?.frozenMessageIds) {
       const id = entry.message.info.id;
       if (typeof id !== "string" || !options.frozenMessageIds.has(id))
@@ -5240,12 +3402,8 @@ function stripOpenRouterReasoningDetails(message) {
   return stripped;
 }
 function selectReasoningRemovals(args) {
-  let maxTag = 0;
-  for (const tag of args.messageTagNumbers.values())
-    if (tag > maxTag)
-      maxTag = tag;
-  const cutoff = maxTag - args.clearReasoningAge;
-  if (maxTag === 0 || cutoff <= 0)
+  const cutoff = args.cutoff;
+  if (cutoff <= 0)
     return [];
   const newest = newestAssistant(args.messages);
   const exempt = findLatestAssistantReasoningMutationExemptMessage(args.messages);
@@ -5259,7 +3417,7 @@ function selectReasoningRemovals(args) {
     if (id !== undefined && (args.alreadyRemoved.has(id) || args.prefixBound && args.alsoGone?.has(id)))
       continue;
     const tag = args.messageTagNumbers.get(message) ?? 0;
-    const removable = id !== undefined && message !== newest && message !== exempt && tag > 0 && tag <= cutoff && hasWireContentBesideReasoning(message) && reasoningPayloadLeavesWithParts(message);
+    const removable = !args.protectedMessages?.has(message) && id !== undefined && message !== newest && message !== exempt && tag > 0 && tag <= cutoff && hasWireContentBesideReasoning(message) && reasoningPayloadLeavesWithParts(message);
     if (removable && id !== undefined)
       selected.push(id);
     else if (args.prefixBound)
@@ -5270,10 +3428,9 @@ function selectReasoningRemovals(args) {
 function removeReasoningParts(messages, ids, providerID) {
   if (ids.size === 0)
     return 0;
-  const exempt = findLatestAssistantReasoningMutationExemptMessage(messages);
   let removed = 0;
   for (const message of messages) {
-    if (message.info.role !== "assistant" || message === exempt)
+    if (message.info.role !== "assistant")
       continue;
     const id = message.info.id;
     if (typeof id !== "string" || !ids.has(id))
@@ -5309,6 +3466,441 @@ function settleDroppedReasoningParts(messages, mode) {
   return settled;
 }
 
+// src/hooks/magic-context/latest-assistant-turn.ts
+var THINKING_TYPES = new Set(["reasoning", "thinking", "redacted_thinking"]);
+function role(message) {
+  if (!isRecord(message))
+    return;
+  return isRecord(message.info) ? message.info.role : message.role;
+}
+function content(message) {
+  if (!isRecord(message))
+    return;
+  return Array.isArray(message.parts) ? message.parts : message.content;
+}
+function latestAssistantTurnStart(messages) {
+  let lo = 0;
+  let hi = messages.length;
+  while (lo < hi) {
+    const mid = lo + hi >>> 1;
+    if (isInActiveAnthropicTurn(messages, mid, true))
+      hi = mid;
+    else
+      lo = mid + 1;
+  }
+  return lo;
+}
+function latestAssistantTurnMessages(messages) {
+  return new Set(messages.slice(latestAssistantTurnStart(messages)));
+}
+function hasActiveAnthropicThinkingTurn(messages, provider, model) {
+  const familyRoute = isAnthropicFamilyRoute(provider, model);
+  for (const message of messages.slice(latestAssistantTurnStart(messages))) {
+    if (role(message) !== "assistant")
+      continue;
+    const parts = content(message);
+    if (!Array.isArray(parts))
+      continue;
+    if (parts.some((part) => isRecord(part) && THINKING_TYPES.has(String(part.type ?? part.kind)) && (familyRoute || isRecord(part.metadata) && isRecord(part.metadata.anthropic))))
+      return true;
+  }
+  return false;
+}
+function protectNewTagMutations(messages, targets, protectedParts, prefixBound) {
+  if (protectedParts.size === 0)
+    return targets;
+  const positions = new Map;
+  let ordinal = 0;
+  for (const message of messages)
+    for (const part of message.parts)
+      positions.set(part, ordinal++);
+  let lastProtected = -1;
+  for (const part of protectedParts)
+    lastProtected = Math.max(lastProtected, positions.get(part) ?? -1);
+  const result = new Map;
+  for (const [tag, target] of targets) {
+    const coordinates = target.mutationParts ?? (target.message ? target.message.parts.map((part) => ({ message: target.message, part })) : []);
+    const prefixEdit = prefixBound && coordinates.some(({ part }) => (positions.get(part) ?? Infinity) < lastProtected);
+    const dropsThinking = target.dropReasoningParts?.some((part) => protectedParts.has(part)) === true;
+    if (!prefixEdit && !dropsThinking) {
+      result.set(tag, target);
+      continue;
+    }
+    result.set(tag, {
+      ...target,
+      thinkingDropProtected: true,
+      thinkingRewriteProtected: prefixEdit,
+      canDrop: () => false,
+      drop: () => "incomplete",
+      truncate: () => "incomplete",
+      skeletonReal: () => "incomplete",
+      skeletonStripped: () => "incomplete",
+      editMarker: () => "incomplete",
+      editMarkerStripped: () => "incomplete",
+      setContent: (content, options) => prefixEdit || options?.keepReasoning !== true ? false : target.setContent(content, options)
+    });
+  }
+  return result;
+}
+function retainedActiveThinkingParts(args) {
+  if (!hasActiveAnthropicThinkingTurn(args.messages, args.providerID, args.modelID))
+    return new Set;
+  const copies = args.messages.map((message) => ({
+    info: message.info,
+    parts: message.parts.map((part) => {
+      if (!isRecord(part) || THINKING_TYPES.has(String(part.type)) || !isRecord(part.metadata))
+        return part;
+      return {
+        ...part,
+        metadata: {
+          ...part.metadata,
+          ...isRecord(part.metadata.openrouter) ? { openrouter: { ...part.metadata.openrouter } } : {}
+        }
+      };
+    })
+  }));
+  stripClearedReasoning(copies);
+  stripReasoningFromAssistantIds(copies, args.providerID, args.bindingIds);
+  stripReasoningFromMergedAssistants(copies, args.providerID, {
+    frozenMessageIds: args.mergedIds
+  });
+  if (args.removedIds?.size)
+    removeReasoningParts(copies, args.removedIds, args.providerID);
+  const retained = new Set;
+  for (let i = latestAssistantTurnStart(args.messages);i < copies.length; i++) {
+    for (const part of copies[i].parts) {
+      if (isRecord(part) && THINKING_TYPES.has(String(part.type)))
+        retained.add(part);
+    }
+  }
+  return retained;
+}
+
+// src/hooks/magic-context/note-visibility.ts
+var NOTE_TOOL_NAMES = new Set(["ctx_note"]);
+var READ_ACTION = "read";
+function hasVisibleNoteReadCall(messages) {
+  for (let i = messages.length - 1;i >= 0; i -= 1) {
+    const parts = messages[i]?.parts;
+    if (!Array.isArray(parts))
+      continue;
+    for (const part of parts) {
+      if (isSentinel(part))
+        continue;
+      if (isVisibleNoteReadPart(part))
+        return true;
+    }
+  }
+  return false;
+}
+function isVisibleNoteReadPart(part) {
+  if (!isRecord(part))
+    return false;
+  if (part.type === "tool" && typeof part.tool === "string" && NOTE_TOOL_NAMES.has(part.tool)) {
+    const state = part.state;
+    if (isRecord(state) && isRecord(state.input)) {
+      return state.input.action === READ_ACTION;
+    }
+    return false;
+  }
+  if (part.type === "tool_use" && typeof part.name === "string" && NOTE_TOOL_NAMES.has(part.name)) {
+    if (isRecord(part.input)) {
+      return part.input.action === READ_ACTION;
+    }
+    return false;
+  }
+  if (part.type === "tool-invocation" && typeof part.toolName === "string" && NOTE_TOOL_NAMES.has(part.toolName)) {
+    const argsCandidate = part.args ?? part.input;
+    if (isRecord(argsCandidate)) {
+      return argsCandidate.action === READ_ACTION;
+    }
+    return false;
+  }
+  return false;
+}
+
+// src/hooks/magic-context/postprocess-read-cache.ts
+var connections = new WeakMap;
+function snapshot(db, sessionId) {
+  const transaction = db;
+  try {
+    if (transaction.inTransaction || transaction.isTransaction) {
+      connections.delete(db);
+      return { version: -1, changes: -1 };
+    }
+  } catch {
+    connections.delete(db);
+    return { version: -1, changes: -1 };
+  }
+  let connection = connections.get(db);
+  if (!connection) {
+    connection = {
+      stamp: db.prepare("SELECT total_changes() AS changes, data_version AS version FROM pragma_data_version"),
+      sessions: new BoundedSessionMap(100)
+    };
+    connections.set(db, connection);
+  }
+  const stamp = connection.stamp.get();
+  const previous = connection.sessions.get(sessionId);
+  if (previous?.version === stamp.version && previous.changes === stamp.changes) {
+    return previous;
+  }
+  const value = { ...stamp };
+  connection.sessions.set(sessionId, value);
+  return value;
+}
+function postprocessTailTags(db, sessionId) {
+  const state = snapshot(db, sessionId);
+  return state.tags ??= getTailHygieneTags(db, sessionId);
+}
+function postprocessOldestTags(db, sessionId, protectedNumbers) {
+  const state = snapshot(db, sessionId);
+  const hints = state.hints;
+  if (hints && hints.protectedNumbers.size === protectedNumbers.size && [...protectedNumbers].every((number) => hints.protectedNumbers.has(number))) {
+    return hints.value;
+  }
+  const value = getOldestActiveUnprotectedToolTags(db, sessionId, protectedNumbers);
+  state.hints = { protectedNumbers: new Set(protectedNumbers), value };
+  return value;
+}
+function postprocessReplaySnapshot(db, sessionId) {
+  const state = snapshot(db, sessionId);
+  const replay = state.replay ??= loadPostprocessReplaySnapshot(db, sessionId);
+  return {
+    ...replay,
+    staleReduceStrippedIds: new Set(replay.staleReduceStrippedIds),
+    processedImageStrippedIds: new Set(replay.processedImageStrippedIds),
+    strippedPlaceholderIds: new Set(replay.strippedPlaceholderIds),
+    hiddenSeamPlaceholderIds: new Set(replay.hiddenSeamPlaceholderIds),
+    mergedReasoningStrippedIds: new Set(replay.mergedReasoningStrippedIds),
+    trailingBlankDecisions: new Map(replay.trailingBlankDecisions),
+    noteNudgeAnchors: structuredClone(replay.noteNudgeAnchors),
+    autoSearchHintDecisions: structuredClone(replay.autoSearchHintDecisions),
+    todoSyntheticAnchor: structuredClone(replay.todoSyntheticAnchor),
+    pendingCompactionMarker: structuredClone(replay.pendingCompactionMarker),
+    compactionMarker: structuredClone(replay.compactionMarker)
+  };
+}
+
+// src/hooks/magic-context/reasoning-budget.ts
+function projectOpencodeReasoningBudgetCutoff(db, sessionId, messages, budget, watermark, proseRatio) {
+  const maxTags = new Map;
+  for (const tag of getTagsBySession(db, sessionId)) {
+    const id = tag.type === "tool" ? tag.toolOwnerMessageId : contentTagOwnerMessageId(tag.messageId);
+    if (id)
+      maxTags.set(id, Math.max(maxTags.get(id) ?? 0, tag.tagNumber));
+  }
+  const messageTags = new Map;
+  const gone = new Set(getReasoningRemovalState(db, sessionId).messageIds);
+  for (const message of messages) {
+    if (typeof message.info.id !== "string")
+      continue;
+    const tag = maxTags.get(message.info.id) ?? 0;
+    messageTags.set(message, tag);
+    if (tag > 0 && tag <= watermark)
+      gone.add(message.info.id);
+  }
+  return opencodeReasoningBudgetCutoff({
+    messages,
+    messageTagNumbers: messageTags,
+    budget,
+    alreadyRemoved: gone,
+    textEstimateByMessageId: getReasoningTokenEstimatesByMessage(db, sessionId, proseRatio),
+    proseRatio,
+    frozenMergedIds: getMergedReasoningStrippedIds(db, sessionId),
+    alsoGone: new Set([...getMergedReasoningStrippedIds(db, sessionId)].filter((id) => id.startsWith(THINKING_BINDING_RECOVERY_FROZEN_PREFIX)).map((id) => id.slice(THINKING_BINDING_RECOVERY_FROZEN_PREFIX.length)))
+  });
+}
+var DEFAULT_KEEP_REASONING_TOKENS = 1e4;
+var UNKNOWN_REASONING_STEP_TOKENS = 1000;
+function resolveKeepReasoningTokens(config, modelKey) {
+  const values = config && typeof config === "object" ? Object.assign(Object.create(null), config) : undefined;
+  return typeof config === "number" ? config : resolveModelConfigValue(values, modelKey)?.value ?? values?.default ?? DEFAULT_KEEP_REASONING_TOKENS;
+}
+function reasoningStepCost(reported, textEstimate, opaque) {
+  if (reported !== undefined && Number.isFinite(reported) && reported > 0)
+    return reported;
+  if (textEstimate > 0)
+    return Math.ceil(textEstimate);
+  return opaque ? UNKNOWN_REASONING_STEP_TOKENS : 0;
+}
+function reasoningBudgetCutoff(steps, budget) {
+  const cost = (step) => step.alreadyRemoved ? 0 : typeof step.cost === "function" ? step.cost() : step.cost;
+  let kept = 0;
+  let upperBound = Number.POSITIVE_INFINITY;
+  for (const step of steps) {
+    if (!step.exempt)
+      continue;
+    kept += cost(step);
+    if (step.tag > 0)
+      upperBound = Math.min(upperBound, step.tag - 1);
+  }
+  for (let index = steps.length - 1;index >= 0; index--) {
+    const step = steps[index];
+    if (step.exempt || step.alreadyRemoved)
+      continue;
+    const tokens = cost(step);
+    if (kept + tokens <= budget) {
+      kept += tokens;
+      if (step.tag > 0)
+        upperBound = Math.min(upperBound, step.tag - 1);
+      continue;
+    }
+    let tag = step.tag;
+    for (let older = index - 1;tag <= 0 && older >= 0; older--)
+      tag = steps[older].tag;
+    return Math.max(0, Math.min(tag, upperBound));
+  }
+  return 0;
+}
+function reasoningTextAndOpaque(parts) {
+  let text = "";
+  let inlineText = "";
+  let opaque = false;
+  let hasReasoning = false;
+  const detailText = new Set;
+  for (const part of parts) {
+    if (!isRecord(part))
+      continue;
+    if (part.ignored === true)
+      continue;
+    if (isRecord(part.metadata)) {
+      const router = part.metadata.openrouter;
+      if (isRecord(router) && Array.isArray(router.reasoning_details) && router.reasoning_details.length > 0) {
+        hasReasoning = true;
+        opaque = true;
+        for (const detail of router.reasoning_details) {
+          if (!isRecord(detail))
+            continue;
+          if (detail.type === "reasoning.text" && typeof detail.text === "string")
+            detailText.add(detail.text);
+          if (detail.type === "reasoning.summary" && typeof detail.summary === "string")
+            detailText.add(detail.summary);
+        }
+      }
+    }
+    if (["reasoning", "thinking", "redacted_thinking"].includes(String(part.type))) {
+      hasReasoning = true;
+      const visible = part.type === "redacted_thinking" || part.redacted === true ? "" : typeof part.thinking === "string" ? part.thinking : typeof part.text === "string" ? part.text : "";
+      if (visible !== "[cleared]")
+        text += visible;
+      opaque ||= part.type === "redacted_thinking" || part.redacted === true || visible === "" && (part.metadata !== undefined || part.signature !== undefined || part.thinkingSignature !== undefined);
+    } else if (part.type === "text" && typeof part.text === "string") {
+      for (const match of part.text.matchAll(/<(?:thinking|think)>([\s\S]*?)<\/(?:thinking|think)>/gi))
+        inlineText += match[1];
+    }
+  }
+  return { text: text || [...detailText].join(""), inlineText, opaque, hasReasoning };
+}
+function opencodeReasoningBudgetCutoff(args) {
+  const assistants = args.messages.filter((message) => message.info.role === "assistant");
+  const newest = assistants.at(-1);
+  const exempt = findLatestAssistantReasoningMutationExemptMessage(args.messages);
+  return reasoningBudgetCutoff(assistants.map((message) => ({
+    tag: args.messageTagNumbers.get(message) ?? 0,
+    exempt: message === newest || message === exempt || isInActiveAnthropicTurn(args.messages, args.messages.indexOf(message), args.anthropic ?? hasAnthropicReasoning(args.messages)),
+    cost: () => {
+      const costMessage = { ...message, parts: [...message.parts] };
+      if (args.frozenMergedIds)
+        stripReasoningFromMergedAssistants([costMessage], "anthropic", {
+          frozenMessageIds: args.frozenMergedIds
+        });
+      const visible = reasoningTextAndOpaque(args.countNeutralized ? costMessage.parts.map(neutralizedReasoningSource) : costMessage.parts);
+      if (!visible.hasReasoning && !visible.inlineText)
+        return 0;
+      const info = message.info;
+      const tokens = isRecord(info.tokens) ? info.tokens.reasoning : undefined;
+      const typedGone = typeof message.info.id === "string" && (args.alreadyRemoved?.has(message.info.id) === true || args.alsoGone?.has(message.info.id) === true);
+      return (visible.hasReasoning && !typedGone ? reasoningStepCost(typeof tokens === "number" ? tokens : undefined, estimateTokens(visible.text) * (args.proseRatio ?? 1), visible.opaque) : 0) + Math.ceil(estimateTokens(visible.inlineText) * (args.proseRatio ?? 1));
+    }
+  })), args.budget);
+}
+
+// src/hooks/magic-context/reasoning-budget-status.ts
+var sources = new Map;
+function captureOpencodeReasoningBudgetStatus(sessionId, messages, budget, prefixBound, proseRatio = 1) {
+  if (messages.some((message) => !isRecord(message) || !isRecord(message.info) || typeof message.info.role !== "string" || !Array.isArray(message.parts))) {
+    sources.delete(sessionId);
+    return;
+  }
+  const compact = messages.filter((message) => message.info.role === "assistant").map((message) => {
+    const info = message.info;
+    const visible = reasoningTextAndOpaque(message.parts);
+    const parts = message.parts.filter(isRecord).map((part) => ({
+      type: typeof part.type === "string" ? part.type : "",
+      text: typeof part.text === "string" && part.type !== "redacted_thinking" && part.redacted !== true ? part.text : undefined,
+      thinking: typeof part.thinking === "string" && part.redacted !== true ? part.thinking : undefined,
+      ignored: part.ignored === true,
+      redacted: part.redacted === true,
+      metadata: part.metadata === undefined ? undefined : {},
+      signature: part.signature === undefined ? undefined : true,
+      thinkingSignature: part.thinkingSignature === undefined ? undefined : true
+    }));
+    if (visible.hasReasoning && !reasoningTextAndOpaque(parts).hasReasoning)
+      parts.push({
+        type: "reasoning",
+        text: visible.text,
+        thinking: undefined,
+        ignored: false,
+        redacted: false,
+        metadata: visible.opaque ? {} : undefined,
+        signature: undefined,
+        thinkingSignature: undefined
+      });
+    return {
+      info: {
+        role: info.role,
+        tokens: isRecord(info.tokens) && typeof info.tokens.reasoning === "number" ? { reasoning: info.tokens.reasoning } : undefined
+      },
+      parts
+    };
+  });
+  sources.delete(sessionId);
+  sources.set(sessionId, { messages: compact, budget, prefixBound, proseRatio });
+  if (sources.size > 32)
+    sources.delete(sources.keys().next().value);
+}
+function reasoningBudgetStatusLine(sessionId) {
+  try {
+    const source = sources.get(sessionId);
+    if (!source)
+      return;
+    source.status ??= opencodeReasoningBudgetStatus(source.messages, source.budget, source.prefixBound, source.proseRatio);
+    return formatReasoningBudgetStatus(source.status);
+  } catch {
+    return;
+  }
+}
+function formatReasoningBudgetStatus(status) {
+  const count = (tokens) => tokens >= 1000 ? `${Number((tokens / 1000).toFixed(1))}k` : String(Math.round(tokens));
+  return `Reasoning kept: ${count(status.kept)} of ${count(status.budget)} (${status.estimated ? "estimated" : "reported"})${status.overrun ? ` (over budget: ${status.overrun})` : ""}`;
+}
+function opencodeReasoningBudgetStatus(messages, budget, prefixBound, proseRatio = 1) {
+  const assistants = messages.filter((message) => message.info.role === "assistant");
+  const newest = assistants.at(-1);
+  const exempt = findLatestAssistantReasoningMutationExemptMessage(messages);
+  let kept = 0;
+  let exemptCost = 0;
+  let estimated = false;
+  for (const message of assistants) {
+    const visible = reasoningTextAndOpaque(message.parts);
+    const info = message.info;
+    const reported = isRecord(info.tokens) && typeof info.tokens.reasoning === "number" ? info.tokens.reasoning : undefined;
+    const cost = (visible.hasReasoning ? reported !== undefined && Number.isFinite(reported) && reported > 0 ? reported : reasoningStepCost(reported, estimateTokens(visible.text) * proseRatio, visible.opaque) : 0) + Math.ceil(estimateTokens(visible.inlineText) * proseRatio);
+    kept += cost;
+    if (message === newest || message === exempt)
+      exemptCost += cost;
+    if (cost > 0 && (!(reported && Number.isFinite(reported) && reported > 0) || visible.inlineText !== ""))
+      estimated = true;
+  }
+  return {
+    kept,
+    budget,
+    estimated,
+    overrun: kept > budget ? exemptCost > budget ? "newest step" : prefixBound ? "signed prefix" : "awaiting rebuild" : undefined
+  };
+}
+
 // src/hooks/magic-context/supersession-reclaim.ts
 var SUPERSESSION_RECENT_MESSAGE_WINDOW = 20;
 function recentSupersessionOwnerMessageIds(db, sessionId) {
@@ -6073,6 +4665,7 @@ function hasRecentAssistantCommit(messages) {
   return false;
 }
 function tagMessages(sessionId, messages, tagger, db, options = {}) {
+  const protectedThinkingParts = new Set([...options.protectedThinkingMessages ?? []].flatMap((message) => message.parts));
   const skipPrefixInjection = options.skipPrefixInjection === true;
   const onToolOwnerFallbackLookup = options.onToolOwnerFallbackLookup;
   const targets = new Map;
@@ -6280,6 +4873,8 @@ function tagMessages(sessionId, messages, tagger, db, options = {}) {
         }
         targets.set(tagId, {
           message,
+          dropReasoningParts: thinkingParts,
+          mutationParts: [{ message, part: textPart }],
           textPrefix: skipPrefixInjection ? "" : prependTag(tagId, ""),
           setContent: (content, options) => {
             if (textPart.text === content)
@@ -6291,6 +4886,8 @@ function tagMessages(sessionId, messages, tagger, db, options = {}) {
             if (options?.keepReasoning === true)
               return true;
             for (const tp of thinkingParts) {
+              if (protectedThinkingParts.has(tp))
+                continue;
               if (partialEnd !== undefined && message.parts.indexOf(tp) > partialEnd)
                 continue;
               neutralizeDroppedReasoningPart(tp);
@@ -6360,6 +4957,7 @@ function tagMessages(sessionId, messages, tagger, db, options = {}) {
         messageTagNumbers.set(message, Math.max(messageTagNumbers.get(message) ?? 0, tagId));
         targets.set(tagId, {
           message,
+          mutationParts: [{ message, part: filePart }],
           setContent: (content) => {
             const prev = messageParts[partIndex];
             const prevText = typeof prev === "object" && prev !== null && "text" in prev ? prev.text : "";
@@ -6403,7 +5001,7 @@ function tagMessages(sessionId, messages, tagger, db, options = {}) {
     if (touchesUncoveredPart)
       continue;
     const thinkingParts = toolThinkingByCallId.get(compositeKey) ?? [];
-    targets.set(tagId, createToolDropTarget(compositeKey, thinkingParts, toolCallIndex, batch, tagId));
+    targets.set(tagId, createToolDropTarget(compositeKey, thinkingParts.filter((part) => !protectedThinkingParts.has(part)), toolCallIndex, batch, tagId));
   }
   const hasRecentReduceCall = lastReduceMessageIndex >= 0 && messages.length - lastReduceMessageIndex <= RECENT_REDUCE_LOOKBACK;
   return {
@@ -6546,7 +5144,8 @@ async function applyTodoSynthesis2(args) {
   return 0;
 }
 function freezeAllReasoningForBindingRecovery(args) {
-  const messageIds = findReasoningBearingAssistantIds(args.messages);
+  const protectedMessages = args.protectedMessages ?? new Set;
+  const messageIds = findReasoningBearingAssistantIds(args.messages.filter((message) => !protectedMessages.has(message)));
   const newIds = messageIds.filter((id) => !args.recoveredMessageIds.has(id));
   if (newIds.length > 0 && !addMergedReasoningStrippedIds(args.db, args.sessionId, newIds.map(thinkingBindingRecoveryFrozenId))) {
     return null;
@@ -6559,7 +5158,8 @@ function countAutoSearchHints(db, sessionId) {
   return getAutoSearchHintDecisions(db, sessionId).filter((decision) => decision.decision === "hint").length;
 }
 function freezeReasoningOnBustingPass2(args) {
-  const messageIds = findReasoningBearingAssistantIds(args.messages).filter((id) => !args.alreadyFrozen.has(id));
+  const protectedMessages = args.protectedMessages ?? new Set;
+  const messageIds = findReasoningBearingAssistantIds(args.messages.filter((message) => !protectedMessages.has(message))).filter((id) => !args.alreadyFrozen.has(id));
   if (messageIds.length === 0)
     return { strip: null, persistenceFailed: false };
   let persisted = false;
@@ -6646,7 +5246,7 @@ function replayRustModeBindingMismatchStrips2(args) {
     if (messageId.length > 0)
       recoveryMessageIds.add(messageId);
   }
-  stripReasoningFromAssistantIds(args.messages, args.resolvedProviderID, recoveryMessageIds);
+  stripReasoningFromAssistantIds(args.messages, args.resolvedProviderID, recoveryMessageIds, args.protectedThinkingMessages);
 }
 var RUST_MARKER_LOCK_SKIP_LOG2 = "rust compaction-marker: pending target write skipped on lock contention; next cache-busting pass retries";
 function isSqliteLockContentionError(error) {
@@ -6759,13 +5359,14 @@ function applyRustModeThinkingStrips(args, hostEditBeforeNewestThinking) {
         if (messageId.length > 0)
           recoveryMessageIds.add(messageId);
       }
-      const flagTarget = args.thinkingBindingRecoveryEnabledForModel ? getThinkingBindingRecoveryTarget(args.db, args.sessionId) : null;
+      const flagTarget = !args.activeThinkingTurn && args.thinkingBindingRecoveryEnabledForModel ? getThinkingBindingRecoveryTarget(args.db, args.sessionId) : null;
       if (flagTarget) {
         thinkingBindingRecovery = freezeAllReasoningForBindingRecovery({
           db: args.db,
           sessionId: args.sessionId,
           messages: args.messages,
           flagTarget,
+          protectedMessages: args.protectedThinkingMessages,
           recoveredMessageIds: recoveryMessageIds
         });
         if (!thinkingBindingRecovery) {
@@ -6775,24 +5376,26 @@ function applyRustModeThinkingStrips(args, hostEditBeforeNewestThinking) {
     } catch (error) {
       sessionLog(args.sessionId, "rust thinking binding recovery failed:", error);
     }
-    stripReasoningFromAssistantIds(args.messages, args.resolvedProviderID, recoveryMessageIds);
-    const moduleBustStrips = args.cacheBustingPass === true && (args.moduleReasoningTrimOnly !== true || hostEditBeforeNewestThinking);
+    stripReasoningFromAssistantIds(args.messages, args.resolvedProviderID, recoveryMessageIds, args.protectedThinkingMessages);
+    const moduleBustStrips = !args.activeThinkingTurn && args.cacheBustingPass === true && (args.moduleReasoningTrimOnly !== true || hostEditBeforeNewestThinking);
     const stripFrom = args.thinkingBindingRecoveryEnabledForModel === true ? proactiveStripStartIndex({ ...args, cacheBustingPass: moduleBustStrips }) : null;
     if (stripFrom !== null) {
       const outcome = freezeReasoningOnBustingPass2({
         db: args.db,
         sessionId: args.sessionId,
         messages: args.messages.slice(stripFrom),
+        protectedMessages: args.protectedThinkingMessages,
         alreadyFrozen: recoveryMessageIds
       });
       if (outcome.strip) {
         proactiveThinkingStrip = outcome.strip;
         for (const id of outcome.strip.messageIds)
           recoveryMessageIds.add(id);
-        stripReasoningFromAssistantIds(args.messages, args.resolvedProviderID, new Set(outcome.strip.messageIds));
+        stripReasoningFromAssistantIds(args.messages, args.resolvedProviderID, new Set(outcome.strip.messageIds), args.protectedThinkingMessages);
       }
     }
   }
+  args.restoreLatestTurnOriginals?.();
   return { thinkingBindingRecovery, proactiveThinkingStrip };
 }
 function runRustModePostprocess2(args) {
@@ -7042,6 +5645,8 @@ function evaluateEmergencyFailClosed2(input) {
   };
 }
 function finalizeMessageRepresentation2(messages, resolvedProviderID, options) {
+  const protectedMessages = options?.protectedThinkingMessages ?? new Set;
+  const restoredMessages = new Set(messages.filter((message) => protectedMessages.has(message) && typeof message.info.id === "string" && options?.restoreThinkingMessageIds?.has(message.info.id)));
   let clearedParts = 0;
   if (modelAcceptsEmptyContent(resolvedProviderID)) {
     const prependedMessageCount = Math.min(messages.length, Math.max(0, options?.prependedMessageCount ?? 0));
@@ -7056,13 +5661,15 @@ function finalizeMessageRepresentation2(messages, resolvedProviderID, options) {
       }
     }
     if (targetedMessages.length > 0) {
-      clearedParts = stripClearedReasoning(targetedMessages);
+      clearedParts = stripClearedReasoning(targetedMessages.filter((message) => !restoredMessages.has(message)));
     }
   }
-  const bindingRecoveryParts = options?.skipMergedReasoningStrip ? 0 : stripReasoningFromAssistantIds(messages, resolvedProviderID, options?.thinkingBindingRecoveryMessageIds ?? new Set);
+  const bindingRecoveryParts = options?.skipMergedReasoningStrip ? 0 : stripReasoningFromAssistantIds(messages, resolvedProviderID, options?.frozenThinkingBindingMessageIds ?? new Set, restoredMessages);
   const mergedReasoningParts = bindingRecoveryParts + (options?.skipMergedReasoningStrip ? 0 : stripReasoningFromMergedAssistants(messages, resolvedProviderID, {
     mutationExemptMessage: options?.reasoningMutationExemptMessage,
-    frozenMessageIds: options?.mergedReasoningStrippedIds
+    frozenMessageIds: options?.mergedReasoningStrippedIds,
+    protectedMessages,
+    restoreMessages: restoredMessages
   }));
   if (!options?.skipTrailingWhitespaceStrip && modelAcceptsEmptyContent(resolvedProviderID)) {
     applyFrozenTrailingBlankDecisions(messages, options?.trailingBlankDecisions ?? new Map);
@@ -7111,7 +5718,29 @@ async function runPostTransformPhase2(args) {
   const deferredMaterialize = args.canConsumeDeferredLate && deferredMaterializationWasPending;
   const materializationRequested = isExplicitFlush || deferredMaterialize;
   const m0M1EnabledForFold = args.m0M1 !== undefined && (!!args.m0M1.projectPath || !!args.m0M1.projectDirectory) && (args.fullFeatureMode || compactionOff);
-  const freezeM0M1 = args.freezeM0M1 === true;
+  const frozenThinking = new Set(args.activeThinkingTurn ? getMergedReasoningStrippedIds(args.db, args.sessionId) : []);
+  const bindingThinking = new Set([...frozenThinking].filter((id) => id.startsWith(THINKING_BINDING_RECOVERY_FROZEN_PREFIX)).map((id) => id.slice(THINKING_BINDING_RECOVERY_FROZEN_PREFIX.length)));
+  const retainedThinking = args.activeThinkingTurn ? retainedActiveThinkingParts({
+    messages: args.messages,
+    providerID: args.resolvedProviderID,
+    modelID: args.resolvedModelID,
+    mergedIds: frozenThinking,
+    bindingIds: bindingThinking,
+    removedIds: getReasoningRemovalState(args.db, args.sessionId).messageIds
+  }) : new Set;
+  const activeThinkingTurn = retainedThinking.size > 0;
+  const protectedThinkingMessages = new Set(args.messages.filter((message) => message.parts.some((part) => retainedThinking.has(part))));
+  const newTargets = protectNewTagMutations(args.messages, args.targets, retainedThinking, args.thinkingBindingRecoveryEnabledForModel === true);
+  let maxReasoningTag = 0;
+  for (const tag of args.messageTagNumbers.values())
+    maxReasoningTag = Math.max(maxReasoningTag, tag);
+  let safeReasoningCutoff = maxReasoningTag;
+  for (const message of protectedThinkingMessages) {
+    const tag = args.messageTagNumbers.get(message);
+    if (tag && tag > 0)
+      safeReasoningCutoff = Math.min(safeReasoningCutoff, tag - 1);
+  }
+  const freezeM0M1 = args.freezeM0M1 === true || activeThinkingTurn && args.thinkingBindingRecoveryEnabledForModel === true;
   const foldDueDecision = m0M1EnabledForFold && args.m0M1 && !freezeM0M1 ? mustMaterialize({
     db: args.db,
     sessionId: args.sessionId,
@@ -7228,6 +5857,8 @@ async function runPostTransformPhase2(args) {
   const shouldReadPendingOps = !compactionOff && (materializationRequested || publishedM1RefreshedThisPass || args.schedulerDecision === "execute" || forceMaterialization || foldExecutedThisPass || firstRenderBust || compartmentRunning);
   const pendingOps = shouldReadPendingOps ? getPendingOps(args.db, args.sessionId) : [];
   const hasPendingUserOps = pendingOps.length > 0;
+  if (args.schedulerDecision === "execute" && pendingOps.some((op) => newTargets.get(op.tagId)?.thinkingDropProtected))
+    args.pendingMaterializationSessions.add(args.sessionId);
   const formatPendingOpsDepth = () => {
     const depth = getPendingOpsCount(args.db, args.sessionId);
     return depth === null ? "not loaded (deferred pass)" : String(depth);
@@ -7345,7 +5976,7 @@ async function runPostTransformPhase2(args) {
       const applyReason = isExplicitFlush ? "explicit_flush" : deferredMaterialize ? "deferred_materialization" : foldBustsServedPrefixThisPass && args.schedulerDecision !== "execute" ? `m0_hard_fold (drain folded into executed m[0] bust, scheduler=${args.schedulerDecision})` : `${reclaimRideLabel(rideSignals)} (scheduler=${args.schedulerDecision})`;
       sessionLog(args.sessionId, `pending ops WILL APPLY — reason=${applyReason}, pendingOps=${formatPendingOpsDepth()}, context=${args.contextUsage.percentage.toFixed(1)}%`);
       const tApply = performance.now();
-      pendingOpsDidMutate = applyPendingOperations(args.sessionId, args.db, args.targets, new Set([
+      pendingOpsDidMutate = applyPendingOperations(args.sessionId, args.db, newTargets, new Set([
         ...args.contextUsage.percentage >= 95 ? [] : args.protectedTagIds,
         ...protectedToolTags
       ]), undefined, pendingOps, [], new Set, (reduction) => droppedTokenReductions.push(reduction));
@@ -7374,7 +6005,7 @@ async function runPostTransformPhase2(args) {
         clearEmergencyDropSample(args.db, args.sessionId);
       }
       let routineCleanupApplied = (emergencyDropEligible ? args.contextUsage.percentage >= 95 || getEmergencyInputSample(args.db, args.sessionId) === 0 : !args.fullFeatureMode || !routinePressureAlreadyApplied) || materializationRequested || emergencyRewriteAlreadyPriced;
-      let cleanup = applyHeuristicCleanup(args.sessionId, args.db, args.targets, args.messageTagNumbers, {
+      let cleanup = applyHeuristicCleanup(args.sessionId, args.db, newTargets, args.messageTagNumbers, {
         protectedTagNumbers: args.protectedTagNumbers,
         protectedCutoff: args.protectedCutoff,
         protectedToolTags,
@@ -7388,7 +6019,7 @@ async function runPostTransformPhase2(args) {
         caveman: cavemanConfig
       }, heuristicTags);
       if (!routineCleanupApplied && cleanup.emergencyDroppedTools > 0) {
-        const ridingCleanup = applyHeuristicCleanup(args.sessionId, args.db, args.targets, args.messageTagNumbers, {
+        const ridingCleanup = applyHeuristicCleanup(args.sessionId, args.db, newTargets, args.messageTagNumbers, {
           protectedTagNumbers: args.protectedTagNumbers,
           protectedCutoff: args.protectedCutoff,
           protectedToolTags,
@@ -7421,34 +6052,45 @@ async function runPostTransformPhase2(args) {
       droppedTokenReductions.push(...cleanup.droppedTokenReductions);
       const t7 = performance.now();
       const ageLaneAllowed = !prefixBoundModel;
-      const clearedReasoning = routineCleanupApplied && canUseEmptySentinels && ageLaneAllowed ? clearOldReasoning(args.messages, args.reasoningByMessage, args.messageTagNumbers, args.clearReasoningAge) : 0;
+      const bindingStrippedIds = new Set;
+      if (routineCleanupApplied && prefixBoundModel) {
+        for (const id of getMergedReasoningStrippedIds(args.db, args.sessionId)) {
+          if (id.startsWith(THINKING_BINDING_RECOVERY_FROZEN_PREFIX)) {
+            bindingStrippedIds.add(id.slice(THINKING_BINDING_RECOVERY_FROZEN_PREFIX.length));
+          }
+        }
+      }
+      const budgetCutoff = routineCleanupApplied ? Math.min(safeReasoningCutoff, opencodeReasoningBudgetCutoff({
+        messages: args.messages,
+        messageTagNumbers: args.messageTagNumbers,
+        budget: args.keepReasoningTokens ?? DEFAULT_KEEP_REASONING_TOKENS,
+        alreadyRemoved: removedReasoningIds,
+        alsoGone: bindingStrippedIds,
+        countNeutralized: reasoningRemovalSelectable,
+        proseRatio: sessionDecisionCalibration(args.db, args.sessionId).proseRatio,
+        frozenMergedIds: getMergedReasoningStrippedIds(args.db, args.sessionId),
+        anthropic: canUseEmptySentinels || prefixBoundModel || hasAnthropicReasoning(args.messages),
+        textEstimateByMessageId: getReasoningTokenEstimatesByMessage(args.db, args.sessionId, sessionDecisionCalibration(args.db, args.sessionId).proseRatio)
+      })) : 0;
+      const clearedReasoning = routineCleanupApplied && canUseEmptySentinels && ageLaneAllowed ? clearOldReasoning(args.messages, args.reasoningByMessage, args.messageTagNumbers, budgetCutoff) : 0;
       if (routineCleanupApplied && canUseEmptySentinels) {
         stripClearedReasoning(args.messages);
       }
-      const strippedInline = routineCleanupApplied && ageLaneAllowed ? stripInlineThinking(args.messages, args.messageTagNumbers, args.clearReasoningAge) : 0;
+      const strippedInline = routineCleanupApplied && ageLaneAllowed ? stripInlineThinking(args.messages, args.messageTagNumbers, budgetCutoff) : 0;
       const persistedInlineWatermark = args.sessionMeta?.clearedReasoningThroughTag ?? 0;
       if (routineCleanupApplied && persistedInlineWatermark > 0 && !compactionOff) {
         replayStrippedInlineThinking(args.messages, args.messageTagNumbers, persistedInlineWatermark);
       }
       let removedReasoningMessages = 0;
       if (routineCleanupApplied && reasoningRemovalSelectable && reasoningRemovalReadable) {
-        const bindingStrippedIds = new Set;
-        if (prefixBoundModel) {
-          for (const id of getMergedReasoningStrippedIds(args.db, args.sessionId)) {
-            if (!id.startsWith(THINKING_BINDING_RECOVERY_FROZEN_PREFIX))
-              continue;
-            const messageId = id.slice(THINKING_BINDING_RECOVERY_FROZEN_PREFIX.length);
-            if (messageId.length > 0)
-              bindingStrippedIds.add(messageId);
-          }
-        }
         const newIds = selectReasoningRemovals({
           messages: args.messages,
           messageTagNumbers: args.messageTagNumbers,
-          clearReasoningAge: args.clearReasoningAge,
+          cutoff: budgetCutoff,
           alreadyRemoved: removedReasoningIds,
           prefixBound: prefixBoundModel,
-          alsoGone: bindingStrippedIds
+          alsoGone: bindingStrippedIds,
+          protectedMessages: protectedThinkingMessages
         });
         if (newIds.length > 0) {
           let persisted = false;
@@ -7478,12 +6120,7 @@ async function runPostTransformPhase2(args) {
         }
       }
       if (clearedReasoning > 0 || strippedInline > 0) {
-        let maxTag = 0;
-        for (const tag of args.messageTagNumbers.values()) {
-          if (tag > maxTag)
-            maxTag = tag;
-        }
-        const newWatermark = maxTag - args.clearReasoningAge;
+        const newWatermark = budgetCutoff;
         const currentWatermark = args.sessionMeta?.clearedReasoningThroughTag ?? 0;
         if (newWatermark > currentWatermark) {
           updateSessionMeta(args.db, args.sessionId, {
@@ -7499,7 +6136,7 @@ async function runPostTransformPhase2(args) {
       heuristicOrReasoningDidMutate = heuristicMutationCount + clearedReasoning + strippedInline + removedReasoningMessages > 0;
       heuristicOrReasoningEditBesidesTrim = heuristicMutationCount + clearedReasoning + strippedInline > 0;
       droppedCount += clearedReasoning + strippedInline + removedReasoningMessages;
-      if (pendingMaterializationAtPassStart && !freezeM0M1) {
+      if (pendingMaterializationAtPassStart && !freezeM0M1 && !pendingOps.some((op) => newTargets.get(op.tagId)?.thinkingDropProtected)) {
         args.pendingMaterializationSessions.delete(args.sessionId);
       }
       if (args.currentTurnId) {
@@ -7517,7 +6154,7 @@ async function runPostTransformPhase2(args) {
       const syntheticPendingOps = buildSyntheticToolReclaimOps({
         db: args.db,
         sessionId: args.sessionId,
-        targets: args.targets,
+        targets: newTargets,
         watermark: args.sessionMeta.toolReclaimWatermark ?? 0,
         protectedToolTags,
         pendingOps
@@ -7529,7 +6166,7 @@ async function runPostTransformPhase2(args) {
         const supersessionOps = buildSupersessionReclaimOps({
           db: args.db,
           sessionId: args.sessionId,
-          targets: args.targets,
+          targets: newTargets,
           pendingOps,
           recentMessageIds,
           protectedTagNumbers: args.protectedTagNumbers,
@@ -7544,7 +6181,7 @@ async function runPostTransformPhase2(args) {
         const editReclaim = buildEditSupersessionReclaim({
           db: args.db,
           sessionId: args.sessionId,
-          targets: args.targets,
+          targets: newTargets,
           pendingOps,
           recentMessageIds,
           protectedTagNumbers: args.protectedTagNumbers,
@@ -7913,6 +6550,7 @@ async function runPostTransformPhase2(args) {
   }
   let autoSearchHintsBefore = 0;
   let autoSearchHintAppendedThisPass = false;
+  let autoSearchCompletedThisPass = false;
   if (args.fullFeatureMode && args.autoSearch?.enabled && args.projectPath) {
     const tAutoSearch = performance.now();
     const visibleMemoryIds = getVisibleMemoryIds(args.db, args.sessionId) ?? undefined;
@@ -7933,6 +6571,7 @@ async function runPostTransformPhase2(args) {
           wordRules: args.autoSearch.wordRules
         }
       });
+      autoSearchCompletedThisPass = autoSearchOutcome.ok;
       if (!autoSearchOutcome.ok) {
         args.passOutcome?.record(`auto-search-${autoSearchOutcome.kind}`);
       }
@@ -7940,7 +6579,7 @@ async function runPostTransformPhase2(args) {
       args.passOutcome?.record("auto-search-internal-failure");
       sessionLog(args.sessionId, "auto-search runner failed:", error);
     }
-    autoSearchHintAppendedThisPass = countAutoSearchHints(args.db, args.sessionId) !== autoSearchHintsBefore;
+    autoSearchHintAppendedThisPass = autoSearchCompletedThisPass && countAutoSearchHints(args.db, args.sessionId) !== autoSearchHintsBefore;
     logTransformTiming(args.sessionId, "pp.autoSearchHint", tAutoSearch);
   }
   if (args.fullFeatureMode && isCacheBustingPass) {
@@ -7977,7 +6616,7 @@ async function runPostTransformPhase2(args) {
     }
   }
   const mergedReasoningStrippedIds = new Set(replaySnapshot?.mergedReasoningStrippedIds ?? []);
-  const thinkingBindingRecoveryMessageIds = new Set;
+  const frozenThinkingBindingMessageIds = new Set;
   let thinkingBindingRecovery = null;
   if (!compactionOff) {
     try {
@@ -7985,17 +6624,18 @@ async function runPostTransformPhase2(args) {
         if (id.startsWith(THINKING_BINDING_RECOVERY_FROZEN_PREFIX)) {
           const messageId = id.slice(THINKING_BINDING_RECOVERY_FROZEN_PREFIX.length);
           if (messageId.length > 0)
-            thinkingBindingRecoveryMessageIds.add(messageId);
+            frozenThinkingBindingMessageIds.add(messageId);
         }
       }
-      const flagTarget = args.thinkingBindingRecoveryEnabledForModel ? replaySnapshot?.thinkingBindingRecoveryTarget ?? null : null;
+      const flagTarget = !activeThinkingTurn && args.thinkingBindingRecoveryEnabledForModel ? replaySnapshot?.thinkingBindingRecoveryTarget ?? null : null;
       if (flagTarget) {
         thinkingBindingRecovery = freezeAllReasoningForBindingRecovery({
           db: args.db,
           sessionId: args.sessionId,
           messages: args.messages,
           flagTarget,
-          recoveredMessageIds: thinkingBindingRecoveryMessageIds
+          protectedMessages: args.protectedThinkingMessages,
+          recoveredMessageIds: frozenThinkingBindingMessageIds
         });
         if (thinkingBindingRecovery) {
           for (const messageId of thinkingBindingRecovery.messageIds) {
@@ -8010,7 +6650,10 @@ async function runPostTransformPhase2(args) {
         }
       }
       if (canUseEmptySentinels && isCacheBustingPass) {
-        const candidates = findMergedReasoningStripDecisions(args.messages, args.resolvedProviderID, mergedReasoningStrippedIds, { mutationExemptMessage: reasoningMutationExemptMessage });
+        const candidates = findMergedReasoningStripDecisions(args.messages, args.resolvedProviderID, mergedReasoningStrippedIds, {
+          mutationExemptMessage: reasoningMutationExemptMessage,
+          protectedMessages: protectedThinkingMessages
+        });
         const newlyDetectedIds = candidates.filter((id) => !mergedReasoningStrippedIds.has(id));
         if (newlyDetectedIds.length > 0) {
           const persisted = addMergedReasoningStrippedIds(args.db, args.sessionId, newlyDetectedIds);
@@ -8116,11 +6759,14 @@ async function runPostTransformPhase2(args) {
   logTransformTiming(args.sessionId, "pp.frozenDecisions", tFrozenDecisions);
   bustedThisPass ||= firstApplicationEdits.any;
   const finalizeOptions = {
+    modelID: args.resolvedModelID,
+    protectedThinkingMessages: args.protectedThinkingMessages,
     prependedMessageCount,
     reasoningMutatedMessages,
     reasoningMutationExemptMessage,
     mergedReasoningStrippedIds,
-    thinkingBindingRecoveryMessageIds,
+    frozenThinkingBindingMessageIds,
+    restoreThinkingMessageIds: args.restoreThinkingMessageIds,
     trailingBlankDecisions,
     skipMergedReasoningStrip: compactionOff,
     skipTrailingWhitespaceStrip: compactionOff
@@ -8132,7 +6778,7 @@ async function runPostTransformPhase2(args) {
       parts: [...message.parts]
     }));
     stripClearedReasoning(remaining);
-    stripReasoningFromAssistantIds(remaining, args.resolvedProviderID, thinkingBindingRecoveryMessageIds);
+    stripReasoningFromAssistantIds(remaining, args.resolvedProviderID, frozenThinkingBindingMessageIds);
     stripReasoningFromMergedAssistants(remaining, args.resolvedProviderID, {
       frozenMessageIds: mergedReasoningStrippedIds,
       mutationExemptMessage: remaining[args.messages.indexOf(reasoningMutationExemptMessage)]
@@ -8159,12 +6805,13 @@ async function runPostTransformPhase2(args) {
       db: args.db,
       sessionId: args.sessionId,
       messages: args.messages,
-      alreadyFrozen: thinkingBindingRecoveryMessageIds
+      protectedMessages: protectedThinkingMessages,
+      alreadyFrozen: frozenThinkingBindingMessageIds
     });
     if (outcome.strip) {
       proactiveThinkingStrip = outcome.strip;
       for (const messageId of outcome.strip.messageIds) {
-        thinkingBindingRecoveryMessageIds.add(messageId);
+        frozenThinkingBindingMessageIds.add(messageId);
         mergedReasoningStrippedIds.add(thinkingBindingRecoveryFrozenId(messageId));
       }
       bustedThisPass = true;
@@ -8196,6 +6843,9 @@ async function runPostTransformPhase2(args) {
     injectTemporalMarkers(args.messages, temporalDecisions);
   const finalRepresentation = finalizeMessageRepresentation2(args.messages, args.resolvedProviderID, finalizeOptions);
   const removedReasoningParts = reasoningRemovalEnabled ? removeReasoningParts(args.messages, removedReasoningIds, args.resolvedProviderID) : 0;
+  const reasoningStatusRatio = sessionDecisionCalibration(args.db, args.sessionId).proseRatio;
+  captureOpencodeReasoningBudgetStatus(args.sessionId, args.messages, args.keepReasoningTokens ?? DEFAULT_KEEP_REASONING_TOKENS, prefixBoundModel, reasoningStatusRatio);
+  args.restoreLatestTurnOriginals?.();
   sessionLog(args.sessionId, `final representation: clearedParts=${finalRepresentation.clearedParts} mergedReasoningParts=${finalRepresentation.mergedReasoningParts} removedReasoningParts=${removedReasoningParts} settledDroppedReasoning=${settledDroppedReasoning}`);
   logTransformTiming(args.sessionId, "finalizeMessageRepresentation", tFinalRepresentation, `clearedParts=${finalRepresentation.clearedParts} mergedReasoningParts=${finalRepresentation.mergedReasoningParts}`);
   const tTailBaseline = performance.now();
@@ -8327,4 +6977,4 @@ function checkM0MutationDriftAndSignal2(args) {
   return false;
 }
 
-export { indexCommitsForProject, embedUnembeddedCommits, createTagger, createUnifiedSearchDiagnostics, parseIdShapedQuery, resolveMemoriesByIdsForSearch, unifiedSearch, formatSearchResults, cavemanWordRulesForLanguage, findSessionId, findLastUserMessageId, clearAutoSearchForSession, setCtxReduceRegisteredGlobally, resolveCtxReduceAvailabilityFromMessages, resolveCtxReduceAvailability, primeCtxReduceSpawnPermission, ctxReduceSpawnPermissionReadNeeded, spawnAgentFromMessages, spawnAgentFromOpenCodeDb, todowritePermissionDenied, cachedToolPermissionDenied, clearToolPermissionDenied, resolveTodowriteAvailabilityFromMessages, resolveTodowriteAvailability, canConsumeDeferredOnThisPass, hasReclaimRide, reclaimRideLabel, replayCavemanCompression, DegradedPassRefusalError, degradedPassError, ENGINE_RECONNECTING_USER_MESSAGE, contextRefusalError, protectedToolRefusal, outgoingContextRefusal, EmergencyFailClosedError, replayClearedReasoning, replayStrippedInlineThinking, stripClearedReasoning, snapshotTrailingBlankSourceDecisions, applyFlushedStatuses, stripStructuralNoise, logTransformTiming, hasRecentAssistantCommit, tagMessages, resetDegradedCacheCount2, isSyntheticHeadMessage2, applyTodoSynthesis2, freezeReasoningOnBustingPass2, firstServedDivergenceIndex2, rustModeServedKeyAfterPersistedStrips2, replayRustModeBindingMismatchStrips2, RUST_MARKER_LOCK_SKIP_LOG2, applyRustModeDeferredCompactionMarker2, clearRustModeBoundaryRecord2, runRustModePostprocess2, reconcileMarkerRepresentation2, clearPendingCompactionMarkerAfterSuccessfulDrain2, defaultCompactionMarkerStrategy2, abortSessionFailClosed2, evaluateEmergencyFailClosed2, finalizeMessageRepresentation2, runPostTransformPhase2, checkM0MutationDriftAndSignal2 };
+export { createTagger, cavemanWordRulesForLanguage, findSessionId, findLastUserMessageId, clearAutoSearchForSession, setCtxReduceRegisteredGlobally, resolveCtxReduceAvailabilityFromMessages, resolveCtxReduceAvailability, primeCtxReduceSpawnPermission, ctxReduceSpawnPermissionReadNeeded, spawnAgentFromMessages, spawnAgentFromOpenCodeDb, todowritePermissionDenied, cachedToolPermissionDenied, clearToolPermissionDenied, resolveTodowriteAvailabilityFromMessages, resolveTodowriteAvailability, canConsumeDeferredOnThisPass, hasReclaimRide, reclaimRideLabel, replayClearedReasoning, replayStrippedInlineThinking, stripClearedReasoning, snapshotTrailingBlankSourceDecisions, projectOpencodeReasoningBudgetCutoff, resolveKeepReasoningTokens, reasoningBudgetCutoff, captureOpencodeReasoningBudgetStatus, reasoningBudgetStatusLine, ENGINE_RECONNECTING_USER_MESSAGE, contextRefusalError, protectedToolRefusal, outgoingContextRefusal, EmergencyFailClosedError, latestAssistantTurnStart, latestAssistantTurnMessages, hasActiveAnthropicThinkingTurn, replayCavemanCompression, DegradedPassRefusalError, degradedPassError, applyFlushedStatuses, stripStructuralNoise, logTransformTiming, hasRecentAssistantCommit, tagMessages, resetDegradedCacheCount2, isSyntheticHeadMessage2, applyTodoSynthesis2, freezeReasoningOnBustingPass2, firstServedDivergenceIndex2, rustModeServedKeyAfterPersistedStrips2, replayRustModeBindingMismatchStrips2, RUST_MARKER_LOCK_SKIP_LOG2, applyRustModeDeferredCompactionMarker2, clearRustModeBoundaryRecord2, runRustModePostprocess2, reconcileMarkerRepresentation2, clearPendingCompactionMarkerAfterSuccessfulDrain2, defaultCompactionMarkerStrategy2, abortSessionFailClosed2, evaluateEmergencyFailClosed2, finalizeMessageRepresentation2, runPostTransformPhase2, checkM0MutationDriftAndSignal2 };