@cortexkit/opencode-magic-context 0.49.6 → 0.49.8

package/dist/v2/{context-p8f2shp1.js → context-wd82v9z6.js}

@@ -9,7 +9,7 @@ import {
   resolveLegacyConfigSources,
   getProtectedTokensTierOverrides,
   loadPluginConfigDetailed
-} from "./server-d6g4whc2.js";
+} from "./server-4qr18rfg.js";
 import {
   getHarness2,
   harnessOwnsOpenCodeStore2
@@ -24,7 +24,7 @@ import {
   log2,
   sessionLog2,
   getLoggerDiagnostics2
-} from "./server-t4k4qexw.js";
+} from "./server-9e5r8y60.js";
 import {
   hasTrustedAbsoluteWall,
   applyProvenInputFloor,
@@ -36,7 +36,7 @@ import {
   getSdkContextLimit,
   getSdkOutputLimit,
   getModelsDevCacheState
-} from "./server-vb7pbd9p.js";
+} from "./server-nveratm5.js";
 import {
   withContentLanguageDirective,
   parseCron,
@@ -48,7 +48,7 @@ import {
   DEFAULT_HISTORIAN_TIMEOUT_MS,
   DEFAULT_LOCAL_EMBEDDING_MODEL,
   DREAM_TASK_PROMOTION_DEFAULTS
-} from "./server-cw6521wn.js";
+} from "./server-7e087rvk.js";
 import {
   historianRunConfig,
   dreamerRunConfig,
@@ -109,6 +109,8 @@ import {
   resolveLkgModelKeys,
   createLkgEntryProjector,
   captureLkgSlot,
+  validateAnthropicReasoningRuns,
+  validateLkgSeam,
   replayLkg,
   coldStartRawServedIndex,
   coldStartUncapturedReplay,
@@ -263,7 +265,7 @@ import {
   startCompartmentAgent,
   setRecompStarting2,
   setRecompTerminal2
-} from "./server-7skbfb81.js";
+} from "./server-q360kdb8.js";
 import {
   CANONICAL_DREAM_TASKS,
   DREAM_TASK_CAPABILITIES,
@@ -301,7 +303,7 @@ import {
   openDatabaseAsync,
   isDatabasePersisted,
   getDatabasePersistenceError
-} from "./server-09g9pkvx.js";
+} from "./server-08k4zkfk.js";
 import {
   setHomeProjectPermission,
   shouldSkipHomeProjectMemory,
@@ -317,7 +319,7 @@ import {
   storedPathBelongsToIdentity,
   beginBootQuietPeriod,
   scheduleAfterBootQuiet
-} from "./server-btgnsv7w.js";
+} from "./server-njnx39q2.js";
 import {
   detectLatestTurnThinkingMismatch,
   isPrefixBoundThinkingModel,
@@ -346,6 +348,8 @@ import {
   sessionDecisionCalibration,
   transitionSessionHygieneUnits,
   getProtectionWindowForSession,
+  withReplayEnvelopeSnapshot,
+  invalidateReplayEnvelopeSnapshot,
   isRustMarkerAdmissionFenced,
   setRustMarkerAdmissionFence,
   ReplayDocumentError,
@@ -415,6 +419,7 @@ import {
   getStaleReduceStrippedIds,
   addStaleReduceStrippedIds,
   getProcessedImageStrippedIds,
+  getProcessedImageMarkers,
   addProcessedImageStrippedIds,
   getPendingCompactionMarkerState,
   getCompactionMarkerHealth,
@@ -424,6 +429,7 @@ import {
   clearPendingCompactionMarkerStateIf,
   getPendingPiCompactionMarkerState,
   clearPendingPiCompactionMarkerStateIf,
+  logPiCompactionMarkerClear,
   setSessionWorkMetrics,
   getObservedEpochFloor,
   resolveEpochFloorForPass,
@@ -458,6 +464,7 @@ import {
   stripReasoningFromAssistantIds,
   findMergedReasoningStripDecisions,
   stripReasoningFromMergedAssistants,
+  getEmptyImageParts,
   stripProcessedImages,
   projectOpencodeReasoningBudgetCutoff,
   DEFAULT_KEEP_REASONING_TOKENS,
@@ -483,6 +490,7 @@ import {
   withRawSessionMessageCache2,
   readRawSessionMessages2,
   visitRawSessionMessages2,
+  visitRawSessionMessagesAsync2,
   prepareRawSessionOrdinals2,
   primeTailRawMessageCache2,
   primeInMemoryTailRawMessageCache2,
@@ -491,11 +499,12 @@ import {
   readRawSessionMessageIdOrdinalsForRange2,
   readRawSessionMessagePartsById2,
   readRawSessionBoundaryEndpoints2,
+  hasRawSessionMessageById2,
   readRawSessionMessageOrdinalById2,
   readRawSessionMessageById2,
   readSessionChunk2,
   readRawSessionSeedTail2
-} from "./server-fby0cxbq.js";
+} from "./server-xj4mewze.js";
 import {
   textMentionsRecentCommit,
   hasMeaningfulUserText2,
@@ -506,7 +515,7 @@ import {
   estimateTokens,
   estimateFixedPromptTokens,
   normalizeText
-} from "./server-kzns2hbz.js";
+} from "./server-s6jqh8bj.js";
 import {
   SubcClient,
   connectionFileExists,
@@ -514,8 +523,9 @@ import {
   toSynapseLaneDescriptor,
   formatSynapseLaneDescriptor,
   SynapseEmbeddingProvider
-} from "./server-hb6xhh9q.js";
+} from "./server-988cqjme.js";
 import {
+  inRootAsyncContext2,
   getTagIdentityWriteGeneration2,
   Database2,
   getSqliteDatabasePath2,
@@ -527,21 +537,18 @@ import {
   isTransientSqliteError2,
   SqliteAcquisitionBusyError2,
   withAsyncPrivilegedWriter2
-} from "./server-0nnd4bry.js";
-import {
-  sameProjectDirectory,
-  canonicalProjectDirectory
-} from "./server-yezz0cp2.js";
+} from "./server-wafzvyhg.js";
+import"./server-63ha7f0f.js";
 import {
   deleteChunkEmbedBackoffForSession
-} from "./server-keswwkvv.js";
+} from "./server-9a6bwc12.js";
 import {
   registerOwnRpcServerInstance,
   rpcPortDir,
   rpcPortFilePath,
   parseRpcPortFile,
   inspectProcessesAsync
-} from "./server-wrem2nmz.js";
+} from "./server-cxsr0ng6.js";
 import {
   BoundedSessionMap,
   LkgRecoveryFenceError,
@@ -560,14 +567,14 @@ import {
   isMessageIndexReconciledThrough2,
   indexMessagesAfterOrdinal2,
   sweepOrphanedOpenCodeMessageIndexes2
-} from "./server-qn23p4h7.js";
+} from "./server-j3dm74ey.js";
 import {
   stableStringify,
   getTemporalDecisions,
   observeTemporalDecisions,
   freezeTemporalDecisions,
   tagIdentityRevisionKey
-} from "./server-6byqfbqf.js";
+} from "./server-shme41gj.js";
 import {
   resolveModelCalibration,
   calibrateBuckets,
@@ -659,14 +666,14 @@ import {
   adoptNullOwnerToolTag2,
   getCandidateToolOwners2,
   pickNearestPriorOwner2
-} from "./server-yd01snxq.js";
+} from "./server-jjsf29aq.js";
 import"./server-51779zs2.js";
 import {
   isRawCompactionSummaryInfo2,
   extractInMemoryMessageViews2,
   buildInMemoryTailRawMessages2,
   runSessionWarmupWorker
-} from "./server-387vkhjq.js";
+} from "./server-bx59ezg6.js";
 import {
   resolveOpenCodeDbPath,
   assertOpenCodeStoreGeneration,
@@ -682,12 +689,12 @@ import {
   latestRealUserTurnIdFromOpenCodeDb,
   getMessageTimesFromOpenCodeDb,
   findLastAssistantModelFromOpenCodeDb
-} from "./server-4tn95znb.js";
+} from "./server-zrwaj29a.js";
 import {
   getCurrentToolSetHash,
   recordToolDefinition,
   getMeasuredToolDefinitionTokens
-} from "./server-7ekna9zs.js";
+} from "./server-adfte03x.js";
 import {
   V2_MEMORY_CATEGORIES,
   CATEGORY_PRIORITY
@@ -700,7 +707,7 @@ import {
   resolveStoredPathWorkspaceIdentity,
   storedPathBelongsToWorkspace,
   computeWorkspaceEpochFingerprint
-} from "./server-ww9nr8pe.js";
+} from "./server-4gz0xkrc.js";
 import {
   GIT_SWEEP_LEASE_RENEWAL_MS,
   acquireGitSweepLease,
@@ -727,7 +734,7 @@ import {
   drainCommitBacklogForProject2,
   embedSessionCompartmentChunks2,
   getEmbeddingCoverageStatus2
-} from "./server-158ehmk2.js";
+} from "./server-4easnf78.js";
 import"./server-fb3zxn06.js";
 import {
   SESSION_NOTE_CONDITION_ERROR,
@@ -771,15 +778,15 @@ import {
   readGitFileChangeTimesSince,
   verificationFileExists,
   normalizeVerificationFiles
-} from "./server-x2r63c0x.js";
+} from "./server-yak3sxya.js";
 import {
   deriveTriggerBudget2,
   deriveHistorianChunkTokens2,
   resolveKnownHistorianContextLimit2,
   resolveHistorianProducerLimits2,
   resolveHistorianContextLimit2
-} from "./server-t528t8qm.js";
-import"./server-6a9mxnb2.js";
+} from "./server-hn9fb3v0.js";
+import"./server-npm52h2q.js";
 import {
   isEmbeddingHostBusy2
 } from "./server-qt1qqasc.js";
@@ -790,10 +797,10 @@ import {
 } from "./server-4dhv7mqz.js";
 import {
   getLocalEmbeddingNativeMemoryStats
-} from "./server-ras2sxnc.js";
+} from "./server-44ryn9rb.js";
 import {
   cosineSimilarity
-} from "./server-f9py7s7a.js";
+} from "./server-4rs8sm06.js";
 import {
   computeCueContentHash,
   hasMuralCueColumns,
@@ -818,7 +825,7 @@ import {
   mergeMemoryStats2,
   archiveMemory2,
   getMemoryCountsByStatus2
-} from "./server-cm4hmxyk.js";
+} from "./server-n78avt2p.js";
 import {
   registerNotificationSink2,
   pushNotification2,
@@ -826,11 +833,11 @@ import {
   drainNotifications2,
   isTuiConnected2
 } from "./server-x8a7jmkh.js";
-import"./server-676xw7at.js";
+import"./server-ckrb5rm8.js";
 import {
   flushIgnoredMessages2,
   sendStatusNotification2
-} from "./server-9zqewm6g.js";
+} from "./server-ak7w74j9.js";
 import {
   renderSingleStoreMigrationRequiredRefusal,
   SingleStoreMigrationRequiredError,
@@ -845,12 +852,13 @@ import {
   SubcModuleTransport,
   indexCommitsForProject,
   embedUnembeddedCommits,
+  withMessageFtsSessionFilter,
   createUnifiedSearchDiagnostics2,
   parseIdShapedQuery2,
   resolveMemoriesByIdsForSearch2,
   unifiedSearch2,
   formatSearchResults2
-} from "./server-aa9w15cs.js";
+} from "./server-y5g32dhq.js";
 import {
   resolvePromptContext2
 } from "./server-fmsr7v69.js";
@@ -864,6 +872,10 @@ import {
 import {
   computeNormalizedHash
 } from "./server-2bvekkfy.js";
+import {
+  sameProjectDirectory,
+  canonicalProjectDirectory
+} from "./server-knvkbfvh.js";
 import {
   getErrorMessage,
   describeError
@@ -890,7 +902,7 @@ import {
 } from "./server-8ajstryz.js";
 import {
   logSlowWriteTransaction
-} from "./server-3t0q2cqx.js";
+} from "./server-7dv9wt9r.js";
 
 // ../../node_modules/.bun/zod@4.1.8/node_modules/zod/v4/classic/external.js
 var exports_external = {};
@@ -2782,6 +2794,7 @@ function forgetCachedPrefix(sessionId) {
 function dropCompartmentsAfter(db, sessionId, anchor, holderId, activeBranch = false, onRetire) {
   db.exec("BEGIN IMMEDIATE");
   let finished = false;
+  let clearedMarker = null;
   try {
     if (!isCompartmentLeaseHeld(db, sessionId, holderId)) {
       db.exec("ROLLBACK");
@@ -2798,14 +2811,16 @@ function dropCompartmentsAfter(db, sessionId, anchor, holderId, activeBranch = f
     if (activeBranch) {
       db.prepare("UPDATE session_meta SET prior_boundary_ordinal = ? WHERE session_id = ?").run((anchor?.endMessage ?? 0) + 1, sessionId);
       const marker = getPendingPiCompactionMarkerState(db, sessionId);
-      if (marker)
-        clearPendingPiCompactionMarkerStateIf(db, sessionId, marker);
+      if (marker && clearPendingPiCompactionMarkerStateIf(db, sessionId, marker, null))
+        clearedMarker = marker;
     }
     deleteChunkEmbedBackoffForSession(db, sessionId);
     queueM0Mutation(db, { sessionId, mutationType: "recomp_boundary_change" });
     clearCachedM0M1(db, sessionId);
     db.exec("COMMIT");
     finished = true;
+    if (clearedMarker)
+      logPiCompactionMarkerClear(sessionId, clearedMarker, "active-branch-retired");
     return dropped.map((row) => row.sequence);
   } finally {
     if (!finished) {
@@ -2956,10 +2971,10 @@ async function sourceReady(source, sessionId) {
 function defer(fn) {
   const immediate = globalThis.setImmediate;
   if (typeof immediate === "function") {
-    immediate(fn);
+    inRootAsyncContext2(() => immediate(fn));
     return;
   }
-  setTimeout(fn, 0);
+  inRootAsyncContext2(() => setTimeout(fn, 0));
 }
 function yieldToEventLoop() {
   return new Promise((resolve) => defer(resolve));
@@ -3043,14 +3058,14 @@ function scheduleReconciliation(db, sessionId, readMessages) {
       reconcileSessionIndex(db, sessionId, readMessages).then((ran) => {
         if (ran)
           return;
-        setTimeout(() => {
+        inRootAsyncContext2(() => setTimeout(() => {
           heapHolder.reconciliationScheduledSessions.delete(sessionId);
           scheduleReconciliation(db, sessionId, readMessages);
-        }, PREPARE_RETRY_MS).unref?.();
+        }, PREPARE_RETRY_MS)).unref?.();
       }).catch((error) => {
         logIndexingError(sessionId, "reconciliation", error);
         if (isDatabaseLockedError(error))
-          setTimeout(() => scheduleReconciliation(db, sessionId, readMessages), 1000).unref();
+          inRootAsyncContext2(() => setTimeout(() => scheduleReconciliation(db, sessionId, readMessages), 1000)).unref();
       }).finally(() => {
         heapHolder.reconciliationScheduledSessions.delete(sessionId);
       });
@@ -3860,7 +3875,7 @@ function queueAutoSearchBackfill(db, sessionId, projectPath, query) {
       pending.delete(key);
       resolve();
     };
-    const queued = setTimeout(() => {
+    const queued = inRootAsyncContext2(() => setTimeout(() => {
       lifecycle.signal.removeEventListener("abort", cancel);
       if (lifecycle.signal.aborted)
         return done();
@@ -3871,7 +3886,7 @@ function queueAutoSearchBackfill(db, sessionId, projectPath, query) {
         clearTimeout(timeout);
         done();
       });
-    }, 0);
+    }, 0));
     const cancel = () => {
       clearTimeout(queued);
       done();
@@ -3918,7 +3933,7 @@ async function executeAutoSearchWorker(db, sessionId, projectPath, query, option
     deadlineUnixMs: autoSearchDeadlineUnixMs(deadlineSignal)
   };
   return new Promise((resolve, reject) => {
-    const worker = new Worker(entry, { workerData: input });
+    const worker = inRootAsyncContext2(() => new Worker(entry, { workerData: input }));
     let settled = false;
     const finish = (results, error) => {
       if (settled)
@@ -4030,7 +4045,7 @@ function searchMessageHistoryOffThread(db, request, entry = defaultAutoSearchWor
       deadline.unref?.();
     };
     try {
-      worker = new Worker(entry, { workerData: input });
+      worker = inRootAsyncContext2(() => new Worker(entry, { workerData: input }));
     } catch (error) {
       finish(null, "start-failed", error);
       return;
@@ -6483,21 +6498,40 @@ function buildReplacementContent(tagId) {
   return `[dropped §${tagId}§]`;
 }
 function applyNewToolDrop(target, options) {
-  if (!target)
+  if (options.persist && (target?.prepareDrop?.() ?? target?.canDrop?.()) === false) {
+    return { result: "incomplete", mode: "full" };
+  }
+  if (!target) {
+    options.persist?.("full");
     return { result: "absent", mode: "full" };
-  if (options.inWindow && hasSmallToolInput(target) || options.keepSkeleton === true || target.cannotRemove?.() === true) {
+  }
+  if (options.inWindow && hasSmallToolInput(target) || options.keepSkeleton === true || target.cannotRemove?.() === true || target.wouldStrandConversationEnd?.() === true) {
     const strip = target.hasAttachments?.() === true;
+    options.persist?.(strip ? "skeleton_stripped" : "skeleton_real");
     return {
       result: (strip ? target.skeletonStripped?.() : target.skeletonReal?.()) ?? "absent",
       mode: strip ? "skeleton_stripped" : "skeleton_real"
     };
   }
+  options.persist?.("full");
   const result = target.drop?.() ?? "absent";
   if (result === "truncated" && target.hasAttachments?.() === true) {
     return { result: target.skeletonStripped?.() ?? "absent", mode: "skeleton_stripped" };
   }
   return { result, mode: result === "truncated" ? "skeleton_real" : "full" };
 }
+function applyPersistedToolDrop(db, sessionId, tagNumber, target, options, afterWrite) {
+  return applyNewToolDrop(target, {
+    ...options,
+    persist: (mode) => {
+      db.transaction(() => {
+        updateTagDropMode2(db, sessionId, tagNumber, mode);
+        updateTagStatus2(db, sessionId, tagNumber, "dropped");
+        afterWrite?.();
+      }).immediate();
+    }
+  });
+}
 function hasSmallToolInput(target) {
   const bytes = target?.inputStringBytes?.() ?? null;
   return bytes !== null && bytes <= SKELETON_REAL_INPUT_MAX_BYTES;
@@ -6577,11 +6611,11 @@ function applyPendingOperations(sessionId, db, targets, protectedTagIds, preload
     diagnostics.reasons[reason] = (diagnostics.reasons[reason] ?? 0) + 1;
   };
   let admitted = false;
-  let startedAt = 0;
   try {
     db.transaction(() => {
       admitted = true;
-      startedAt = performance.now();
+    }).immediate();
+    {
       const pendingOps = preloadedPendingOps ?? getPendingOps(db, sessionId);
       const tags = preloadedTags ?? getTagsByNumbers2(db, sessionId, [
         ...new Set([
@@ -6633,10 +6667,31 @@ function applyPendingOperations(sessionId, db, targets, protectedTagIds, preload
             continue;
           }
         }
+        const persistDrop = (mode) => {
+          let startedAt = 0;
+          try {
+            db.transaction(() => {
+              startedAt = performance.now();
+              if (mode)
+                updateTagDropMode2(db, sessionId, pendingOp.tagId, mode);
+              updateTagStatus2(db, sessionId, pendingOp.tagId, "dropped");
+              if (!synthetic)
+                removePendingOp(db, sessionId, pendingOp.tagId);
+            }).immediate();
+          } finally {
+            if (startedAt)
+              logSlowWriteTransaction("apply_pending_operation", startedAt);
+          }
+        };
         let shouldPersistDrop = false;
         if (isToolTag) {
           if (editMarkerTagIds.has(pendingOp.tagId)) {
             const strip = target?.hasAttachments?.() === true;
+            if (target?.canDrop?.() === false || target?.prepareDrop?.() === false || !target) {
+              reject("edit_marker_incomplete");
+              continue;
+            }
+            persistDrop(strip ? "edit_marker_stripped" : "edit_marker");
             const markResult = (strip ? target?.editMarkerStripped?.() : target?.editMarker?.()) ?? "absent";
             if (markResult === "incomplete" || markResult === "absent") {
               reject(`edit_marker_${markResult}`);
@@ -6645,11 +6700,11 @@ function applyPendingOperations(sessionId, db, targets, protectedTagIds, preload
             didMutateMessage = true;
             operationMutated = true;
             onTagReduced?.({ tagNumber: pendingOp.tagId, mode: "edit_marker" });
-            updateTagDropMode2(db, sessionId, pendingOp.tagId, strip ? "edit_marker_stripped" : "edit_marker");
             shouldPersistDrop = true;
           } else {
             const { result: dropResult, mode: appliedMode } = applyNewToolDrop(target, {
-              inWindow: skeletonWindow.has(pendingOp.tagId)
+              inWindow: skeletonWindow.has(pendingOp.tagId),
+              persist: persistDrop
             });
             if (dropResult === "incomplete" || synthetic && dropResult !== "removed" && dropResult !== "truncated") {
               reject(`drop_${dropResult}`);
@@ -6665,12 +6720,12 @@ function applyPendingOperations(sessionId, db, targets, protectedTagIds, preload
             } else {
               reject(`drop_${dropResult}`);
             }
-            updateTagDropMode2(db, sessionId, pendingOp.tagId, appliedMode);
             shouldPersistDrop = true;
           }
         } else if (target) {
           const replacement = buildReplacementContent(pendingOp.tagId);
           const priorContent = target.getContent?.();
+          persistDrop();
           const changed = target.setContent(replacement);
           if (changed) {
             didMutateMessage = true;
@@ -6687,30 +6742,25 @@ function applyPendingOperations(sessionId, db, targets, protectedTagIds, preload
           shouldPersistDrop = true;
         } else if (!synthetic) {
           reject("target_absent");
+          persistDrop();
           shouldPersistDrop = true;
         }
         if (!shouldPersistDrop) {
           reject("not_persisted");
           continue;
         }
-        updateTagStatus2(db, sessionId, pendingOp.tagId, "dropped");
-        if (!synthetic)
-          removePendingOp(db, sessionId, pendingOp.tagId);
         if (operationMutated)
           diagnostics.mutated += 1;
         else
           diagnostics.persistedWithoutMutation += 1;
       }
-    }).immediate();
+    }
   } catch (error) {
     if (!admitted && /database (?:table )?is locked|sqlite_(busy|locked)/i.test(String(error))) {
       sessionLog2(sessionId, "pending operations write admission busy; retaining prior bytes for retry");
       return false;
     }
     throw error;
-  } finally {
-    if (admitted)
-      logSlowWriteTransaction("apply_pending_operations", startedAt);
   }
   if (diagnostics) {
     onBatchComplete?.(diagnostics);
@@ -7208,31 +7258,27 @@ function applyHeuristicCleanup(sessionId, db, targets, messageTagNumbers, config
     if (plan.shouldDrop) {
       const toDrop = new Set(plan.tagNumbers);
       const newestEmergencyTags = recentTags;
-      db.transaction(() => {
-        for (const tag of tags) {
-          if (!toDrop.has(tag.tagNumber))
-            continue;
-          if (tag.status !== "active" || tag.type !== "tool")
-            continue;
-          const target = targets.get(tag.tagNumber);
-          const recent = (emergency.usagePercentage ?? 0) < 95 && newestEmergencyTags.has(tag.tagNumber);
-          const { result, mode } = applyNewToolDrop(target, {
-            inWindow: recent,
-            keepSkeleton: target?.requiresToolArcSkeleton === true
+      for (const tag of tags) {
+        if (!toDrop.has(tag.tagNumber))
+          continue;
+        if (tag.status !== "active" || tag.type !== "tool")
+          continue;
+        const target = targets.get(tag.tagNumber);
+        const recent = (emergency.usagePercentage ?? 0) < 95 && newestEmergencyTags.has(tag.tagNumber);
+        const { result } = applyPersistedToolDrop(db, sessionId, tag.tagNumber, target, {
+          inWindow: recent,
+          keepSkeleton: target?.requiresToolArcSkeleton === true
+        });
+        if (result === "removed" || result === "truncated") {
+          droppedTools++;
+          emergencyDroppedTools++;
+          droppedTokenReductions.push({
+            tagNumber: tag.tagNumber,
+            mode: result === "removed" ? "full" : "truncated"
           });
-          if (result === "removed" || result === "truncated") {
-            updateTagStatus2(db, sessionId, tag.tagNumber, "dropped");
-            updateTagDropMode2(db, sessionId, tag.tagNumber, mode);
-            droppedTools++;
-            emergencyDroppedTools++;
-            droppedTokenReductions.push({
-              tagNumber: tag.tagNumber,
-              mode: result === "removed" ? "full" : "truncated"
-            });
-            emergencyReclaimedTokens += estimateEmergencyDropReclaimTokens(measuredByTag.get(tag.tagNumber) ?? tag);
-          }
+          emergencyReclaimedTokens += estimateEmergencyDropReclaimTokens(measuredByTag.get(tag.tagNumber) ?? tag);
         }
-      }).immediate();
+      }
       sessionLog2(sessionId, `emergency tiered drop: ${plan.reason}`);
     } else {
       sessionLog2(sessionId, `emergency tiered drop skipped: ${plan.reason}`);
@@ -7313,35 +7359,33 @@ function applyHeuristicCleanup(sessionId, db, targets, messageTagNumbers, config
       group.push(tag);
       fingerprintGroups.set(fingerprint, group);
     }
-    db.transaction(() => {
-      for (const [, group] of fingerprintGroups) {
-        if (group.length <= 1)
+    for (const [, group] of fingerprintGroups) {
+      if (group.length <= 1)
+        continue;
+      group.sort((a, b) => a.tagNumber - b.tagNumber);
+      for (let i = 0;i < group.length - 1; i++) {
+        const tag = group[i];
+        if (config.protectedTagNumbers.has(tag.tagNumber))
           continue;
-        group.sort((a, b) => a.tagNumber - b.tagNumber);
-        for (let i = 0;i < group.length - 1; i++) {
-          const tag = group[i];
-          if (config.protectedTagNumbers.has(tag.tagNumber))
-            continue;
-          const target = targets.get(tag.tagNumber);
-          if (protectedTools.has(tag.tagNumber))
-            continue;
-          if (target?.canDrop?.() === false)
-            continue;
-          const { result, mode } = applyNewToolDrop(target, { inWindow: false });
-          if (result === "incomplete")
-            continue;
-          updateTagDropMode2(db, sessionId, tag.tagNumber, mode);
-          updateTagStatus2(db, sessionId, tag.tagNumber, "dropped");
-          if (result === "removed" || result === "truncated") {
-            deduplicatedTools++;
-            droppedTokenReductions.push({
-              tagNumber: tag.tagNumber,
-              mode: result === "removed" ? "full" : "truncated"
-            });
-          }
+        const target = targets.get(tag.tagNumber);
+        if (protectedTools.has(tag.tagNumber))
+          continue;
+        if (target?.canDrop?.() === false)
+          continue;
+        const { result } = applyPersistedToolDrop(db, sessionId, tag.tagNumber, target, {
+          inWindow: false
+        });
+        if (result === "incomplete")
+          continue;
+        if (result === "removed" || result === "truncated") {
+          deduplicatedTools++;
+          droppedTokenReductions.push({
+            tagNumber: tag.tagNumber,
+            mode: result === "removed" ? "full" : "truncated"
+          });
         }
       }
-    }).immediate();
+    }
   }
   if (droppedTools > 0 || deduplicatedTools > 0 || droppedInjections > 0) {
     sessionLog2(sessionId, `heuristic cleanup: dropped ${droppedTools} tool tags, deduplicated ${deduplicatedTools} tool calls, dropped ${droppedInjections} system injections`);
@@ -7515,6 +7559,7 @@ function postprocessReplaySnapshot(db, sessionId) {
     ...replay,
     staleReduceStrippedIds: new Set(replay.staleReduceStrippedIds),
     processedImageStrippedIds: new Set(replay.processedImageStrippedIds),
+    processedImageMarkers: new Map(replay.processedImageMarkers),
     strippedPlaceholderIds: new Set(replay.strippedPlaceholderIds),
     hiddenSeamPlaceholderIds: new Set(replay.hiddenSeamPlaceholderIds),
     mergedReasoningStrippedIds: new Set(replay.mergedReasoningStrippedIds),
@@ -8820,11 +8865,6 @@ function runRustModePostprocess(args) {
   for (const anchor of getNoteNudgeAnchors(args.db, args.sessionId)) {
     appendReminderToUserMessageById(args.messages, anchor.messageId, anchor.text);
   }
-  for (const decision of getAutoSearchHintDecisions(args.db, args.sessionId)) {
-    if (decision.decision === "hint" && getUnpublishedAutoSearchNoHint(args.sessionId, decision.messageId) === undefined) {
-      appendReminderToUserMessageById(args.messages, decision.messageId, decision.text);
-    }
-  }
   const trailingBlankDecisions = new Map;
   const visibleAssistantIds = args.messages.filter((message) => message.info.role === "assistant").map((message) => message.info.id).filter((id) => typeof id === "string");
   if (modelAcceptsEmptyContent(args.resolvedProviderID)) {
@@ -8862,7 +8902,7 @@ function runRustModePostprocess(args) {
     userMessageIds: args.messages.filter((m) => m.info.role === "user" && typeof m.info.id === "string").map((m) => m.info.id),
     anchorMessageId: currentUserMessageId,
     isLiveTail: args.messages.at(-1)?.info.id === currentUserMessageId,
-    isCacheBustingPass: args.cacheBustingPass === true
+    prefixRewriteCoversAnchor: false
   });
   const noteReadStillVisible = hasVisibleNoteReadCall(args.messages);
   const deferredNoteText = peekNoteNudgeText(args.db, args.sessionId, currentUserMessageId, args.projectPath, noteReadStillVisible, eligibility);
@@ -8879,6 +8919,11 @@ function runRustModePostprocess(args) {
       sessionLog2(args.sessionId, `rust note-nudge delivery skipped wire append: ${outcome.kind}`);
     }
   }
+  for (const decision of getAutoSearchHintDecisions(args.db, args.sessionId)) {
+    if (decision.decision === "hint" && getUnpublishedAutoSearchNoHint(args.sessionId, decision.messageId) === undefined) {
+      appendReminderToUserMessageById(args.messages, decision.messageId, decision.text);
+    }
+  }
   const { thinkingBindingRecovery, proactiveThinkingStrip } = applyRustModeThinkingStrips(args, noteNudgeAppended || servedMarkerRecord() !== servedMarkerBefore);
   const marker = getPersistedCompactionMarkerState(args.db, args.sessionId);
   return {
@@ -9737,15 +9782,32 @@ async function runPostTransformPhase(args) {
       sessionLog2(args.sessionId, "transform failed dropping stale ctx_reduce calls:", error);
     }
   }
-  if (canUseEmptySentinels && !compactionOff && replaySnapshot) {
+  if (!compactionOff && replaySnapshot) {
     try {
       const tImg = performance.now();
+      const imageWatermark = canEditWholePrefix ? Math.max(args.watermark, getMaxDroppedTagNumber2(args.db, args.sessionId)) : args.watermark;
       const frozenImageIds = replaySnapshot.processedImageStrippedIds;
+      const frozenMarkers = replaySnapshot.processedImageMarkers;
+      const replacementText = canUseEmptySentinels ? "" : "[image stripped]";
       stripProcessedImages(args.messages, frozenImageIds, {
-        detect: canEditWholePrefix && args.watermark > 0,
-        watermark: args.watermark,
+        detect: canEditWholePrefix && imageWatermark > 0,
+        watermark: imageWatermark,
         messageTagNumbers: args.messageTagNumbers,
-        persistNewIds: (ids) => addProcessedImageStrippedIds(args.db, args.sessionId, ids),
+        protectedCutoff: args.protectedCutoff,
+        contextPercentage: args.contextUsage.percentage,
+        replacementText,
+        frozenMarkers,
+        protectedMessageIds: new Set([
+          ...args.tags.filter((tag) => protectedToolTags.has(tag.tagNumber)).map((tag) => tag.toolOwnerMessageId ?? tag.messageId)
+        ]),
+        persistNewIds: (ids, markers) => {
+          if (!addProcessedImageStrippedIds(args.db, args.sessionId, ids, markers))
+            return false;
+          const committed = getProcessedImageMarkers(args.db, args.sessionId);
+          for (const id of ids)
+            frozenMarkers.set(id, committed.get(id) ?? replacementText);
+          return true;
+        },
         onFirstApplication: recordFirstApplicationAt
       });
       logTransformTiming(args.sessionId, "stripProcessedImages", tImg);
@@ -9873,16 +9935,6 @@ async function runPostTransformPhase(args) {
     logTransformTiming(args.sessionId, "pp.placeholderNeutralize", tPlaceholder);
   }
   const tNudgeBlock = performance.now();
-  if (args.fullFeatureMode && !compactionOff && replaySnapshot) {
-    for (const anchor of replaySnapshot.noteNudgeAnchors) {
-      appendReminderToUserMessageById(args.messages, anchor.messageId, anchor.text);
-    }
-    for (const decision of replaySnapshot.autoSearchHintDecisions) {
-      if (decision.decision === "hint") {
-        appendReminderToUserMessageById(args.messages, decision.messageId, decision.text);
-      }
-    }
-  }
   logTransformTiming(args.sessionId, "pp.nudgeAndSticky", tNudgeBlock);
   const tMarker = performance.now();
   const explicitRebuildHappened = args.historyRefreshExplicitBeforePrepare && args.rebuiltHistoryFromInitialPrepare;
@@ -9958,13 +10010,15 @@ async function runPostTransformPhase(args) {
   const noteReadStillVisible = args.fullFeatureMode ? hasVisibleNoteReadCall(args.messages) : false;
   let noteNudgeAppendedThisPass = false;
   const noteNudgeUserMessageId = findNoteNudgeUserMessageId(args.messages);
+  const lastServedForNote = canEditWholePrefix && (m0RematerializedThisPass || historyWasConsumedThisPass) ? args.readLastServedMessages?.() : null;
+  const rewrittenHeadCoversNote = !!lastServedForNote && args.messages.slice(0, prependedMessageCount).some((message, index) => isSyntheticHeadMessage(message) && index < lastServedForNote.length && servedMessageKey(message, args.resolvedProviderID) !== servedMessageKey(lastServedForNote[index], args.resolvedProviderID));
   const noteNudgeEligibility = args.fullFeatureMode ? observeNoteNudgeServe({
     db: args.db,
     sessionId: args.sessionId,
     userMessageIds: args.messages.filter((m) => m.info.role === "user" && typeof m.info.id === "string").map((m) => m.info.id),
     anchorMessageId: noteNudgeUserMessageId,
     isLiveTail: args.messages.at(-1)?.info.id === noteNudgeUserMessageId,
-    isCacheBustingPass
+    prefixRewriteCoversAnchor: canEditWholePrefix && rewrittenHeadCoversNote
   }) : undefined;
   const deferredNoteText = args.fullFeatureMode ? peekNoteNudgeText(args.db, args.sessionId, noteNudgeUserMessageId, args.projectPath, noteReadStillVisible, noteNudgeEligibility) : null;
   if (deferredNoteText) {
@@ -9981,6 +10035,16 @@ async function runPostTransformPhase(args) {
       sessionLog2(args.sessionId, `note-nudge delivery skipped wire append: ${outcome.kind}`);
     }
   }
+  if (args.fullFeatureMode && !compactionOff && replaySnapshot) {
+    for (const anchor of replaySnapshot.noteNudgeAnchors) {
+      appendReminderToUserMessageById(args.messages, anchor.messageId, anchor.text);
+    }
+    for (const decision of replaySnapshot.autoSearchHintDecisions) {
+      if (decision.decision === "hint") {
+        appendReminderToUserMessageById(args.messages, decision.messageId, decision.text);
+      }
+    }
+  }
   let todoAnchorMovedThisPass = false;
   if (args.fullFeatureMode && !compactionOff) {
     const todoAnchorBefore = replaySnapshot ? replaySnapshot.todoSyntheticAnchor : getPersistedTodoSyntheticAnchor(args.db, args.sessionId);
@@ -11180,7 +11244,7 @@ function createPassOutcome() {
 }
 
 // src/hooks/magic-context/rust-mode-transform.ts
-import { createHash as createHash4, randomUUID as randomUUID2 } from "node:crypto";
+import { createHash as createHash5, randomUUID as randomUUID2 } from "node:crypto";
 
 // src/features/magic-context/memory/single-store-embedding-drain.ts
 function isWatermarkRow(row) {
@@ -13627,13 +13691,235 @@ function resolveRustLkgReplayParticipant(sessionId) {
     return latest;
   return alive.length === 1 ? alive[0] : undefined;
 }
-function noteExternalLkgReplay(participant, sessionId, inputCount) {
+function noteExternalLkgReplay(participant, sessionId, inputMessages, servedMessages) {
   if (!participant)
     return;
-  participant.enterFreezeFromExternalServe(sessionId, inputCount);
+  participant.enterFreezeFromExternalServe(sessionId, inputMessages, servedMessages);
   sessionLog2(sessionId, "lkg_external_replay_froze_rust_adapter");
 }
 
+// src/hooks/magic-context/rust-served-raw.ts
+import { createHash as createHash4 } from "node:crypto";
+class RustServedRawConflict extends EmergencyFailClosedError {
+  reason;
+  messageIds;
+  firstBlockId;
+  constructor(reason, messageIds, firstBlockId) {
+    super(`Rust served-raw conflict: ${reason} at ${firstBlockId}`);
+    this.reason = reason;
+    this.messageIds = messageIds;
+    this.firstBlockId = firstBlockId;
+  }
+}
+function partDigest(part) {
+  const serialized = JSON.stringify(part);
+  return createHash4("sha256").update(stableStringify(serialized === undefined ? undefined : JSON.parse(serialized))).digest("hex");
+}
+function records(doc) {
+  if (doc.rustServedRaw === undefined)
+    return [];
+  if (!Array.isArray(doc.rustServedRaw))
+    throw new EmergencyFailClosedError("Invalid Rust served-raw evidence");
+  for (const row of doc.rustServedRaw) {
+    if (!row || typeof row.messageId !== "string" || !Number.isSafeInteger(row.index) || row.index < 0 || row.partId !== undefined && typeof row.partId !== "string" || typeof row.digest !== "string" || !/^[a-f0-9]{64}$/.test(row.digest) || !Array.isArray(row.blockIds) || !row.blockIds.every((id) => typeof id === "string")) {
+      throw new EmergencyFailClosedError("Invalid Rust served-raw part");
+    }
+  }
+  return doc.rustServedRaw;
+}
+function rustRawRebuild(db, sessionId) {
+  const value = readReplayEnvelope(db, sessionId).rustRawRebuild;
+  if (value === undefined)
+    return;
+  if (!value || typeof value.identity !== "string" || !/^[a-f0-9]{64}$/.test(value.identity) || !["source_removed", "source_changed", "candidate_loss", "candidate_conflict"].includes(value.reason) || !Array.isArray(value.messageIds) || !value.messageIds.every((id) => typeof id === "string") || typeof value.firstBlockId !== "string" || typeof value.pending !== "boolean") {
+    throw new EmergencyFailClosedError("Invalid Rust raw-rebuild request");
+  }
+  return value;
+}
+function servedRawBlockIds(db, sessionId) {
+  return records(readReplayEnvelope(db, sessionId)).flatMap((row) => row.blockIds);
+}
+function sourcePart(row, message) {
+  return row.partId === undefined ? message?.parts[row.index] : message?.parts.find((part) => part?.id === row.partId);
+}
+function conflict(row, reason) {
+  return new RustServedRawConflict(reason, [row.messageId], row.blockIds[0] ?? `${row.messageId}#0`);
+}
+function checkRustServedRawIngress(db, sessionId, input) {
+  const rows = records(readReplayEnvelope(db, sessionId));
+  if (!rows.length)
+    return;
+  const byId = new Map(input.map((message) => [message.info.id, message]));
+  const changed = rows.filter((row) => partDigest(sourcePart(row, byId.get(row.messageId))) !== row.digest);
+  const first = changed[0];
+  if (!first)
+    return;
+  throw new RustServedRawConflict(sourcePart(first, byId.get(first.messageId)) === undefined ? "source_removed" : "source_changed", [...new Set(changed.map((row) => row.messageId))], first.blockIds[0] ?? `${first.messageId}#0`);
+}
+function requestRustRawRebuild(db, sessionId, error) {
+  if (!updateReplayDocument(db, sessionId, (doc) => {
+    const previous = doc.rustRawRebuild;
+    if (previous?.pending && previous.reason === error.reason && previous.firstBlockId === error.firstBlockId && error.messageIds.every((id) => previous.messageIds.includes(id)))
+      return false;
+    const messageIds = [
+      ...new Set([
+        ...previous?.pending ? previous.messageIds : [],
+        ...error.messageIds
+      ])
+    ];
+    const identity = partDigest([
+      previous?.identity ?? "",
+      error.reason,
+      messageIds,
+      error.firstBlockId
+    ]);
+    doc.version = 2;
+    doc.rustRawRebuild = {
+      identity,
+      reason: error.reason,
+      messageIds,
+      firstBlockId: error.firstBlockId,
+      pending: true
+    };
+    return true;
+  }))
+    throw new EmergencyFailClosedError("Cannot persist Rust raw-rebuild request");
+}
+function noteRustServedRaw(db, sessionId, input, served) {
+  const additions = [];
+  const byId = new Map(served.filter((message) => typeof message?.info?.id === "string").map((message) => [message.info.id, message]));
+  for (const message of input) {
+    const visible = byId.get(message.info.id);
+    if (!visible)
+      continue;
+    let offset = 0;
+    for (const [index, value] of message.parts.entries()) {
+      if (!value || typeof value !== "object")
+        continue;
+      const part = value;
+      const count = encodeOpenCodeMessagesToCk([{ ...message, parts: [part] }])[0].ck.content.length;
+      const actual = typeof part.id === "string" ? visible.parts.find((candidate) => candidate?.id === part.id) : visible.parts[index];
+      const status = part.state?.status;
+      const reachesProvider = !(part.type === "text" && part.ignored === true) && ![
+        "compaction",
+        "step-start",
+        "step-finish",
+        "snapshot",
+        "patch",
+        "agent",
+        "retry"
+      ].includes(String(part.type)) && (part.type !== "tool" || status === "completed" || status === "error");
+      if (reachesProvider && count > 0) {
+        const digest = partDigest(part);
+        if (actual === part || partDigest(actual) === digest) {
+          additions.push({
+            messageId: message.info.id,
+            index,
+            ...typeof part.id === "string" ? { partId: part.id } : {},
+            digest,
+            blockIds: Array.from({ length: count }, (_, i) => `${message.info.id}#${offset + i}`)
+          });
+        }
+      }
+      offset += count;
+    }
+  }
+  if (!additions.length)
+    return;
+  if (!updateReplayDocument(db, sessionId, (doc) => {
+    const rows = records(doc);
+    const key = (row) => stableStringify([row.messageId, row.partId ?? row.index]);
+    const merged = new Map(rows.map((row) => [key(row), row]));
+    for (const row of additions)
+      merged.set(key(row), row);
+    const next = [...merged.values()];
+    if (stableStringify(rows) === stableStringify(next))
+      return false;
+    doc.version = 2;
+    doc.rustServedRaw = next;
+    return true;
+  }))
+    throw new EmergencyFailClosedError("Cannot persist Rust served-raw evidence");
+}
+function preserveRustServedRaw(db, sessionId, output, input = output, reconstruct = new Set, covered = new Set) {
+  const rows = records(readReplayEnvelope(db, sessionId));
+  if (!rows.length)
+    return false;
+  const sources = new Map(input.map((message) => [message.info.id, message]));
+  const byId = new Map(output.map((message) => [message.info.id, message]));
+  let repaired = false;
+  for (const row of rows) {
+    if (covered.has(row.messageId))
+      continue;
+    const original = sources.get(row.messageId);
+    const source = sourcePart(row, original);
+    if (!original || !source)
+      throw conflict(row, "source_removed");
+    if (partDigest(source) !== row.digest)
+      throw conflict(row, "source_changed");
+    let message = byId.get(row.messageId);
+    if (!message) {
+      if (!reconstruct.has(row.messageId))
+        throw conflict(row, "candidate_loss");
+      const sourceIndex = input.indexOf(original);
+      const next = output.findIndex((candidate) => input.findIndex((entry) => entry.info.id === candidate.info.id) > sourceIndex);
+      message = structuredClone(original);
+      output.splice(next < 0 ? output.length : next, 0, message);
+      byId.set(row.messageId, message);
+      repaired = true;
+    }
+    const parts = message.parts;
+    if (row.partId === undefined) {
+      const candidate = parts[row.index];
+      if (partDigest(candidate) === row.digest)
+        continue;
+      const reversibleTag = source.type === "text" && typeof source.text === "string" && typeof candidate?.text === "string" && /^§\d+§ /.test(candidate.text) && candidate.text.replace(/^§\d+§ /, "") === source.text && partDigest({ ...candidate, text: source.text }) === row.digest;
+      if (!reversibleTag) {
+        if (!reconstruct.has(row.messageId))
+          throw conflict(row, "candidate_conflict");
+        message.parts = structuredClone(original.parts);
+        repaired = true;
+        continue;
+      }
+      parts[row.index] = structuredClone(source);
+      continue;
+    }
+    const matches = parts.flatMap((part, i) => part.id === row.partId ? [i] : []);
+    if (matches.length > 1)
+      throw conflict(row, "candidate_conflict");
+    const index = matches[0];
+    if (index !== undefined) {
+      if (partDigest(parts[index]) !== row.digest)
+        parts[index] = structuredClone(source);
+    } else if (["reasoning", "thinking", "redacted_thinking"].includes(String(source.type)) || reconstruct.has(row.messageId)) {
+      parts.splice(row.index, 0, structuredClone(source));
+      repaired = true;
+    } else
+      throw conflict(row, "candidate_loss");
+  }
+  return repaired;
+}
+function releaseRustServedRaw(db, sessionId, output, rebuiltIdentity) {
+  const snapshot = readReplayEnvelope(db, sessionId);
+  if (!records(snapshot).length && !snapshot.rustRawRebuild?.pending)
+    return;
+  const byId = new Map(output.map((message) => [message.info.id, message]));
+  if (!updateReplayDocument(db, sessionId, (doc) => {
+    const rows = records(doc);
+    const kept = rows.filter((row) => partDigest(sourcePart(row, byId.get(row.messageId))) === row.digest);
+    const recovery = doc.rustRawRebuild;
+    const acknowledged = recovery?.pending && recovery.identity === rebuiltIdentity;
+    if (kept.length === rows.length && !acknowledged)
+      return false;
+    doc.version = 2;
+    doc.rustServedRaw = kept;
+    if (acknowledged)
+      doc.rustRawRebuild = { ...recovery, pending: false };
+    return true;
+  }))
+    throw new EmergencyFailClosedError("Cannot release Rust served-raw evidence");
+}
+
 // src/hooks/magic-context/transform-context-state.ts
 function loadPersistedUsageWatermark(db, sessionId) {
   const result = db.prepare("SELECT last_response_time FROM session_meta WHERE session_id = ?").get(sessionId);
@@ -13876,16 +14162,19 @@ function rustCaptureDigests(inputs, prior, acceptedInputs) {
   } : undefined);
   return { ...incremental, inputContentSignatures };
 }
+var contentSnapshotFieldVisitObserverForTests;
 function messageMatchesContentSnapshot(message, snapshot) {
   let fieldIndex = 0;
   const matched = visitMessageContentFields(contentSnapshotValue(message), {
     field(value) {
+      contentSnapshotFieldVisitObserverForTests?.();
       if (!Object.is(value, snapshot.fields[fieldIndex]))
         return false;
       fieldIndex += 1;
       return true;
     },
     beginObject() {
+      contentSnapshotFieldVisitObserverForTests?.();
       const expectedCount = snapshot.fields[fieldIndex];
       if (typeof expectedCount !== "number")
         return;
@@ -13912,10 +14201,10 @@ function messageCacheSignature(message) {
   const parts = Array.isArray(message.parts) ? message.parts : [];
   const serializedParts = JSON.stringify(parts) ?? "null";
   const serializedMessage = JSON.stringify(message) ?? "null";
-  return `${messageIdOf(message) ?? ""}:${parts.length}:${Buffer.byteLength(serializedParts)}:${createHash4("sha256").update(serializedMessage).digest("hex")}`;
+  return `${messageIdOf(message) ?? ""}:${parts.length}:${Buffer.byteLength(serializedParts)}:${createHash5("sha256").update(serializedMessage).digest("hex")}`;
 }
 function advanceWireFingerprint(previous, encoded) {
-  return createHash4("sha256").update(previous).update("\\0").update(JSON.stringify(encoded) ?? "null").digest("hex");
+  return createHash5("sha256").update(previous).update("\\0").update(JSON.stringify(encoded) ?? "null").digest("hex");
 }
 function buildWireFingerprint(encoded) {
   let fingerprint = "rust-wire-v1";
@@ -14445,7 +14734,8 @@ function buildTransformBody(args) {
       args.providerId ? `provider:${args.providerId}` : "",
       args.modelKey ? `model:${args.modelKey}` : "",
       args.variant ? `variant:${args.variant}` : "",
-      args.systemPromptHash ? `system:${args.systemPromptHash}` : ""
+      args.systemPromptHash ? `system:${args.systemPromptHash}` : "",
+      args.rawRebuild ? `raw_replay:${args.rawRebuild.identity}` : ""
     ].filter(Boolean).join("|"),
     system_prompt_hash: args.systemPromptHash,
     adopted_system_prompt_hash: args.passInputs.adopted_system_prompt_hash,
@@ -14453,6 +14743,14 @@ function buildTransformBody(args) {
     is_subagent: args.passInputs.is_subagent === true,
     messages: args.input,
     native_messages: args.nativeMessages,
+    served_raw_block_ids: args.servedRawBlockIds ?? [],
+    ...args.rawRebuild?.pending ? {
+      raw_replay_rebuild: {
+        identity: args.rawRebuild.identity,
+        reason: args.rawRebuild.reason,
+        message_ids: args.rawRebuild.messageIds
+      }
+    } : {},
     tool_input_key_orders: args.toolInputKeyOrders ?? toolInputKeyOrders(args.input),
     ...args.fullArrayFingerprint ? { full_array_fingerprint: args.fullArrayFingerprint } : {},
     ...args.tailDelta ? {
@@ -14643,6 +14941,7 @@ function createRustModeTransform(deps, options) {
       throw error;
     } finally {
       clock.clearTimeout(timer);
+      invalidateReplayEnvelopeSnapshot(deps.db, args.sessionId);
     }
   };
   const callTransformWithStallProbe = async (args, attemptTimeoutMs) => {
@@ -14751,6 +15050,24 @@ function createRustModeTransform(deps, options) {
       logTransformTiming(sessionId, "rust.ordinal_rebuild", startedAt, detail);
     }
   };
+  const recordRawConflict = (sessionId, error) => {
+    requestRustRawRebuild(deps.db, sessionId, error);
+    dropSlot(sessionId, `raw_replay_${error.reason}`);
+    const state = ensureState(states, sessionId);
+    state.forceFullWire = true;
+    state.parked = false;
+    sessionLog2(sessionId, `raw_replay_rebuild_requested reason=${error.reason} first_changed=${error.firstBlockId}`);
+  };
+  const observeRawReplay = (sessionId, input, served) => {
+    try {
+      checkRustServedRawIngress(deps.db, sessionId, input);
+      noteRustServedRaw(deps.db, sessionId, input, served);
+    } catch (error) {
+      if (error instanceof RustServedRawConflict)
+        recordRawConflict(sessionId, error);
+      throw error;
+    }
+  };
   const replayLastGood = (sessionId, currentMessages, output, systemPromptTokens) => {
     try {
       if (states.get(sessionId)?.markerAdmissionFenced || isRustMarkerAdmissionFenced(deps.db, sessionId))
@@ -14837,6 +15154,7 @@ function createRustModeTransform(deps, options) {
       ownDirtyRevision: lkgDirtyRevision(sessionId)
     }));
     const replayInputCount = currentMessages.length;
+    observeRawReplay(sessionId, currentMessages, replay.messages);
     replaceMessagesInPlace(output, replay.messages);
     ensureState(states, sessionId).lkgLatestServedDigest = lkgServedArrayDigest(JSON.stringify(replay.messages));
     enterLkgReplayFreeze(ensureState(states, sessionId), replayInputCount);
@@ -14900,7 +15218,10 @@ function createRustModeTransform(deps, options) {
   const passStampBySession = new Map;
   const replayParticipant = {
     lastPassStamp: (sessionId) => states.has(sessionId) ? passStampBySession.get(sessionId) : undefined,
-    enterFreezeFromExternalServe: (sessionId, inputCount) => enterLkgReplayFreeze(ensureState(states, sessionId), inputCount),
+    enterFreezeFromExternalServe: (sessionId, inputMessages, servedMessages) => {
+      observeRawReplay(sessionId, inputMessages, servedMessages);
+      enterLkgReplayFreeze(ensureState(states, sessionId), inputMessages.length);
+    },
     replayFits: (sessionId, messages, inputMessages) => {
       try {
         const fit = lkgReplayFits({
@@ -15046,6 +15367,24 @@ function createRustModeTransform(deps, options) {
     bindSystemDateRequest(output, dateRequest);
     const passObservedAtMs = Date.now();
     const state = ensureState(states, sessionId);
+    let rawRebuild;
+    let rawReadError;
+    try {
+      rawRebuild = rustRawRebuild(deps.db, sessionId);
+      try {
+        checkRustServedRawIngress(deps.db, sessionId, messages);
+      } catch (error) {
+        if (!(error instanceof RustServedRawConflict) || !rawRebuild?.pending)
+          throw error;
+        requestRustRawRebuild(deps.db, sessionId, error);
+        rawRebuild = rustRawRebuild(deps.db, sessionId);
+      }
+    } catch (error) {
+      if (error instanceof RustServedRawConflict)
+        throw error;
+      rawReadError = error;
+    }
+    const reconstructRaw = new Set(rawRebuild?.messageIds ?? []);
     let entrySlot = getSlot(sessionId);
     try {
       entrySlot = loadPersistedLkgSlot(deps.db, sessionId, true) ?? entrySlot;
@@ -15084,6 +15423,7 @@ function createRustModeTransform(deps, options) {
     let decision = "error";
     let materializeReason = "none";
     let frozenReleaseReason = null;
+    let frozenReleaseFirstChanged = "unknown";
     let schedulerDecision;
     let responseCommitted;
     let responsePrefixBustPermitted;
@@ -15109,7 +15449,7 @@ function createRustModeTransform(deps, options) {
     let recoveryProjectRoot = options.projectRoot ?? deps.directory ?? "";
     const passUsageSnapshot = loadContextUsage(deps.contextUsageMap, deps.db, sessionId);
     requestInputTokens = Math.max(0, Math.floor(passUsageSnapshot.inputTokens));
-    let preflightError;
+    let preflightError = rawReadError;
     let markerAdmissionRecovery = state.markerAdmissionFenced;
     try {
       markerAdmissionRecovery ||= isRustMarkerAdmissionFenced(deps.db, sessionId);
@@ -15303,7 +15643,7 @@ function createRustModeTransform(deps, options) {
         decision,
         committed: responseCommitted,
         prefixBustPermitted: responsePrefixBustPermitted,
-        reason: materializeReason,
+        reason: applied && served && frozenReleaseReason ? `lkg_frozen_release:${frozenReleaseReason};first_changed=${frozenReleaseFirstChanged};materialize_reason=${materializeReason}` : materializeReason,
         schedulerDecision,
         schedulerDeferReason,
         historianNoFire,
@@ -15325,7 +15665,7 @@ function createRustModeTransform(deps, options) {
           materializeReason: materializeReason === "none" ? null : materializeReason,
           inputTokens: requestInputTokens,
           tsMs: passObservedAtMs,
-          lkgFrozenReleaseReason: applied && served ? frozenReleaseReason ?? undefined : undefined
+          lkgFrozenReleaseReason: applied && served && frozenReleaseReason ? `${frozenReleaseReason};first_changed=${frozenReleaseFirstChanged}` : undefined
         });
       }
     };
@@ -15360,7 +15700,7 @@ function createRustModeTransform(deps, options) {
           sessionLog2(sessionId, `rust module stages (slow pass): ${detail}`);
       }
     };
-    if (state.parked) {
+    if (state.parked && !preflightError) {
       state.passesSincePark += 1;
       if (!emergencyFailClosed && passUsageSnapshot.percentage < RUST_PARK_PROBE_PRESSURE_BYPASS_PCT && state.passCount % RUST_PARK_RETRY_INTERVAL !== 0) {
         decision = "parked";
@@ -15645,7 +15985,7 @@ function createRustModeTransform(deps, options) {
         const id = messageIdOf(message) ?? `index:${todoStart + offset}`;
         const parts = message.parts?.filter((part) => isRecord4(part) && part.type === "tool" && part.tool === "todowrite");
         if (parts?.length) {
-          todoCalls.set(id, createHash4("sha256").update(JSON.stringify(parts)).digest("hex"));
+          todoCalls.set(id, createHash5("sha256").update(JSON.stringify(parts)).digest("hex"));
         } else {
           todoCalls.delete(id);
         }
@@ -15791,6 +16131,8 @@ function createRustModeTransform(deps, options) {
       };
       let body = buildTransformBody({
         sessionId,
+        rawRebuild,
+        servedRawBlockIds: servedRawBlockIds(deps.db, sessionId),
         input: encodedInput,
         nativeMessages: wireDelta ? messages.slice(wireDelta.rawStart) : messages,
         toolInputKeyOrders: toolInputKeyOrders(encodedInput),
@@ -15990,6 +16332,8 @@ function createRustModeTransform(deps, options) {
           const retryWireBuildStartedAt = performance.now();
           body = buildTransformBody({
             sessionId,
+            rawRebuild,
+            servedRawBlockIds: servedRawBlockIds(deps.db, sessionId),
             input: retryEncodedInput,
             nativeMessages: messages,
             toolInputKeyOrders: toolInputKeyOrders(retryEncodedInput),
@@ -16049,6 +16393,13 @@ function createRustModeTransform(deps, options) {
         sessionLog2(sessionId, `signed thinking reset fence: ${fenced.length} assistant(s) [${fenced.join(",")}]`);
       }
       const cacheBustingPass = moduleDecisionBusts;
+      if (rawRebuild?.pending && !moduleDecisionBusts) {
+        throw new EmergencyFailClosedError("Rust raw-rebuild request was not authorized by the module");
+      }
+      if (rawRebuild?.pending) {
+        frozenReleaseReason = `raw_replay_${rawRebuild.reason}`;
+        frozenReleaseFirstChanged = rawRebuild.firstBlockId;
+      }
       let frozenReplayReleased = false;
       if (markerAdmissionRecovery && !moduleDecisionBusts)
         throw new RustTransformProtocolError("rust marker admission recovery: supported prefix_bust_permitted=true required; upgrade ck-mc if unsupported");
@@ -16080,6 +16431,7 @@ function createRustModeTransform(deps, options) {
         let appliedMessages = moduleMessages;
         let markerStrategyFailure;
         let replayedFrozenRepresentation = false;
+        let reconstructedRaw = false;
         const boundaryId = response.boundary_id;
         if (typeof boundaryId === "string" && boundaryId.length > 0) {
           assertNativeBoundary(moduleMessages, sessionId, boundaryId);
@@ -16124,7 +16476,7 @@ function createRustModeTransform(deps, options) {
         }
         if (recoveryFenceRebuild) {
           frozenReplayReleased = true;
-          frozenReleaseReason = "lkg_recovery_fence_unproven";
+          frozenReleaseReason ??= "lkg_recovery_fence_unproven";
           frozenReleaseLastServed = { messages: null, proven: false };
         }
         if (state.lkgRepresentationFrozen && !shouldAdoptModuleAfterFreeze(moduleDecisionBusts, frozenReplayReleased)) {
@@ -16189,6 +16541,10 @@ function createRustModeTransform(deps, options) {
         if (!replayedFrozenRepresentation) {
           const outputCloneStartedAt = performance.now();
           appliedMessages = cloneModuleNativeOutput(moduleMessages);
+          if (!moduleDecisionBusts || rawRebuild?.pending && rawRebuild.reason.startsWith("candidate")) {
+            const covered = moduleDecisionBusts && typeof response.coverage_ordinal === "number" ? new Set([...state.idOrdinalMemo].filter(([, ordinal]) => ordinal <= Number(response.coverage_ordinal)).map(([id]) => id)) : new Set;
+            reconstructedRaw = preserveRustServedRaw(deps.db, sessionId, appliedMessages, messages, reconstructRaw, covered);
+          }
           timings.outputClone += performance.now() - outputCloneStartedAt;
         }
         pendingWireCache.nativeOutput = moduleMessages;
@@ -16247,7 +16603,7 @@ function createRustModeTransform(deps, options) {
             prefixPermissionSupported: permissionSupported,
             moduleReasoningTrimOnly: response.reasoning_trim_only === true,
             moduleSignedThinkingReset: response.signed_thinking_reset === true,
-            ...permissionSupported && (passStartedFrozen || frozenReleaseReason || coldStartLastServed) ? { frozenReleaseLastServed } : {},
+            ...moduleDecisionBusts && (passStartedFrozen || frozenReleaseReason || coldStartLastServed) ? { frozenReleaseLastServed } : {},
             trailingBlankSourceDecisions,
             trailingBlankNewestAssistantId: typeof trailingBlankNewestAssistantId === "string" ? trailingBlankNewestAssistantId : undefined,
             tagger: deps.tagger,
@@ -16258,6 +16614,23 @@ function createRustModeTransform(deps, options) {
           if (markerStrategyFailure)
             throw markerStrategyFailure;
         }
+        if (!moduleDecisionBusts && !replayedFrozenRepresentation) {
+          reconstructedRaw = preserveRustServedRaw(deps.db, sessionId, appliedMessages, messages, reconstructRaw) || reconstructedRaw;
+          replayRustModeBindingMismatchStrips({
+            db: deps.db,
+            sessionId,
+            messages: appliedMessages,
+            resolvedProviderID: model?.providerID
+          });
+          if (servedRawBlockIds(deps.db, sessionId).length > 0 && (!validateLkgSeam([], appliedMessages, model?.providerID ?? null) || model?.providerID === "anthropic" && !validateAnthropicReasoningRuns(appliedMessages.map((message) => ({
+            ...message,
+            parts: message.parts.filter((part) => !isRecord4(part) || !["text", "reasoning"].includes(String(part.type)) || part.text !== "")
+          }))))) {
+            throw new RustServedRawConflict("candidate_conflict", [
+              ...new Set(servedRawBlockIds(deps.db, sessionId).map((id) => id.replace(/#\d+$/, "")))
+            ], servedRawBlockIds(deps.db, sessionId)[0] ?? "unknown");
+          }
+        }
         if (typeof boundaryId === "string" && boundaryId.length > 0) {
           assertNativeBoundary(appliedMessages, sessionId, boundaryId);
         }
@@ -16293,6 +16666,24 @@ function createRustModeTransform(deps, options) {
           }
         }
         logStage(sessionId, "apply", applyStartedAt, timings);
+        if (frozenReleaseReason && frozenReleaseLastServed.messages && [...frozenReleaseLastServed.messages, ...appliedMessages].every((message) => isRecord4(message) && isRecord4(message.info) && Array.isArray(message.parts))) {
+          frozenReleaseFirstChanged = "none";
+          const byId = new Map(appliedMessages.map((message) => [message.info.id, message]));
+          for (const before of frozenReleaseLastServed.messages) {
+            const after = byId.get(before.info.id);
+            const index = before.parts.findIndex((part, i) => JSON.stringify(part) !== JSON.stringify(after?.parts[i]));
+            if (!after || index >= 0) {
+              const blockIndex = index > 0 ? encodeOpenCodeMessagesToCk([
+                { ...before, parts: before.parts.slice(0, index) }
+              ])[0].ck.content.length : 0;
+              frozenReleaseFirstChanged = `${before.info.id}#${blockIndex}`;
+              break;
+            }
+          }
+        }
+        if (replayedFrozenRepresentation || reconstructedRaw) {
+          noteRustServedRaw(deps.db, sessionId, messages, appliedMessages);
+        }
         const lkgInputIds = messages.map((message) => message.info.id);
         const lkgInputKeys = resolveLkgModelKeys(messages);
         const applyReplaceStartedAt = performance.now();
@@ -16550,6 +16941,9 @@ function createRustModeTransform(deps, options) {
           }
         }
       }
+      if (moduleDecisionBusts) {
+        releaseRustServedRaw(deps.db, sessionId, output.messages, rawRebuild?.identity);
+      }
     } catch (error) {
       if (markerDefinitelyNoCut) {
         try {
@@ -16687,7 +17081,12 @@ function createRustModeTransform(deps, options) {
   const adapter = {
     run: async (sessionId, messages, output, sessionMeta) => {
       try {
-        await withSqliteTransformPass2(() => run(sessionId, messages, output, sessionMeta));
+        await withReplayEnvelopeSnapshot(deps.db, sessionId, () => withSqliteTransformPass2(() => run(sessionId, messages, output, sessionMeta)));
+      } catch (error) {
+        if (error instanceof RustServedRawConflict) {
+          recordRawConflict(sessionId, error);
+        }
+        throw error;
       } finally {
         try {
           withoutSqliteTransformPass2(() => resolveHostRunner()?.pump(sessionId));
@@ -17111,15 +17510,27 @@ class UnmanagedOverWindowError extends Error {
 }
 
 // src/hooks/magic-context/unresolved-history-boundary.ts
+function storedHistoryBoundaryPresence(db, sessionId) {
+  try {
+    const row = db.prepare("SELECT cached_m0_last_baseline_end_message_id AS id FROM session_meta WHERE session_id = ?").get(sessionId);
+    return row?.id ? hasRawSessionMessageById2(sessionId, row.id) : undefined;
+  } catch {
+    return;
+  }
+}
+
 class UnresolvedHistoryBoundaryError extends Error {
   estimatedTokens;
   contextLimitTokens;
+  boundaryPresent;
   code = "UNRESOLVED_HISTORY_BOUNDARY";
   recoverable = true;
-  constructor(estimatedTokens, contextLimitTokens) {
-    super(renderUserFacingFailure("history_boundary_unresolved", "plain"));
+  constructor(estimatedTokens, contextLimitTokens, boundaryPresent) {
+    const reason = boundaryPresent === true ? "The boundary row is present in the host store but out of order relative to the loaded history. " : boundaryPresent === false ? "The boundary row is missing from the host store. " : "";
+    super(reason + renderUserFacingFailure("history_boundary_unresolved", "plain"));
     this.estimatedTokens = estimatedTokens;
     this.contextLimitTokens = contextLimitTokens;
+    this.boundaryPresent = boundaryPresent;
     this.name = "UnresolvedHistoryBoundaryError";
   }
 }
@@ -18276,7 +18687,7 @@ Historian previously failed ${historianFailureState.failureCount} time(s), so Ma
         });
         if (untrimmed.tokens > boundaryContextLimit) {
           sessionLog2(sessionId, `history boundary unresolved: prefix trim refused and the untrimmed request estimate ${untrimmed.tokens} (trusted=${untrimmed.trusted}) exceeds the context limit ${boundaryContextLimit}; not sending it`);
-          throw new UnresolvedHistoryBoundaryError(untrimmed.tokens, boundaryContextLimit);
+          throw new UnresolvedHistoryBoundaryError(untrimmed.tokens, boundaryContextLimit, storedHistoryBoundaryPresence(db, sessionId));
         }
       }
       if (unmanagedOverWindowPass) {
@@ -18603,6 +19014,114 @@ function resolveHistoryBudgetTokens(historyBudgetPercentage, contextUsage, execu
   }) / 100) * historyBudgetPercentage);
 }
 
+// src/shared/recovery-reasoning-prefix.ts
+function recoveryReasoningPrefixes(messages, partsKey) {
+  const prefixes = [];
+  for (let index = 0;index < messages.length; index++) {
+    const message = messages[index];
+    const parts = message?.[partsKey];
+    if (!Array.isArray(parts))
+      continue;
+    for (let p = 0;p < parts.length; p++) {
+      const type = parts[p]?.type;
+      if (type !== "thinking" && type !== "reasoning" && type !== "redactedThinking" && type !== "redacted_thinking")
+        continue;
+      prefixes.push(JSON.stringify([
+        ...messages.slice(0, index),
+        { ...message, [partsKey]: parts.slice(0, p + 1) }
+      ]));
+    }
+  }
+  return prefixes;
+}
+
+// src/hooks/magic-context/replay-committed-drops.ts
+function replayCommittedDrops(db, sessionId, messages) {
+  const original = messages;
+  const reasoningPrefixes = recoveryReasoningPrefixes(messages, "parts");
+  if (reasoningPrefixes.length)
+    messages = structuredClone(messages);
+  const tags = getTagsBySession2(db, sessionId).filter((tag) => tag.status === "dropped");
+  const toolTags = new Map(tags.filter((tag) => tag.type === "tool").map((tag) => [makeToolCompositeKey(tag.toolOwnerMessageId ?? "", tag.messageId), tag]));
+  const textTags = new Map(tags.filter((tag) => tag.type !== "tool").map((tag) => [tag.messageId, tag]));
+  const byNumber = new Map(tags.map((tag) => [tag.tagNumber, tag]));
+  const index = new Map;
+  const owners = new Map;
+  const resolvedOwners = new Map;
+  const ambiguousCalls = new Set;
+  const targets = new Map;
+  let precedingThinking = [];
+  const toolThinking = new Map;
+  const batch = new ToolMutationBatch(messages);
+  for (const message of messages) {
+    if (message.info.role === "user")
+      precedingThinking = [];
+    const thinking = message.parts.filter(isThinkingPart);
+    for (let p = 0;p < message.parts.length; p++) {
+      const part = message.parts[p];
+      const observation = extractToolCallObservation(part);
+      if (observation) {
+        const { callId, kind } = observation;
+        const pending = owners.get(callId) ?? [];
+        if (pending.length > 1)
+          ambiguousCalls.add(callId);
+        const hostingKey = makeToolCompositeKey(message.info.id ?? "", callId);
+        const owner = kind === "invocation" || part.type === "tool" || toolTags.has(hostingKey) ? message.info.id ?? "" : pending.shift() ?? resolvedOwners.get(callId) ?? message.info.id ?? "";
+        if (kind === "invocation")
+          pending.push(owner);
+        else
+          resolvedOwners.set(callId, owner);
+        owners.set(callId, pending);
+        const key = makeToolCompositeKey(owner, callId);
+        if (message.info.role === "tool" && !toolThinking.has(key))
+          toolThinking.set(key, precedingThinking);
+        const entry = index.get(key) ?? { occurrences: [], hasResult: false };
+        entry.occurrences.push({ message, part, kind });
+        entry.hasResult ||= kind === "result" && partHasCompletedResult(part);
+        index.set(key, entry);
+      } else {
+        const prefix = isTextPart(part) ? /^§(\d+)§\s/.exec(part.text) : null;
+        const tag = (prefix ? byNumber.get(Number(prefix[1])) : undefined) ?? textTags.get(`${message.info.id}:p${p}`) ?? textTags.get(`${message.info.id}:file${p}`);
+        if (tag && tag.type !== "tool")
+          targets.set(tag.tagNumber, {
+            message,
+            setContent(content) {
+              if (isTextPart(part)) {
+                if (part.text === content)
+                  return false;
+                part.text = content;
+              } else
+                message.parts[p] = { type: "text", text: content };
+              return true;
+            }
+          });
+      }
+    }
+    if (message.info.role === "assistant" && !message.parts.some(isTextPart))
+      precedingThinking = thinking;
+  }
+  const arcsByCall = new Map;
+  for (const entry of index.values()) {
+    const callId = extractToolCallObservation(entry.occurrences[0]?.part)?.callId ?? "";
+    arcsByCall.set(callId, (arcsByCall.get(callId) ?? 0) + 1);
+  }
+  for (const [key, entry] of index) {
+    const callId = extractToolCallObservation(entry.occurrences[0]?.part)?.callId ?? "";
+    if (ambiguousCalls.has(callId))
+      continue;
+    const tag = toolTags.get(key) ?? (arcsByCall.get(callId) === 1 ? toolTags.get(makeToolCompositeKey("", callId)) : undefined);
+    if (tag)
+      targets.set(tag.tagNumber, createToolDropTarget(key, toolThinking.get(key) ?? [], index, batch, tag.tagNumber));
+  }
+  applyFlushedStatuses(sessionId, db, targets, tags);
+  batch.finalize();
+  if (JSON.stringify(recoveryReasoningPrefixes(messages, "parts")) !== JSON.stringify(reasoningPrefixes))
+    return false;
+  if (messages !== original)
+    original.splice(0, original.length, ...messages);
+  return true;
+}
+
 // src/plugin/messages-transform.ts
 var ASSISTANT_TERMINAL_RETRY_MESSAGE = "The conversation ends with a completed assistant response and cannot be resubmitted as-is — send a new message to continue.";
 
@@ -18745,7 +19264,6 @@ function tryMessagesTransformLkgReplay(args) {
         sessionLog2(sessionId, "lkg_emergency_armed");
       } else {
         const inputMessages = output.messages;
-        const inputCount = inputMessages.length;
         const keys = resolveLkgModelKeys(inputMessages);
         const replay = replayLkg({
           sessionId,
@@ -18764,6 +19282,10 @@ function tryMessagesTransformLkgReplay(args) {
           sessionLog2(sessionId, "lkg_restart_rebuild_required");
           return false;
         }
+        if (replay.ok && !rust && !replayCommittedDrops(db, sessionId, replay.messages)) {
+          sessionLog2(sessionId, "lkg_reasoning_prefix_changed");
+          return false;
+        }
         let tsFit = true;
         if (replay.ok && !rust && keys.providerKey && keys.modelKey) {
           const model = {
@@ -18813,8 +19335,8 @@ function tryMessagesTransformLkgReplay(args) {
             return false;
           retirePendingSystemPromptDelivery(sessionId);
           args.onLkgReplay?.();
+          noteExternalLkgReplay(rust, sessionId, inputMessages, replay.messages);
           replaceMessagesInPlace2(output, replay.messages);
-          noteExternalLkgReplay(rust, sessionId, inputCount);
           sessionLog2(sessionId, "lkg_replay_served");
           return true;
         } else {
@@ -20124,7 +20646,7 @@ function computeOpenCodeWorkMetricsIncremental(openCodeDb, sessionId, carry) {
 import { readFileSync, statSync } from "node:fs";
 
 // src/plugin/embedding-bootstrap-helpers.ts
-import { createHash as createHash5 } from "node:crypto";
+import { createHash as createHash6 } from "node:crypto";
 var EMBEDDING_AFFECTING_KEYS = new Set([
   "embedding.api_key",
   "embedding.endpoint",
@@ -20172,7 +20694,7 @@ var EMBEDDING_WARNING_TERMS = [
 ];
 var loggedFailureSignatures = new Map;
 function sha256Prefix(value, length = 16) {
-  return createHash5("sha256").update(value).digest("hex").slice(0, length);
+  return createHash6("sha256").update(value).digest("hex").slice(0, length);
 }
 function warningLooksEmbeddingRelated(message) {
   const lower = message.toLowerCase();
@@ -21555,7 +22077,7 @@ function registerRpcHandlers(rpcServer, args) {
     const sessionId = String(params.sessionId ?? "");
     if (!sessionId)
       return { owner: false };
-    const sessionDirectory = liveSessionState.sessionDirectoryBySession.get(sessionId) ?? await readHostSessionDirectory(args.client, sessionId);
+    const sessionDirectory = args.readSessionDirectory ? await args.readSessionDirectory(sessionId) : await readHostSessionDirectory(args.client, sessionId) ?? liveSessionState.sessionDirectoryBySession.get(sessionId);
     if (!sessionDirectory)
       return { owner: false };
     return {
@@ -21626,7 +22148,7 @@ function registerRpcHandlers(rpcServer, args) {
     return { count: buildCompartmentCount(db, sessionId, moduleStatus) };
   });
   const buildManagedCtx = async (db) => {
-    const { deriveHistorianChunkTokens, resolveHistorianContextLimit } = await importPluginModule(() => import("./derive-budgets-enckmg7y.js"));
+    const { deriveHistorianChunkTokens, resolveHistorianContextLimit } = await importPluginModule(() => import("./derive-budgets-0rmpmxjw.js"));
     const { resolveHistorianModel } = await importPluginModule(() => import("./model-resolution-nx97z3x7.js"));
     const { userMemoryCollectionEnabled } = await importPluginModule(() => import("./task-config-x0hq3qfd.js"));
     const DEFAULT_HISTORIAN_TIMEOUT_MS = 10 * 60 * 1000;
@@ -21641,6 +22163,7 @@ function registerRpcHandlers(rpcServer, args) {
       directory,
       historianChunkTokens: deriveHistorianChunkTokens(resolveHistorianContextLimit(historianModel.primary?.model)),
       historianTimeoutMs: runConfig.historian_timeout_ms ?? DEFAULT_HISTORIAN_TIMEOUT_MS,
+      historianMaxOutputTokens: runConfig.historian?.maxTokens,
       memoryEnabled: config.memory?.enabled ?? true,
       autoPromote: runConfig.memory?.auto_promote ?? true,
       historianModel: historianModel.primary,
@@ -21655,6 +22178,20 @@ function registerRpcHandlers(rpcServer, args) {
     const sessionId = String(params.sessionId ?? "");
     if (!sessionId)
       return { ok: false, error: "no session" };
+    const readDirectory = args.readSessionDirectory;
+    if (readDirectory) {
+      const { handoffHistoryWork } = await import("./history-owner-2cr9py37.js");
+      const handed = await handoffHistoryWork({
+        storageDir: args.storageDir ?? getMagicContextStorageDir(),
+        directory,
+        sessionId,
+        method: "recomp",
+        params,
+        readDirectory: () => readDirectory(sessionId)
+      });
+      if (handed)
+        return handed;
+    }
     const dir = String(params.directory ?? directory);
     if (config.transform_mode === "rust") {
       return executeRustRecompRpc(rustModeModuleClient, sessionId, dir);
@@ -21662,8 +22199,8 @@ function registerRpcHandlers(rpcServer, args) {
     const db = readDatabase();
     if (!db)
       return { ok: false, error: "db unavailable" };
-    const { runManagedRecomp } = await importPluginModule(() => import("./recomp-orchestrator-v64r4s4r.js"));
-    const { sendIgnoredMessage } = await importPluginModule(() => import("./send-session-notification-5aj2j7vf.js"));
+    const { runManagedRecomp } = await importPluginModule(() => import("./recomp-orchestrator-ee91r9s6.js"));
+    const { sendIgnoredMessage } = await importPluginModule(() => import("./send-session-notification-6n7chhyp.js"));
     log2(`[rpc] recomp requested for session ${sessionId}`);
     if (!args.client && !args.hiddenCompletionExecutor) {
       return {
@@ -21719,6 +22256,21 @@ function registerRpcHandlers(rpcServer, args) {
     return { ok: true, message };
   });
   rpcServer.handle("wrapup", async (params) => {
+    const readDirectory = args.readSessionDirectory;
+    if (readDirectory && params.sessionId) {
+      const { handoffHistoryWork } = await import("./history-owner-2cr9py37.js");
+      const sessionId = String(params.sessionId);
+      const handed = await handoffHistoryWork({
+        storageDir: args.storageDir ?? getMagicContextStorageDir(),
+        directory,
+        sessionId,
+        method: "wrapup",
+        params,
+        readDirectory: () => readDirectory(sessionId)
+      });
+      if (handed)
+        return handed;
+    }
     const sessionId = String(params.sessionId ?? "");
     if (!sessionId)
       return { ok: false, error: "no session" };
@@ -21732,7 +22284,7 @@ function registerRpcHandlers(rpcServer, args) {
     const db = readDatabase();
     if (!db)
       return { ok: false, error: "db unavailable" };
-    const { runManagedWrapup } = await importPluginModule(() => import("./wrapup-orchestrator-cahk37n7.js"));
+    const { runManagedWrapup } = await importPluginModule(() => import("./wrapup-orchestrator-5wxy1ggv.js"));
     const model = liveSessionState.liveModelBySession.get(sessionId);
     const contextLimit = model ? resolveContextLimit(model.providerID, model.modelID, { db, sessionID: sessionId }) : 128000;
     const ctx = {
@@ -22157,7 +22709,7 @@ class MagicContextRpcServer {
     }
     this.startedAt = Date.now();
     const self = this;
-    const server = Bun.serve({
+    const server = inRootAsyncContext2(() => Bun.serve({
       port: 0,
       hostname: "127.0.0.1",
       fetch(req, srv) {
@@ -22180,7 +22732,7 @@ class MagicContextRpcServer {
           self.sockets.delete(ws);
         }
       }
-    });
+    }));
     this.server = server;
     this.port = server.port ?? 0;
     try {
@@ -22721,8 +23273,8 @@ function hostMediaFromEncoded(value) {
 import { randomUUID as randomUUID4 } from "node:crypto";
 
 // src/v2/fold/owner.ts
-import { createHash as createHash6 } from "node:crypto";
-var foldDigest = (value) => createHash6("sha256").update(value).digest("hex");
+import { createHash as createHash7 } from "node:crypto";
+var foldDigest = (value) => createHash7("sha256").update(value).digest("hex");
 
 class FoldOwner {
   storage;
@@ -23063,12 +23615,12 @@ function placeCacheHint(content, hint) {
   const index = lastText >= 0 ? lastText : content.length - 1;
   content[index] = { ...content[index], cache: hint };
 }
-function removeEmptyTextParts(content, rendered) {
+function removeEmptyTextParts(content, rendered, mayRemove) {
   let hint;
   let removed = 0;
   for (let index = content.length - 1;index >= 0; index -= 1) {
     const part = content[index];
-    if (part?.type !== "text" || part.text !== "")
+    if (part?.type !== "text" || part.text !== "" || !mayRemove(part))
       continue;
     if (hint === undefined)
       hint = part.cache;
@@ -23144,12 +23696,14 @@ function contentValueAttachments(value) {
     ...typeof item.name === "string" ? { filename: item.name } : {}
   }));
 }
-function rebuildFileContent(value, output) {
+function rebuildFileContent(value, output, attachments) {
   if (isDroppedToolOutput(output))
     return { type: "text", value: output };
   const rebuilt = [];
   let placed = false;
   for (const item of value) {
+    if (item?.type === "file" && Array.isArray(attachments) && !attachments.some((attachment) => attachment?.url === item.uri && attachment?.mime === item.mime))
+      continue;
     if (item?.type !== "text") {
       rebuilt.push(item);
       continue;
@@ -23292,14 +23846,16 @@ function adaptPayload(draft, admittedIDs = new Set) {
       let head = 0;
       const rendered = [];
       const emptyTextGuard = modelAcceptsEmptyContent(draft.model.providerID);
+      const imageOmissions = getEmptyImageParts(messages);
       let omitted = 0;
       let emptyTextParts = 0;
       for (const message of messages) {
         const original = originals.get(message) ?? (typeof message.info.id === "string" ? originalsByID.get(message.info.id) : undefined);
         const id = message.info.syntheticHead ? HEAD_IDS[head++] : original?.id;
         const content = [];
+        const emptyImages = new Set;
         const following = [];
-        for (const candidate of message.parts) {
+        for (const [partIndex, candidate] of message.parts.entries()) {
           const part = candidate;
           const bridge = bridges.get(part) ?? (part.type === "tool" && typeof part.callID === "string" ? bridgesFor(message)?.get(part.callID) : undefined);
           if (!bridge) {
@@ -23355,7 +23911,10 @@ function adaptPayload(draft, admittedIDs = new Set) {
             }
             const { synthetic: _synthetic, ...clean } = part;
             const original = hostPartTypes.has(clean.type) && !containsHostInstance(clean) ? hostParts.get(contentKey(clean)) : undefined;
-            content.push(original ?? clean);
+            const projected = original ?? clean;
+            if (imageOmissions.get(message.info.id ?? "")?.has(partIndex))
+              emptyImages.add(projected);
+            content.push(projected);
             continue;
           }
           const state = part.state;
@@ -23387,7 +23946,7 @@ function adaptPayload(draft, admittedIDs = new Set) {
           if (bridge.result && bridge.resultMessage) {
             const result = {
               ...bridge.result,
-              result: state.output === bridge.output ? bridge.result.result : bridge.files && typeof state.output === "string" ? rebuildFileContent(bridge.files, state.output) : {
+              result: state.output === bridge.output ? bridge.result.result : bridge.files && typeof state.output === "string" ? rebuildFileContent(bridge.files, state.output, state.attachments) : {
                 type: state.status === "error" ? "error" : "text",
                 value: state.output
               }
@@ -23398,7 +23957,7 @@ function adaptPayload(draft, admittedIDs = new Set) {
               following.push({ ...bridge.resultMessage, content: [result] });
           }
         }
-        const guarded = emptyTextGuard ? removeEmptyTextParts(content, rendered) : 0;
+        const guarded = removeEmptyTextParts(content, rendered, (part) => emptyTextGuard || emptyImages.has(part));
         if (content.length || !original?.content.length && guarded === 0) {
           const value = {
             ...original,
@@ -23408,7 +23967,7 @@ function adaptPayload(draft, admittedIDs = new Set) {
           };
           const existing = id ? existingHeads.get(id) : undefined;
           rendered.push(existing ? Object.assign(existing, { content }) : value);
-        } else if (emptyTextGuard) {
+        } else if (emptyTextGuard || guarded > 0) {
           omitted += 1;
         }
         emptyTextParts += guarded;
@@ -23416,7 +23975,7 @@ function adaptPayload(draft, admittedIDs = new Set) {
       }
       if (omitted + emptyTextParts > 0 && !emptyTextOmissionLogged.has(draft.sessionID)) {
         emptyTextOmissionLogged.add(draft.sessionID);
-        sessionLog2(draft.sessionID, `v2 payload: left out ${omitted} emptied messages and ${emptyTextParts} empty text parts, because Anthropic rejects an empty text block (logged once per session)`);
+        sessionLog2(draft.sessionID, `v2 payload: left out ${omitted} emptied messages and ${emptyTextParts} empty text parts, ${emptyTextGuard ? "because Anthropic rejects an empty text block" : "to replay frozen image omissions"} (logged once per session)`);
       }
       draft.messages.splice(0, draft.messages.length, ...rendered);
     }
@@ -24306,7 +24865,7 @@ function createNativeHiddenChildren(host, removeSession, options) {
     }
     const directory = stored.location?.directory;
     if (options.directory !== undefined && directory !== undefined && !sameProjectDirectory(directory, options.directory)) {
-      throw new HiddenCompletionRefusal("hidden_prompt_unrecognized", `hidden child ${sessionID} is bound to ${directory}, not to this instance's ${options.directory}`, true);
+      throw new HiddenCompletionRefusal("hidden_prompt_unrecognized", `hidden child ${sessionID} is bound to ${directory}, not to this instance's ${options.directory}. Reopen the parent session in ${directory}, then run /ctx-recomp so its owning instance can rebuild history.`, true);
     }
     if (stored.parentID === parentID || parentDroppedNoted)
       return;
@@ -24933,7 +25492,7 @@ async function createV2HiddenCompletionExecutor(host, options) {
         budgetReject = reject;
       });
       if (budget) {
-        budgetPoll = setInterval(() => {
+        budgetPoll = inRootAsyncContext2(() => setInterval(() => {
           try {
             const fresh = withReader(options.openReader, (reader) => reader.assistantSince?.(run.child.id, usageSeq) ?? (() => {
               const latest = reader.latestAssistant(run.child.id);
@@ -24947,7 +25506,10 @@ async function createV2HiddenCompletionExecutor(host, options) {
               const decision = budget.charge(Math.max(0, tokens?.input ?? 0), Math.max(0, tokens?.cache?.read ?? 0), Math.max(0, tokens?.cache?.write ?? 0), row.data.finish === "stop" && !(row.data.content ?? []).some((part) => part.type === "tool-call"), false);
               const onBudgetUpdate = run.identity.metadata?.onBudgetUpdate;
               if (typeof onBudgetUpdate === "function")
-                onBudgetUpdate({ ...budget.snapshot(), sessionId: run.child.id });
+                onBudgetUpdate({
+                  ...budget.snapshot(),
+                  sessionId: run.child.id
+                });
               if (decision !== "continue") {
                 if (budgetPoll)
                   clearInterval(budgetPoll);
@@ -24961,7 +25523,7 @@ async function createV2HiddenCompletionExecutor(host, options) {
               clearInterval(budgetPoll);
             budgetReject(error instanceof Error ? error : new Error(String(error)));
           }
-        }, POLL_INTERVAL_MS);
+        }, POLL_INTERVAL_MS));
       }
       let abortReject;
       const aborted = new Promise((_resolve, reject) => {
@@ -25316,11 +25878,11 @@ class DeletedSessionTombstones {
 }
 
 // src/features/magic-context/dreamer/task-executor.ts
-import { createHash as createHash13 } from "node:crypto";
+import { createHash as createHash14 } from "node:crypto";
 import { existsSync as existsSync7, readFileSync as readFileSync8 } from "node:fs";
 
 // src/features/magic-context/mural/compress-cues.ts
-import { createHash as createHash7 } from "node:crypto";
+import { createHash as createHash8 } from "node:crypto";
 
 // src/features/magic-context/dreamer/storage-dream-state.ts
 var getDreamStateStatements = new WeakMap;
@@ -25523,7 +26085,7 @@ function startLeaseHeartbeat(db, holderId, leaseKey, onLost, intervalOrAcquisiti
     }
   };
   beat();
-  const timer = lost ? undefined : setInterval(() => withSqliteBackgroundWriter2(beat), intervalMs);
+  const timer = lost ? undefined : inRootAsyncContext2(() => setInterval(() => withSqliteBackgroundWriter2(beat), intervalMs));
   return {
     stop: () => {
       if (timer)
@@ -26050,7 +26612,7 @@ async function applyCuesThroughModule(args, chunk, manifestText, signal) {
       log2(`[dreamer] compress-cues: skipped cue for memory ${entry.id} (${failure.reason}; rejection ${rejectionCount}/${CUE_REJECTION_LATCH_THRESHOLD})`);
     }
   }
-  const commandId = `mural-cues:${route.moduleCommandId}:${createHash7("sha256").update(chunk.map((candidate) => candidate.memory.id).join(",")).digest("hex").slice(0, 24)}`;
+  const commandId = `mural-cues:${route.moduleCommandId}:${createHash8("sha256").update(chunk.map((candidate) => candidate.memory.id).join(",")).digest("hex").slice(0, 24)}`;
   let response;
   try {
     response = await route.moduleClient.call({
@@ -26149,6 +26711,25 @@ async function runHiddenSingleShotPrompt(args) {
     });
     promptSettled = true;
     return { validated: run.validated, completion: run.output, childSessionId: handle.id };
+  } catch (error) {
+    if (args.onFailureOutput) {
+      let timer;
+      try {
+        const completion = await Promise.race([
+          args.executor.collect(handle, 200),
+          new Promise((resolve) => {
+            timer = setTimeout(() => resolve(null), 5000);
+          })
+        ]);
+        if (completion)
+          args.onFailureOutput(completion);
+      } catch (readError) {
+        log2(`${args.callContext}: failed to collect interrupted output: ${String(readError)}`);
+      } finally {
+        clearTimeout(timer);
+      }
+    }
+    throw error;
   } finally {
     await args.executor.close(handle, {
       promptSettled,
@@ -26619,7 +27200,7 @@ function applyReviewVerdict(args, leaseKey, parsed, result) {
 }
 
 // src/features/magic-context/dreamer/classify.ts
-import { createHash as createHash8 } from "node:crypto";
+import { createHash as createHash9 } from "node:crypto";
 
 // src/plugin/rust-tool-backends.ts
 function isRustAuthorityDrainingError(error) {
@@ -27056,7 +27637,7 @@ async function runClassifyThroughModule(args, chunk, anchors, signal, runOnHost)
     if (entry.qualifier)
       modelVariants[entry.model] = entry.qualifier;
   }
-  const commandId = `classify:${args.moduleCommandId ?? Date.now()}:${createHash8("sha256").update(chunk.map((candidate) => candidate.id).join(",")).digest("hex").slice(0, 24)}`;
+  const commandId = `classify:${args.moduleCommandId ?? Date.now()}:${createHash9("sha256").update(chunk.map((candidate) => candidate.id).join(",")).digest("hex").slice(0, 24)}`;
   const runTask = (hostCompletion) => args.moduleClient?.call({
     sessionId: args.moduleSessionId,
     projectRoot: args.moduleProjectRoot,
@@ -27331,7 +27912,7 @@ function takeCurateSafetyRefusalCount(sessionId) {
 
 // src/features/magic-context/dreamer/docs-proposals.ts
 import { execFileSync } from "node:child_process";
-import { createHash as createHash9 } from "node:crypto";
+import { createHash as createHash10 } from "node:crypto";
 import {
   existsSync as existsSync4,
   mkdirSync,
@@ -27346,7 +27927,7 @@ import {
 import { tmpdir } from "node:os";
 import { join as join7 } from "node:path";
 var FILES = ["ARCHITECTURE.md", "STRUCTURE.md"];
-var hash = (text) => createHash9("sha256").update(text).digest("hex");
+var hash = (text) => createHash10("sha256").update(text).digest("hex");
 var proposalDir = (projectDir) => join7(projectDir, ".cortexkit/magic-context/docs-update-proposals");
 function docsBaseHashes(projectDir) {
   return Object.fromEntries(FILES.map((name) => [
@@ -27882,7 +28463,7 @@ function throwIfAborted2(signal) {
 }
 
 // src/features/magic-context/smart-notes/compiler.ts
-import { createHash as createHash10 } from "node:crypto";
+import { createHash as createHash11 } from "node:crypto";
 
 // src/features/magic-context/smart-notes/compiler-prompt.ts
 var SMART_NOTE_COMPILER_SYSTEM_PROMPT = `You are the Magic Context smart-note compiler for the magic-context system.
@@ -28213,7 +28794,7 @@ function manifestAdvisoryWarnings(code, manifest) {
   return warnings;
 }
 function hashCheck(surfaceCondition, compiledCheck, manifest, checkCron) {
-  return createHash10("sha256").update(surfaceCondition ?? "").update("\x00").update(compiledCheck).update("\x00").update(JSON.stringify(manifest)).update("\x00").update(checkCron).digest("hex");
+  return createHash11("sha256").update(surfaceCondition ?? "").update("\x00").update(compiledCheck).update("\x00").update(JSON.stringify(manifest)).update("\x00").update(checkCron).digest("hex");
 }
 function extractJsonObject(output) {
   const fenced = output.match(/```(?:json)?\s*([\s\S]*?)```/i);
@@ -28307,10 +28888,10 @@ async function probeWakePlaneCatalog() {
   if (!await connectionFileExists(file)) {
     throw new Error("subc connection is not configured");
   }
-  const client = await SubcClient.connect({
+  const client = await inRootAsyncContext2(() => SubcClient.connect({
     connectionFile: file,
     handshakeTimeoutMs: WAKE_PLANE_HANDSHAKE_TIMEOUT_MS
-  });
+  }));
   try {
     return await client.catalogList();
   } finally {
@@ -28979,34 +29560,36 @@ function snapshotMaintainDocsFiles(docsDir) {
 }
 
 // src/features/magic-context/dreamer/map-memories.ts
-import { createHash as createHash11 } from "node:crypto";
+import { createHash as createHash12 } from "node:crypto";
 
 // src/features/magic-context/dreamer/map-memories-prompt.ts
+import { execFile as execFile2 } from "node:child_process";
 import { existsSync as existsSync6, statSync as statSync3 } from "node:fs";
 import path4 from "node:path";
+import { promisify as promisify2 } from "node:util";
 var MAP_MEMORIES_SYSTEM_PROMPT = `You are a memory mapper for the magic-context system. You map project memories to the repository files that back them.
 
 A memory's BACKING FILES are the file(s) whose code the memory makes a claim about — the files you would open to check whether the memory is accurate. You do NOT judge accuracy, rewrite, or remove anything. You only LOCATE backing files.
 
-Tools (read-only): read, grep, glob. Request line ranges rather than full files; use offset/limit for longer files. Each memory may come with "Likely files" already named in it and confirmed to exist — confirm those FIRST (cheap) instead of searching. Use search/grep to FIND code only when no likely files are given. Do not guess — confirm a file exists and genuinely backs the memory before listing it. Keep reads minimal: you do not need to read a whole file to confirm it backs a one-line claim.
+Tools (read-only): read, grep, glob. Use at most 3 tool calls per memory, including searches and reads. Never read the same file twice in a batch; reuse what you already learned. Never repeat an identical search or use broad searches such as "fn " or ".*". Request one useful line range, not repeated slices. Each memory may come with "Likely files" from paths it names or a literal identifier search, confirmed to exist — confirm those FIRST (cheap) instead of searching. Use search/grep to FIND code only when no likely files are given. Do not guess — confirm a file exists and genuinely backs the memory before listing it. You are locating code, not exhaustively verifying the claim. If the call budget runs out before you can decide, leave that id unmapped and move on; uncertainty is not evidence of file-independence.
 
 For each memory decide ONE of:
-- Backing files found → the COMPLETE set of repo-relative paths whose code the memory is about.
+- Backing files found → the specific repo-relative paths whose code the memory is about; do not chase every caller or related implementation.
 - File-independent → the memory describes EXTERNAL behavior (a provider / API / platform / protocol limit, e.g. "Anthropic returns 400 on empty content"), or a pure process / workflow / philosophy rule, with NO specific local file that backs it. A BEHAVIORAL claim (when to act, how to work, who decides, or tool-usage discipline) is file-independent even when it cites file paths or commands as examples: a named file is not the file backing the rule.
 
-Output ONE XML manifest at the very end and NOTHING else — no narration, no per-memory commentary, no reasoning:
+Output ONE XML manifest and NOTHING else — no narration, no per-memory commentary, no reasoning. Open <mappings> before investigating. Emit each <memory> element as soon as you decide its mapping, before investigating the next memory, so an interruption cannot lose completed work. Close </mappings> when finished:
 <mappings>
 <memory id="N" files="path/a.ts,path/b.ts"/>
 <memory id="M" independent="true"/>
 </mappings>
 
 Rules:
-- Every input memory id MUST appear exactly once.
+- Every decided input memory id MUST appear exactly once. Omit uncertain ids rather than inventing backing files or declaring them independent.
 - files: repo-relative, comma-separated, no spaces inside a path. Only files that actually exist and genuinely back the memory.
 - A BACKING FILE is CODE that implements or handles the claim — not a file that merely mentions it. A path named inside a process directive is an action target or example, not evidence that the file backs the directive. A markdown doc (.md), a PARITY/notes file, or a test that only DESCRIBES an external fact is NOT a backing file. If the only place a memory's fact appears is prose/docs/a test (no code implements or handles it), mark it independent="true".
 - Many CONSTRAINTS are HYBRID: "external system does X, and OUR code handles it here." Map those to the HANDLING code (you can verify the handling, even though you can't verify the external behavior). Only mark independent when there is NO local code that implements or handles the fact.
 - Prefer the most specific file(s); do not pad with tangential files. Most memories map to one file; some to a few.
-- When you genuinely cannot find any local backing and it is not clearly external, still emit the memory with independent="true" (do not drop it).`;
+- Mark independent="true" only for the file-independent cases above; an investigation that runs out of calls stays unmapped.`;
 var MAX_SEED_PATHS_PER_MEMORY = 3;
 var PATH_PATTERN = "`?((?:[\\w.-]+\\/)+[\\w.-]+\\.(?:ts|tsx|js|jsx|mjs|cjs|rs|go|py|json|jsonc|sql|toml|sh))`?";
 function extractMemoryCandidatePaths(content, repoDir) {
@@ -29028,10 +29611,65 @@ function extractMemoryCandidatePaths(content, repoDir) {
   }
   return [...found];
 }
+var execFileAsync2 = promisify2(execFile2);
+async function seedIdentifierCandidates(memories, repoDir) {
+  const identifiers = new Map(memories.filter((memory) => memory.candidates.length === 0).map((memory) => [
+    memory.id,
+    [
+      ...new Set(memory.content.match(/\b(?:[A-Z][A-Za-z0-9_]{3,}|[a-z][a-z0-9]*[A-Z][A-Za-z0-9_]*|[a-z][a-z0-9]*_[A-Za-z0-9_]{2,})\b/g) ?? [])
+    ].slice(0, 3)
+  ]));
+  const terms = [...new Set([...identifiers.values()].flat())];
+  if (terms.length === 0)
+    return memories;
+  let stdout;
+  try {
+    const result = await execFileAsync2("git", [
+      "-c",
+      "core.quotePath=false",
+      "grep",
+      "--no-color",
+      "-n",
+      "-I",
+      "-F",
+      ...terms.flatMap((term) => ["-e", term]),
+      "--",
+      ...["ts", "tsx", "js", "jsx", "mjs", "cjs", "rs", "go", "py", "sql", "sh"].map((extension) => `*.${extension}`)
+    ], {
+      cwd: repoDir,
+      encoding: "utf8",
+      timeout: 2000,
+      maxBuffer: 256 * 1024,
+      windowsHide: true,
+      killSignal: "SIGKILL"
+    });
+    stdout = result.stdout;
+  } catch {
+    return memories;
+  }
+  const matches = stdout.split(`
+`).flatMap((line) => {
+    const match = line.match(/^([^:]+):\d+:(.*)$/);
+    return match ? [{ file: match[1], text: match[2] }] : [];
+  });
+  return memories.map((memory) => {
+    const names = identifiers.get(memory.id);
+    if (!names?.length)
+      return memory;
+    const files = new Map;
+    for (const match of matches) {
+      const score = names.filter((name) => match.text.includes(name)).length;
+      if (score)
+        files.set(match.file, Math.max(files.get(match.file) ?? 0, score));
+    }
+    const candidates = [...files].sort((a, b) => b[1] - a[1] || a[0].localeCompare(b[0])).slice(0, MAX_SEED_PATHS_PER_MEMORY).map(([file]) => file);
+    return candidates.length ? { ...memory, candidates } : memory;
+  });
+}
 function buildMapMemoriesPrompt(projectPath, memories) {
   const list = memories.map((m) => {
     const seed = m.candidates.length ? `
-Likely files (named in the memory, confirmed to exist): ${m.candidates.join(", ")}` : "";
+Likely files (candidate paths, confirmed to exist): ${m.candidates.join(", ")}` : "";
     return `[${m.id}] ${m.category}
 ${m.content}${seed}`;
   }).join(`
@@ -29041,13 +29679,13 @@ ${m.content}${seed}`;
 
 Project: ${projectPath}
 
-For each memory below, find the repo file(s) it makes a claim about, or mark it file-independent. Behavioral process/workflow directives stay file-independent even when they name files. When "Likely files" are listed, those paths are named in the memory and confirmed to exist — START there only for code claims: confirm each actually backs the claim (a quick read/outline), drop any that don't, add others only if genuinely needed. Search from scratch only when no likely files are given. Then output ONE <mappings> manifest covering every id.
+For each memory below, find the repo file(s) it makes a claim about, or mark it file-independent. Behavioral process/workflow directives stay file-independent even when they name files. When "Likely files" are listed, those paths either occur in the memory or match its identifiers in a bounded literal source search — START there only for code claims: confirm each actually backs the claim (a quick read/outline), drop any that don't, add others only if genuinely needed. Search from scratch only when no likely files are given. Use at most 3 tool calls per memory, reuse prior reads, and emit each decided mapping immediately in ONE <mappings> manifest. Leave uncertain ids unmapped and move on.
 
 <memories>
 ${list}
 </memories>`;
 }
-var MEMORY_ELEMENT_PATTERN = "<memory\\b([^>]*)(?:\\/>|>([\\s\\S]*?)<\\/memory>)";
+var MEMORY_ELEMENT_PATTERN = "<memory\\b([^<>]*)(?:\\/>|>([\\s\\S]*?)<\\/memory>)";
 var NESTED_FILE_PATTERN = "<file\\b([^>]*)\\/?>";
 function extractNestedFilePaths(inner) {
   const files = [];
@@ -29105,12 +29743,78 @@ function validateMapMemoriesManifest(text, expectedIds) {
   assertNoDuplicateManifestIds(parsed.filter((entry) => expectedIds.has(entry.id)).map((entry) => entry.id), "mappings");
   return parsed;
 }
+function parsePartialMapMemoriesManifest(text, expectedIds) {
+  const start = text.indexOf("<mappings>");
+  if (start < 0)
+    return [];
+  const entries = new Map;
+  const conflicts = new Set;
+  for (const match of text.slice(start).matchAll(new RegExp(MEMORY_ELEMENT_PATTERN, "gi"))) {
+    try {
+      const entry = parseMapMemoriesManifest(`<mappings>${match[0]}</mappings>`)[0];
+      if (!entry || !expectedIds.has(entry.id) || conflicts.has(entry.id))
+        continue;
+      const previous = entries.get(entry.id);
+      if (previous && JSON.stringify(previous) !== JSON.stringify(entry)) {
+        entries.delete(entry.id);
+        conflicts.add(entry.id);
+      } else {
+        entries.set(entry.id, entry);
+      }
+    } catch {}
+  }
+  return [...entries.values()];
+}
 
 // src/features/magic-context/dreamer/map-memories.ts
-var MAP_BATCH_SIZE = 20;
+var MAP_BATCH_SIZE = 5;
 var MAP_BATCH_FLOOR_MS = 240000;
 var CONSECUTIVE_TIMEOUT_LIMIT2 = 2;
 var MAX_INDEPENDENT_REQUEUE_PER_RUN = MAP_BATCH_SIZE;
+function retryKey(project) {
+  return `map-memories:retry:${project}`;
+}
+function readRetries(db, project) {
+  try {
+    const parsed = JSON.parse(getDreamState(db, retryKey(project)) ?? "{}");
+    if (!isRecord(parsed))
+      return {};
+    const retries = {};
+    for (const [id, value] of Object.entries(parsed)) {
+      if (isRecord(value) && typeof value.content === "string" && typeof value.failures === "number" && typeof value.deferUntil === "number") {
+        retries[id] = {
+          content: value.content,
+          failures: value.failures,
+          deferUntil: value.deferUntil
+        };
+      }
+    }
+    return retries;
+  } catch {
+    return {};
+  }
+}
+function contentKey2(memory) {
+  return createHash12("sha256").update(`${memory.category}
+${memory.content}`).digest("hex");
+}
+function isDeferred(memory, retries) {
+  const retry = retries[memory.id];
+  return !!retry && retry.content === contentKey2(memory) && retry.deferUntil > Date.now();
+}
+function assistantText2(messages) {
+  return messages.filter((message) => isRecord(message) && (message.role === "assistant" || isRecord(message.info) && message.info.role === "assistant")).map((message) => extractLatestAssistantText([message]) ?? (isRecord(message) && Array.isArray(message.content) ? message.content.filter(isRecord).filter((part) => part.type === "text" && typeof part.text === "string").map((part) => part.text).join(`
+`) : "")).join(`
+`);
+}
+function currentManifest(text) {
+  const start = text.lastIndexOf("<mappings>");
+  return start < 0 ? text : text.slice(start);
+}
+function logBatchUsage(messages, committed, startedAt) {
+  const steps = messages.filter((message) => isRecord(message) && (message.role === "assistant" || isRecord(message.info) && message.info.role === "assistant")).length;
+  log2(`[dreamer] map-memories batch: steps=${steps} committed=${committed} steps_per_memory=${committed ? (steps / committed).toFixed(2) : "n/a"} elapsed_ms=${Date.now() - startedAt}`);
+}
 function computeMapBatchSliceMs(remainingMs, batchesRemaining) {
   return Math.min(remainingMs, Math.max(MAP_BATCH_FLOOR_MS, Math.floor(remainingMs / batchesRemaining)));
 }
@@ -29132,7 +29836,7 @@ function toMapInput(memory, repoDir) {
     candidates: extractMemoryCandidatePaths(memory.content, repoDir)
   };
 }
-function selectMapMemoryInputs(db, projectIdentity, repoDir) {
+function selectMapMemoryInputs(db, projectIdentity, repoDir, includeDeferred = false) {
   const active = getMemoriesByProject2(db, projectIdentity);
   const activeIds = active.map((m) => m.id);
   const unmapped = new Set(getUnmappedMemoryIds(db, activeIds));
@@ -29151,7 +29855,8 @@ function selectMapMemoryInputs(db, projectIdentity, repoDir) {
     if (requeue.length >= MAX_INDEPENDENT_REQUEUE_PER_RUN)
       break;
   }
-  return [...unmappedInputs, ...requeue];
+  const retries = readRetries(db, projectIdentity);
+  return [...unmappedInputs, ...requeue].filter((memory) => includeDeferred || !isDeferred(memory, retries));
 }
 async function mapMemories(args) {
   const result = {
@@ -29161,14 +29866,21 @@ async function mapMemories(args) {
     remaining: 0,
     complete: true
   };
-  const inputs = selectMapMemoryInputs(args.db, args.projectIdentity, args.sessionDirectory);
+  const allInputs = selectMapMemoryInputs(args.db, args.projectIdentity, args.sessionDirectory, true);
+  const retries = readRetries(args.db, args.projectIdentity);
+  const activeIds = new Set(allInputs.map((memory) => String(memory.id)));
+  for (const id of Object.keys(retries))
+    if (!activeIds.has(id))
+      delete retries[id];
+  const inputs = allInputs.filter((memory) => !isDeferred(memory, retries));
+  result.remaining = allInputs.length;
+  result.complete = result.remaining === 0;
   if (inputs.length === 0)
     return result;
   const batches = [];
   for (let i = 0;i < inputs.length; i += MAP_BATCH_SIZE) {
     batches.push({ inputs: inputs.slice(i, i + MAP_BATCH_SIZE), isOmissionRetry: false });
   }
-  result.remaining = inputs.length;
   const abortController = new AbortController;
   const heartbeat = startLeaseHeartbeat(args.db, args.holderId, args.leaseKey, (reason) => abortController.abort(new Error(reason)), args.leaseAcquisition);
   try {
@@ -29191,6 +29903,24 @@ async function mapMemories(args) {
         break;
       const outcome = await mapOneBatch(args, batch.inputs, sliceMs, abortController.signal);
       const committed = outcome.mapped + outcome.independent;
+      runLeaseGuardedWrite(args.db, args.holderId, args.leaseKey, () => {
+        const committedIds = new Set(outcome.committedIds);
+        for (const memory of batch.inputs) {
+          if (committedIds.has(memory.id)) {
+            delete retries[memory.id];
+            continue;
+          }
+          const content = contentKey2(memory);
+          const prior = retries[memory.id];
+          const failures = (prior?.content === content ? prior.failures : 0) + 1;
+          retries[memory.id] = {
+            content,
+            failures,
+            deferUntil: failures < 2 ? 0 : Date.now() + Math.min(24, 2 ** (failures - 2)) * 3600000
+          };
+        }
+        setDreamState(args.db, retryKey(args.projectIdentity), JSON.stringify(retries));
+      });
       result.mapped += outcome.mapped;
       result.independent += outcome.independent;
       result.remaining -= committed;
@@ -29200,8 +29930,8 @@ async function mapMemories(args) {
       }
       if (outcome.requeue?.length) {
         if (!batch.isOmissionRetry) {
-          batches.splice(i + 1, 0, {
-            inputs: outcome.requeue,
+          batches.push({
+            inputs: outcome.requeue.filter((memory) => !isDeferred(memory, retries)),
             isOmissionRetry: true
           });
           log2(`[dreamer] map-memories: committed ${committed}/${batch.inputs.length} mapping(s); requeueing ${outcome.requeue.length} omitted id(s) in a targeted retry`);
@@ -29209,12 +29939,12 @@ async function mapMemories(args) {
           log2(`[dreamer] map-memories: targeted retry still omitted ${outcome.requeue.length} id(s); leaving them unmapped for the next run`);
         }
       }
-      if (outcome.failure?.class === "timeout") {
+      if (outcome.failure?.class === "timeout" && committed === 0) {
         consecutiveTimeouts += 1;
         timeoutStreakElapsedMs.push(outcome.failure.elapsedMs);
         if (consecutiveTimeouts >= CONSECUTIVE_TIMEOUT_LIMIT2) {
           result.stopReason = "timeout-circuit-breaker";
-          log2(`[dreamer] map-memories starvation: circuit breaker tripped after ${consecutiveTimeouts} consecutive batch timeouts (model too slow for its time slice); per-batch elapsed [${timeoutStreakElapsedMs.join("ms, ")}ms] vs ${sliceMs}ms slice; stopping with ${result.remaining} mapping(s) remaining`);
+          log2(`[dreamer] map-memories starvation: circuit breaker tripped after ${consecutiveTimeouts} consecutive batch timeouts with no committed mappings (investigation made no durable progress); per-batch elapsed [${timeoutStreakElapsedMs.join("ms, ")}ms] vs ${sliceMs}ms slice; stopping with ${result.remaining} mapping(s) remaining`);
           break;
         }
       } else {
@@ -29234,12 +29964,13 @@ async function mapOneBatch(args, batch, sliceMs, signal) {
   let promptSettled = false;
   const startedAt = Date.now();
   let budgetFinalized = false;
+  let failedCompletion;
   const onBudgetUpdate = (state) => {
     budgetFinalized ||= state.finalizeFired;
     args.onBudgetUpdate?.(state);
   };
   try {
-    const prompt = buildMapMemoriesPrompt(args.projectIdentity, batch);
+    const prompt = buildMapMemoriesPrompt(args.projectIdentity, await seedIdentifierCandidates(batch, args.sessionDirectory));
     if (args.hiddenCompletionExecutor) {
       const run = await runHiddenSingleShotPrompt({
         executor: args.hiddenCompletionExecutor,
@@ -29255,14 +29986,18 @@ async function mapOneBatch(args, batch, sliceMs, signal) {
         fallbackModels: args.fallbackModels,
         timeoutMs: sliceMs,
         signal,
-        parse: (text) => validateMapMemoriesManifest(text, new Set(batch.map((memory) => memory.id)))
+        onFailureOutput: (completion) => {
+          failedCompletion = completion;
+        },
+        parse: (text, completion) => validateMapMemoriesManifest(currentManifest(assistantText2(completion.messages ?? []) || text), new Set(batch.map((memory) => memory.id)))
       });
       recordInvocation2(args, startedAt, {
         status: "completed",
         messages: run.completion.messages ?? []
       });
-      const outcome = await applyParsedBatchMappings(args, batch, run.validated, budgetFinalized);
-      const returnedIds = new Set(run.validated.map((entry) => entry.id));
+      const outcome = await applyParsedBatchMappings(args, batch, run.validated, budgetFinalized, true);
+      logBatchUsage(run.completion.messages ?? [], outcome.mapped + outcome.independent, startedAt);
+      const returnedIds = new Set(outcome.committedIds);
       return {
         ...outcome,
         requeue: budgetFinalized ? [] : batch.filter((memory) => !returnedIds.has(memory.id))
@@ -29305,7 +30040,7 @@ async function mapOneBatch(args, batch, sliceMs, signal) {
       fetchOutput: async () => {
         const messagesResponse = await client.session.messages({
           path: { id: agentSessionId },
-          query: { directory: args.sessionDirectory, limit: 100 }
+          query: { directory: args.sessionDirectory, limit: 200 }
         });
         return normalizeSDKResponse(messagesResponse, [], {
           preferResponseOnMissingData: true
@@ -29315,7 +30050,7 @@ async function mapOneBatch(args, batch, sliceMs, signal) {
         if (hasLengthCappedOutput(messages)) {
           throw new Error("map-memories returned length-capped output");
         }
-        const text = extractLatestAssistantText(messages);
+        const text = currentManifest(assistantText2(messages));
         if (!text)
           throw new Error("map-memories returned no output");
         return validateMapMemoriesManifest(text, new Set(batch.map((memory) => memory.id)));
@@ -29323,8 +30058,9 @@ async function mapOneBatch(args, batch, sliceMs, signal) {
     });
     promptSettled = true;
     recordInvocation2(args, startedAt, { status: "completed", messages: run.output });
-    const outcome = await applyParsedBatchMappings(args, batch, run.validated, budgetFinalized);
-    const returnedIds = new Set(run.validated.filter((entry) => batch.some((memory) => memory.id === entry.id)).map((entry) => entry.id));
+    const outcome = await applyParsedBatchMappings(args, batch, run.validated, budgetFinalized, true);
+    logBatchUsage(run.output, outcome.mapped + outcome.independent, startedAt);
+    const returnedIds = new Set(outcome.committedIds);
     return {
       ...outcome,
       requeue: budgetFinalized ? [] : batch.filter((memory) => !returnedIds.has(memory.id))
@@ -29332,18 +30068,23 @@ async function mapOneBatch(args, batch, sliceMs, signal) {
   } catch (error) {
     const desc = describeError(error);
     log2(`[dreamer] map-memories batch failed: ${desc.brief}`, desc.stackHead ? { stackHead: desc.stackHead } : undefined);
+    const messages = failedCompletion?.messages ?? await readFailedChildMessages(args.client, agentSessionId, args.sessionDirectory) ?? [];
     recordInvocation2(args, startedAt, {
       status: failedInvocationStatus(error),
       error,
-      messages: await readFailedChildMessages(args.client, agentSessionId, args.sessionDirectory)
+      messages
     });
-    if (error instanceof DreamerModuleFailureError || error instanceof DreamTokenBudgetExceeded)
+    if (error instanceof DreamerModuleFailureError)
       throw error;
     if (signal.aborted)
       throw error;
+    const recovered = parsePartialMapMemoriesManifest(assistantText2(messages) || failedCompletion?.text || "", new Set(batch.map((memory) => memory.id)));
+    const outcome = await applyParsedBatchMappings(args, batch, recovered, budgetFinalized, true);
+    logBatchUsage(messages, outcome.mapped + outcome.independent, startedAt);
+    if (error instanceof DreamTokenBudgetExceeded)
+      throw error;
     return {
-      mapped: 0,
-      independent: 0,
+      ...outcome,
       failure: {
         class: isTimeoutClassError2(error) ? "timeout" : "other",
         elapsedMs: Date.now() - startedAt
@@ -29362,7 +30103,7 @@ async function mapOneBatch(args, batch, sliceMs, signal) {
       });
   }
 }
-async function applyParsedBatchMappings(args, batch, parsed, budgetFinalized = false) {
+async function applyParsedBatchMappings(args, batch, parsed, budgetFinalized = false, allowPartial = false) {
   const batchIds = new Set(batch.map((memory) => memory.id));
   const valid = parsed.filter((entry) => batchIds.has(entry.id));
   const unknown = parsed.filter((entry) => !batchIds.has(entry.id));
@@ -29370,14 +30111,14 @@ async function applyParsedBatchMappings(args, batch, parsed, budgetFinalized = f
     log2(`[dreamer] map-memories warning: dropping ${unknown.length} unknown mapping entr${unknown.length === 1 ? "y" : "ies"} outside the current batch (${unknown.map((entry) => entry.id).join(", ")})`);
   }
   assertNoDuplicateManifestIds(valid.map((entry) => entry.id), "mappings");
-  if (!budgetFinalized && valid.length * 2 < batch.length) {
+  if (!allowPartial && !budgetFinalized && valid.length * 2 < batch.length) {
     throw new Error(`mappings manifest covers ${valid.length}/${batch.length} batch ids after filtering unknown entries; rejecting mostly-wrong manifest`);
   }
   if (budgetFinalized && valid.length < batch.length) {
     log2(`[dreamer] map-memories: accepted partial manifest after token budget: ${valid.length}/${batch.length}`);
   }
   if (valid.length === 0)
-    return { mapped: 0, independent: 0 };
+    return { mapped: 0, independent: 0, committedIds: [] };
   const planned = [];
   const batchById = new Map(batch.map((memory) => [memory.id, memory]));
   for (const p of valid) {
@@ -29426,9 +30167,10 @@ async function applyParsedBatchMappings(args, batch, parsed, budgetFinalized = f
     });
   }
   if (planned.length === 0)
-    return { mapped: 0, independent: 0 };
+    return { mapped: 0, independent: 0, committedIds: [] };
   let mapped = 0;
   let independent = 0;
+  const committedIds = [];
   if (args.moduleRoute) {
     const identities = getModuleMemoryIdentities(args.db, args.projectIdentity, planned.map((item) => item.id));
     const rows = planned.map((item) => {
@@ -29452,7 +30194,7 @@ async function applyParsedBatchMappings(args, batch, parsed, budgetFinalized = f
           name: "memory.set_mapping",
           arguments: {
             memory_project: args.projectIdentity,
-            command_id: `${args.moduleRoute.moduleCommandId}:${createHash11("sha256").update(rows.map((row) => row.memory_id).join(",")).digest("hex").slice(0, 16)}`,
+            command_id: `${args.moduleRoute.moduleCommandId}:${createHash12("sha256").update(rows.map((row) => row.memory_id).join(",")).digest("hex").slice(0, 16)}`,
             rows
           }
         }
@@ -29466,19 +30208,22 @@ async function applyParsedBatchMappings(args, batch, parsed, budgetFinalized = f
     const accepted = new Set(result.accepted.filter((id) => typeof id === "number"));
     for (const item of planned) {
       const identity = identities.get(item.id);
-      if (identity && accepted.has(identity.moduleId))
+      if (identity && accepted.has(identity.moduleId)) {
         item.independent ? independent += 1 : mapped += 1;
+        committedIds.push(item.id);
+      }
     }
-    return { mapped, independent };
+    return { mapped, independent, committedIds };
   }
   const now = Date.now();
   runLeaseGuardedWrite(args.db, args.holderId, args.leaseKey, () => {
     for (const item of planned) {
       recordMemoryMapping(args.db, item.id, item.files, now, item.mappingOrigin);
       item.independent ? independent += 1 : mapped += 1;
+      committedIds.push(item.id);
     }
   });
-  return { mapped, independent };
+  return { mapped, independent, committedIds };
 }
 function recordInvocation2(args, startedAt, params) {
   if (!args.parentSessionId)
@@ -29746,32 +30491,41 @@ async function promotePrimers(args) {
 // src/features/magic-context/dreamer/primer-seed.ts
 var PRIMER_SEED_CAP_TOKENS = 4000;
 function renderUserAndToolOrientation(sessionId, startOrdinal, endOrdinal, capTokens) {
+  const renderer = orientationRenderer(capTokens);
+  visitRawSessionMessages2(sessionId, startOrdinal, endOrdinal, renderer.visit, {
+    summary: true
+  });
+  return renderer.result();
+}
+function orientationRenderer(capTokens) {
   const lines = [];
   let tokens = 0;
   let sawMessage = false;
-  visitRawSessionMessages2(sessionId, startOrdinal, endOrdinal, (msg) => {
-    sawMessage = true;
-    const out = [];
-    if (msg.role === "user" && hasMeaningfulUserText2(msg.parts)) {
-      const text = extractTexts2(msg.parts).map((t) => cleanUserText2(t)).map(normalizeText).filter((t) => t.length > 0).join(" / ");
-      if (text)
-        out.push(`U: ${text}`);
-    }
-    for (const tc of extractToolCallSummaries(msg.parts))
-      out.push(tc);
-    for (const line of out) {
-      const lineTokens = estimateTokens(line);
-      if (tokens + lineTokens > capTokens && lines.length > 0) {
-        lines.push("… (orientation truncated; investigate the current source directly)");
-        return false;
+  return {
+    visit: (msg) => {
+      sawMessage = true;
+      const out = [];
+      if (msg.role === "user" && hasMeaningfulUserText2(msg.parts)) {
+        const text = extractTexts2(msg.parts).map((t) => cleanUserText2(t)).map(normalizeText).filter((t) => t.length > 0).join(" / ");
+        if (text)
+          out.push(`U: ${text}`);
+      }
+      for (const tc of extractToolCallSummaries(msg.parts))
+        out.push(tc);
+      for (const line of out) {
+        const lineTokens = estimateTokens(line);
+        if (tokens + lineTokens > capTokens && lines.length > 0) {
+          lines.push("… (orientation truncated; investigate the current source directly)");
+          return false;
+        }
+        lines.push(line);
+        tokens += lineTokens;
       }
-      lines.push(line);
-      tokens += lineTokens;
-    }
-    return true;
-  }, { summary: true });
-  return sawMessage ? lines.join(`
-`) : null;
+      return true;
+    },
+    result: () => sawMessage ? lines.join(`
+`) : null
+  };
 }
 function selectPrimerOriginCandidate(db, primer) {
   return getPrimerCandidatesByIds(db, primer.sourceCandidateIds).filter((candidate) => candidate.projectPath === primer.projectPath).sort((a, b) => b.sourceMessageTime - a.sourceMessageTime || b.id - a.id)[0];
@@ -29805,16 +30559,37 @@ function closedBookOriginP1(db, sessionId, originStartMessage) {
   return { orientation, sessionId };
 }
 function buildPrimerSeed(db, primer) {
+  return buildPrimerSeedUsing(db, selectPrimerOriginCandidate(db, primer), renderUserAndToolOrientation);
+}
+async function buildPrimerSeedAsync(db, primer) {
   const mostRecent = selectPrimerOriginCandidate(db, primer);
+  let orientation = null;
+  if (mostRecent && typeof mostRecent.sourceCompartmentStart === "number" && typeof mostRecent.sourceCompartmentEnd === "number") {
+    try {
+      const renderer = orientationRenderer(PRIMER_SEED_CAP_TOKENS);
+      await visitRawSessionMessagesAsync2(mostRecent.sessionId, mostRecent.sourceCompartmentStart, mostRecent.sourceCompartmentEnd, renderer.visit, { summary: true });
+      orientation = renderer.result();
+    } catch {
+      orientation = null;
+    }
+  }
+  return buildPrimerSeedUsing(db, mostRecent, () => orientation);
+}
+function buildPrimerSeedUsing(db, mostRecent, render) {
   if (!mostRecent || typeof mostRecent.sourceCompartmentStart !== "number" || typeof mostRecent.sourceCompartmentEnd !== "number") {
-    return { kind: "closed-book", orientation: "", prePost: "", sessionId: null };
+    return {
+      kind: "closed-book",
+      orientation: "",
+      prePost: "",
+      sessionId: null
+    };
   }
   const sessionId = mostRecent.sessionId;
   const start = mostRecent.sourceCompartmentStart;
   const end = mostRecent.sourceCompartmentEnd;
   let orientation = null;
   try {
-    orientation = renderUserAndToolOrientation(sessionId, start, end, PRIMER_SEED_CAP_TOKENS);
+    orientation = render(sessionId, start, end, PRIMER_SEED_CAP_TOKENS);
   } catch {
     orientation = null;
   }
@@ -29945,14 +30720,14 @@ async function refreshOnePrimer(args, primer, sliceMs, signal) {
       provider = null;
     }
   }
-  const seed = withRawSessionMessageCache2(() => {
+  const seed = await (async () => {
     const unregister = provider && originSessionId ? setRawMessageProvider2(originSessionId, provider) : null;
     try {
-      return buildPrimerSeed(args.db, primer);
+      return provider?.iterateMessageRangeAsync ? await buildPrimerSeedAsync(args.db, primer) : withRawSessionMessageCache2(() => buildPrimerSeed(args.db, primer));
     } finally {
       unregister?.();
     }
-  });
+  })();
   let agentSessionId = null;
   let promptSettled = false;
   const startedAt = Date.now();
@@ -29968,7 +30743,10 @@ async function refreshOnePrimer(args, primer, sliceMs, signal) {
         prompt,
         title: "magic-context-dream-refresh-primers",
         callContext: "dreamer:refresh-primers",
-        metadata: { tokenBudget: args.tokenBudget, onBudgetUpdate: args.onBudgetUpdate },
+        metadata: {
+          tokenBudget: args.tokenBudget,
+          onBudgetUpdate: args.onBudgetUpdate
+        },
         model: args.model,
         fallbackModels: args.fallbackModels,
         language: args.language,
@@ -30034,7 +30812,10 @@ async function refreshOnePrimer(args, primer, sliceMs, signal) {
       validateOutput: (messages) => parseAnswer(messages, primer.answer)
     });
     promptSettled = true;
-    recordInvocation3(args, startedAt, { status: "completed", messages: run.output });
+    recordInvocation3(args, startedAt, {
+      status: "completed",
+      messages: run.output
+    });
     const answer = run.validated.trim();
     if (!answer)
       return false;
@@ -30049,7 +30830,10 @@ async function refreshOnePrimer(args, primer, sliceMs, signal) {
   } catch (error) {
     const desc = describeError(error);
     log2(`[dreamer] refresh-primers failed (primer #${primer.id}): ${desc.brief}`, desc.stackHead ? { stackHead: desc.stackHead } : undefined);
-    recordInvocation3(args, startedAt, { status: failedInvocationStatus(error), error });
+    recordInvocation3(args, startedAt, {
+      status: failedInvocationStatus(error),
+      error
+    });
     throw error;
   } finally {
     if (agentSessionId && args.client)
@@ -30687,12 +31471,12 @@ function insertDreamRun(db, run) {
 }
 
 // src/features/magic-context/dreamer/verify.ts
-import { createHash as createHash12 } from "node:crypto";
+import { createHash as createHash13 } from "node:crypto";
 
 // src/features/magic-context/dreamer/verify-diff.ts
-import { execFile as execFile2 } from "node:child_process";
-import { promisify as promisify2 } from "node:util";
-var exec = promisify2(execFile2);
+import { execFile as execFile3 } from "node:child_process";
+import { promisify as promisify3 } from "node:util";
+var exec = promisify3(execFile3);
 var VERIFY_DIFF_BUDGET_TOKENS = 12000;
 var MAX_DIFF_BYTES = 4 * 1024 * 1024;
 async function git2(root, args) {
@@ -31431,7 +32215,7 @@ async function applyParsedVerifyManifest(args, batch, parsed, headAtPrompt, budg
           name: "memory.set_verification",
           arguments: {
             memory_project: args.projectIdentity,
-            command_id: `${args.moduleRoute.moduleCommandId}:${createHash12("sha256").update(rows.map((row) => row.memory_id).join(",")).digest("hex").slice(0, 16)}`,
+            command_id: `${args.moduleRoute.moduleCommandId}:${createHash13("sha256").update(rows.map((row) => row.memory_id).join(",")).digest("hex").slice(0, 16)}`,
             rows
           }
         }
@@ -32237,7 +33021,7 @@ function parseFrictionGateVerdict(verdict) {
 }
 function computeRetrospectiveWindowKey(flagged) {
   const anchors = flagged.map((message) => `${message.sessionId}:${message.ts}`).sort().join("|");
-  return createHash13("sha256").update(anchors).digest("hex").slice(0, 32);
+  return createHash14("sha256").update(anchors).digest("hex").slice(0, 32);
 }
 function renderFrictionWindow(messages, flaggedOrdinals, radius = 2) {
   const flagged = new Set(flaggedOrdinals);
@@ -33625,7 +34409,7 @@ async function startDreamScheduleTimer(args) {
       startupTickTimer = null;
       runTick("startup");
     });
-    const timer = setInterval(() => runTick("interval"), DREAM_TIMER_INTERVAL_MS);
+    const timer = inRootAsyncContext2(() => setInterval(() => runTick("interval"), DREAM_TIMER_INTERVAL_MS));
     if (typeof timer === "object" && "unref" in timer) {
       timer.unref();
     }
@@ -33921,7 +34705,7 @@ async function runCompiledSmartNoteSweep(reg, db) {
   }
 }
 function startGitSweepLeaseRenewal(db, projectIdentity, holderId) {
-  const timer = setInterval(() => {
+  const timer = inRootAsyncContext2(() => setInterval(() => {
     try {
       if (!renewGitSweepLease(db, projectIdentity, holderId)) {
         log2(`[git-commits] sweep lease renewal failed for ${projectIdentity}`);
@@ -33929,7 +34713,7 @@ function startGitSweepLeaseRenewal(db, projectIdentity, holderId) {
     } catch (error) {
       log2(`[git-commits] sweep lease renewal errored for ${projectIdentity}: ${error instanceof Error ? error.message : String(error)}`);
     }
-  }, GIT_SWEEP_LEASE_RENEWAL_MS);
+  }, GIT_SWEEP_LEASE_RENEWAL_MS));
   timer.unref?.();
   return () => clearInterval(timer);
 }
@@ -34191,9 +34975,9 @@ function hiddenTerminalError(event) {
 }
 
 // src/v2/hooks/lkg-system.ts
-import { createHash as createHash14 } from "node:crypto";
+import { createHash as createHash15 } from "node:crypto";
 function identity(slot) {
-  return createHash14("sha256").update(JSON.stringify({
+  return createHash15("sha256").update(JSON.stringify({
     capturedAt: slot.capturedAt,
     captureSequence: slot.captureSequence,
     rowVersion: slot.rowVersion,
@@ -34468,12 +35252,12 @@ function createRustRefusalRecovery(options) {
     watchers.delete(sessionId);
   };
   const schedule = (sessionId, watcher) => {
-    watcher.timer = setTimeout(() => void poll(sessionId, watcher), pollIntervalMs);
+    watcher.timer = inRootAsyncContext2(() => setTimeout(() => void poll(sessionId, watcher), pollIntervalMs));
   };
   const probe = async (watcher, sessionId) => {
     const controller = new AbortController;
     const timeoutError = new Error("rust refusal recovery probe timed out");
-    const timer = setTimeout(() => controller.abort(timeoutError), probeTimeoutMs);
+    const timer = inRootAsyncContext2(() => setTimeout(() => controller.abort(timeoutError), probeTimeoutMs));
     try {
       await Promise.race([
         options.moduleClient.call({
@@ -35155,6 +35939,14 @@ function createV2RawMessageReader(openReader) {
         reader.close();
       }
     },
+    orderOf: (sessionID, messageID) => {
+      const reader = openReader();
+      try {
+        return reader.sequenceForId(sessionID, messageID) ?? null;
+      } finally {
+        reader.close();
+      }
+    },
     ordinalMapForRange: (sessionID, fromOrdinal, toOrdinal) => {
       const reader = openReader();
       try {
@@ -35212,6 +36004,9 @@ function createV2RawMessageProvider(reader, sessionID) {
     readMessagePartsById: (messageID) => reader.findPartsById(sessionID, messageID),
     hasMessageById: (messageID) => reader.hasById(sessionID, messageID),
     readMessageOrdinalById: (messageID) => reader.ordinalOf(sessionID, messageID),
+    ...reader.orderOf ? {
+      readMessageOrderById: (messageID) => reader.orderOf?.(sessionID, messageID) ?? null
+    } : {},
     readMessageIdOrdinalsForRange: (fromOrdinal, toOrdinal) => reader.ordinalMapForRange(sessionID, fromOrdinal, toOrdinal),
     readMessageOrdinalPage: (after, limit) => reader.readOrdinalPage(sessionID, after, limit),
     getMessageCount: () => reader.getCount(sessionID),
@@ -47010,7 +47805,7 @@ function resolveCtxExpandMode(args, domain) {
 }
 
 // src/tools/ctx-expand/render.ts
-import { createHash as createHash15 } from "node:crypto";
+import { createHash as createHash16 } from "node:crypto";
 function isRecord6(value) {
   return value !== null && typeof value === "object" && !Array.isArray(value);
 }
@@ -47234,11 +48029,61 @@ function renderItemByTag(db, sessionId, number, textIndexDomain = "part") {
   const index = scoped ? Number(scoped[2]) : 0;
   const piText = message.parts.filter((part) => isRecord6(part) && part.type === "text");
   const part = message.parts[index];
-  const matching = derived ? piText.filter((part) => isRecord6(part) && typeof part.text === "string" && createHash15("sha256").update(part.text).digest("hex") === derived[3]) : [];
+  const matching = derived ? piText.filter((part) => isRecord6(part) && typeof part.text === "string" && createHash16("sha256").update(part.text).digest("hex") === derived[3]) : [];
   const selected = derived ? matching[Number(derived[4])] : textIndexDomain === "text" ? piText[index] : part;
   return selected ? renderPartFull(selected) ?? "" : `Tag ${number}'s original text part is no longer in stored history.`;
 }
 
+// src/tools/ctx-expand/search-archive.ts
+function renderSearchArchive(db, sessionId, start, end, tokenBudget, archiveOnly = false) {
+  return withMessageFtsSessionFilter(db, sessionId, (sessionFirst) => {
+    let rawIds;
+    const rows = db.prepare(sessionFirst ? `SELECT f.message_ordinal AS ordinal, f.message_id AS id, f.role, f.content
+                   FROM message_fts_rowid_map AS m
+                   JOIN message_history_fts AS f ON f.rowid = m.fts_rowid
+                   WHERE m.session_id = ?1 AND m.message_ordinal BETWEEN ?2 AND ?3
+                     AND f.session_id = ?1 AND f.message_ordinal BETWEEN ?2 AND ?3
+                   ORDER BY m.message_ordinal` : `SELECT message_ordinal AS ordinal, message_id AS id, role, content
+                   FROM message_history_fts
+                   WHERE session_id = ?1 AND message_ordinal BETWEEN ?2 AND ?3
+                   ORDER BY CAST(message_ordinal AS INTEGER)`);
+    const blocks = [];
+    let tokens = 0;
+    let lastOrdinal = start - 1;
+    let truncated = false;
+    for (const row of rows.iterate(sessionId, start, end)) {
+      if (!row.content)
+        continue;
+      if (!archiveOnly) {
+        rawIds ??= readRawSessionMessageIdOrdinalsForRange2(sessionId, start, end);
+        if (rawIds.get(row.id) === row.ordinal)
+          continue;
+      }
+      const block = `[${row.ordinal}] ${row.role === "user" ? "U" : "A"}: ${row.content}`;
+      const cost = estimateTokens(block);
+      if (blocks.length > 0 && tokens + cost > tokenBudget) {
+        truncated = true;
+        break;
+      }
+      blocks.push(block);
+      tokens += cost;
+      lastOrdinal = row.ordinal;
+    }
+    if (blocks.length === 0)
+      return null;
+    const text = [
+      "From the search archive: indexed text only; no surrounding messages or tool output.",
+      "",
+      ...blocks
+    ];
+    if (truncated) {
+      text.push("", `Truncated at message ${lastOrdinal} (budget: ~${tokenBudget} tokens). Call ctx_expand(start=${lastOrdinal + 1}, end=${end}) for more archived text.`);
+    }
+    return text.join(`
+`);
+  });
+}
+
 // src/tools/ctx-expand/tools.ts
 var ctxExpandArgsShape = {
   tag: tool.schema.union([tool.schema.number(), tool.schema.string()]).optional().describe("Tag number from a §N§ tag or a [dropped §N§] placeholder, not a message ordinal. Returns that one item in full. Use alone."),
@@ -47272,7 +48117,7 @@ function createCtxExpandTool(deps) {
         return renderItemByTag(deps.db, sessionId, mode.tag);
       }
       if (mode.kind === "message") {
-        return renderMessageByOrdinal(sessionId, mode.message);
+        return renderSearchArchive(deps.db, sessionId, mode.message, mode.message, CTX_EXPAND_TOKEN_BUDGET) ?? renderMessageByOrdinal(sessionId, mode.message);
       }
       const { start, end, verbose } = mode;
       const lastCompartmentEnd = getLastCompartmentEndMessage(deps.db, sessionId);
@@ -47280,6 +48125,9 @@ function createCtxExpandTool(deps) {
         return `Range ${start}-${end} is entirely within the live tail (after the last compacted message ${lastCompartmentEnd}); those messages are already visible in context.`;
       }
       const effectiveEnd = lastCompartmentEnd >= 0 ? Math.min(end, lastCompartmentEnd) : end;
+      const archived = renderSearchArchive(deps.db, sessionId, start, effectiveEnd, CTX_EXPAND_TOKEN_BUDGET);
+      if (archived)
+        return archived;
       if (verbose) {
         const v = renderVerboseRange(sessionId, start, effectiveEnd, CTX_EXPAND_TOKEN_BUDGET, deps.expandTools);
         if (!v.text) {
@@ -48106,9 +48954,9 @@ function isMissingError(error) {
 }
 
 // ../retina-local-fs/src/provider.ts
-import { execFile as execFile3 } from "node:child_process";
-import { promisify as promisify3 } from "node:util";
-var execFileAsync2 = promisify3(execFile3);
+import { execFile as execFile4 } from "node:child_process";
+import { promisify as promisify4 } from "node:util";
+var execFileAsync3 = promisify4(execFile4);
 function parseSemver(value) {
   const match = /^v?(0|[1-9]\d*)\.(0|[1-9]\d*)\.(0|[1-9]\d*)(?:-([0-9A-Za-z.-]+))?(?:\+[0-9A-Za-z.-]+)?$/.exec(value);
   if (!match) {
@@ -48757,7 +49605,7 @@ function formatCtxReduceReply(stampedCount, selfStampCount = 0) {
   return parts.join(" ");
 }
 // src/tools/ctx-reduce/tools.ts
-import { createHash as createHash16 } from "node:crypto";
+import { createHash as createHash17 } from "node:crypto";
 
 // src/features/magic-context/range-parser.ts
 function parseRangeString(input) {
@@ -48820,11 +49668,11 @@ function createCtxReduceTool(deps) {
       const stableId = `oc-${sessionId}-${callId}`;
       if (Buffer.byteLength(stableId) <= 128)
         return stableId;
-      return `oc-${createHash16("sha256").update(stableId).digest("hex")}`;
+      return `oc-${createHash17("sha256").update(stableId).digest("hex")}`;
     }
     fallbackCommandSequence += 1;
     const monotonicId = `oc-${sessionId}-${fallbackCommandSequence}`;
-    return Buffer.byteLength(monotonicId) <= 128 ? monotonicId : `oc-${createHash16("sha256").update(monotonicId).digest("hex")}`;
+    return Buffer.byteLength(monotonicId) <= 128 ? monotonicId : `oc-${createHash17("sha256").update(monotonicId).digest("hex")}`;
   };
   return tool({
     description: CTX_REDUCE_DESCRIPTION,
@@ -50540,6 +51388,13 @@ ${baseline}
     hiddenCompletionExecutor: storageOpenedAtBoot ? hiddenCompletionExecutor : lateHiddenExecutor,
     compactionMarkerStrategy: v2CompactionMarkerStrategy,
     prepareHistorySession,
+    readSessionDirectory: async (sessionID) => {
+      try {
+        return (await context.session.get({ sessionID })).location?.directory ?? null;
+      } catch {
+        return null;
+      }
+    },
     storageDir
   });
   rpcServer.handle("dream", async (params) => {
@@ -50607,11 +51462,11 @@ ${baseline}
     directory,
     compactionEnabled: !compactionOff
   });
-  setTimeout(() => {
+  inRootAsyncContext2(() => setTimeout(() => {
     if (rpcStopped)
       return;
     rpcServer.start().catch((error) => log2("[magic-context] v2 RPC server failed to start", error));
-  }, 0);
+  }, 0));
   return {
     async dispose() {
       rpcStopped = true;