@cortexkit/opencode-magic-context 0.49.6 → 0.49.8

package/dist/{index-zgzdm6dg.js → index-gzg9ekc1.js}

@@ -6,7 +6,7 @@ import {
   getTemporalDecisions,
   freezeTemporalDecisions,
   stableStringify
-} from "./index-1bt88epp.js";
+} from "./index-bd9cjab3.js";
 import {
   protectedToolTagNumbers,
   byteSize,
@@ -62,36 +62,38 @@ import {
   getTagsByNumbers2,
   getNewestToolTagNumbers2,
   getDroppedTagsByNumbers2,
+  getMaxDroppedTagNumber2,
   getTagById2,
   getToolTagNumberByOwner2,
   getNullOwnerToolTag2,
   adoptNullOwnerToolTag2,
   getCandidateToolOwners2,
   pickNearestPriorOwner2
-} from "./index-1j8jcjpa.js";
+} from "./index-xpn05jxq.js";
 import {
   textMentionsRecentCommit,
   hasMeaningfulUserText2,
   estimateTokens
-} from "./index-qx53vezw.js";
+} from "./index-gjvjh960.js";
 import {
   log2,
   sessionLog2
-} from "./index-nsjyysj0.js";
+} from "./index-mvvephtj.js";
 import {
+  inRootAsyncContext2,
   getTagIdentityWriteGeneration2,
   getSqliteDatabasePath2,
   assertTransformWrite2,
   isTransientSqliteError2
-} from "./index-0nnd4bry.js";
+} from "./index-wafzvyhg.js";
 import {
   isValidLanguageCode
-} from "./index-k6xvbj2e.js";
+} from "./index-w28y7d0z.js";
 import {
   getProjectEmbeddingSnapshot2,
   embedTextForProject2,
   embedBatchForProject2
-} from "./index-9s58tq95.js";
+} from "./index-rg1cezmj.js";
 import {
   isEmbeddingHostBusy2
 } from "./index-qt1qqasc.js";
@@ -140,6 +142,7 @@ import {
   addTrailingBlankDecisions,
   demoteTrailingBlankKeepDecisions,
   addStaleReduceStrippedIds,
+  getProcessedImageMarkers,
   addProcessedImageStrippedIds,
   getPendingCompactionMarkerState,
   loadPostprocessReplaySnapshot,
@@ -185,7 +188,7 @@ import {
   extractToolCallObservation,
   ToolMutationBatch,
   createToolDropTarget
-} from "./index-vztbgcdk.js";
+} from "./index-9g1c4bt9.js";
 import {
   getMaxM0MutationId,
   rememberUnpublishedAutoSearchNoHint,
@@ -219,21 +222,21 @@ import {
   peekNoteNudgeText,
   markNoteNudgeDelivered,
   getActiveCompartmentRun
-} from "./index-vh3e2mvr.js";
+} from "./index-hxrvx6cy.js";
 import {
   runSessionWarmupWorker
-} from "./index-vnjhmkwk.js";
+} from "./index-angx1s0k.js";
 import {
   openCodeDbExists,
   withReadOnlySessionDb,
   getMessageTimesFromOpenCodeDb
-} from "./index-ab3bgm2m.js";
+} from "./index-q76br5zn.js";
 import {
   BoundedSessionMap
-} from "./index-1xaw2pq8.js";
+} from "./index-b4gcb3rk.js";
 import {
   renderUserFacingFailure
-} from "./index-s0gsmthp.js";
+} from "./index-ydjgz36f.js";
 import {
   getErrorMessage
 } from "./index-y8v6yerm.js";
@@ -243,7 +246,7 @@ import {
 } from "./index-d9vfe7xq.js";
 import {
   logSlowWriteTransaction
-} from "./index-4mjhqadz.js";
+} from "./index-150zz6fh.js";
 
 // src/features/magic-context/tagger.ts
 var TOOL_COMPOSITE_KEY_SEP = "\x00";
@@ -1337,7 +1340,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();
@@ -1348,7 +1351,7 @@ function queueAutoSearchBackfill(db, sessionId, projectPath, query) {
         clearTimeout(timeout);
         done();
       });
-    }, 0);
+    }, 0));
     const cancel = () => {
       clearTimeout(queued);
       done();
@@ -1395,7 +1398,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)
@@ -1507,7 +1510,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;
@@ -2765,21 +2768,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;
@@ -2859,11 +2881,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([
@@ -2915,10 +2937,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}`);
@@ -2927,11 +2970,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}`);
@@ -2947,12 +2990,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;
@@ -2969,30 +3012,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);
@@ -3281,31 +3319,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}`);
@@ -3386,35 +3420,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`);
@@ -3588,6 +3620,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),
@@ -4897,11 +4930,6 @@ function runRustModePostprocess2(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)) {
@@ -4939,7 +4967,7 @@ function runRustModePostprocess2(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);
@@ -4956,6 +4984,11 @@ function runRustModePostprocess2(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 {
@@ -5814,15 +5847,32 @@ async function runPostTransformPhase2(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);
@@ -5950,16 +6000,6 @@ async function runPostTransformPhase2(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;
@@ -6035,13 +6075,15 @@ async function runPostTransformPhase2(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) => isSyntheticHeadMessage2(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) {
@@ -6058,6 +6100,16 @@ async function runPostTransformPhase2(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);
@@ -6541,4 +6593,4 @@ function checkM0MutationDriftAndSignal2(args) {
   return false;
 }
 
-export { createTagger, cavemanWordRulesForLanguage, searchMessageHistoryOffThread, findSessionId, findLastUserMessageId, clearAutoSearchForSession, setCtxReduceRegisteredGlobally, resolveCtxReduceAvailabilityFromMessages, resolveCtxReduceAvailability, primeCtxReduceSpawnPermission, ctxReduceSpawnPermissionReadNeeded, spawnAgentFromMessages, spawnAgentFromOpenCodeDb, todowritePermissionDenied, cachedToolPermissionDenied, clearToolPermissionDenied, resolveTodowriteAvailabilityFromMessages, resolveTodowriteAvailability, canConsumeDeferredOnThisPass, hasReclaimRide, reclaimRideLabel, captureOpencodeReasoningBudgetStatus, reasoningBudgetStatusLine, ENGINE_RECONNECTING_USER_MESSAGE, ENGINE_BUSY_USER_MESSAGE, SIGNED_THINKING_RESET_FENCE_FAILED, contextRefusalError, protectedToolRefusal, outgoingContextRefusal, signedTurnContextRefusal, EmergencyFailClosedError, latestAssistantTurnStart, latestAssistantTurnMessages, hasActiveAnthropicThinkingTurn, replayCavemanCompression, DegradedPassRefusalError, degradedPassError, applyFlushedStatuses, prewarmTagOwners, waitForTagOwners, stripStructuralNoise, logTransformTiming, hasRecentAssistantCommit, tagMessages, resetDegradedCacheCount2, isSyntheticHeadMessage2, applyTodoSynthesis2, freezeReasoningOnBustingPass2, firstServedDivergenceIndex2, rustModeServedKeyAfterPersistedStrips2, replayRustModeBindingMismatchStrips2, RUST_MARKER_LOCK_SKIP_LOG2, applyRustModeDeferredCompactionMarker2, clearRustModeBoundaryRecord2, runRustModePostprocess2, reconcileMarkerRepresentation2, clearPendingCompactionMarkerAfterSuccessfulDrain2, defaultCompactionMarkerStrategy2, abortSessionFailClosed2, evaluateEmergencyFailClosed2, finalizeMessageRepresentation2, runPostTransformPhase2, checkM0MutationDriftAndSignal2 };
+export { makeToolCompositeKey, createTagger, cavemanWordRulesForLanguage, searchMessageHistoryOffThread, findSessionId, findLastUserMessageId, clearAutoSearchForSession, setCtxReduceRegisteredGlobally, resolveCtxReduceAvailabilityFromMessages, resolveCtxReduceAvailability, primeCtxReduceSpawnPermission, ctxReduceSpawnPermissionReadNeeded, spawnAgentFromMessages, spawnAgentFromOpenCodeDb, todowritePermissionDenied, cachedToolPermissionDenied, clearToolPermissionDenied, resolveTodowriteAvailabilityFromMessages, resolveTodowriteAvailability, canConsumeDeferredOnThisPass, hasReclaimRide, reclaimRideLabel, captureOpencodeReasoningBudgetStatus, reasoningBudgetStatusLine, ENGINE_RECONNECTING_USER_MESSAGE, ENGINE_BUSY_USER_MESSAGE, SIGNED_THINKING_RESET_FENCE_FAILED, contextRefusalError, protectedToolRefusal, outgoingContextRefusal, signedTurnContextRefusal, EmergencyFailClosedError, latestAssistantTurnStart, latestAssistantTurnMessages, hasActiveAnthropicThinkingTurn, replayCavemanCompression, DegradedPassRefusalError, degradedPassError, applyFlushedStatuses, prewarmTagOwners, waitForTagOwners, stripStructuralNoise, logTransformTiming, hasRecentAssistantCommit, tagMessages, resetDegradedCacheCount2, isSyntheticHeadMessage2, applyTodoSynthesis2, freezeReasoningOnBustingPass2, firstServedDivergenceIndex2, rustModeServedKeyAfterPersistedStrips2, replayRustModeBindingMismatchStrips2, RUST_MARKER_LOCK_SKIP_LOG2, applyRustModeDeferredCompactionMarker2, clearRustModeBoundaryRecord2, runRustModePostprocess2, reconcileMarkerRepresentation2, clearPendingCompactionMarkerAfterSuccessfulDrain2, defaultCompactionMarkerStrategy2, abortSessionFailClosed2, evaluateEmergencyFailClosed2, finalizeMessageRepresentation2, runPostTransformPhase2, checkM0MutationDriftAndSignal2 };