@cortexkit/opencode-magic-context 0.49.34 → 0.49.36

package/dist/{index-hbx7m8he.js → index-dfdg2cgg.js}

@@ -7,7 +7,7 @@ import {
   getTemporalDecisions,
   freezeTemporalDecisions,
   stableStringify
-} from "./index-xrnsygfq.js";
+} from "./index-9wnbnx8f.js";
 import {
   protectedToolTagNumbers,
   stripPersistedAssistantText,
@@ -74,19 +74,19 @@ import {
   adoptNullOwnerToolTag2,
   getCandidateToolOwners2,
   pickNearestPriorOwner2
-} from "./index-np3rgfw4.js";
+} from "./index-8jjjmhab.js";
 import {
   textMentionsRecentCommit,
   hasMeaningfulUserText2,
   estimateTokens
-} from "./index-b88dwwrh.js";
+} from "./index-4xyjr62e.js";
 import {
   getMagicContextStorageDir
 } from "./index-g2q4htwp.js";
 import {
   log2,
   sessionLog2
-} from "./index-h7tgn49j.js";
+} from "./index-jrfre9ah.js";
 import {
   inRootAsyncContext2,
   getTagIdentityWriteGeneration2,
@@ -95,16 +95,14 @@ import {
   isTransientSqliteError2
 } from "./index-gzy5w8ya.js";
 import {
-  getProjectEmbeddingSnapshot2,
-  embedTextForProject2,
-  embedBatchForProject2
-} from "./index-2743x98y.js";
+  reuseWorker
+} from "./index-96ztjvkn.js";
 import {
   createWorkerShutdown
-} from "./index-cpjk5jd2.js";
+} from "./index-1d042x6w.js";
 import {
   runSessionWarmupWorker
-} from "./index-rverk2vz.js";
+} from "./index-r2epb000.js";
 import {
   getMaxM0MutationId,
   getLastCompartmentEndMessage,
@@ -121,30 +119,12 @@ import {
   clearPendingMaterialization,
   saveSourceContent,
   replaceSourceContent,
-  getSourceContents,
-  compareOpenCodeMessagesByCanonicalOrder,
-  prepareCompactionMarkerCandidates,
-  MARKER_SUMMARY_TEXT,
-  applyDeferredCompactionMarker,
-  injectTemporalMarkers,
-  clearInjectionCache,
-  getVisibleMemoryIds,
-  renderCompartmentInjection,
-  MaterializeContentionError,
-  mustMaterialize,
-  hydrateCachedM0Mural,
-  prepareCachedM0M1Replay,
-  hasCompleteCachedM0M1,
-  injectM0M1,
-  observeNoteNudgeServe,
-  peekNoteNudgeText,
-  markNoteNudgeDelivered,
-  getActiveCompartmentRun
-} from "./index-atekmqef.js";
+  getSourceContents
+} from "./index-72czy45z.js";
 import {
   cleanSearchText,
   matchedSearchSnippet
-} from "./index-9gpw8hrm.js";
+} from "./index-2rs7912w.js";
 import {
   stripSystemInjection,
   isTextPart,
@@ -242,10 +222,15 @@ import {
   extractToolCallObservation,
   ToolMutationBatch,
   createToolDropTarget
-} from "./index-7g9dr8gy.js";
+} from "./index-tn9drm1a.js";
 import {
   isValidLanguageCode
-} from "./index-nxrsns5x.js";
+} from "./index-c5dzns43.js";
+import {
+  getProjectEmbeddingSnapshot2,
+  embedTextForProject2,
+  embedBatchForProject2
+} from "./index-21fgrfrf.js";
 import {
   isEmbeddingHostBusy2
 } from "./index-qt1qqasc.js";
@@ -253,17 +238,38 @@ import {
   openCodeDbExists,
   withReadOnlySessionDb,
   getMessageTimesFromOpenCodeDb
-} from "./index-y1qwzvxn.js";
+} from "./index-vd2ywmfe.js";
 import {
   BoundedSessionMap
-} from "./index-s1n8dd2n.js";
+} from "./index-jkanybgq.js";
 import {
   getMessageIndexEpoch,
-  isMessageIndexSearchable
-} from "./index-04z754rd.js";
+  isMessageIndexSearchable,
+  createAutoSearchDiagnostics
+} from "./index-dz48h1wx.js";
+import {
+  compareOpenCodeMessagesByCanonicalOrder,
+  prepareCompactionMarkerCandidates,
+  MARKER_SUMMARY_TEXT,
+  applyDeferredCompactionMarker,
+  injectTemporalMarkers,
+  clearInjectionCache,
+  getVisibleMemoryIds,
+  renderCompartmentInjection,
+  MaterializeContentionError,
+  mustMaterialize,
+  hydrateCachedM0Mural,
+  prepareCachedM0M1Replay,
+  hasCompleteCachedM0M1,
+  injectM0M1,
+  observeNoteNudgeServe,
+  peekNoteNudgeText,
+  markNoteNudgeDelivered,
+  getActiveCompartmentRun
+} from "./index-9tdvbdv1.js";
 import {
   userFacingFailureCode
-} from "./index-as2amvn3.js";
+} from "./index-xnm0wq1r.js";
 import {
   normalizeProtectedToolName,
   mergeProtectedTools
@@ -273,7 +279,7 @@ import {
 } from "./index-y8v6yerm.js";
 import {
   logSlowWriteTransaction
-} from "./index-t5pck3ss.js";
+} from "./index-fxbk7gk3.js";
 
 // src/features/magic-context/tagger.ts
 var TOOL_COMPOSITE_KEY_SEP = "\x00";
@@ -1262,6 +1268,32 @@ function selectAutoSearchResults(results, threshold) {
   return results.filter((result) => relevance(result) >= threshold).sort((left, right) => relevance(right) - relevance(left));
 }
 
+// src/hooks/magic-context/auto-search-observation.ts
+var disabledTurns = new WeakMap;
+function logDisabledAutoSearch(db, sessionId, messageId, threshold, startedAt) {
+  const sessions = disabledTurns.get(db) ?? new Map;
+  disabledTurns.set(db, sessions);
+  if (sessions.get(sessionId) === messageId)
+    return;
+  sessions.set(sessionId, messageId);
+  observeAutoSearch(sessionId, threshold, startedAt).finish("disabled");
+}
+function observeAutoSearch(sessionId, threshold, startedAt) {
+  const diagnostics = createAutoSearchDiagnostics(threshold);
+  let logged = false;
+  return {
+    diagnostics,
+    finish(outcome, reason) {
+      if (logged)
+        return;
+      logged = true;
+      const lanes = Object.entries(diagnostics.lanes).map(([lane, value]) => `${lane}:${value.top?.toFixed(3) ?? "none"}`).join(",");
+      const nearMisses = Object.values(diagnostics.lanes).reduce((sum, lane) => sum + lane.nearMisses, 0);
+      sessionLog2(sessionId, `auto-search: decision outcome=${outcome}${reason ? ` reason=${reason}` : ""} lanes=${lanes || "none"} nearMisses=${nearMisses} threshold=${threshold} pool=${diagnostics.pool} rows=${diagnostics.poolRows ?? "unknown"} workerStarted=${diagnostics.workerStarted ?? "unknown"} peek=${diagnostics.peek} elapsedMs=${Math.round(performance.now() - startedAt)}`);
+    }
+  };
+}
+
 // src/hooks/magic-context/auto-search-worker-client.ts
 import { Worker } from "node:worker_threads";
 var pendingRegistrations = new WeakMap;
@@ -1408,7 +1440,7 @@ async function acquireSearchWorker(db, key, entry, input, signal) {
     }
     const fresh = !slot;
     if (!slot) {
-      const worker = inRootAsyncContext2(() => new Worker(entry, { workerData: { ...input, persistent: true } }));
+      const worker = inRootAsyncContext2(() => input.job === "backfill" && entry.href === defaultAutoSearchWorkerEntry().href ? reuseWorker(entry, { workerData: input }) : new Worker(entry, { workerData: { ...input, persistent: true } }));
       const shutdown = createWorkerShutdown(worker, "auto-search", AUTO_SEARCH_WORKER_CLOSE_DEADLINE_MS);
       slot = {
         worker,
@@ -1486,6 +1518,7 @@ function queueAutoSearchBackfill(db, sessionId, projectPath, query) {
   pending.set(key, work);
   return work;
 }
+var nextSearchJobId = 0;
 async function executeAutoSearchWorker(db, sessionId, projectPath, query, options, entry, job) {
   if (options.signal?.aborted)
     return [];
@@ -1499,12 +1532,14 @@ async function executeAutoSearchWorker(db, sessionId, projectPath, query, option
     readMessages: _readMessages,
     searchMessageHistory: _searchMessageHistory,
     stepTimings: _stepTimings,
+    onAutoSearchDiagnostics: _onAutoSearchDiagnostics,
     ...serializable
   } = options;
   const lifecycle = registerAutoSearchWork(sessionId);
   const signal = deadlineSignal ? AbortSignal.any([deadlineSignal, lifecycle.signal]) : lifecycle.signal;
   const snapshot = getProjectEmbeddingSnapshot2(projectPath);
   const input = {
+    jobId: ++nextSearchJobId,
     job,
     path,
     harness: getHarness2(),
@@ -1540,6 +1575,11 @@ async function executeAutoSearchWorker(db, sessionId, projectPath, query, option
     throw new AutoSearchBusyError;
   }
   const { slot, fresh } = lease;
+  if (options.autoSearchDiagnostics) {
+    options.autoSearchDiagnostics.workerStarted = fresh;
+    if (fresh)
+      options.autoSearchDiagnostics.pool = "cold";
+  }
   const worker = slot.worker;
   const detachable = job === "search" && entry.href === defaultAutoSearchWorkerEntry().href;
   const startedAt = performance.now();
@@ -1619,6 +1659,17 @@ async function executeAutoSearchWorker(db, sessionId, projectPath, query, option
     const onMessage = async (reply) => {
       if (released)
         return;
+      if (entry.href === defaultAutoSearchWorkerEntry().href && reply.jobId !== input.jobId)
+        return;
+      if (reply.kind === "diagnostics") {
+        if (!settled && options.autoSearchDiagnostics) {
+          const workerStarted = options.autoSearchDiagnostics.workerStarted;
+          Object.assign(options.autoSearchDiagnostics, reply.diagnostics, {
+            workerStarted
+          });
+        }
+        return;
+      }
       if (reply.kind === "result" || reply.kind === "error") {
         if (detachedAt !== undefined) {
           logLateSearch(sessionId, performance.now() - detachedAt, detachedAt - startedAt, ownerVectorMs, reply.kind === "result" ? reply.timings : undefined, reply.kind === "error");
@@ -1637,7 +1688,7 @@ async function executeAutoSearchWorker(db, sessionId, projectPath, query, option
       }
       if (reply.kind === "messages" || reply.kind === "accepted")
         return;
-      const response = { id: reply.id };
+      const response = { id: reply.id, jobId: input.jobId };
       if (!signal.aborted) {
         const requestedAt = performance.now();
         try {
@@ -1766,7 +1817,7 @@ function searchMessageHistoryOffThread(db, request, entry = defaultAutoSearchWor
       deadline.unref?.();
     };
     try {
-      worker = inRootAsyncContext2(() => new Worker(entry, { workerData: input }));
+      worker = inRootAsyncContext2(() => entry.href === defaultAutoSearchWorkerEntry().href ? reuseWorker(entry, { workerData: input }) : new Worker(entry, { workerData: input }));
       shutdown = createWorkerShutdown(worker, "message-search", MESSAGE_SEARCH_WORKER_CLOSE_DEADLINE_MS);
     } catch (error) {
       finish(null, "start-failed", error);
@@ -1954,8 +2005,12 @@ function findLatestMeaningfulUserMessage(messages) {
 async function runAutoSearchHint(args) {
   const startedAt = performance.now();
   const { sessionId, db, messages, options } = args;
-  if (!options.enabled)
+  if (!options.enabled) {
+    const tail = findLatestMeaningfulUserMessage(messages);
+    if (tail && typeof tail.info.id === "string" && messages.at(-1) === tail)
+      logDisabledAutoSearch(db, sessionId, tail.info.id, options.scoreThreshold, startedAt);
     return AUTO_SEARCH_OK;
+  }
   const userMsg = findLatestMeaningfulUserMessage(messages);
   if (!userMsg || typeof userMsg.info.id !== "string")
     return AUTO_SEARCH_OK;
@@ -1979,10 +2034,12 @@ async function runAutoSearchHint(args) {
     if (messages.length === 0 || messages[messages.length - 1].info.id !== userMsgId) {
       return AUTO_SEARCH_OK;
     }
+    const observation = observeAutoSearch(sessionId, options.scoreThreshold, startedAt);
     const embeddingSnapshot = getProjectEmbeddingSnapshot2(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");
+      observation.finish("no-candidates", "unregistered");
       return AUTO_SEARCH_OK;
     }
     const writeNoHintAndReconcile = async (reason) => {
@@ -1993,21 +2050,24 @@ async function runAutoSearchHint(args) {
       }, startedAt);
       if (outcome === null) {
         persistAutoSearchSkip(db, sessionId, userMsgId);
+        observation.finish("timeout");
         return { ok: false, kind: "timeout" };
       }
-      if (!outcome.ok)
+      if (!outcome.ok) {
+        observation.finish("error", outcome.kind);
         return {
           ok: false,
           kind: outcome.kind === "storage-busy" ? "storage-busy" : "cas-exhaustion"
         };
+      }
       if (outcome.kind === "already-present" && outcome.decision.decision === "hint") {
         appendReminderToUserMessageById(messages, userMsgId, outcome.decision.text);
       }
+      observation.finish(outcome.decision.decision === "hint" ? "attached" : reason === "below-threshold" ? "below-threshold" : reason === "error" ? "error" : "no-candidates", reason);
       return AUTO_SEARCH_OK;
     };
     const rawPartsText = collectUserPromptParts(userMsg);
     if (hasStackedAugmentation(rawPartsText)) {
-      sessionLog2(sessionId, "auto-search: skipping — user message already carries augmentation/hint");
       return writeNoHintAndReconcile("stacked");
     }
     const rawPrompt = extractUserPromptText(userMsg);
@@ -2023,6 +2083,7 @@ async function runAutoSearchHint(args) {
         const embeddingEnabled = embeddingSnapshot ? embeddingSnapshot.historyEnabled : options.embeddingEnabled;
         const gitCommitsEnabled = embeddingSnapshot?.gitCommitEnabled ?? options.gitCommitsEnabled ?? false;
         const searchOptions = {
+          autoSearchDiagnostics: observation.diagnostics,
           limit: 10,
           maxMessageOrdinal: Math.max(0, getLastCompartmentEndMessage(db, sessionId)),
           excludeMessageId: userMsgId,
@@ -2049,11 +2110,10 @@ async function runAutoSearchHint(args) {
       if (lifecycleSignal.aborted)
         return AUTO_SEARCH_OK;
       if (error instanceof AutoSearchBusyError) {
-        sessionLog2(sessionId, "auto-search: an earlier search of this session is still running, skipping hint for this turn");
+        observation.finish("timeout", "worker-busy");
         persistAutoSearchSkip(db, sessionId, userMsgId);
         return { ok: false, kind: "timeout" };
       }
-      log2(`[auto-search] unified search failed for session ${sessionId} (no-hint frozen for this turn): ${error instanceof Error ? error.message : String(error)}`);
       const outcome = await writeNoHintAndReconcile("error");
       return outcome.ok ? { ok: false, kind: "search-failure" } : outcome;
     }
@@ -2061,9 +2121,8 @@ async function runAutoSearchHint(args) {
       return AUTO_SEARCH_OK;
     try {
       if (results === null) {
-        sessionLog2(sessionId, `auto-search: timed out after ${AUTO_SEARCH_TIMEOUT_MS}ms, skipping hint for this turn`);
+        observation.finish("timeout");
         persistAutoSearchSkip(db, sessionId, userMsgId);
-        sessionLog2(sessionId, "auto-search: skip frozen; retries for this turn are replay-only");
         return { ok: false, kind: "timeout" };
       }
       if (results.length === 0) {
@@ -2071,7 +2130,6 @@ async function runAutoSearchHint(args) {
       }
       results = selectAutoSearchResults(results, options.scoreThreshold);
       if (results.length === 0) {
-        sessionLog2(sessionId, `auto-search: no fragment meets relevance threshold ${options.scoreThreshold}`);
         return writeNoHintAndReconcile("below-threshold");
       }
       const hintText = buildAutoSearchHint(results, {
@@ -2091,18 +2149,19 @@ ${hintText}`;
       }, startedAt);
       if (outcome === null) {
         persistAutoSearchSkip(db, sessionId, userMsgId);
+        observation.finish("timeout");
         return { ok: false, kind: "timeout" };
       }
       if (!outcome.ok) {
+        observation.finish("error", outcome.kind);
         if (outcome.kind === "storage-busy")
           return { ok: false, kind: "storage-busy" };
-        sessionLog2(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);
       }
-      sessionLog2(sessionId, `auto-search: attached hint to ${userMsgId} (${results.length} fragments, top relevance ${(results[0].relevanceScore ?? results[0].score).toFixed(3)})`);
+      observation.finish(outcome.decision.decision === "hint" ? "attached" : "no-candidates");
       return AUTO_SEARCH_OK;
     } finally {
       if (!lifecycleSignal.aborted && results !== null)
@@ -3308,6 +3367,130 @@ function degradedPassError(site, error) {
   return new DegradedPassRefusalError(site, { cause: error });
 }
 
+// src/hooks/magic-context/strip-structural-noise.ts
+var STRUCTURAL_PART_TYPES = new Set(["meta", "step-start", "step-finish", "reasoning"]);
+var structuralSentinels = new WeakSet;
+function isStructuralNoiseSentinel(part) {
+  return isRecord(part) && structuralSentinels.has(part);
+}
+function isStructuralNoisePart(part) {
+  if (!isRecord(part) || typeof part.type !== "string") {
+    return false;
+  }
+  if (!STRUCTURAL_PART_TYPES.has(part.type)) {
+    return false;
+  }
+  if (part.type === "reasoning" && typeof part.text === "string" && part.text !== "[cleared]") {
+    return false;
+  }
+  return true;
+}
+function stripStructuralNoise(messages) {
+  let strippedParts = 0;
+  for (const message of messages) {
+    if (!Array.isArray(message.parts)) {
+      continue;
+    }
+    for (let i = 0;i < message.parts.length; i++) {
+      const part = message.parts[i];
+      if (isSentinel(part))
+        continue;
+      if (!isStructuralNoisePart(part))
+        continue;
+      message.parts[i] = makeSentinel(part);
+      if (isRecord(part) && part.type !== "reasoning") {
+        structuralSentinels.add(message.parts[i]);
+      }
+      strippedParts++;
+    }
+  }
+  return strippedParts;
+}
+
+// src/hooks/magic-context/project-structural-sentinels.ts
+function readOmissions(value) {
+  if (value === undefined)
+    return new Set;
+  if (!Array.isArray(value) || value.some((id) => typeof id !== "string" || !id))
+    throw new Error("Invalid structural-sentinel replay decisions");
+  return new Set(value);
+}
+function hasSignedReasoning(message) {
+  return message.info.role === "assistant" && message.parts.some((part) => {
+    if (!isRecord(part) || part.type !== "reasoning" || !isRecord(part.metadata))
+      return false;
+    const anthropic = part.metadata.anthropic;
+    return isRecord(anthropic) && typeof anthropic.signature === "string";
+  });
+}
+function readKeepIds(document) {
+  const value = document.structuralSentinelUpgrade;
+  if (value === undefined)
+    return;
+  if (!isRecord(value) || !Array.isArray(value.keep) || value.keep.some((id) => typeof id !== "string" || !id))
+    throw new Error("Invalid structural-sentinel upgrade");
+  return new Set(value.keep);
+}
+function prepareStructuralSentinelChoices(args) {
+  const document = readReplayEnvelope(args.db, args.sessionId);
+  if (readKeepIds(document))
+    return document;
+  const prior = !!args.db.prepare(`SELECT 1 WHERE
+                    EXISTS (SELECT 1 FROM session_meta WHERE session_id = ? AND trailing_blank_decisions <> '')
+                    OR EXISTS (SELECT 1 FROM session_replay_decisions WHERE session_id = ?)
+                    OR EXISTS (SELECT 1 FROM tags WHERE session_id = ?)
+                    OR EXISTS (SELECT 1 FROM lkg_slots WHERE session_id = ?)`).get(args.sessionId, args.sessionId, args.sessionId, args.sessionId);
+  try {
+    const persisted = updateReplayDocument(args.db, args.sessionId, (current) => {
+      if (readKeepIds(current))
+        return false;
+      current.version = 2;
+      current.structuralSentinelUpgrade = {
+        keep: prior ? args.messages.flatMap((message) => message.info.id && hasSignedReasoning(message) ? [message.info.id] : []) : []
+      };
+      return true;
+    });
+    if (!persisted)
+      throw new Error("Cannot persist structural-sentinel upgrade");
+  } catch (error) {
+    sessionLog2(args.sessionId, `structural-sentinel upgrade deferred: ${String(error)}`);
+    return document;
+  }
+  return readReplayEnvelope(args.db, args.sessionId);
+}
+function projectStructuralSentinels(args) {
+  const structuralMessages = args.messages.filter((message) => message.parts.some(isStructuralNoiseSentinel));
+  if (structuralMessages.length === 0)
+    return 0;
+  const document = args.deferUpgrade ? readReplayEnvelope(args.db, args.sessionId) : prepareStructuralSentinelChoices(args);
+  const keepIds = args.deferUpgrade ? undefined : readKeepIds(document);
+  let omittedIds = readOmissions(document.structuralSentinelOmissions);
+  const candidates = structuralMessages.filter((message) => typeof message.info.id === "string" && message.info.id !== "" && hasSignedReasoning(message));
+  const selected = keepIds && args.rebuilding ? candidates.filter((message) => keepIds.has(message.info.id ?? "") && !omittedIds.has(message.info.id ?? "")) : [];
+  if (selected.length) {
+    if (!updateReplayDocument(args.db, args.sessionId, (document) => {
+      const ids = readOmissions(document.structuralSentinelOmissions);
+      for (const message of selected) {
+        ids.add(message.info.id);
+      }
+      document.version = 2;
+      document.structuralSentinelOmissions = [...ids];
+      return true;
+    }))
+      throw new Error("Cannot persist structural-sentinel omissions");
+    omittedIds = readOmissions(readReplayEnvelope(args.db, args.sessionId).structuralSentinelOmissions);
+  }
+  let removed = 0;
+  for (const message of candidates) {
+    if (!omittedIds.has(message.info.id ?? "") && (!keepIds || keepIds.has(message.info.id ?? "")))
+      continue;
+    const parts = message.parts.filter((part) => !isStructuralNoiseSentinel(part));
+    removed += message.parts.length - parts.length;
+    message.parts = parts;
+  }
+  return removed;
+}
+
 // src/features/magic-context/storage-host-instruction-retention.ts
 var NAMESPACE3 = "hostInstructionRetention";
 var enabled = true;
@@ -3473,6 +3656,50 @@ function renderConvertedToolSkeletons(targets, converted) {
   }
   return didMutate;
 }
+function prepareAgedToolSkeletonConversions(db, sessionId, targets, options = {}) {
+  const candidates = [...targets.keys()].sort((a, b) => a - b);
+  const readRows = (connection) => {
+    const window = getNewestToolTagNumbers2(connection, sessionId, RECENT_TOOL_SKELETON_WINDOW);
+    const recent = new Set(window);
+    const statement = connection.prepare(`SELECT tag_number AS tagNumber, drop_mode AS dropMode, message_id AS callId
+             FROM tags WHERE session_id = ? AND tag_number = ?
+               AND type = 'tool' AND status = 'dropped'
+               AND drop_mode IN ('truncated', 'skeleton_real', 'skeleton_stripped')`);
+    const rows = candidates.filter((id) => !recent.has(id)).flatMap((id) => {
+      const row = statement.get(sessionId, id);
+      return row ? [row] : [];
+    });
+    return { window, rows };
+  };
+  const snapshot = readRows(db);
+  options.prepareRemovals?.(snapshot.rows);
+  const converted = new Map;
+  const plannedRemovals = new Set;
+  for (const row of snapshot.rows) {
+    const target = targets.get(row.tagNumber);
+    if (target?.thinkingDropProtected || target?.thinkingRewriteProtected || target?.identityRepairProtected)
+      continue;
+    if (target?.canDrop?.() !== true || target.prepareDrop?.() === false)
+      continue;
+    if (target.requiresToolArcSkeleton) {
+      const owners = target.mutationParts ? target.mutationParts.map(({ message }) => message).filter((message) => message.info.role === "assistant") : target.message ? [target.message] : [];
+      if (owners.length === 0 || owners.some((message) => !options.thinkingStrippedIds?.has(message.info.id ?? "")))
+        continue;
+    }
+    if (target.cannotRemove?.() === true || target.wouldStrandConversationEnd?.(plannedRemovals) === true)
+      continue;
+    converted.set(row.tagNumber, "full");
+    target.notePlannedRemoval?.(plannedRemovals);
+  }
+  return {
+    converted,
+    isCurrent: (connection) => JSON.stringify(readRows(connection)) === JSON.stringify(snapshot),
+    persist: (connection) => {
+      for (const tagNumber of converted.keys())
+        updateTagDropMode2(connection, sessionId, tagNumber, "full");
+    }
+  };
+}
 var PENDING_OPERATION_CHUNK_SIZE = 64;
 function applyPendingOperations(sessionId, db, targets, protectedTagIds, preloadedTags, preloadedPendingOps, syntheticPendingOps = [], editMarkerTagIds = new Set, onTagReduced, onBatchComplete, onEligibilitySnapshot) {
   let didMutateMessage = false;
@@ -4548,38 +4775,6 @@ ${typeof state?.output === "string" ? state.output : JSON.stringify(state?.outpu
     text: typeof part.text === "string" ? part.text : typeof part.thinking === "string" ? part.thinking : undefined
   };
 }
-// src/hooks/magic-context/strip-structural-noise.ts
-var STRUCTURAL_PART_TYPES = new Set(["meta", "step-start", "step-finish", "reasoning"]);
-function isStructuralNoisePart(part) {
-  if (!isRecord(part) || typeof part.type !== "string") {
-    return false;
-  }
-  if (!STRUCTURAL_PART_TYPES.has(part.type)) {
-    return false;
-  }
-  if (part.type === "reasoning" && typeof part.text === "string" && part.text !== "[cleared]") {
-    return false;
-  }
-  return true;
-}
-function stripStructuralNoise(messages) {
-  let strippedParts = 0;
-  for (const message of messages) {
-    if (!Array.isArray(message.parts)) {
-      continue;
-    }
-    for (let i = 0;i < message.parts.length; i++) {
-      const part = message.parts[i];
-      if (isSentinel(part))
-        continue;
-      if (!isStructuralNoisePart(part))
-        continue;
-      message.parts[i] = makeSentinel(part);
-      strippedParts++;
-    }
-  }
-  return strippedParts;
-}
 // src/hooks/magic-context/foreign-text-parts.ts
 function hasStringId(part) {
   return part !== null && typeof part === "object" && typeof part.id === "string";
@@ -6070,6 +6265,9 @@ async function runPostTransformPhase2(args) {
     }
   };
   const trailingBlankSourceDecisions = args.trailingBlankSourceDecisions ?? snapshotTrailingBlankSourceDecisions(args.messages);
+  let structuralSentinelUpgradeFailed = args.structuralSentinelUpgradeFailed ?? false;
+  if (!structuralSentinelUpgradeFailed && args.opencode1 && !compactionOff && modelAcceptsEmptyContent(args.resolvedProviderID))
+    structuralSentinelUpgradeFailed = prepareStructuralSentinelChoices(args).structuralSentinelUpgrade === undefined;
   if (!modelAcceptsEmptyContent(args.resolvedProviderID) && !compactionOff)
     captureInlineThinkingRepairs(args.messages, args.messageTagNumbers, args.sessionMeta?.clearedReasoningThroughTag ?? 0);
   const servedShapeRepair = prepareServedShapeRepair(args.db, args.sessionId, args.messages, args.readLastServedMessages, compactionOff ? undefined : postprocessReplaySnapshot(args.db, args.sessionId));
@@ -6188,6 +6386,8 @@ async function runPostTransformPhase2(args) {
   const servedBeforeFirstRender = firstRenderBust ? args.readLastServedMessages?.() : null;
   let foldExecutedThisPass = false;
   let foldBustsServedPrefixThisPass = false;
+  let foldChangesHeadThisPass = false;
+  let recoveryExternalFoldCause = null;
   let publishedM1RefreshedThisPass = false;
   let prefixPreflightFailed = false;
   const softRefreshOpportunity = !freezeM0M1 && (args.schedulerDecision === "execute" || deferredMaterialize || servedShapeRepair.needsRebuild);
@@ -6266,9 +6466,16 @@ async function runPostTransformPhase2(args) {
       prefixPreflightFailed = foldResult.materializationContentionRetryExhausted === true;
       foldExecutedThisPass = foldExecutesThisPass(foldDueDecision.value || softRefreshOpportunity, foldResult.m0RematerializedThisPass);
       foldBustsServedPrefixThisPass = foldExecutedThisPass && (committedFoldBustsServedPrefix ?? true);
+      foldChangesHeadThisPass = foldExecutedThisPass && committedFoldChangesHead === true;
       publishedM1RefreshedThisPass = !foldResult.materializationContentionRetryExhausted && previousM1 !== args.sessionMeta.cachedM1Bytes?.toString("utf8");
       m0RematerializedThisPass = foldResult.m0RematerializedThisPass;
       m0MaterializeReason = foldResult.decision.reason;
+      if (!prefixPreflightFailed && foldExecutedThisPass) {
+        const decision = foldResult.decision;
+        if (decision.reason === "system_hash" && decision.systemHashPrev && decision.systemHashPrev !== "0" || decision.reason === "model_change" && decision.m0ModelKeyPrev || decision.reason === "tool_definitions") {
+          recoveryExternalFoldCause = decision.reason;
+        }
+      }
       if (foldResult.m0RematerializedThisPass && convertedToolSkeletons.size > 0) {
         convertedToolSkeletonsDidMutate = renderConvertedToolSkeletons(args.targets, convertedToolSkeletons);
         sessionLog2(args.sessionId, `HARD fold converted ${convertedToolSkeletons.size} legacy dropped-tool skeleton(s) to real-or-absent`);
@@ -6371,8 +6578,14 @@ async function runPostTransformPhase2(args) {
       newTargets = args.targets;
     }
   }
+  const recoveryHasHistoryHead = m0M1EnabledForFold || (args.pendingCompartmentInjection?.compartmentCount ?? 0) > 0;
+  const recoveryHeadChangedThisPass = !prefixPreflightFailed && (foldChangesHeadThisPass || !firstRenderBust && publishedM1RefreshedThisPass || !m0M1EnabledForFold && legacyPublishedHeadChanged(args));
+  const recoveryHeadlessRebuild = !recoveryHasHistoryHead && (args.schedulerDecision === "execute" || isExplicitFlush || forceMaterialization || emergencyDropEligible);
+  const recoveredShapeRewriteProof = recoveryHeadChangedThisPass ? "head_bytes" : recoveryExternalFoldCause ?? (recoveryHeadlessRebuild ? "headless_rebuild" : null);
+  const canNormalizeRecoveredShape = isCacheBustingPass && !activeThinkingPrefixHold && recoveredShapeRewriteProof !== null;
+  sessionLog2(args.sessionId, `rewrite permission: allowed=${isCacheBustingPass} ${reclaimRideLabel(rideSignals)} served_shape_repair=${servedShapeRepair.needsRebuild} signed_prefix_release=${rewritingSignedPrefix} fold_prefix_loss=${foldBustsServedPrefixThisPass} first_render=${firstRenderBust} idle_expiry=${idleExpiryRebuild} thinking_hold=${activeThinkingPrefixHold} recovery_has_head=${recoveryHasHistoryHead} recovery_head_changed=${recoveryHeadChangedThisPass} recovery_headless_rebuild=${recoveryHeadlessRebuild} proven_external_fold=${recoveryExternalFoldCause ?? "none"} recovered_shape_proof=${recoveredShapeRewriteProof ?? "none"}`);
   let recoveryTailNormalizedThisPass = false;
-  if (args.normalizeRecoveryTail && isCacheBustingPass && !activeThinkingPrefixHold) {
+  if (args.normalizeRecoveryTail && canNormalizeRecoveredShape) {
     args.normalizeRecoveryTail();
     recoveryTailNormalizedThisPass = true;
     args.tags = getTagsBySession2(args.db, args.sessionId);
@@ -6771,6 +6984,20 @@ async function runPostTransformPhase2(args) {
         }
       }
     }
+    if (!args.fullFeatureMode && canEditWholePrefix && !compactionOff) {
+      const thinkingStrippedIds = new Set([...bindingThinking, ...removedReasoningIds]);
+      for (const id of getMergedReasoningStrippedIds(args.db, args.sessionId)) {
+        if (id.startsWith(THINKING_BINDING_RECOVERY_FROZEN_PREFIX))
+          thinkingStrippedIds.add(id.slice(THINKING_BINDING_RECOVERY_FROZEN_PREFIX.length));
+      }
+      const conversions = prepareAgedToolSkeletonConversions(args.db, args.sessionId, newTargets, { thinkingStrippedIds });
+      args.db.transaction(() => {
+        if (!conversions.isCurrent(args.db))
+          throw new Error("Subagent skeleton candidates changed before commit");
+        conversions.persist(args.db);
+      }).immediate();
+      convertedToolSkeletonsDidMutate = renderConvertedToolSkeletons(newTargets, conversions.converted) || convertedToolSkeletonsDidMutate;
+    }
     const tBatchFinalize = performance.now();
     args.batch?.finalize();
     if (toolReclaimApplicationOpportunity) {
@@ -7181,6 +7408,18 @@ async function runPostTransformPhase2(args) {
     }
     autoSearchHintAppendedThisPass = autoSearchCompletedThisPass && countAutoSearchHints(args.db, args.sessionId) !== autoSearchHintsBefore;
     logTransformTiming(args.sessionId, "pp.autoSearchHint", tAutoSearch);
+  } else if (args.fullFeatureMode && args.autoSearch && !args.autoSearch.enabled && args.projectPath) {
+    await runAutoSearchHint({
+      sessionId: args.sessionId,
+      db: args.db,
+      messages: args.messages,
+      options: {
+        enabled: false,
+        scoreThreshold: args.autoSearch.scoreThreshold,
+        minPromptChars: args.autoSearch.minPromptChars,
+        projectPath: args.projectPath
+      }
+    });
   }
   if (args.fullFeatureMode && canEditWholePrefix) {
     const visibleIds = new Set;
@@ -7464,6 +7703,19 @@ async function runPostTransformPhase2(args) {
     if (reasoningRemovalEnabled)
       removeReasoningParts(args.messages, removedReasoningIds, args.resolvedProviderID);
   }
+  const releaseRecoveryThisPass = canEditWholePrefix;
+  if (releaseRecoveryThisPass)
+    args.releaseRecoveryPrefix?.();
+  sessionLog2(args.sessionId, `recovery projection: case=${canNormalizeRecoveredShape ? recoveredShapeRewriteProof : releaseRecoveryThisPass ? "conversation_only" : "defer"} released=${releaseRecoveryThisPass} normalized=${recoveryTailNormalizedThisPass}`);
+  if (canUseEmptySentinels && args.opencode1) {
+    projectStructuralSentinels({
+      db: args.db,
+      sessionId: args.sessionId,
+      messages: args.messages,
+      rebuilding: canNormalizeRecoveredShape && bustedThisPass,
+      deferUpgrade: structuralSentinelUpgradeFailed
+    });
+  }
   sessionLog2(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();
@@ -7601,4 +7853,4 @@ function checkM0MutationDriftAndSignal2(args) {
   return false;
 }
 
-export { makeToolCompositeKey, createTagger, cavemanWordRulesForLanguage, searchMessageHistoryOffThread, findSessionId, findLastUserMessageId, clearAutoSearchForSession, setCtxReduceRegisteredGlobally, resolveCtxReduceAvailabilityFromMessages, resolveCtxReduceAvailability, primeCtxReduceSpawnPermission, ctxReduceSpawnPermissionReadNeeded, spawnAgentFromMessages, spawnAgentFromOpenCodeDb, todowritePermissionDenied, cachedToolPermissionDenied, clearToolPermissionDenied, resolveTodowriteAvailabilityFromMessages, resolveTodowriteAvailability, diagnosticStateChanged, clearDiagnosticLogState, canConsumeDeferredOnThisPass, hasReclaimRide, reclaimRidePermitted, reclaimRideLabel, pendingDropEligibilityKey, createPendingDropEligibilityCache, readExecuteReclaimState, writeExecuteReclaimState, maintainExecuteFloorMark, captureOpencodeReasoningBudgetStatus, reasoningBudgetStatusLine, ENGINE_RECONNECTING_USER_MESSAGE, ENGINE_BUSY_USER_MESSAGE, SIGNED_THINKING_RESET_FENCE_FAILED, contextRefusalError, protectedToolRefusal, outgoingContextRefusal, signedTurnContextRefusal, EmergencyFailClosedError, latestAssistantTurnStart, latestAssistantTurnMessages, hasActiveAnthropicThinkingTurn, replayCavemanCompression, DegradedPassRefusalError, degradedPassError, renderDroppedText, applyFlushedStatuses, prewarmTagOwners, waitForTagOwners, stripStructuralNoise, collectForeignTextParts, isLegacyForeignTextTag, withTransformTimingSummary, logTransformTiming, hasRecentAssistantCommit, tagMessages, resetDegradedCacheCount2, isSyntheticHeadMessage2, applyTodoSynthesis2, freezeReasoningOnBustingPass2, servesThinkingBlock2, firstServedDivergenceIndex2, rustModeServedKeyAfterPersistedStrips2, replayRustModeBindingMismatchStrips2, RUST_MARKER_LOCK_SKIP_LOG2, applyRustModeDeferredCompactionMarker2, clearRustModeBoundaryRecord2, runRustModePostprocess2, reconcileMarkerRepresentation2, clearPendingCompactionMarkerAfterSuccessfulDrain2, defaultCompactionMarkerStrategy2, abortSessionFailClosed2, evaluateEmergencyFailClosed2, finalizeMessageRepresentation2, runPostTransformPhase2, checkM0MutationDriftAndSignal2 };
+export { makeToolCompositeKey, createTagger, cavemanWordRulesForLanguage, searchMessageHistoryOffThread, findSessionId, findLastUserMessageId, clearAutoSearchForSession, setCtxReduceRegisteredGlobally, resolveCtxReduceAvailabilityFromMessages, resolveCtxReduceAvailability, primeCtxReduceSpawnPermission, ctxReduceSpawnPermissionReadNeeded, spawnAgentFromMessages, spawnAgentFromOpenCodeDb, todowritePermissionDenied, cachedToolPermissionDenied, clearToolPermissionDenied, resolveTodowriteAvailabilityFromMessages, resolveTodowriteAvailability, diagnosticStateChanged, clearDiagnosticLogState, canConsumeDeferredOnThisPass, hasReclaimRide, reclaimRidePermitted, reclaimRideLabel, pendingDropEligibilityKey, createPendingDropEligibilityCache, readExecuteReclaimState, writeExecuteReclaimState, maintainExecuteFloorMark, captureOpencodeReasoningBudgetStatus, reasoningBudgetStatusLine, ENGINE_RECONNECTING_USER_MESSAGE, ENGINE_BUSY_USER_MESSAGE, SIGNED_THINKING_RESET_FENCE_FAILED, contextRefusalError, protectedToolRefusal, outgoingContextRefusal, signedTurnContextRefusal, EmergencyFailClosedError, latestAssistantTurnStart, latestAssistantTurnMessages, hasActiveAnthropicThinkingTurn, replayCavemanCompression, DegradedPassRefusalError, degradedPassError, isStructuralNoiseSentinel, stripStructuralNoise, prepareStructuralSentinelChoices, renderDroppedText, applyFlushedStatuses, prewarmTagOwners, waitForTagOwners, collectForeignTextParts, isLegacyForeignTextTag, withTransformTimingSummary, logTransformTiming, hasRecentAssistantCommit, tagMessages, resetDegradedCacheCount2, isSyntheticHeadMessage2, applyTodoSynthesis2, freezeReasoningOnBustingPass2, servesThinkingBlock2, firstServedDivergenceIndex2, rustModeServedKeyAfterPersistedStrips2, replayRustModeBindingMismatchStrips2, RUST_MARKER_LOCK_SKIP_LOG2, applyRustModeDeferredCompactionMarker2, clearRustModeBoundaryRecord2, runRustModePostprocess2, reconcileMarkerRepresentation2, clearPendingCompactionMarkerAfterSuccessfulDrain2, defaultCompactionMarkerStrategy2, abortSessionFailClosed2, evaluateEmergencyFailClosed2, finalizeMessageRepresentation2, runPostTransformPhase2, checkM0MutationDriftAndSignal2 };