@cortexkit/opencode-magic-context 0.49.20 → 0.49.22

package/dist/v2/{context-cc33tv2z.js → context-ea3x7smm.js}

@@ -6,7 +6,7 @@ import {
   resolveLegacyConfigSources,
   getProtectedTokensTierOverrides,
   loadPluginConfigDetailed
-} from "./server-5arr9ecn.js";
+} from "./server-94wk1ey3.js";
 import {
   getHarness2,
   harnessOwnsOpenCodeStore2
@@ -46,7 +46,7 @@ import {
   DEFAULT_HISTORIAN_TIMEOUT_MS,
   DEFAULT_LOCAL_EMBEDDING_MODEL,
   DREAM_TASK_PROMOTION_DEFAULTS
-} from "./server-271qxsf5.js";
+} from "./server-24g8r2d0.js";
 import {
   CANONICAL_DREAM_TASKS,
   DREAM_TASK_CAPABILITIES,
@@ -286,7 +286,7 @@ import {
   startCompartmentAgent,
   setRecompStarting2,
   setRecompTerminal2
-} from "./server-c7dxxsj7.js";
+} from "./server-zg5y109h.js";
 import {
   resolveHistorianModel2
 } from "./server-5kym00ag.js";
@@ -311,7 +311,7 @@ import {
   openDatabaseAsync,
   isDatabasePersisted,
   getDatabasePersistenceError
-} from "./server-hqzyq8n4.js";
+} from "./server-j8h7bsca.js";
 import {
   pruneMissingProjectIdentities,
   setHomeProjectPermission,
@@ -328,14 +328,197 @@ import {
   storedPathBelongsToIdentity,
   beginBootQuietPeriod,
   scheduleAfterBootQuiet
-} from "./server-ne8arh8t.js";
+} from "./server-qjvk4a9t.js";
+import {
+  registerOwnRpcServerInstance,
+  rpcPortDir,
+  rpcPortFilePath,
+  parseRpcPortFile,
+  inspectProcessesAsync
+} from "./server-k3t06fxr.js";
+import {
+  BoundedSessionMap,
+  LkgRecoveryFenceError,
+  lkgServedArrayDigest,
+  takeLkgRecoveryLockSweepPage,
+  hasCleanLkgRecoveryFence,
+  dirtyLkgRecoveryRevision,
+  ownsLkgDirtyFence,
+  invalidateCleanLkgRecoveryFence,
+  prepareLkgCaptureFence,
+  certifyCommittedLkgCapture,
+  markLkgRecoveryDirty,
+  gaDatabasePath,
+  RAW_MESSAGE_TYPES,
+  V2StoreReaderPool,
+  V2StoreReader,
+  cleanSearchText,
+  matchedSearchSnippet,
+  advanceSessionActivity,
+  backfillSessionActivity,
+  getLastIndexedOrdinal2,
+  getMessageIndexReconciliationStartOrdinal2,
+  isMessageIndexReconciledThrough2,
+  clearIndexedMessages2,
+  indexMessagesAfterOrdinal2,
+  sweepOrphanedOpenCodeMessageIndexesCooperatively2
+} from "./server-ppcd1qxh.js";
+import"./server-51779zs2.js";
+import {
+  inRootAsyncContext2,
+  getTagIdentityWriteGeneration2,
+  Database2,
+  getSqliteDatabasePath2,
+  getSqliteMemoryStats2,
+  withSqliteBackgroundWriter2,
+  withSqliteTransformPass2,
+  withoutSqliteTransformPass2,
+  assertTransformWrite2,
+  isTransientSqliteError2,
+  SqliteAcquisitionBusyError2,
+  withAsyncPrivilegedWriter2
+} from "./server-gzy5w8ya.js";
+import {
+  createWorkerShutdown
+} from "./server-cpjk5jd2.js";
+import {
+  isRawCompactionSummaryInfo2,
+  extractInMemoryMessageViews2,
+  buildInMemoryTailRawMessages2,
+  RawOrdinalsNotReady2,
+  runSessionWarmupWorker
+} from "./server-4kjmrjn4.js";
+import {
+  resolveOpenCodeDbPath,
+  assertOpenCodeStoreGeneration,
+  openCodeDbPathExists,
+  recordOpenCodeDbReadFailure,
+  clearOpenCodeDbReadFailure,
+  claimOpenCodeDbDiagnosticOnce
+} from "./server-2ra6pwf3.js";
+import {
+  resolveModelCalibration,
+  calibrateBuckets,
+  resolveDecisionCalibration
+} from "./server-1zx87sdm.js";
+import {
+  protectedToolTagNumbers,
+  protectedToolTokenCount,
+  stripPersistedAssistantText,
+  byteSize,
+  stripTagPrefix,
+  peelLeadingMcTagNotation,
+  prependTag,
+  isThinkingPart,
+  currentReclaimableToolOutputCount,
+  isRecord,
+  contentTagOwnerMessageId,
+  estimateImageTokensFromDataUrl,
+  estimateToolAttachmentImageTokens,
+  providerVisiblePart,
+  normalizeTodoStateJson,
+  buildSyntheticTodoPart,
+  computeSyntheticCallId,
+  isSyntheticTodoPart,
+  countRealUserMessages,
+  tailHygieneStructuralSignature,
+  sameTailHygieneStructuralSignature,
+  formatTailHygienePrefixMismatch,
+  refreshTailHygieneBaseline,
+  effectiveTailHygiene,
+  assertTailHygieneContentUnchangedIfEnabled,
+  CHANNEL1_SENTINEL,
+  CHANNEL1_FLOOR_TOKENS,
+  isDroppedToolOutput,
+  toolOutputTokens,
+  decideChannel1,
+  evaluateChannel2,
+  formatChannel1Evaluation,
+  formatChannel2Evaluation,
+  buildChannel2Reminder,
+  buildChannel1Reminder,
+  estimateEmergencyDropReclaimTokens,
+  planEmergencyDrop,
+  measureEmergencyTag,
+  queuePendingOp,
+  getPendingOps,
+  hasPendingDropOps,
+  getPendingOpsCount,
+  clearPendingOps,
+  removePendingOp,
+  updateTagByteSize2,
+  getRecentTagOwnerMessageIds2,
+  AGE_RECLAIM_MIN_TOKENS2,
+  getOldestActiveUnprotectedToolTags2,
+  getActiveToolTagsForAgeReclaim2,
+  getTriggerTagTokenUpperBound2,
+  getActiveTagTokenTotalsByMessage2,
+  updateTagTokenCount2,
+  tryGetReasoningTokenEstimatesByMessage2,
+  cachedTagOwnerRatios2,
+  tagOwnerWarmupState2,
+  installTagOwnerDelta2,
+  installTagOwnerSummary2,
+  isTagOwnerSummaryReady2,
+  tagTokenCountIsNull2,
+  backfillTagTokenCounts2,
+  insertTag2,
+  updateTagStatus2,
+  markTagDropped2,
+  markWhitespaceAssistantTagInert2,
+  getInertWhitespaceAssistantTags2,
+  getInertWhitespaceAssistantTagsByNumbers2,
+  updateTagDropMode2,
+  updateCavemanDepth2,
+  updateTagMessageId2,
+  markTagsCompactedByMessageIds2,
+  getMaxTagNumberBySession2,
+  getTagNumberByMessageId2,
+  getAssignableTagNumberByMessageId2,
+  deriveTagLoadFloor2,
+  getTagsBySession2,
+  getActiveTagsBySession2,
+  getTailHygieneTags2,
+  getDroppedTagsBySession2,
+  getTagsByNumbers2,
+  getNewestToolTagNumbers2,
+  getDroppedTagsByNumbers2,
+  getMaxDroppedTagNumber2,
+  getTagById2,
+  getToolTagNumberByOwner2,
+  getNullOwnerToolTag2,
+  adoptNullOwnerToolTag2,
+  getCandidateToolOwners2,
+  pickNearestPriorOwner2
+} from "./server-fa7vtp40.js";
+import {
+  textMentionsRecentCommit,
+  hasMeaningfulUserText2,
+  extractTexts2,
+  extractToolCallSummaries,
+  getTokenizerNativeMemoryStats,
+  preloadTokenizer,
+  estimateTokens,
+  estimateFixedPromptTokens,
+  normalizeText
+} from "./server-3mz2qh5a.js";
+import {
+  stableStringify,
+  getTemporalDecisions,
+  observeTemporalDecisions,
+  freezeTemporalDecisions,
+  tagRevisionKey,
+  tagIdentityRevisionKey
+} from "./server-rqebawx1.js";
+import {
+  openCodeDbExists,
+  withReadOnlySessionDb,
+  latestPersistedMessageForRecovery,
+  latestRealUserTurnIdFromOpenCodeDb,
+  getMessageTimesFromOpenCodeDb,
+  findLastAssistantModelFromOpenCodeDb
+} from "./server-3vhxy2k5.js";
 import {
-  detectLatestTurnThinkingMismatch,
-  isPrefixBoundThinkingModel,
-  detectOverflow,
-  ensureSessionMetaRow,
-  clearCachedM0M1,
-  clearCachedM0,
   expandToolPart,
   markHostUnservedRow,
   markCoveredInstructionRow,
@@ -363,6 +546,9 @@ import {
   transitionSessionHygieneUnits,
   readEpochFloorSnapshot,
   getProtectionWindowForSession,
+  ensureSessionMetaRow,
+  clearCachedM0M1,
+  clearCachedM0,
   withReplayEnvelopeSnapshot,
   invalidateReplayEnvelopeSnapshot,
   isRustMarkerAdmissionFenced,
@@ -453,6 +639,9 @@ import {
   getReasoningRemovalState,
   addRemovedReasoningIds,
   markDropLeavesReasoning,
+  detectLatestTurnThinkingMismatch,
+  isPrefixBoundThinkingModel,
+  detectOverflow,
   modelAcceptsEmptyContent,
   isAnthropicFamilyRoute,
   neutralizeDroppedReasoningPart,
@@ -466,12 +655,15 @@ import {
   isInActiveAnthropicTurn,
   activeAnthropicTurnStart,
   hasAnthropicReasoning,
+  markServedShapeRepair,
+  prepareServedShapeRepair,
   stripSystemInjectedMessages,
   stripDroppedPlaceholderMessages,
   replayClearedReasoning,
   replayStrippedInlineThinking,
   clearOldReasoning,
   stripClearedReasoning,
+  captureInlineThinkingRepairs,
   stripInlineThinking,
   findReasoningBearingAssistantIds,
   findLatestAssistantReasoningMutationExemptMessage,
@@ -523,7 +715,24 @@ import {
   readRawSessionMessageById2,
   readSessionChunk2,
   readRawSessionSeedTail2
-} from "./server-ej96a39v.js";
+} from "./server-m4bfaevz.js";
+import {
+  getCurrentToolSetHash,
+  recordToolDefinition,
+  getMeasuredToolDefinitionTokens
+} from "./server-d1dzgvwd.js";
+import"./server-dtp8hcjh.js";
+import {
+  SubcClient,
+  connectionFileExists,
+  SYNAPSE_DEFAULT_MODEL,
+  toSynapseLaneDescriptor,
+  formatSynapseLaneDescriptor,
+  SynapseEmbeddingProvider
+} from "./server-ab1g0wn9.js";
+import {
+  deleteChunkEmbedBackoffForSession2
+} from "./server-62g58aaz.js";
 import {
   embedPauseBySession,
   embedRunStateBySession,
@@ -535,6 +744,7 @@ import {
   getEmbedDrainUiStatus,
   clearEmbedSessionState,
   describeShadowBackfillWriteRefusal2,
+  retainProjectEmbedding2,
   markProjectLoadUntrusted2,
   drainProjectEmbeddingIdentityMaintenance2,
   drainStaleEmbeddingIdentitiesForProject2,
@@ -552,212 +762,7 @@ import {
   embedSessionCompartmentChunks2,
   getEmbeddingCoverageStatus2,
   getAutoEmbeddingSessionCoverage2
-} from "./server-0epqaxhd.js";
-import {
-  textMentionsRecentCommit,
-  hasMeaningfulUserText2,
-  extractTexts2,
-  extractToolCallSummaries,
-  getTokenizerNativeMemoryStats,
-  preloadTokenizer,
-  estimateTokens,
-  estimateFixedPromptTokens,
-  normalizeText
-} from "./server-3mz2qh5a.js";
-import {
-  SubcClient,
-  connectionFileExists,
-  SYNAPSE_DEFAULT_MODEL,
-  toSynapseLaneDescriptor,
-  formatSynapseLaneDescriptor,
-  SynapseEmbeddingProvider
-} from "./server-af2pght7.js";
-import {
-  inRootAsyncContext2,
-  getTagIdentityWriteGeneration2,
-  Database2,
-  getSqliteDatabasePath2,
-  getSqliteMemoryStats2,
-  withSqliteBackgroundWriter2,
-  withSqliteTransformPass2,
-  withoutSqliteTransformPass2,
-  assertTransformWrite2,
-  isTransientSqliteError2,
-  SqliteAcquisitionBusyError2,
-  withAsyncPrivilegedWriter2
-} from "./server-1zx2pa5d.js";
-import"./server-51779zs2.js";
-import {
-  createWorkerShutdown
-} from "./server-cpjk5jd2.js";
-import {
-  isRawCompactionSummaryInfo2,
-  extractInMemoryMessageViews2,
-  buildInMemoryTailRawMessages2,
-  RawOrdinalsNotReady2,
-  runSessionWarmupWorker
-} from "./server-55rgxfrw.js";
-import"./server-br1x0tev.js";
-import {
-  deleteChunkEmbedBackoffForSession2
-} from "./server-wyawsa88.js";
-import {
-  registerOwnRpcServerInstance,
-  rpcPortDir,
-  rpcPortFilePath,
-  parseRpcPortFile,
-  inspectProcessesAsync
-} from "./server-k3t06fxr.js";
-import {
-  BoundedSessionMap,
-  LkgRecoveryFenceError,
-  lkgServedArrayDigest,
-  takeLkgRecoveryLockSweepPage,
-  hasCleanLkgRecoveryFence,
-  dirtyLkgRecoveryRevision,
-  ownsLkgDirtyFence,
-  invalidateCleanLkgRecoveryFence,
-  prepareLkgCaptureFence,
-  certifyCommittedLkgCapture,
-  markLkgRecoveryDirty,
-  cleanSearchText,
-  matchedSearchSnippet,
-  gaDatabasePath,
-  RAW_MESSAGE_TYPES,
-  V2StoreReaderPool,
-  V2StoreReader,
-  advanceSessionActivity,
-  backfillSessionActivity,
-  getLastIndexedOrdinal2,
-  getMessageIndexReconciliationStartOrdinal2,
-  isMessageIndexReconciledThrough2,
-  indexMessagesAfterOrdinal2,
-  sweepOrphanedOpenCodeMessageIndexesCooperatively2
-} from "./server-63fqdghs.js";
-import {
-  stableStringify,
-  getTemporalDecisions,
-  observeTemporalDecisions,
-  freezeTemporalDecisions,
-  tagRevisionKey,
-  tagIdentityRevisionKey
-} from "./server-168pb207.js";
-import {
-  resolveModelCalibration,
-  calibrateBuckets,
-  resolveDecisionCalibration
-} from "./server-1zx87sdm.js";
-import {
-  protectedToolTagNumbers,
-  protectedToolTokenCount,
-  stripPersistedAssistantText,
-  byteSize,
-  stripTagPrefix,
-  peelLeadingMcTagNotation,
-  prependTag,
-  isThinkingPart,
-  currentReclaimableToolOutputCount,
-  isRecord,
-  contentTagOwnerMessageId,
-  estimateImageTokensFromDataUrl,
-  estimateToolAttachmentImageTokens,
-  providerVisiblePart,
-  normalizeTodoStateJson,
-  buildSyntheticTodoPart,
-  computeSyntheticCallId,
-  isSyntheticTodoPart,
-  countRealUserMessages,
-  tailHygieneStructuralSignature,
-  sameTailHygieneStructuralSignature,
-  formatTailHygienePrefixMismatch,
-  refreshTailHygieneBaseline,
-  effectiveTailHygiene,
-  assertTailHygieneContentUnchangedIfEnabled,
-  CHANNEL1_SENTINEL,
-  CHANNEL1_FLOOR_TOKENS,
-  isDroppedToolOutput,
-  toolOutputTokens,
-  decideChannel1,
-  evaluateChannel2,
-  formatChannel1Evaluation,
-  formatChannel2Evaluation,
-  buildChannel2Reminder,
-  buildChannel1Reminder,
-  estimateEmergencyDropReclaimTokens,
-  planEmergencyDrop,
-  measureEmergencyTag,
-  queuePendingOp,
-  getPendingOps,
-  hasPendingDropOps,
-  getPendingOpsCount,
-  clearPendingOps,
-  removePendingOp,
-  updateTagByteSize2,
-  getRecentTagOwnerMessageIds2,
-  AGE_RECLAIM_MIN_TOKENS2,
-  getOldestActiveUnprotectedToolTags2,
-  getActiveToolTagsForAgeReclaim2,
-  getTriggerTagTokenUpperBound2,
-  getActiveTagTokenTotalsByMessage2,
-  updateTagTokenCount2,
-  tryGetReasoningTokenEstimatesByMessage2,
-  cachedTagOwnerRatios2,
-  tagOwnerWarmupState2,
-  installTagOwnerDelta2,
-  installTagOwnerSummary2,
-  isTagOwnerSummaryReady2,
-  tagTokenCountIsNull2,
-  backfillTagTokenCounts2,
-  insertTag2,
-  updateTagStatus2,
-  markTagDropped2,
-  markWhitespaceAssistantTagInert2,
-  getInertWhitespaceAssistantTags2,
-  getInertWhitespaceAssistantTagsByNumbers2,
-  updateTagDropMode2,
-  updateCavemanDepth2,
-  updateTagMessageId2,
-  markTagsCompactedByMessageIds2,
-  getMaxTagNumberBySession2,
-  getTagNumberByMessageId2,
-  getAssignableTagNumberByMessageId2,
-  deriveTagLoadFloor2,
-  getTagsBySession2,
-  getActiveTagsBySession2,
-  getTailHygieneTags2,
-  getDroppedTagsBySession2,
-  getTagsByNumbers2,
-  getNewestToolTagNumbers2,
-  getDroppedTagsByNumbers2,
-  getMaxDroppedTagNumber2,
-  getTagById2,
-  getToolTagNumberByOwner2,
-  getNullOwnerToolTag2,
-  adoptNullOwnerToolTag2,
-  getCandidateToolOwners2,
-  pickNearestPriorOwner2
-} from "./server-a3dwxfgd.js";
-import {
-  resolveOpenCodeDbPath,
-  assertOpenCodeStoreGeneration,
-  openCodeDbPathExists,
-  recordOpenCodeDbReadFailure,
-  clearOpenCodeDbReadFailure,
-  claimOpenCodeDbDiagnosticOnce
-} from "./server-2ra6pwf3.js";
-import {
-  openCodeDbExists,
-  withReadOnlySessionDb,
-  latestPersistedMessageForRecovery,
-  latestRealUserTurnIdFromOpenCodeDb,
-  getMessageTimesFromOpenCodeDb,
-  findLastAssistantModelFromOpenCodeDb
-} from "./server-brj8j2gk.js";
-import {
-  getCurrentToolSetHash,
-  recordToolDefinition,
-  getMeasuredToolDefinitionTokens
-} from "./server-dj7tz4ph.js";
+} from "./server-ad18djzs.js";
 import {
   V2_MEMORY_CATEGORIES,
   CATEGORY_PRIORITY
@@ -770,7 +775,7 @@ import {
   resolveStoredPathWorkspaceIdentity,
   storedPathBelongsToWorkspace,
   computeWorkspaceEpochFingerprint
-} from "./server-9x0kmta4.js";
+} from "./server-wwaw5npa.js";
 import {
   configureContextDatabasePragmas2
 } from "./server-fb3zxn06.js";
@@ -816,7 +821,7 @@ import {
   readGitFileChangeTimesSince,
   verificationFileExists,
   normalizeVerificationFiles
-} from "./server-vn2nwcv6.js";
+} from "./server-d48x3m4x.js";
 import {
   deriveTriggerBudget2,
   deriveHistorianChunkTokens2,
@@ -824,7 +829,7 @@ import {
   resolveHistorianProducerLimits2,
   resolveHistorianContextLimit2
 } from "./server-53eh1r8r.js";
-import"./server-ygtykank.js";
+import"./server-806rzhs6.js";
 import {
   isEmbeddingHostBusy2
 } from "./server-qt1qqasc.js";
@@ -837,7 +842,7 @@ import {
   releaseGitSweepLease,
   recordSessionProjectIdentity,
   hasRecordedSessionProjectIdentity
-} from "./server-4nw4fqhr.js";
+} from "./server-bsgd4dk1.js";
 import {
   saveEmbeddingIfHashMatches,
   invalidateProject2,
@@ -847,10 +852,10 @@ import {
   getCachedLocalEmbeddingPooling,
   preflightLocalEmbeddingPooling,
   getLocalEmbeddingNativeMemoryStats
-} from "./server-j4jnp9b5.js";
+} from "./server-vr4szghm.js";
 import {
   cosineSimilarity
-} from "./server-xsryvyf6.js";
+} from "./server-qteg2kt9.js";
 import {
   computeCueContentHash,
   hasMuralCueColumns,
@@ -875,7 +880,7 @@ import {
   mergeMemoryStats2,
   archiveMemory2,
   getMemoryCountsByStatus2
-} from "./server-y4a3nhtk.js";
+} from "./server-jjvbk92s.js";
 import {
   registerNotificationSink2,
   pushNotification2,
@@ -887,7 +892,7 @@ import"./server-1bw1wcbp.js";
 import {
   flushIgnoredMessages2,
   sendStatusNotification2
-} from "./server-230fnbws.js";
+} from "./server-6v3cdzsx.js";
 import {
   renderSingleStoreMigrationRequiredRefusal,
   SingleStoreMigrationRequiredError,
@@ -907,14 +912,14 @@ import {
   resolveMemoriesByIdsForSearch2,
   unifiedSearch2,
   formatSearchResults2
-} from "./server-m91f9m5s.js";
+} from "./server-33nqbqkw.js";
 import {
   resolvePromptContext2
 } from "./server-fmsr7v69.js";
 import"./server-kaqs6h31.js";
 import {
   renderSearchArchiveOffThread2
-} from "./server-4sxjs6hn.js";
+} from "./server-132h8twc.js";
 import {
   compareSemverCore
 } from "./server-84w6rvvf.js";
@@ -1730,6 +1735,270 @@ function summarizeManualDream(summary) {
 `);
 }
 
+// src/features/magic-context/message-index-async.ts
+var indexCancellations = new Map;
+var sessionEpochs = new Map;
+var workerMeasurements = new WeakMap;
+function isDatabaseLockedError(error) {
+  if (!error || typeof error !== "object")
+    return false;
+  const e = error;
+  if (typeof e.code === "string") {
+    if (e.code === "SQLITE_BUSY" || e.code === "SQLITE_LOCKED")
+      return true;
+  }
+  if (typeof e.message === "string") {
+    if (/database is locked/i.test(e.message))
+      return true;
+    if (/sqlite_(busy|locked)/i.test(e.message))
+      return true;
+  }
+  return false;
+}
+var RECONCILIATION_BATCH_SIZE = 100;
+
+class MagicContextMessageIndexHeapHolder {
+  reconciledSessions = new Set;
+  reconciledSnapshots = new Map;
+  stalledSessions = new Set;
+  reconciliationScheduledSessions = new Set;
+  clearAndReindexScheduledSessions = new Map;
+  sessionLocks = new Map;
+  incrementalTimers = new Map;
+  pendingIncrementalKeys = new Set;
+  completedIncrementalKeys = new Set;
+  activeReconcilerBuffers = new Map;
+}
+var heapHolder = new MagicContextMessageIndexHeapHolder;
+function clearCompletedIncrementalKeys(sessionId) {
+  const prefix = `${sessionId}\x00`;
+  for (const key of heapHolder.completedIncrementalKeys) {
+    if (key.startsWith(prefix))
+      heapHolder.completedIncrementalKeys.delete(key);
+  }
+}
+var PREPARE_RETRY_MS = 60000;
+async function sourceReady(source, sessionId) {
+  const prepare = source?.prepare;
+  return typeof prepare === "function" ? prepare(sessionId) : true;
+}
+function defer(fn) {
+  const immediate = globalThis.setImmediate;
+  if (typeof immediate === "function") {
+    inRootAsyncContext2(() => immediate(fn));
+    return;
+  }
+  inRootAsyncContext2(() => setTimeout(fn, 0));
+}
+function yieldToEventLoop() {
+  return new Promise((resolve) => defer(resolve));
+}
+function runWithSessionLock(sessionId, operation) {
+  const previous = heapHolder.sessionLocks.get(sessionId) ?? Promise.resolve();
+  const run = previous.catch(() => {
+    return;
+  }).then(async () => {
+    await operation();
+  });
+  heapHolder.sessionLocks.set(sessionId, run);
+  run.finally(() => {
+    if (heapHolder.sessionLocks.get(sessionId) === run) {
+      heapHolder.sessionLocks.delete(sessionId);
+    }
+  }).catch(() => {
+    return;
+  });
+  return run;
+}
+function logIndexingError(sessionId, action, error) {
+  if (isDatabaseLockedError(error)) {
+    sessionLog2(sessionId, `message FTS async ${action} skipped (database busy; will retry on next reconciliation)`);
+    return;
+  }
+  sessionLog2(sessionId, `message FTS async ${action} failed: ${error instanceof Error ? error.message : String(error)}`);
+  log2(`[message-index-async] ${action} failed for ${sessionId}:`, error);
+}
+function serializedMessageBytes(messages) {
+  try {
+    return Buffer.byteLength(JSON.stringify(messages));
+  } catch {
+    return 0;
+  }
+}
+function logReconciliationStall(sessionId, reason) {
+  if (heapHolder.stalledSessions.has(sessionId))
+    return;
+  heapHolder.stalledSessions.add(sessionId);
+  sessionLog2(sessionId, `message FTS reconciliation stalled: ${reason}; will retry`);
+}
+async function reconcileSessionIndex(db, sessionId, readMessages) {
+  if (!await sourceReady(readMessages, sessionId)) {
+    logReconciliationStall(sessionId, "raw message reader is not ready");
+    return false;
+  }
+  await runWithSessionLock(sessionId, async () => {
+    if (!readMessages.getRevision && heapHolder.reconciledSessions.has(sessionId))
+      return;
+    let fallbackSnapshot = null;
+    try {
+      const fullReader = typeof readMessages === "function" ? readMessages : null;
+      const revision = readMessages.getRevision?.(sessionId);
+      const previous = heapHolder.reconciledSnapshots.get(sessionId);
+      const finalWatermark = previous && revision === previous.revision ? previous.count : revision !== undefined && readMessages.getCountAfterRevision ? previous && revision > previous.revision ? previous.count + readMessages.getCountAfterRevision(sessionId, previous.revision, revision) : readMessages.getCountAfterRevision(sessionId, -1, revision) : readMessages.getCount ? readMessages.getCount(sessionId) : (fallbackSnapshot = fullReader?.(sessionId) ?? []).length;
+      let cursor = getMessageIndexReconciliationStartOrdinal2(db, sessionId);
+      let after = cursor === previous?.count ? previous.after : undefined;
+      while (cursor < finalWatermark) {
+        const pageEnd = Math.min(finalWatermark, cursor + RECONCILIATION_BATCH_SIZE);
+        const messages = readMessages.readPage ? readMessages.readPage(sessionId, cursor, RECONCILIATION_BATCH_SIZE, finalWatermark, after) : (fallbackSnapshot ?? []).filter((message) => message.ordinal > cursor && message.ordinal <= pageEnd);
+        const retainedMessages = fallbackSnapshot ?? messages;
+        heapHolder.activeReconcilerBuffers.set(sessionId, retainedMessages);
+        withSqliteBackgroundWriter2(() => indexMessagesAfterOrdinal2(db, sessionId, messages, cursor, pageEnd));
+        const nextCursor = getMessageIndexReconciliationStartOrdinal2(db, sessionId);
+        if (nextCursor <= cursor)
+          break;
+        cursor = nextCursor;
+        const last = messages.at(-1);
+        after = last?.ordinal === cursor && typeof last.createdAt === "number" ? { timeCreated: last.createdAt, id: last.id } : undefined;
+        if (cursor < finalWatermark) {
+          await yieldToEventLoop();
+        }
+      }
+      if (isMessageIndexReconciledThrough2(db, sessionId, finalWatermark)) {
+        heapHolder.reconciledSessions.add(sessionId);
+        if (revision !== undefined) {
+          if (!after && finalWatermark > 0 && readMessages.readPage) {
+            const last = readMessages.readPage(sessionId, finalWatermark - 1, 1, finalWatermark).at(-1);
+            if (last?.ordinal === finalWatermark && typeof last.createdAt === "number")
+              after = { timeCreated: last.createdAt, id: last.id };
+          }
+          heapHolder.reconciledSnapshots.set(sessionId, {
+            revision,
+            count: finalWatermark,
+            after
+          });
+        }
+      } else {
+        logReconciliationStall(sessionId, `gap after ordinal ${cursor} (store count ${finalWatermark})`);
+      }
+    } finally {
+      heapHolder.activeReconcilerBuffers.delete(sessionId);
+    }
+  });
+  return true;
+}
+function scheduleReconciliation(db, sessionId, readMessages) {
+  if (!readMessages.getRevision && heapHolder.reconciledSessions.has(sessionId) || heapHolder.reconciliationScheduledSessions.has(sessionId)) {
+    return;
+  }
+  heapHolder.reconciliationScheduledSessions.add(sessionId);
+  scheduleAfterBootQuiet(() => {
+    defer(() => {
+      let appendedDuringReconciliation = false;
+      const previousSnapshot = heapHolder.reconciledSnapshots.get(sessionId);
+      reconcileSessionIndex(db, sessionId, readMessages).then((ran) => {
+        if (ran) {
+          const snapshot = heapHolder.reconciledSnapshots.get(sessionId);
+          appendedDuringReconciliation = snapshot !== undefined && snapshot !== previousSnapshot && readMessages.getRevision !== undefined && readMessages.getRevision(sessionId) !== snapshot.revision;
+          return;
+        }
+        inRootAsyncContext2(() => setTimeout(() => {
+          heapHolder.reconciliationScheduledSessions.delete(sessionId);
+          scheduleReconciliation(db, sessionId, readMessages);
+        }, PREPARE_RETRY_MS)).unref?.();
+      }).catch((error) => {
+        logReconciliationStall(sessionId, error instanceof Error ? error.message : String(error));
+        if (isDatabaseLockedError(error))
+          inRootAsyncContext2(() => setTimeout(() => scheduleReconciliation(db, sessionId, readMessages), 1000)).unref();
+      }).finally(() => {
+        heapHolder.reconciliationScheduledSessions.delete(sessionId);
+        if (appendedDuringReconciliation)
+          scheduleReconciliation(db, sessionId, readMessages);
+      });
+    });
+  });
+}
+async function sweepOrphanedOpenCodeMessageIndexesOffThread(db, openSource, options = {}) {
+  if (getHarness2() === "opencode" || getHarness2() === "opencode2")
+    options = {
+      ...options,
+      fenceLockNames: options.fenceLockNames ?? takeLkgRecoveryLockSweepPage()
+    };
+  if (getHarness2() === "opencode2")
+    openSource = () => new Database2(gaDatabasePath(getDataDir(), process.env.OPENCODE_CHANNEL ?? "latest"), {
+      readonly: true,
+      fileMustExist: true
+    });
+  const path = getSqliteDatabasePath2(db);
+  if (!path || getHarness2() !== "opencode" && getHarness2() !== "opencode2")
+    return sweepOrphanedOpenCodeMessageIndexesCooperatively2(db, openSource, options);
+  let source = null;
+  let sourcePath = null;
+  try {
+    source = openSource();
+    if (source)
+      sourcePath = getSqliteDatabasePath2(source);
+  } catch {} finally {
+    if (sourcePath)
+      source?.close();
+  }
+  if (!sourcePath)
+    return sweepOrphanedOpenCodeMessageIndexesCooperatively2(db, () => source, options);
+  const reply = await runSessionWarmupWorker({
+    path,
+    sessionId: "",
+    harness: getHarness2(),
+    orphanSweep: { sourcePath, options }
+  }, {});
+  if (!("orphanSweep" in reply))
+    throw new Error("message history orphan sweep worker failed");
+  return reply.orphanSweep;
+}
+function scheduleClearAndReindex(db, sessionId, readMessages) {
+  heapHolder.reconciledSessions.delete(sessionId);
+  heapHolder.reconciledSnapshots.delete(sessionId);
+  heapHolder.reconciliationScheduledSessions.delete(sessionId);
+  clearCompletedIncrementalKeys(sessionId);
+  const existing = heapHolder.clearAndReindexScheduledSessions.get(sessionId);
+  if (existing) {
+    existing.source = readMessages;
+    return;
+  }
+  const pending = { source: readMessages };
+  heapHolder.clearAndReindexScheduledSessions.set(sessionId, pending);
+  scheduleAfterBootQuiet(() => {
+    defer(() => {
+      let cleared = false;
+      runWithSessionLock(sessionId, () => {
+        if (heapHolder.clearAndReindexScheduledSessions.get(sessionId) !== pending)
+          return;
+        heapHolder.clearAndReindexScheduledSessions.delete(sessionId);
+        heapHolder.reconciledSessions.delete(sessionId);
+        heapHolder.reconciledSnapshots.delete(sessionId);
+        clearCompletedIncrementalKeys(sessionId);
+        clearIndexedMessages2(db, sessionId);
+        cleared = true;
+      }).then(() => cleared ? reconcileSessionIndex(db, sessionId, pending.source) : undefined).catch((error) => {
+        heapHolder.reconciledSessions.delete(sessionId);
+        if (heapHolder.clearAndReindexScheduledSessions.get(sessionId) === pending)
+          heapHolder.clearAndReindexScheduledSessions.delete(sessionId);
+        logIndexingError(sessionId, "clear and reindex", error);
+      });
+    });
+  });
+}
+function getMessageIndexQueueHeapStats() {
+  return {
+    queueLength: heapHolder.reconciliationScheduledSessions.size + heapHolder.incrementalTimers.size + heapHolder.pendingIncrementalKeys.size,
+    reconciliationScheduled: heapHolder.reconciliationScheduledSessions.size,
+    incrementalTimers: heapHolder.incrementalTimers.size,
+    pendingIncremental: heapHolder.pendingIncrementalKeys.size,
+    activeSessionLocks: heapHolder.sessionLocks.size,
+    completedIncrementalKeys: heapHolder.completedIncrementalKeys.size,
+    activeBufferMessages: [...heapHolder.activeReconcilerBuffers.values()].reduce((sum, messages) => sum + messages.length, 0),
+    activeBufferBytes: [...heapHolder.activeReconcilerBuffers.values()].reduce((sum, messages) => sum + serializedMessageBytes(messages), 0)
+  };
+}
+
 // src/shared/model-cache-ttl.ts
 var MODEL_CACHE_LIFETIMES = [
   {
@@ -3308,197 +3577,6 @@ function capDreamerReadOutput(input, output) {
   return true;
 }
 
-// src/features/magic-context/message-index-async.ts
-var indexCancellations = new Map;
-var sessionEpochs = new Map;
-var workerMeasurements = new WeakMap;
-function isDatabaseLockedError(error) {
-  if (!error || typeof error !== "object")
-    return false;
-  const e = error;
-  if (typeof e.code === "string") {
-    if (e.code === "SQLITE_BUSY" || e.code === "SQLITE_LOCKED")
-      return true;
-  }
-  if (typeof e.message === "string") {
-    if (/database is locked/i.test(e.message))
-      return true;
-    if (/sqlite_(busy|locked)/i.test(e.message))
-      return true;
-  }
-  return false;
-}
-var RECONCILIATION_BATCH_SIZE = 100;
-
-class MagicContextMessageIndexHeapHolder {
-  reconciledSessions = new Set;
-  reconciliationScheduledSessions = new Set;
-  clearAndReindexScheduledSessions = new Map;
-  sessionLocks = new Map;
-  incrementalTimers = new Map;
-  pendingIncrementalKeys = new Set;
-  completedIncrementalKeys = new Set;
-  activeReconcilerBuffers = new Map;
-}
-var heapHolder = new MagicContextMessageIndexHeapHolder;
-var PREPARE_RETRY_MS = 60000;
-async function sourceReady(source, sessionId) {
-  const prepare = source?.prepare;
-  return typeof prepare === "function" ? prepare(sessionId) : true;
-}
-function defer(fn) {
-  const immediate = globalThis.setImmediate;
-  if (typeof immediate === "function") {
-    inRootAsyncContext2(() => immediate(fn));
-    return;
-  }
-  inRootAsyncContext2(() => setTimeout(fn, 0));
-}
-function yieldToEventLoop() {
-  return new Promise((resolve) => defer(resolve));
-}
-function runWithSessionLock(sessionId, operation) {
-  const previous = heapHolder.sessionLocks.get(sessionId) ?? Promise.resolve();
-  const run = previous.catch(() => {
-    return;
-  }).then(async () => {
-    await operation();
-  });
-  heapHolder.sessionLocks.set(sessionId, run);
-  run.finally(() => {
-    if (heapHolder.sessionLocks.get(sessionId) === run) {
-      heapHolder.sessionLocks.delete(sessionId);
-    }
-  }).catch(() => {
-    return;
-  });
-  return run;
-}
-function logIndexingError(sessionId, action, error) {
-  if (isDatabaseLockedError(error)) {
-    sessionLog2(sessionId, `message FTS async ${action} skipped (database busy; will retry on next reconciliation)`);
-    return;
-  }
-  sessionLog2(sessionId, `message FTS async ${action} failed: ${error instanceof Error ? error.message : String(error)}`);
-  log2(`[message-index-async] ${action} failed for ${sessionId}:`, error);
-}
-function serializedMessageBytes(messages) {
-  try {
-    return Buffer.byteLength(JSON.stringify(messages));
-  } catch {
-    return 0;
-  }
-}
-async function reconcileSessionIndex(db, sessionId, readMessages) {
-  if (!await sourceReady(readMessages, sessionId))
-    return false;
-  await runWithSessionLock(sessionId, async () => {
-    if (heapHolder.reconciledSessions.has(sessionId))
-      return;
-    let fallbackSnapshot = null;
-    try {
-      const fullReader = typeof readMessages === "function" ? readMessages : null;
-      const finalWatermark = readMessages.getCount ? readMessages.getCount(sessionId) : (fallbackSnapshot = fullReader?.(sessionId) ?? []).length;
-      let cursor = getMessageIndexReconciliationStartOrdinal2(db, sessionId);
-      let after;
-      while (cursor < finalWatermark) {
-        const pageEnd = Math.min(finalWatermark, cursor + RECONCILIATION_BATCH_SIZE);
-        const messages = readMessages.readPage ? readMessages.readPage(sessionId, cursor, RECONCILIATION_BATCH_SIZE, finalWatermark, after) : (fallbackSnapshot ?? []).filter((message) => message.ordinal > cursor && message.ordinal <= pageEnd);
-        const retainedMessages = fallbackSnapshot ?? messages;
-        heapHolder.activeReconcilerBuffers.set(sessionId, retainedMessages);
-        withSqliteBackgroundWriter2(() => indexMessagesAfterOrdinal2(db, sessionId, messages, cursor, pageEnd));
-        const nextCursor = getMessageIndexReconciliationStartOrdinal2(db, sessionId);
-        if (nextCursor <= cursor)
-          break;
-        cursor = nextCursor;
-        const last = messages.at(-1);
-        after = last?.ordinal === cursor && typeof last.createdAt === "number" ? { timeCreated: last.createdAt, id: last.id } : undefined;
-        if (cursor < finalWatermark) {
-          await yieldToEventLoop();
-        }
-      }
-      if (isMessageIndexReconciledThrough2(db, sessionId, finalWatermark)) {
-        heapHolder.reconciledSessions.add(sessionId);
-      }
-    } finally {
-      heapHolder.activeReconcilerBuffers.delete(sessionId);
-    }
-  });
-  return true;
-}
-function scheduleReconciliation(db, sessionId, readMessages) {
-  if (heapHolder.reconciledSessions.has(sessionId) || heapHolder.reconciliationScheduledSessions.has(sessionId)) {
-    return;
-  }
-  heapHolder.reconciliationScheduledSessions.add(sessionId);
-  scheduleAfterBootQuiet(() => {
-    defer(() => {
-      reconcileSessionIndex(db, sessionId, readMessages).then((ran) => {
-        if (ran)
-          return;
-        inRootAsyncContext2(() => setTimeout(() => {
-          heapHolder.reconciliationScheduledSessions.delete(sessionId);
-          scheduleReconciliation(db, sessionId, readMessages);
-        }, PREPARE_RETRY_MS)).unref?.();
-      }).catch((error) => {
-        logIndexingError(sessionId, "reconciliation", error);
-        if (isDatabaseLockedError(error))
-          inRootAsyncContext2(() => setTimeout(() => scheduleReconciliation(db, sessionId, readMessages), 1000)).unref();
-      }).finally(() => {
-        heapHolder.reconciliationScheduledSessions.delete(sessionId);
-      });
-    });
-  });
-}
-async function sweepOrphanedOpenCodeMessageIndexesOffThread(db, openSource, options = {}) {
-  if (getHarness2() === "opencode" || getHarness2() === "opencode2")
-    options = {
-      ...options,
-      fenceLockNames: options.fenceLockNames ?? takeLkgRecoveryLockSweepPage()
-    };
-  if (getHarness2() === "opencode2")
-    openSource = () => new Database2(gaDatabasePath(getDataDir(), process.env.OPENCODE_CHANNEL ?? "latest"), {
-      readonly: true,
-      fileMustExist: true
-    });
-  const path = getSqliteDatabasePath2(db);
-  if (!path || getHarness2() !== "opencode" && getHarness2() !== "opencode2")
-    return sweepOrphanedOpenCodeMessageIndexesCooperatively2(db, openSource, options);
-  let source = null;
-  let sourcePath = null;
-  try {
-    source = openSource();
-    if (source)
-      sourcePath = getSqliteDatabasePath2(source);
-  } catch {} finally {
-    if (sourcePath)
-      source?.close();
-  }
-  if (!sourcePath)
-    return sweepOrphanedOpenCodeMessageIndexesCooperatively2(db, () => source, options);
-  const reply = await runSessionWarmupWorker({
-    path,
-    sessionId: "",
-    harness: getHarness2(),
-    orphanSweep: { sourcePath, options }
-  }, {});
-  if (!("orphanSweep" in reply))
-    throw new Error("message history orphan sweep worker failed");
-  return reply.orphanSweep;
-}
-function getMessageIndexQueueHeapStats() {
-  return {
-    queueLength: heapHolder.reconciliationScheduledSessions.size + heapHolder.incrementalTimers.size + heapHolder.pendingIncrementalKeys.size,
-    reconciliationScheduled: heapHolder.reconciliationScheduledSessions.size,
-    incrementalTimers: heapHolder.incrementalTimers.size,
-    pendingIncremental: heapHolder.pendingIncrementalKeys.size,
-    activeSessionLocks: heapHolder.sessionLocks.size,
-    completedIncrementalKeys: heapHolder.completedIncrementalKeys.size,
-    activeBufferMessages: [...heapHolder.activeReconcilerBuffers.values()].reduce((sum, messages) => sum + messages.length, 0),
-    activeBufferBytes: [...heapHolder.activeReconcilerBuffers.values()].reduce((sum, messages) => sum + serializedMessageBytes(messages), 0)
-  };
-}
-
 // src/plugin/sidebar-snapshot-cache.ts
 var MAX_CACHED_SESSIONS = 100;
 var STALE_SNAPSHOT_AGE_MS = 5 * 60 * 1000;
@@ -4262,7 +4340,15 @@ class AutoSearchBusyError extends Error {
   }
 }
 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");
+  const {
+    rerankConfig: _rerankConfig,
+    rerankClient: _rerankClient,
+    rerankConnectionFile: _rerankConnectionFile,
+    onRerankSkipped: _onRerankSkipped,
+    captureRerankLanes: _captureRerankLanes,
+    ...hintOptions
+  } = options;
+  return executeAutoSearchWorker(db, sessionId, projectPath, query, { ...hintOptions, explicitSearch: false, rerank: false }, entry, "search");
 }
 var pendingBackfills = new WeakMap;
 var searchWorkers = new WeakMap;
@@ -5950,7 +6036,7 @@ function canConsumeDeferredOnThisPass(args) {
   return args.schedulerDecision === "execute" || args.contextPercentage >= (args.forceMaterializationPercentage ?? escalationBands(65).forceMaterializationPercentage);
 }
 function hasReclaimRide(signals) {
-  return signals.hardFold || signals.force || signals.explicitFlush || signals.publishedHistory || signals.subagentExecute === true || signals.executeReclaim === true;
+  return signals.hardFold || signals.force || signals.explicitFlush || signals.publishedHistory || signals.subagentExecute === true || signals.executeReclaim === true || signals.servedShapeRepair === true;
 }
 function prefixMutationPermitted(gate) {
   return !gate.signedThinkingHold || gate.firstRender || gate.idleExpiry || gate.emergency;
@@ -5964,7 +6050,8 @@ var RECLAIM_RIDE_NAMES = [
   "explicitFlush",
   "publishedHistory",
   "subagentExecute",
-  "executeReclaim"
+  "executeReclaim",
+  "servedShapeRepair"
 ];
 function reclaimRideLabel(signals) {
   const active = RECLAIM_RIDE_NAMES.filter((name) => signals[name]);
@@ -9319,7 +9406,7 @@ function tagMessages(sessionId, messages, tagger, db, options = {}) {
         const textPart = part;
         const thinkingParts = messageThinkingParts;
         const contentId = `${messageId}:p${partIndex}`;
-        const whitespaceOnlyAssistant = message.info.role === "assistant" && stripTagPrefix(textPart.text).trim().length === 0;
+        const whitespaceOnlyAssistant = message.info.role === "assistant" && (stripTagPrefix(textPart.text).trim().length === 0 || textPart.text.includes("§") && stripPersistedAssistantText(textPart.text).length === 0);
         let existingTagId;
         if (whitespaceOnlyAssistant) {
           const persistedWhitespaceTag = getTagNumberByMessageId2(db, sessionId, contentId);
@@ -9371,7 +9458,7 @@ function tagMessages(sessionId, messages, tagger, db, options = {}) {
         accAssignTag += performance.now() - _tAssignText;
         const persistedSource = sourceContents.get(tagId);
         if (persistedSource !== undefined && !options.refreshSourceContents) {
-          textPart.text = options.normalizeRestoredAssistantText && message.info.role === "assistant" ? options.normalizeRestoredAssistantText(persistedSource) : persistedSource;
+          textPart.text = options.normalizeRestoredAssistantText && message.info.role === "assistant" ? options.normalizeRestoredAssistantText(persistedSource, message.info.providerID) : persistedSource;
         } else {
           const sourceContent = stripTagPrefix(textPart.text);
           if (sourceContent.trim().length > 0 || options.refreshSourceContents) {
@@ -10254,6 +10341,9 @@ async function runPostTransformPhase(args) {
     }
   };
   const trailingBlankSourceDecisions = args.trailingBlankSourceDecisions ?? snapshotTrailingBlankSourceDecisions(args.messages);
+  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));
   let trailingBlankNewestAssistant;
   for (let index = args.messages.length - 1;index >= 0; index -= 1) {
     const message = args.messages[index];
@@ -10283,8 +10373,8 @@ async function runPostTransformPhase(args) {
   }
   const activeCompartmentRun = args.canRunCompartments ? getActiveCompartmentRun(args.sessionId) : undefined;
   const compartmentRunning = args.canRunCompartments && !args.awaitedCompartmentRun && activeCompartmentRun !== undefined;
-  let deferredMaterialize = args.canConsumeDeferredLate && deferredMaterializationWasPending;
-  let materializationRequested = isExplicitFlush || deferredMaterialize;
+  let deferredMaterialize = (args.canConsumeDeferredLate || servedShapeRepair.needsRebuild) && deferredMaterializationWasPending;
+  let materializationRequested = isExplicitFlush || deferredMaterialize || servedShapeRepair.needsRebuild;
   const m0M1EnabledForFold = args.m0M1 !== undefined && (!!args.m0M1.projectPath || !!args.m0M1.projectDirectory) && (args.fullFeatureMode || compactionOff);
   const frozenThinking = new Set(args.activeThinkingTurn || compactionOff ? getMergedReasoningStrippedIds(args.db, args.sessionId) : []);
   const compactionOffFrozenThinking = compactionOff ? compactionOffFrozenThinkingIds(frozenThinking) : new Set;
@@ -10338,6 +10428,8 @@ async function runPostTransformPhase(args) {
     rewritingSignedPrefix = true;
     thinkingReleasedForFit ||= forFit;
   };
+  if (servedShapeRepair.needsRebuild && activeThinkingTurn)
+    releaseThinkingForRewrite(false, true);
   if (args.forceSignedRebuildForFit && (activeThinkingPrefixHold || activeThinkingTurn && args.thinkingBindingRecoveryEnabledForModel === true)) {
     releaseThinkingForRewrite(true);
   }
@@ -10369,7 +10461,7 @@ async function runPostTransformPhase(args) {
   let foldBustsServedPrefixThisPass = false;
   let publishedM1RefreshedThisPass = false;
   let prefixPreflightFailed = false;
-  const softRefreshOpportunity = !freezeM0M1 && (args.schedulerDecision === "execute" || deferredMaterialize);
+  const softRefreshOpportunity = !freezeM0M1 && (args.schedulerDecision === "execute" || deferredMaterialize || servedShapeRepair.needsRebuild);
   let m0RematerializedThisPass = false;
   const m0CoverageBeforeFold = args.sessionMeta.cachedM0Bytes === null ? -1 : args.sessionMeta.cachedM0MaxCompartmentSeq;
   let m0MaterializeReason = null;
@@ -10498,6 +10590,7 @@ async function runPostTransformPhase(args) {
   const heldIdleExpiryRebuild = activeThinkingPrefixHold && args.m0M1?.hardSignals?.cacheExpired === true;
   const idleExpiryRebuild = (!freezeM0M1 || activeThinkingPrefixHold) && args.m0M1?.hardSignals?.cacheExpired === true;
   const rideSignals = {
+    servedShapeRepair: servedShapeRepair.needsRebuild,
     executeReclaim: false,
     subagentExecute: !args.fullFeatureMode && args.schedulerDecision === "execute",
     hardFold: rewritingSignedPrefix || foldBustsServedPrefixThisPass || firstRenderBust || idleExpiryRebuild,
@@ -10522,15 +10615,18 @@ async function runPostTransformPhase(args) {
     }),
     usableWindow: args.usableWindow
   });
-  const publishedWorkDrainAllowed = !compactionOff && reclaimRidePermitted(rideSignals, {
+  const publishedWorkDrainAllowed = (!compactionOff || servedShapeRepair.needsRebuild) && reclaimRidePermitted(rideSignals, {
     signedThinkingHold: activeThinkingPrefixHold,
     firstRender: firstRenderBust,
     idleExpiry: idleExpiryRebuild,
     emergency: emergencyDropEligible
   });
-  const shouldApplyPendingOps = publishedWorkDrainAllowed;
-  const shouldRunHeuristics = publishedWorkDrainAllowed && (rideSignals.publishedHistory || rideSignals.executeReclaim || materializationRequested || forceMaterialization || foldBustsServedPrefixThisPass || firstRenderBust || heldIdleExpiryRebuild || emergencyDropEligible || args.schedulerDecision === "execute" && (!alreadyRanThisTurn || !args.fullFeatureMode));
+  const shouldApplyPendingOps = !compactionOff && publishedWorkDrainAllowed;
+  const shouldRunHeuristics = !compactionOff && publishedWorkDrainAllowed && (rideSignals.publishedHistory || rideSignals.executeReclaim || rideSignals.servedShapeRepair || materializationRequested || forceMaterialization || foldBustsServedPrefixThisPass || firstRenderBust || heldIdleExpiryRebuild || emergencyDropEligible || args.schedulerDecision === "execute" && (!alreadyRanThisTurn || !args.fullFeatureMode));
   const isCacheBustingPass = publishedWorkDrainAllowed;
+  if (servedShapeRepair.needsRebuild && !isCacheBustingPass)
+    throw new Error("Served-shape repair requires a rebuilding pass");
+  servedShapeRepair.apply(isCacheBustingPass);
   let unheldSignedTurnBust = false;
   if (isCacheBustingPass && !activeThinkingPrefixHold && activeThinkingTurn && args.thinkingBindingRecoveryEnabledForModel === true) {
     if (foldBustsServedPrefixThisPass || firstRenderBust || publishedM1RefreshedThisPass)
@@ -10658,6 +10754,8 @@ async function runPostTransformPhase(args) {
   };
   if (temporalFirstApplication)
     recordFirstApplicationWireEdit(true);
+  if (servedShapeRepair.needsRebuild)
+    recordFirstApplicationWireEdit(true);
   const firstApplicationLocations = new Map;
   const recordFirstApplicationAt = (message, partIndex) => {
     recordFirstApplicationWireEdit(false);
@@ -10800,11 +10898,12 @@ async function runPostTransformPhase(args) {
       if (routineCleanupApplied && canUseEmptySentinels) {
         stripClearedReasoning(args.messages);
       }
-      const strippedInline = routineCleanupApplied && ageLaneAllowed ? stripInlineThinking(args.messages, args.messageTagNumbers, budgetCutoff) : 0;
+      const strippedInline = routineCleanupApplied && ageLaneAllowed ? stripInlineThinking(args.messages, args.messageTagNumbers, budgetCutoff, !canUseEmptySentinels) : 0;
       const persistedInlineWatermark = args.sessionMeta?.clearedReasoningThroughTag ?? 0;
       if (routineCleanupApplied && persistedInlineWatermark > 0 && !compactionOff) {
-        replayStrippedInlineThinking(args.messages, args.messageTagNumbers, persistedInlineWatermark);
+        replayStrippedInlineThinking(args.messages, args.messageTagNumbers, persistedInlineWatermark, !canUseEmptySentinels);
       }
+      servedShapeRepair.apply(isCacheBustingPass);
       let removedReasoningMessages = 0;
       if (routineCleanupApplied && !prefixBoundModel && reasoningRemovalSelectable && reasoningRemovalReadable) {
         const newIds = selectReasoningRemovals({
@@ -11131,7 +11230,7 @@ async function runPostTransformPhase(args) {
       }
     }
     if (isCacheBustingPass) {
-      const droppedResult = stripDroppedPlaceholderMessages(args.messages, args.resolvedProviderID, recordFirstApplicationAt);
+      const droppedResult = stripDroppedPlaceholderMessages(args.messages.filter((message) => !servedShapeRepair.messageIDs.has(message.info.id ?? "")), args.resolvedProviderID, recordFirstApplicationAt);
       const protectedTailStart = Math.max(0, args.messages.length - SYSTEM_INJECTION_ACTIONABLE_TAIL_MESSAGES);
       const systemInjectedResult = stripSystemInjectedMessages(args.messages, protectedTailStart, args.resolvedProviderID, recordFirstApplicationAt);
       const hiddenMessages = args.hiddenMessagesAtCompactionSeam ?? [];
@@ -19094,7 +19193,7 @@ function createTransform(deps) {
         failPass("store-generation-rebase-failure", error);
       }
     }
-    if (deps.client !== undefined) {
+    if (deps.client !== undefined || deps.hostMessageReconciliationSource !== undefined) {
       withoutSqliteTransformPass2(() => scheduleReconciliation(db, sessionId, host.hostMessageReconciliationSource));
     }
     const tUserMsg = performance.now();
@@ -19794,7 +19893,7 @@ Historian previously failed ${historianFailureState.failureCount} time(s), so Ma
     if (persistedReasoningWatermark > 0 && !compactionOff) {
       const tReplay = performance.now();
       const replayed = canUseEmptySentinels ? replayClearedReasoning(messages, reasoningByMessage, messageTagNumbers, persistedReasoningWatermark) : 0;
-      const replayedInline = replayStrippedInlineThinking(messages, messageTagNumbers, persistedReasoningWatermark);
+      const replayedInline = replayStrippedInlineThinking(messages, messageTagNumbers, persistedReasoningWatermark, !canUseEmptySentinels);
       if (replayed > 0 || replayedInline > 0) {
         sessionLog2(sessionId, `reasoning replay: cleared=${replayed} inlineStripped=${replayedInline} (watermark=${persistedReasoningWatermark})`);
       }
@@ -22419,6 +22518,7 @@ async function ensureProjectRegisteredFromOpenCodeDirectory(directory, db, optio
   } else {
     unregisterProjectShadowEmbedding2(projectIdentity);
   }
+  options.onRegistered?.(projectIdentity);
 }
 
 // src/hooks/magic-context/format-embed-failure.ts
@@ -23679,8 +23779,8 @@ function registerRpcHandlers(rpcServer, args) {
     const db = readDatabase();
     if (!db)
       return { ok: false, error: "db unavailable" };
-    const { runManagedRecomp } = await importPluginModule(() => import("./recomp-orchestrator-47m4hv5g.js"));
-    const { sendIgnoredMessage } = await importPluginModule(() => import("./send-session-notification-nwvrv34d.js"));
+    const { runManagedRecomp } = await importPluginModule(() => import("./recomp-orchestrator-b12zaptj.js"));
+    const { sendIgnoredMessage } = await importPluginModule(() => import("./send-session-notification-8eqe259v.js"));
     log2(`[rpc] recomp requested for session ${sessionId}`);
     if (!args.client && !args.hiddenCompletionExecutor) {
       return {
@@ -23764,7 +23864,7 @@ function registerRpcHandlers(rpcServer, args) {
     const db = readDatabase();
     if (!db)
       return { ok: false, error: "db unavailable" };
-    const { runManagedWrapup } = await importPluginModule(() => import("./wrapup-orchestrator-639whfhq.js"));
+    const { runManagedWrapup } = await importPluginModule(() => import("./wrapup-orchestrator-3ssd5yy1.js"));
     const model = liveSessionState.liveModelBySession.get(sessionId);
     const contextLimit = model ? resolveContextLimit(model.providerID, model.modelID, { db, sessionID: sessionId }) : 128000;
     const ctx = {
@@ -25140,8 +25240,8 @@ function toolStateContent(state) {
 }
 
 // src/v2/hooks/copied-tag-notation.ts
-function stripCopiedTagNotation(text) {
-  return text.includes("§") ? stripPersistedAssistantText(text) : text;
+function stripCopiedTagNotation(text, acceptsEmpty = true) {
+  return text.includes("§") ? stripPersistedAssistantText(text, acceptsEmpty) : text;
 }
 
 // src/v2/hooks/payload.ts
@@ -25396,12 +25496,16 @@ function adaptPayload(draft, admittedIDs = new Set, messageTimes = new Map, hidd
   const messages = [];
   for (const message of source) {
     const parts = [];
+    const copiedTagOnly = [];
     for (const content of message.content) {
       if (paired.has(content))
         continue;
       const part = callParts.get(content) ?? (content.type === "tool-result" ? nativeTool(undefined, { part: content, message }) : clonePreservingInstances(content));
-      if (message.role === "assistant" && part.type === "text" && typeof part.text === "string")
-        part.text = stripCopiedTagNotation(part.text);
+      if (message.role === "assistant" && part.type === "text" && typeof part.text === "string") {
+        if (!modelAcceptsEmptyContent(draft.model.providerID) && part.text.trim().length > 0 && stripCopiedTagNotation(part.text).trim().length === 0)
+          copiedTagOnly.push({ index: parts.length, text: part.text });
+        part.text = stripCopiedTagNotation(part.text, modelAcceptsEmptyContent(draft.model.providerID));
+      }
       if (message.id && admittedIDs.has(message.id))
         part.synthetic = true;
       parts.push(part);
@@ -25443,6 +25547,7 @@ function adaptPayload(draft, admittedIDs = new Set, messageTimes = new Map, hidd
       });
     }
     originals.set(mapped, message);
+    markServedShapeRepair(mapped.info, copiedTagOnly);
     if (isCoveredInstructionRow(message))
       markCoveredInstructionRow(mapped.info);
     if (typeof message.id !== "string")
@@ -30085,28 +30190,35 @@ function diff(name, before, after) {
     rmSync2(dir, { recursive: true, force: true });
   }
 }
-function validateDocsProposal(projectDir, output, budget, expected) {
-  if (Object.entries(expected).some(([name, value]) => docsBaseHashes(projectDir)[name] !== value))
-    throw new Error("base drifted");
+function parseDocsProposalOutput(output) {
   const match = output.match(/```json\s*([\s\S]*?)```/);
   const parsed = JSON.parse(match?.[1] ?? output);
   if (!Array.isArray(parsed))
     throw new Error("proposal must be a JSON array");
   const changes = parsed;
-  if (!changes.length)
-    throw new Error("empty proposal");
   if (changes.some((item) => !item || !FILES.includes(item.file)))
     throw new Error("unknown proposal file");
+  const seen = new Set;
+  for (const change of changes) {
+    const key = `${change.file}:${change.heading}`;
+    if (!["replace", "add", "remove"].includes(change.action) || typeof change.heading !== "string" || !/^#{1,6} [^\r\n]+$/.test(change.heading) || typeof change.text !== "string" || typeof change.reason !== "string" || !change.reason.trim() || /[\r\n]/.test(change.reason) || seen.has(key))
+      throw new Error(`invalid section change in ${change.file}`);
+    seen.add(key);
+  }
+  return changes;
+}
+function validateDocsProposal(projectDir, output, budget, expected) {
+  if (Object.entries(expected).some(([name, value]) => docsBaseHashes(projectDir)[name] !== value))
+    throw new Error("base drifted");
+  const changes = parseDocsProposalOutput(output);
+  if (!changes.length)
+    throw new Error("empty proposal");
   let tokens = 0;
   let diffs = "";
   for (const file of FILES) {
     const before = existsSync4(join8(projectDir, file)) ? readFileSync6(join8(projectDir, file), "utf8") : "";
     let after = before;
-    const seen = new Set;
     for (const change of changes.filter((item) => item.file === file)) {
-      if (!["replace", "add", "remove"].includes(change.action) || typeof change.heading !== "string" || !/^#{1,6} [^\r\n]+$/.test(change.heading) || typeof change.text !== "string" || typeof change.reason !== "string" || !change.reason.trim() || /[\r\n]/.test(change.reason) || seen.has(change.heading))
-        throw new Error(`invalid section change in ${file}`);
-      seen.add(change.heading);
       const section = sections(after).find((item) => item.heading === change.heading);
       if (change.action === "add") {
         if (section || !change.text.startsWith(`${change.heading}
@@ -35725,6 +35837,8 @@ async function runAgenticTask(config, ctx, helpers) {
           timeoutMs: Math.min(Math.max(0, deadline - Date.now()), config.timeoutMinutes * 60 * 1000),
           signal: abortController.signal,
           parse: (text, completion) => {
+            if (task === "maintain-docs")
+              parseDocsProposalOutput(text);
             if (task !== "curate")
               return text;
             const memoryOperations = inspectCurateMemoryOperations(completion.messages);
@@ -35788,6 +35902,8 @@ async function runAgenticTask(config, ctx, helpers) {
             if (task !== "curate") {
               if (!text)
                 throw new Error("Dreamer returned no assistant output.");
+              if (task === "maintain-docs")
+                parseDocsProposalOutput(text);
               return text;
             }
             const memoryOperations = inspectCurateMemoryOperations(messages);
@@ -35837,7 +35953,7 @@ async function runAgenticTask(config, ctx, helpers) {
     recordInvocation("completed", run.output);
     if (task === "maintain-docs" && docsHashes && changes) {
       try {
-        if (run.validated === "[]") {
+        if (parseDocsProposalOutput(String(run.validated)).length === 0) {
           helpers.recordRun("completed", null, { progress: "no corrections proposed" });
           return {
             status: "completed",
@@ -37046,7 +37162,7 @@ function registerV2DreamScheduleTimer(args) {
       since_days: gitCommitIndexing.since_days,
       max_commits: gitCommitIndexing.max_commits
     } : undefined,
-    ensureRegistered: ensureProjectRegisteredFromOpenCodeDirectory
+    ensureRegistered: args.ensureRegistered ?? ensureProjectRegisteredFromOpenCodeDirectory
   }).catch((error) => {
     log2(`[magic-context] v2 dream timer registration failed (continuing without it): ${error}`);
     return;
@@ -37141,6 +37257,41 @@ function startDreamTrigger(context, args) {
   };
 }
 
+// src/v2/hooks/embedding-lifecycle.ts
+function createV2EmbeddingScope(initialProject) {
+  const releases = new Map;
+  const pending = new Set;
+  let disposed = false;
+  let disposal;
+  const claim = (project) => {
+    if (!releases.has(project))
+      releases.set(project, retainProjectEmbedding2(project));
+  };
+  if (initialProject)
+    claim(initialProject);
+  return {
+    ensureRegistered(directory, db) {
+      if (disposed)
+        return Promise.resolve();
+      const registration = ensureProjectRegisteredFromOpenCodeDirectory(directory, db, {
+        onRegistered: claim
+      });
+      pending.add(registration);
+      return registration.finally(() => pending.delete(registration));
+    },
+    dispose() {
+      disposed = true;
+      disposal ??= (async () => {
+        await Promise.allSettled([...pending]);
+        for (const release of releases.values())
+          release();
+        releases.clear();
+      })();
+      return disposal;
+    }
+  };
+}
+
 // src/v2/hooks/generate.ts
 function generateReplayAnchor(messages) {
   let index = messages.length - 1;
@@ -38179,6 +38330,22 @@ function* readV2RawMessagePagesForConversion(openReader, sessionID, pageRows = C
 function createV2RawMessageReader(openReader) {
   const servedBoundaryCache = new Map;
   return {
+    getRevision: (sessionID) => {
+      const reader = openReader();
+      try {
+        return reader.latestSequence(sessionID);
+      } finally {
+        reader.close();
+      }
+    },
+    getCountAfterRevision: (sessionID, after, through) => {
+      const reader = openReader();
+      try {
+        return reader.messageCountAfterSequence(sessionID, after, through);
+      } finally {
+        reader.close();
+      }
+    },
     readPage: (sessionID, afterOrdinal, limit, finalWatermark, after) => {
       const reader = openReader();
       try {
@@ -52189,6 +52356,7 @@ function createCtxSearchTool(deps) {
           return formatSearchResults2(query, idResults ?? [], toolContext.sessionID, diagnostics);
         }
       }
+      let rerankSkipped = "";
       const results = await unifiedSearch2(deps.db, toolContext.sessionID, projectPath, query, {
         limit: normalizeLimit2(args.limit),
         memoryEnabled,
@@ -52207,11 +52375,16 @@ function createCtxSearchTool(deps) {
         gitRepositoryAvailable: typeof toolContext.directory === "string" ? directoryHasGitMetadata(toolContext.directory) : undefined,
         explicitSearch: true,
         rerankConnectionFile: deps.rerankConnectionFile,
+        rerankConfig: deps.rerankConfig,
+        onRerankSkipped: (line) => {
+          rerankSkipped = line;
+        },
         searchMessageHistory: (request) => searchMessageHistoryOffThread(deps.db, request),
         signal: toolContext.abort,
         ...dateRange
       });
-      return formatSearchResults2(query, results, toolContext.sessionID, diagnostics);
+      return formatSearchResults2(query, results, toolContext.sessionID, diagnostics) + (rerankSkipped ? `
+${rerankSkipped}` : "");
     }
   });
 }
@@ -52221,13 +52394,13 @@ function createCtxSearchTools(deps) {
   };
 }
 // src/v2/hooks/tools.ts
-async function registerTools(context, db, config, rustToolBackends, isInternalChild) {
+async function registerTools(context, db, config, rustToolBackends, isInternalChild, ensureProjectRegistered = ensureProjectRegisteredFromOpenCodeDirectory) {
   const compaction = isCompactionEnabled(config);
   setCtxReduceRegisteredGlobally(compaction);
   const project = {
     db,
     resolveProjectPath: (directory) => resolveProjectIdentityForSession(directory, config.allow_home_project),
-    ensureProjectRegistered: ensureProjectRegisteredFromOpenCodeDirectory
+    ensureProjectRegistered
   };
   const definitions = {
     ...compaction ? createCtxReduceTools({
@@ -52247,7 +52420,11 @@ async function registerTools(context, db, config, rustToolBackends, isInternalCh
       smartNotesEnabled: config.smart_notes.enabled,
       ...rustToolBackends ? { rustToolBackends } : {}
     }),
-    ...createCtxSearchTools({ ...project, rerankConnectionFile: config.subc?.connection_file }),
+    ...createCtxSearchTools({
+      ...project,
+      rerankConnectionFile: config.subc?.connection_file,
+      rerankConfig: config.rerank
+    }),
     ...config.memory.enabled ? {
       ...createCtxMemoryTools({
         ...project,
@@ -52421,7 +52598,7 @@ function maybeAutoEmbedSessionBackfill(deps, sessionId) {
 }
 
 // src/v2/hooks/transform-features.ts
-function createV2TransformFeatureDeps(config, compactionOff, directory) {
+function createV2TransformFeatureDeps(config, compactionOff, directory, ensureProjectRegistered = ensureProjectRegisteredFromOpenCodeDirectory) {
   return {
     protectedTools: config.protected_tools,
     commitClusterTrigger: config.commit_cluster_trigger,
@@ -52432,7 +52609,7 @@ function createV2TransformFeatureDeps(config, compactionOff, directory) {
       injectionBudgetTokens: config.memory.injection_budget_tokens,
       autoPromote: config.memory.auto_promote
     },
-    ensureProjectRegistered: ensureProjectRegisteredFromOpenCodeDirectory,
+    ensureProjectRegistered,
     historyBudgetPercentage: config.history_budget_percentage,
     experimentalUserMemories: userObservationCollectionEnabled2(config.dreamer),
     userObservationsRequested: userObservationsRequested2(config.dreamer),
@@ -52443,7 +52620,7 @@ function createV2TransformFeatureDeps(config, compactionOff, directory) {
       scoreThreshold: config.memory.auto_search?.score_threshold ?? 0.6,
       minPromptChars: config.memory.auto_search?.min_prompt_chars ?? 20,
       directory,
-      ensureProjectRegistered: ensureProjectRegisteredFromOpenCodeDirectory,
+      ensureProjectRegistered,
       wordRules: cavemanWordRulesForLanguage(config.language)
     },
     cavemanTextCompression: compactionOff ? undefined : config.caveman_text_compression?.enabled === true ? {
@@ -52453,7 +52630,7 @@ function createV2TransformFeatureDeps(config, compactionOff, directory) {
     } : undefined
   };
 }
-function createV2AutoEmbedSession(deps) {
+function createV2AutoEmbedSession(deps, ensureProjectRegistered = ensureProjectRegisteredFromOpenCodeDirectory) {
   return (sessionId) => {
     const directory = deps.resolveDirectory(sessionId);
     const projectIdentity = resolveProjectIdentityForSession(directory, deps.allowHomeProject);
@@ -52463,7 +52640,7 @@ function createV2AutoEmbedSession(deps) {
       db: deps.db,
       projectIdentity,
       ensureRegistered: async () => {
-        await ensureProjectRegisteredFromOpenCodeDirectory(directory, deps.db);
+        await ensureProjectRegistered(directory, deps.db);
         deps.onDirectoryResolved?.(sessionId, directory);
       }
     }, sessionId);
@@ -52797,6 +52974,7 @@ async function registerContext(context) {
     console.warn(`[magic-context] v2 setup disabled by conflicting context hooks: ${conflicts.reasons.join("; ")}`);
     return;
   }
+  const embeddings = createV2EmbeddingScope(resolveProjectIdentityForSession(directory, config.allow_home_project));
   const folds = new FoldOwner(context.storage);
   const nativeFoldMemory = !compactionOff && process.env.MC_OC2_INVISIBLE_FOLD === "1" ? nativeFoldCache(() => storage.require()) : undefined;
   const nativeFoldReplay = nativeFoldMemory ? new NativeFoldReplay(nativeFoldMemory, () => openStoreReader(), context.storage) : undefined;
@@ -52853,7 +53031,7 @@ async function registerContext(context) {
   }) : undefined;
   const hiddenChildHook = new HiddenChildHook;
   await context.session.hook("http.request", (draft) => hiddenChildHook.cacheRequest(draft));
-  const tools = db && isDatabasePersisted(db) ? await registerTools(context, db, config, moduleToolBackends?.backends, (id) => hiddenChildHook.owns(id)) : undefined;
+  const tools = db && isDatabasePersisted(db) ? await registerTools(context, db, config, moduleToolBackends?.backends, (id) => hiddenChildHook.owns(id), embeddings.ensureRegistered) : undefined;
   const usage = new Map;
   const generateReplay = new V2GenerateReplay;
   await context.session.hook("http.response", async (draft) => {
@@ -52975,7 +53153,8 @@ async function registerContext(context) {
       liveConfig: () => liveConfigReader.poll().effective,
       executor: withLiveDreamerOutputCap(lateHiddenExecutor, config, () => liveConfigReader.poll().effective),
       openReader: openStoreReader,
-      rustModeModuleClient
+      rustModeModuleClient,
+      ensureRegistered: embeddings.ensureRegistered
     });
   };
   if (db && isDatabasePersisted(db))
@@ -53249,6 +53428,10 @@ async function registerContext(context) {
             if (!event.data?.sessionID)
               continue;
             const sessionID = event.data.sessionID;
+            if (db && event.type === "session.revert.committed") {
+              const indexDb = db;
+              withoutSqliteTransformPass2(() => scheduleClearAndReindex(indexDb, sessionID, pagedRead));
+            }
             if (event.type?.startsWith("session.revert.") || event.type === "session.message.content.updated") {
               nativeFoldReplay?.onEvent(event);
               restoredRows.forget(sessionID);
@@ -53364,7 +53547,7 @@ async function registerContext(context) {
     }) || draft.model.limit?.context || (state.lastObservedModelKey === modelKey ? state.lastUsageContextLimit : undefined);
     return materializeM0({
       ...createM0RenderOptions({
-        ...createV2TransformFeatureDeps(config, compactionOff, directory),
+        ...createV2TransformFeatureDeps(config, compactionOff, directory, embeddings.ensureRegistered),
         ...createV2ThresholdDeps(config)
       }, usage.get(draft.sessionID)?.usage ?? { percentage: 0, inputTokens: 0 }, modelKey, contextLimit, resolveProjectIdentityForSession(directory, config.allow_home_project)),
       db,
@@ -53736,7 +53919,7 @@ async function registerContext(context) {
       await cacheV2SessionDirectory(context.session, draft.sessionID, sessionDirectories);
       prepareHistorySession(draft.sessionID);
       transform ??= createTransform({
-        ...createV2TransformFeatureDeps(config, compactionOff, directory),
+        ...createV2TransformFeatureDeps(config, compactionOff, directory, embeddings.ensureRegistered),
         cacheTtlConfig: config.cache_ttl,
         cacheTtlConfigured: config.cacheTtlConfigured,
         sampleCacheTtlConfig: () => liveConfigReader.poll().effective,
@@ -53746,7 +53929,7 @@ async function registerContext(context) {
         contextUsageMap: usage,
         compactionOff,
         storeGeneration: "v2",
-        normalizeRestoredAssistantText: stripCopiedTagNotation,
+        normalizeRestoredAssistantText: (text, providerID) => stripCopiedTagNotation(text, providerID === "anthropic"),
         refreshSourceContents: (sessionID) => nativeFoldReplay?.needsHeadRebuild(sessionID) ?? false,
         hostCleanupCompactionMarkers: () => ({
           verified: true,
@@ -53783,7 +53966,7 @@ async function registerContext(context) {
           resolveDirectory: (sessionID) => sessionDirectories.get(sessionID) ?? directory,
           allowHomeProject: config.allow_home_project,
           recompProgressBySession: new Map
-        }),
+        }, embeddings.ensureRegistered),
         hiddenCompletionExecutor,
         historianRunnable: !compactionOff && hiddenCompletionExecutor !== undefined && config.historian?.disable !== true,
         historianModel: historianModels.primary,
@@ -54133,6 +54316,7 @@ async function registerContext(context) {
       deletedSessions.clear();
       await dreamTrigger?.dispose();
       await maintenanceTimer?.dispose();
+      await embeddings.dispose();
       for (const release of rawProviders.values())
         release();
       rawProviders.clear();