@cortexkit/opencode-magic-context 0.49.0 → 0.49.2

package/dist/{index-1g30axtz.js → index-p0n5ryq8.js}

@@ -9,7 +9,6 @@ import {
 } from "./index-1bt88epp.js";
 import {
   protectedToolTagNumbers,
-  stripWellFormedLeadingTagPrefix,
   byteSize,
   stripTagPrefix,
   prependTag,
@@ -38,9 +37,7 @@ import {
   AGE_RECLAIM_MIN_TOKENS2,
   getOldestActiveUnprotectedToolTags2,
   getActiveToolTagsForAgeReclaim2,
-  getReasoningTokenEstimatesByMessage2,
   tryGetReasoningTokenEstimatesByMessage2,
-  getMaxTagNumberByOwnerMessage2,
   cachedTagOwnerRatios2,
   tagOwnerWarmupState2,
   installTagOwnerDelta2,
@@ -59,6 +56,7 @@ import {
   getMaxTagNumberBySession2,
   getTagNumberByMessageId2,
   getAssignableTagNumberByMessageId2,
+  getTagsBySession2,
   getActiveTagsBySession2,
   getTailHygieneTags2,
   getTagsByNumbers2,
@@ -87,23 +85,25 @@ import {
   isTransientSqliteError2
 } from "./index-kb9nn0a0.js";
 import {
-  isValidLanguageCode,
-  resolveModelConfigValue
-} from "./index-kq57tdf0.js";
+  isValidLanguageCode
+} from "./index-k6xvbj2e.js";
 import {
   getProjectEmbeddingSnapshot2,
   embedTextForProject2,
   embedBatchForProject2
-} from "./index-kp5qe690.js";
+} from "./index-fg00p1cg.js";
 import {
   isEmbeddingHostBusy2
 } from "./index-qt1qqasc.js";
 import {
-  BoundedSessionMap,
-  getMaxM0MutationId,
+  stripSystemInjection,
+  isTextPart,
+  isToolPartWithOutput,
+  isFilePart,
+  buildFileSourceContent,
+  toolPartHasUserAnswer,
+  isEditTool,
   escalationBands,
-  MERGED_REASONING_PARTS_PREFIX,
-  readFrozenMergedReasoningParts,
   HYGIENE_PROVIDER_UNITS_VERSION,
   sessionDecisionCalibration,
   transitionSessionHygieneUnits,
@@ -146,6 +146,48 @@ import {
   setPendingCompactionMarkerState,
   replacePendingCompactionMarkerStateIf,
   clearPendingCompactionMarkerStateIf,
+  getReasoningRemovalState,
+  addRemovedReasoningIds,
+  markDropLeavesReasoning,
+  modelAcceptsEmptyContent,
+  isAnthropicFamilyRoute,
+  neutralizeDroppedReasoningPart,
+  restoreNeutralizedReasoningPart,
+  isNeutralizedReasoningPart,
+  makeSentinel,
+  makeWholeMessageSentinel,
+  isSentinel,
+  replaySentinelByMessageIds,
+  isInActiveAnthropicTurn,
+  hasAnthropicReasoning,
+  stripSystemInjectedMessages,
+  stripDroppedPlaceholderMessages,
+  replayClearedReasoning,
+  replayStrippedInlineThinking,
+  clearOldReasoning,
+  stripClearedReasoning,
+  stripInlineThinking,
+  findReasoningBearingAssistantIds,
+  findLatestAssistantReasoningMutationExemptMessage,
+  snapshotTrailingBlankSourceDecisions,
+  findTrailingBlankDecisionCandidates,
+  applyFrozenTrailingBlankDecisions,
+  stripReasoningFromAssistantIds,
+  findMergedReasoningStripDecisions,
+  stripReasoningFromMergedAssistants,
+  stripProcessedImages,
+  DEFAULT_KEEP_REASONING_TOKENS,
+  reasoningStepCost,
+  reasoningTextAndOpaque,
+  opencodeReasoningBudgetCutoff,
+  SKELETON_REAL_INPUT_MAX_BYTES,
+  partHasCompletedResult,
+  extractToolCallObservation,
+  ToolMutationBatch,
+  createToolDropTarget
+} from "./index-sv0bb7vg.js";
+import {
+  getMaxM0MutationId,
   rememberUnpublishedAutoSearchNoHint,
   getUnpublishedAutoSearchNoHint,
   forgetUnpublishedAutoSearchNoHint,
@@ -153,6 +195,9 @@ import {
   cancelAutoSearchWork,
   updateSessionMeta,
   advanceToolReclaimWatermark,
+  requestPendingMaterialization,
+  pendingMaterializationOrigin,
+  clearPendingMaterialization,
   saveSourceContent,
   replaceSourceContent,
   getSourceContents,
@@ -173,7 +218,7 @@ import {
   peekNoteNudgeText,
   markNoteNudgeDelivered,
   getActiveCompartmentRun
-} from "./index-2jcbj7r1.js";
+} from "./index-zfzdpeq2.js";
 import {
   runSessionWarmupWorker
 } from "./index-h5zfkjyk.js";
@@ -181,35 +226,13 @@ import {
   openCodeDbExists,
   withReadOnlySessionDb,
   getMessageTimesFromOpenCodeDb
-} from "./index-9qjqq45k.js";
+} from "./index-0pjvpfkf.js";
 import {
-  stripSystemInjection,
-  isTextPart,
-  isToolPartWithOutput,
-  isFilePart,
-  buildFileSourceContent,
-  toolPartHasUserAnswer,
-  isEditTool,
-  modelAcceptsEmptyContent,
-  isAnthropicFamilyRoute,
-  neutralizeDroppedReasoningPart,
-  restoreNeutralizedReasoningPart,
-  isNeutralizedReasoningPart,
-  neutralizedReasoningSource,
-  makeSentinel,
-  makeWholeMessageSentinel,
-  neutralizeWholeMessage,
-  isSentinel,
-  replaySentinelByMessageIds,
-  SKELETON_REAL_INPUT_MAX_BYTES,
-  partHasCompletedResult,
-  extractToolCallObservation,
-  ToolMutationBatch,
-  createToolDropTarget
-} from "./index-2jgwttpt.js";
+  BoundedSessionMap
+} from "./index-sfhndpcb.js";
 import {
   renderUserFacingFailure
-} from "./index-kmpvemph.js";
+} from "./index-rafsaxac.js";
 import {
   getErrorMessage
 } from "./index-y8v6yerm.js";
@@ -2136,851 +2159,6 @@ function reclaimRideLabel(signals) {
   return `ride=${active.length > 0 ? active.join("+") : "none"}`;
 }
 
-// src/features/magic-context/storage-reasoning-removal.ts
-var NAMESPACE = "reasoningRemoval";
-var BACKUP_NAMESPACE = "reasoningRemovalBackup";
-function invalidState(sessionId) {
-  return new Error(`invalid persisted reasoning removal state for session ${sessionId}`);
-}
-function parseState(doc, sessionId, namespace = NAMESPACE) {
-  const lane = doc[namespace];
-  if (lane === undefined)
-    return { messageIds: new Set, dropLeavesReasoning: false };
-  if (!isRecord(lane) || !Array.isArray(lane.messageIds))
-    throw invalidState(sessionId);
-  const ids = new Set;
-  for (const id of lane.messageIds) {
-    if (typeof id !== "string" || id.length === 0)
-      throw invalidState(sessionId);
-    ids.add(id);
-  }
-  if (lane.dropLeavesReasoning !== undefined && typeof lane.dropLeavesReasoning !== "boolean") {
-    throw invalidState(sessionId);
-  }
-  return { messageIds: ids, dropLeavesReasoning: lane.dropLeavesReasoning === true };
-}
-function writeState(doc, state) {
-  doc.version = 2;
-  const lane = {
-    messageIds: [...state.messageIds],
-    ...state.dropLeavesReasoning ? { dropLeavesReasoning: true } : {}
-  };
-  doc[NAMESPACE] = lane;
-  doc[BACKUP_NAMESPACE] = { ...lane, messageIds: [...lane.messageIds] };
-}
-function getReasoningRemovalState(db, sessionId) {
-  const doc = readReplayEnvelope(db, sessionId);
-  try {
-    return parseState(doc, sessionId);
-  } catch (error) {
-    if (doc[BACKUP_NAMESPACE] === undefined)
-      throw error;
-    return parseState(doc, sessionId, BACKUP_NAMESPACE);
-  }
-}
-function addRemovedReasoningIds(db, sessionId, ids) {
-  const requested = [...ids].filter((id) => typeof id === "string" && id.length > 0);
-  if (requested.length === 0)
-    return true;
-  return updateReplayDocument(db, sessionId, (doc) => {
-    const current = parseState(doc, sessionId);
-    let changed = false;
-    for (const id of requested) {
-      if (current.messageIds.has(id))
-        continue;
-      current.messageIds.add(id);
-      changed = true;
-    }
-    if (!changed)
-      return false;
-    writeState(doc, current);
-    return true;
-  });
-}
-function markDropLeavesReasoning(db, sessionId) {
-  return updateReplayDocument(db, sessionId, (doc) => {
-    const current = parseState(doc, sessionId);
-    if (current.dropLeavesReasoning)
-      return false;
-    current.dropLeavesReasoning = true;
-    writeState(doc, current);
-    return true;
-  });
-}
-
-// src/hooks/magic-context/active-anthropic-turn.ts
-function isInActiveAnthropicTurn(messages, index, anthropic) {
-  const start = activeAnthropicTurnStart(messages, anthropic);
-  return start !== undefined && index >= start;
-}
-function activeAnthropicTurnStart(messages, anthropic) {
-  if (!anthropic)
-    return;
-  for (let user = messages.length - 1;user >= 0; user--) {
-    const message = messages[user];
-    if (!isRecord(message))
-      continue;
-    const info = isRecord(message.info) ? message.info : message;
-    if (info.role !== "user" || info.synthetic === true || message.synthetic === true)
-      continue;
-    const id = typeof info.id === "string" ? info.id : "";
-    if (id.startsWith("synth-user-"))
-      continue;
-    const parts = Array.isArray(message.parts) ? message.parts : Array.isArray(message.content) ? message.content : [];
-    if (parts.length > 0 && parts.every((part) => isRecord(part) && (part.synthetic === true || part.ignored === true || ["tool_result", "toolResult", "tool-result"].includes(String(part.type)))))
-      continue;
-    return user + 1;
-  }
-  return;
-}
-function hasAnthropicReasoning(messages) {
-  return messages.some((message) => {
-    if (!isRecord(message))
-      return false;
-    const info = isRecord(message.info) ? message.info : message;
-    if (isAnthropicFamilyRoute(typeof info.providerID === "string" ? info.providerID : typeof info.provider === "string" ? info.provider : undefined, typeof info.modelID === "string" ? info.modelID : typeof info.model === "string" ? info.model : undefined))
-      return true;
-    const parts = Array.isArray(message.parts) ? message.parts : [];
-    return parts.some((part) => isRecord(part) && isRecord(part.metadata) && isRecord(part.metadata.anthropic));
-  });
-}
-
-// src/hooks/magic-context/strip-content.ts
-var MARKER_ONLY_PATTERN = /^(?:(?:§\d+§|\[dropped(?: §\d+§)?\]|\[cleared\])\s*)+$/;
-function isMarkerOnlyText(text) {
-  const trimmed = text.trim();
-  return trimmed.length > 0 && MARKER_ONLY_PATTERN.test(trimmed);
-}
-var TAG_PREFIX_PATTERN = /^§\d+§\s*/;
-var SYSTEM_INJECTION_PATTERNS = [
-  /^<!-- OMO_INTERNAL_INITIATOR -->$/,
-  /^<system-reminder>[\s\S]*<\/system-reminder>$/,
-  /^\[SYSTEM DIRECTIVE:/,
-  /^\[Category\+Skill Reminder\]/,
-  /^\[EDIT ERROR - IMMEDIATE ACTION REQUIRED\]/,
-  /^\[task CALL FAILED/,
-  /^\[EMERGENCY CONTEXT WINDOW WARNING\]/
-];
-function isSystemInjectedText(text) {
-  const stripped = text.trim().replace(TAG_PREFIX_PATTERN, "").trim();
-  if (stripped.length === 0)
-    return false;
-  return SYSTEM_INJECTION_PATTERNS.some((pattern) => pattern.test(stripped));
-}
-function stripSystemInjectedMessages(messages, protectedTailStart, providerID, onFirstApplication) {
-  let stripped = 0;
-  const sentineledIds = [];
-  for (let i = 0;i < messages.length; i++) {
-    if (i >= protectedTailStart)
-      continue;
-    const msg = messages[i];
-    if (msg.parts.length === 0)
-      continue;
-    if (msg.info.role === "user")
-      continue;
-    if (msg.parts.length === 1 && isSentinel(msg.parts[0]))
-      continue;
-    let hasContentPart = false;
-    let allContentIsSystemInjection = true;
-    for (const part of msg.parts) {
-      if (!isRecord(part))
-        continue;
-      const partType = part.type;
-      if (METADATA_PART_TYPES.has(partType))
-        continue;
-      if (part.ignored === true)
-        continue;
-      if (partType === "tool") {
-        allContentIsSystemInjection = false;
-        break;
-      }
-      if (partType === "text" && typeof part.text === "string") {
-        hasContentPart = true;
-        if (!isSystemInjectedText(part.text)) {
-          allContentIsSystemInjection = false;
-          break;
-        }
-        continue;
-      }
-      allContentIsSystemInjection = false;
-      break;
-    }
-    if (hasContentPart && allContentIsSystemInjection) {
-      onFirstApplication?.(msg, 0);
-      neutralizeWholeMessage(msg, providerID);
-      stripped++;
-      if (typeof msg.info.id === "string")
-        sentineledIds.push(msg.info.id);
-    }
-  }
-  return { stripped, sentineledIds };
-}
-var METADATA_PART_TYPES = new Set([
-  "step-start",
-  "step-finish",
-  "snapshot",
-  "patch",
-  "agent",
-  "retry",
-  "subtask",
-  "compaction"
-]);
-function stripDroppedPlaceholderMessages(messages, providerID, onFirstApplication) {
-  let stripped = 0;
-  const sentineledIds = [];
-  for (let i = 0;i < messages.length; i++) {
-    const msg = messages[i];
-    if (msg.parts.length === 0)
-      continue;
-    if (msg.info.role === "user")
-      continue;
-    if (msg.parts.length === 1 && isSentinel(msg.parts[0]))
-      continue;
-    let hasContentPart = false;
-    let hasNonDroppedContent = false;
-    for (const part of msg.parts) {
-      if (!isRecord(part)) {
-        hasNonDroppedContent = true;
-        break;
-      }
-      const partType = part.type;
-      if (METADATA_PART_TYPES.has(partType))
-        continue;
-      if (partType === "tool") {
-        hasNonDroppedContent = true;
-        break;
-      }
-      if ((partType === "text" || partType === "reasoning") && typeof part.text === "string") {
-        hasContentPart = true;
-        if (part.text.trim().length === 0)
-          continue;
-        if (!isMarkerOnlyText(part.text)) {
-          hasNonDroppedContent = true;
-          break;
-        }
-        continue;
-      }
-      hasNonDroppedContent = true;
-      break;
-    }
-    if (hasContentPart && !hasNonDroppedContent) {
-      onFirstApplication?.(msg, 0);
-      neutralizeWholeMessage(msg, providerID);
-      stripped++;
-      if (typeof msg.info.id === "string")
-        sentineledIds.push(msg.info.id);
-    }
-  }
-  return { stripped, sentineledIds };
-}
-function replayClearedReasoning(messages, reasoningByMessage, messageTagNumbers, persistedWatermark) {
-  if (persistedWatermark <= 0)
-    return 0;
-  let cleared = 0;
-  for (const message of messages) {
-    const msgTag = messageTagNumbers.get(message) ?? 0;
-    if (msgTag === 0 || msgTag > persistedWatermark)
-      continue;
-    const parts = reasoningByMessage.get(message);
-    if (!parts)
-      continue;
-    for (const tp of parts) {
-      if (tp.type === "text")
-        continue;
-      if (tp.thinking !== undefined && tp.thinking !== "[cleared]") {
-        tp.thinking = "[cleared]";
-        cleared++;
-      }
-      if (tp.text !== undefined && tp.text !== "[cleared]") {
-        tp.text = "[cleared]";
-        cleared++;
-      }
-    }
-  }
-  return cleared;
-}
-function replayStrippedInlineThinking(messages, messageTagNumbers, persistedWatermark) {
-  if (persistedWatermark <= 0)
-    return 0;
-  let stripped = 0;
-  for (const message of messages) {
-    if (message.info.role !== "assistant")
-      continue;
-    const msgTag = messageTagNumbers.get(message) ?? 0;
-    if (msgTag === 0 || msgTag > persistedWatermark)
-      continue;
-    for (const part of message.parts) {
-      if (!isRecord(part) || part.type !== "text" || typeof part.text !== "string")
-        continue;
-      if (!part.text.includes("<think"))
-        continue;
-      const cleaned = part.text.replace(INLINE_THINKING_PATTERN, "");
-      if (cleaned !== part.text) {
-        part.text = cleaned;
-        stripped++;
-      }
-    }
-  }
-  return stripped;
-}
-function clearOldReasoning(messages, reasoningByMessage, messageTagNumbers, cutoff) {
-  const ageCutoff = cutoff;
-  let cleared = 0;
-  for (const message of messages) {
-    const msgTag = messageTagNumbers.get(message) ?? 0;
-    if (msgTag === 0 || msgTag > ageCutoff)
-      continue;
-    const parts = reasoningByMessage.get(message);
-    if (!parts)
-      continue;
-    for (const tp of parts) {
-      if (tp.type === "text")
-        continue;
-      if (tp.thinking !== undefined && tp.thinking !== "[cleared]") {
-        tp.thinking = "[cleared]";
-        cleared++;
-      }
-      if (tp.text !== undefined && tp.text !== "[cleared]") {
-        tp.text = "[cleared]";
-        cleared++;
-      }
-    }
-  }
-  return cleared;
-}
-var CLEARED_REASONING_TYPES = new Set(["thinking", "reasoning"]);
-function stripClearedReasoning(messages) {
-  let stripped = 0;
-  for (const message of messages) {
-    if (message.info.role !== "assistant")
-      continue;
-    for (let i = 0;i < message.parts.length; i++) {
-      const part = message.parts[i];
-      if (!isRecord(part))
-        continue;
-      const partType = part.type;
-      if (!CLEARED_REASONING_TYPES.has(partType))
-        continue;
-      if (!("thinking" in part) && !("text" in part))
-        continue;
-      const thinking = "thinking" in part ? part.thinking : undefined;
-      const text = "text" in part ? part.text : undefined;
-      const isCleared = (thinking === undefined || thinking === "[cleared]") && (text === undefined || text === "[cleared]");
-      if (!isCleared)
-        continue;
-      message.parts[i] = makeSentinel(part);
-      stripped++;
-    }
-  }
-  return stripped;
-}
-var INLINE_THINKING_PATTERN = /<(?:thinking|think)>[\s\S]*?<\/(?:thinking|think)>\s*/g;
-function stripInlineThinking(messages, messageTagNumbers, cutoff) {
-  const ageCutoff = cutoff;
-  let stripped = 0;
-  for (const message of messages) {
-    if (message.info.role !== "assistant")
-      continue;
-    const msgTag = messageTagNumbers.get(message) ?? 0;
-    if (msgTag === 0 || msgTag > ageCutoff)
-      continue;
-    for (const part of message.parts) {
-      if (!isRecord(part) || part.type !== "text" || typeof part.text !== "string")
-        continue;
-      const cleaned = part.text.replace(INLINE_THINKING_PATTERN, "");
-      if (cleaned !== part.text) {
-        part.text = cleaned;
-        stripped++;
-      }
-    }
-  }
-  return stripped;
-}
-var REASONING_IGNORED_PART_TYPES = new Set([
-  "step-start",
-  "step-finish",
-  "snapshot",
-  "patch",
-  "agent",
-  "retry",
-  "subtask",
-  "compaction"
-]);
-var REASONING_PART_TYPES = new Set(["reasoning", "thinking", "redacted_thinking"]);
-function hasReasoningReplayContent(message) {
-  return message.parts.some((part) => {
-    if (!isRecord(part) || part.ignored === true)
-      return false;
-    const type = typeof part.type === "string" ? part.type : "";
-    if (REASONING_IGNORED_PART_TYPES.has(type))
-      return false;
-    return type !== "text" || typeof part.text !== "string" || part.text.trim().length > 0;
-  });
-}
-function findReasoningBearingAssistantIds(messages) {
-  const ids = new Set;
-  for (const message of messages) {
-    if (message.info.role !== "assistant")
-      continue;
-    const id = message.info.id;
-    if (typeof id !== "string" || id.length === 0)
-      continue;
-    if (message.parts.some((part) => isRecord(part) && REASONING_PART_TYPES.has(String(part.type)))) {
-      ids.add(id);
-    }
-  }
-  return [...ids];
-}
-function findLatestAssistantReasoningMutationExemptMessage(messages) {
-  for (let index = messages.length - 1;index >= 0; index -= 1) {
-    const message = messages[index];
-    if (message.info.role === "assistant" && hasReasoningReplayContent(message))
-      return message;
-  }
-  return;
-}
-function planMergedAssistantReasoningStrip(messages, mutationExemptMessage, frozenMessageIds, protectedMessages) {
-  const plan = [];
-  let prevRole;
-  let keptReasoningInRun = false;
-  for (const message of messages) {
-    const role = message.info.role;
-    if (role !== "assistant") {
-      prevRole = role;
-      keptReasoningInRun = false;
-      continue;
-    }
-    const firstInRun = prevRole !== "assistant";
-    if (firstInRun)
-      keptReasoningInRun = false;
-    if (protectedMessages?.has(message) || message === mutationExemptMessage || frozenMessageIds?.has(message.info.id ?? "")) {
-      prevRole = role;
-      continue;
-    }
-    let keepIndex = -1;
-    if (firstInRun && !keptReasoningInRun) {
-      for (let i = 0;i < message.parts.length; i++) {
-        const part = message.parts[i];
-        if (!isRecord(part))
-          continue;
-        const partType = part.type;
-        if (REASONING_IGNORED_PART_TYPES.has(partType))
-          continue;
-        if (part.ignored === true)
-          continue;
-        if (isSentinel(part))
-          continue;
-        if (partType === "text" && typeof part.text === "string" && part.text.trim() === "") {
-          continue;
-        }
-        if (REASONING_PART_TYPES.has(partType)) {
-          keepIndex = i;
-        }
-        break;
-      }
-    }
-    const stripIndices = [];
-    for (let i = 0;i < message.parts.length; i++) {
-      const part = message.parts[i];
-      if (!isRecord(part))
-        continue;
-      if (!REASONING_PART_TYPES.has(part.type))
-        continue;
-      if (part.cache_control !== undefined)
-        continue;
-      if (i === keepIndex) {
-        keptReasoningInRun = true;
-        continue;
-      }
-      stripIndices.push(i);
-    }
-    if (stripIndices.length > 0)
-      plan.push({ message, stripIndices });
-    prevRole = role;
-  }
-  return plan;
-}
-var MAX_FROZEN_TRAILING_BLANKS = 1e4;
-var CANONICAL_BLANK_PART = { type: "text", text: "" };
-function isSentinelInvisibleTextPart(part) {
-  return isRecord(part) && part.type === "text" && typeof part.text === "string" && stripWellFormedLeadingTagPrefix(part.text).trim() === "";
-}
-function isCanonicalBlankPart(part) {
-  return isRecord(part) && Object.keys(part).length === 2 && part.type === "text" && part.text === "";
-}
-function trailingBlankKeepCount(decision) {
-  if (decision === "keep")
-    return 1;
-  if (!decision.startsWith("keep:"))
-    return;
-  const countText = decision.slice("keep:".length);
-  if (!/^[1-9]\d*$/.test(countText))
-    return;
-  const count = Number(countText);
-  return Number.isSafeInteger(count) && count > 0 && count <= MAX_FROZEN_TRAILING_BLANKS ? count : undefined;
-}
-function trailingBlankDecisionForMessage(message) {
-  const id = message.info.id;
-  if (message.info.role !== "assistant" || typeof id !== "string" || id.length === 0) {
-    return;
-  }
-  let trailingCount = 0;
-  while (trailingCount < message.parts.length && isSentinelInvisibleTextPart(message.parts[message.parts.length - trailingCount - 1])) {
-    trailingCount += 1;
-  }
-  if (trailingCount > MAX_FROZEN_TRAILING_BLANKS && trailingCount < message.parts.length) {
-    return;
-  }
-  const decision = message.parts.length === 0 || trailingCount === message.parts.length ? "keep" : trailingCount === 0 ? "strip" : trailingCount === 1 ? "keep" : `keep:${trailingCount}`;
-  return [id, decision];
-}
-function snapshotTrailingBlankSourceDecisions(messages) {
-  const decisions = new Map;
-  for (const message of messages) {
-    const observed = trailingBlankDecisionForMessage(message);
-    if (observed)
-      decisions.set(...observed);
-  }
-  return decisions;
-}
-function findTrailingBlankDecisionCandidates(messages, frozenDecisions, options) {
-  const observedDecisions = options?.sourceDecisions ?? snapshotTrailingBlankSourceDecisions(messages);
-  const visibleIds = new Set(messages.flatMap((message) => typeof message.info.id === "string" ? [message.info.id] : []));
-  const decisions = [];
-  for (const [id, decision] of observedDecisions) {
-    if (!visibleIds.has(id))
-      continue;
-    const frozen = frozenDecisions.get(id);
-    if (frozen !== undefined && (id !== options?.refreshMessageId || frozen === decision || frozen === "strip")) {
-      continue;
-    }
-    decisions.push([id, decision]);
-  }
-  return decisions;
-}
-function applyFrozenTrailingBlankDecisions(messages, frozenDecisions) {
-  let mutations = 0;
-  for (let messageIndex = 0;messageIndex < messages.length; messageIndex += 1) {
-    let message = messages[messageIndex];
-    const id = message.info.id;
-    if (message.info.role !== "assistant" || typeof id !== "string")
-      continue;
-    const decision = frozenDecisions.get(id);
-    if (!decision)
-      continue;
-    let lastMeaningfulIndex = message.parts.length - 1;
-    while (lastMeaningfulIndex >= 0 && isSentinelInvisibleTextPart(message.parts[lastMeaningfulIndex])) {
-      lastMeaningfulIndex -= 1;
-    }
-    const replaceParts = (start, deleteCount, insertBlankCount) => {
-      message = { ...message, parts: [...message.parts] };
-      messages[messageIndex] = message;
-      message.parts.splice(start, deleteCount, ...Array.from({ length: insertBlankCount }, () => ({ ...CANONICAL_BLANK_PART })));
-    };
-    if (lastMeaningfulIndex < 0) {
-      if (message.parts.length === 0)
-        continue;
-      if (message.parts.length !== 1 || !isCanonicalBlankPart(message.parts[0])) {
-        mutations += Math.max(1, message.parts.length);
-        replaceParts(0, message.parts.length, 1);
-      }
-      continue;
-    }
-    const trailingCount = message.parts.length - lastMeaningfulIndex - 1;
-    const keepCount = trailingBlankKeepCount(decision);
-    if (keepCount !== undefined) {
-      if (trailingCount === 0)
-        continue;
-      const blankIndex = lastMeaningfulIndex + 1;
-      const suffixIsCanonical = trailingCount === keepCount && message.parts.slice(blankIndex).every(isCanonicalBlankPart);
-      if (!suffixIsCanonical) {
-        mutations += Math.max(1, trailingCount, keepCount);
-        replaceParts(blankIndex, trailingCount, keepCount);
-      }
-      continue;
-    }
-    if (trailingCount === 0)
-      continue;
-    const lastMeaningfulPart = message.parts[lastMeaningfulIndex];
-    if (isRecord(lastMeaningfulPart) && REASONING_PART_TYPES.has(lastMeaningfulPart.type)) {
-      const blankIndex = lastMeaningfulIndex + 1;
-      if (trailingCount !== 1 || !isCanonicalBlankPart(message.parts[blankIndex])) {
-        mutations += Math.max(1, trailingCount);
-        replaceParts(blankIndex, trailingCount, 1);
-      }
-      continue;
-    }
-    mutations += trailingCount;
-    replaceParts(lastMeaningfulIndex + 1, trailingCount, 0);
-  }
-  return mutations;
-}
-function stripReasoningFromAssistantIds(messages, providerID, messageIds, protectedMessages) {
-  if (messageIds.size === 0)
-    return 0;
-  const emptySentinels = modelAcceptsEmptyContent(providerID);
-  let stripped = 0;
-  for (const message of messages) {
-    if (protectedMessages?.has(message))
-      continue;
-    const id = message.info.id;
-    if (typeof id !== "string" || !messageIds.has(id))
-      continue;
-    for (let index = 0;index < message.parts.length; index += 1) {
-      const part = message.parts[index];
-      if (!isRecord(part) || !REASONING_PART_TYPES.has(String(part.type)))
-        continue;
-      if (emptySentinels) {
-        message.parts[index] = makeSentinel(part);
-      } else {
-        message.parts.splice(index, 1);
-        index -= 1;
-      }
-      stripped += 1;
-    }
-    if (message.parts.length === 0)
-      message.parts.push(makeWholeMessageSentinel(providerID));
-  }
-  return stripped;
-}
-function findMergedReasoningStripDecisions(messages, providerID, frozenIds, options) {
-  if (providerID !== "anthropic")
-    return [];
-  const frozenParts = readFrozenMergedReasoningParts(frozenIds);
-  const decisions = [];
-  for (const entry of planMergedAssistantReasoningStrip(messages, options?.mutationExemptMessage, new Set(frozenParts.keys()), options?.protectedMessages)) {
-    const id = entry.message.info.id;
-    if (typeof id !== "string" || id.length === 0 || frozenParts.has(id))
-      continue;
-    const parts = entry.stripIndices.map((index) => {
-      const part = entry.message.parts[index];
-      return isRecord(part) && typeof part.id === "string" ? part.id : index;
-    });
-    decisions.push(id, MERGED_REASONING_PARTS_PREFIX + JSON.stringify([id, parts]));
-  }
-  return decisions;
-}
-function stripReasoningFromMergedAssistants(messages, providerID, options) {
-  if (providerID !== "anthropic")
-    return 0;
-  let stripped = 0;
-  const frozenParts = options?.frozenParts ?? readFrozenMergedReasoningParts(options?.frozenMessageIds ?? new Set);
-  for (const message of messages) {
-    if (message.info.role !== "assistant" || options?.restoreMessages?.has(message))
-      continue;
-    const parts = frozenParts.get(message.info.id ?? "");
-    if (!parts)
-      continue;
-    for (let index = 0;index < message.parts.length; index += 1) {
-      const part = message.parts[index];
-      if (!isRecord(part) || !REASONING_PART_TYPES.has(String(part.type)))
-        continue;
-      if (!parts.includes(index) && !(typeof part.id === "string" && parts.includes(part.id)))
-        continue;
-      message.parts[index] = makeSentinel(part);
-      stripped++;
-    }
-  }
-  for (const entry of planMergedAssistantReasoningStrip(messages, options?.mutationExemptMessage, options?.frozenPartMessageIds ?? new Set(frozenParts.keys()), options?.frozenMessageIds ? options.restoreMessages : options?.protectedMessages)) {
-    if (options?.frozenMessageIds) {
-      const id = entry.message.info.id;
-      if (typeof id !== "string" || !options.frozenMessageIds.has(id))
-        continue;
-    }
-    for (const index of entry.stripIndices) {
-      entry.message.parts[index] = makeSentinel(entry.message.parts[index]);
-      stripped++;
-    }
-  }
-  return stripped;
-}
-function stripProcessedImages(messages, frozenIds, options) {
-  const { detect, watermark, messageTagNumbers } = options;
-  let stripped = 0;
-  const newlyStrippedIds = [];
-  let hasAssistantResponse = false;
-  for (let i = messages.length - 1;i >= 0; i--) {
-    const msg = messages[i];
-    if (msg.info.role === "assistant") {
-      hasAssistantResponse = true;
-      continue;
-    }
-    if (msg.info.role !== "user") {
-      continue;
-    }
-    const id = typeof msg.info.id === "string" ? msg.info.id : undefined;
-    const inFrozen = id !== undefined && frozenIds.has(id);
-    const maxTag = messageTagNumbers.get(msg) ?? 0;
-    const isNewDetection = !inFrozen && detect && hasAssistantResponse && id !== undefined && maxTag <= watermark;
-    if (!inFrozen && !isNewDetection) {
-      continue;
-    }
-    let touchedThisMsg = false;
-    for (let j = 0;j < msg.parts.length; j++) {
-      const part = msg.parts[j];
-      if (!isRecord(part) || part.type !== "file") {
-        continue;
-      }
-      if (typeof part.mime !== "string" || !part.mime.startsWith("image/")) {
-        continue;
-      }
-      if (typeof part.url === "string" && part.url.startsWith("data:") && part.url.length > 200) {
-        if (isNewDetection)
-          options.onFirstApplication?.(msg, j);
-        msg.parts[j] = makeSentinel(part);
-        stripped++;
-        touchedThisMsg = true;
-      }
-    }
-    if (touchedThisMsg && isNewDetection && id !== undefined) {
-      newlyStrippedIds.push(id);
-    }
-  }
-  return { stripped, newlyStrippedIds };
-}
-
-// src/hooks/magic-context/reasoning-budget.ts
-function projectOpencodeReasoningBudgetCutoff(db, sessionId, messages, budget, watermark, proseRatio) {
-  const textEstimateByMessageId = getReasoningTokenEstimatesByMessage2(db, sessionId, proseRatio);
-  const maxTags = getMaxTagNumberByOwnerMessage2(db, sessionId);
-  const messageTags = new Map;
-  const gone = new Set(getReasoningRemovalState(db, sessionId).messageIds);
-  for (const message of messages) {
-    if (typeof message.info.id !== "string")
-      continue;
-    const tag = maxTags.get(message.info.id) ?? 0;
-    messageTags.set(message, tag);
-    if (tag > 0 && tag <= watermark)
-      gone.add(message.info.id);
-  }
-  const frozenMergedIds = getMergedReasoningStrippedIds(db, sessionId);
-  return opencodeReasoningBudgetCutoff({
-    messages,
-    messageTagNumbers: messageTags,
-    budget,
-    alreadyRemoved: gone,
-    textEstimateByMessageId,
-    proseRatio,
-    frozenMergedIds,
-    alsoGone: new Set([...frozenMergedIds].filter((id) => id.startsWith(THINKING_BINDING_RECOVERY_FROZEN_PREFIX)).map((id) => id.slice(THINKING_BINDING_RECOVERY_FROZEN_PREFIX.length)))
-  });
-}
-var DEFAULT_KEEP_REASONING_TOKENS = 1e4;
-var UNKNOWN_REASONING_STEP_TOKENS = 1000;
-function resolveKeepReasoningTokens(config, modelKey) {
-  const values = config && typeof config === "object" ? Object.assign(Object.create(null), config) : undefined;
-  return typeof config === "number" ? config : resolveModelConfigValue(values, modelKey)?.value ?? values?.default ?? DEFAULT_KEEP_REASONING_TOKENS;
-}
-function reasoningStepCost(reported, textEstimate, opaque) {
-  if (reported !== undefined && Number.isFinite(reported) && reported > 0)
-    return reported;
-  if (textEstimate > 0)
-    return Math.ceil(textEstimate);
-  return opaque ? UNKNOWN_REASONING_STEP_TOKENS : 0;
-}
-function reasoningBudgetCutoff(steps, budget) {
-  const cost = (step) => step.alreadyRemoved ? 0 : typeof step.cost === "function" ? step.cost() : step.cost;
-  let kept = 0;
-  let upperBound = Number.POSITIVE_INFINITY;
-  for (const step of steps) {
-    if (!step.exempt)
-      continue;
-    kept += cost(step);
-    if (step.tag > 0)
-      upperBound = Math.min(upperBound, step.tag - 1);
-  }
-  for (let index = steps.length - 1;index >= 0; index--) {
-    const step = steps[index];
-    if (step.exempt || step.alreadyRemoved)
-      continue;
-    const tokens = cost(step);
-    if (kept + tokens <= budget) {
-      kept += tokens;
-      if (step.tag > 0)
-        upperBound = Math.min(upperBound, step.tag - 1);
-      continue;
-    }
-    let tag = step.tag;
-    for (let older = index - 1;tag <= 0 && older >= 0; older--)
-      tag = steps[older].tag;
-    return Math.max(0, Math.min(tag, upperBound));
-  }
-  return 0;
-}
-function reasoningTextAndOpaque(parts) {
-  let text = "";
-  let inlineText = "";
-  let opaque = false;
-  let hasReasoning = false;
-  const detailText = new Set;
-  for (const part of parts) {
-    if (!isRecord(part))
-      continue;
-    if (part.ignored === true)
-      continue;
-    if (isRecord(part.metadata)) {
-      const router = part.metadata.openrouter;
-      if (isRecord(router) && Array.isArray(router.reasoning_details) && router.reasoning_details.length > 0) {
-        hasReasoning = true;
-        opaque = true;
-        for (const detail of router.reasoning_details) {
-          if (!isRecord(detail))
-            continue;
-          if (detail.type === "reasoning.text" && typeof detail.text === "string")
-            detailText.add(detail.text);
-          if (detail.type === "reasoning.summary" && typeof detail.summary === "string")
-            detailText.add(detail.summary);
-        }
-      }
-    }
-    if (["reasoning", "thinking", "redacted_thinking"].includes(String(part.type))) {
-      hasReasoning = true;
-      const visible = part.type === "redacted_thinking" || part.redacted === true ? "" : typeof part.thinking === "string" ? part.thinking : typeof part.text === "string" ? part.text : "";
-      if (visible !== "[cleared]")
-        text += visible;
-      opaque ||= part.type === "redacted_thinking" || part.redacted === true || visible === "" && (part.metadata !== undefined || part.signature !== undefined || part.thinkingSignature !== undefined);
-    } else if (part.type === "text" && typeof part.text === "string") {
-      for (const match of part.text.matchAll(/<(?:thinking|think)>([\s\S]*?)<\/(?:thinking|think)>/gi))
-        inlineText += match[1];
-    }
-  }
-  return { text: text || [...detailText].join(""), inlineText, opaque, hasReasoning };
-}
-function opencodeReasoningBudgetCutoff(args) {
-  const assistants = args.messages.filter((message) => message.info.role === "assistant");
-  const newest = assistants.at(-1);
-  const exempt = findLatestAssistantReasoningMutationExemptMessage(args.messages);
-  const anthropic = args.anthropic ?? hasAnthropicReasoning(args.messages);
-  const indexOfMessage = new Map;
-  args.messages.forEach((message, index) => {
-    if (!indexOfMessage.has(message))
-      indexOfMessage.set(message, index);
-  });
-  const frozenParts = args.frozenMergedIds ? readFrozenMergedReasoningParts(args.frozenMergedIds) : undefined;
-  const frozenPartMessageIds = frozenParts ? new Set(frozenParts.keys()) : undefined;
-  return reasoningBudgetCutoff(assistants.map((message) => ({
-    tag: args.messageTagNumbers.get(message) ?? 0,
-    exempt: message === newest || message === exempt || isInActiveAnthropicTurn(args.messages, indexOfMessage.get(message) ?? -1, anthropic),
-    cost: () => {
-      const costMessage = { ...message, parts: [...message.parts] };
-      const id = message.info.id ?? "";
-      if (args.frozenMergedIds && (frozenParts?.has(id) || args.frozenMergedIds.has(id)))
-        stripReasoningFromMergedAssistants([costMessage], "anthropic", {
-          frozenMessageIds: args.frozenMergedIds,
-          frozenParts,
-          frozenPartMessageIds
-        });
-      const visible = reasoningTextAndOpaque(args.countNeutralized ? costMessage.parts.map(neutralizedReasoningSource) : costMessage.parts);
-      if (!visible.hasReasoning && !visible.inlineText)
-        return 0;
-      const info = message.info;
-      const tokens = isRecord(info.tokens) ? info.tokens.reasoning : undefined;
-      const typedGone = typeof message.info.id === "string" && (args.alreadyRemoved?.has(message.info.id) === true || args.alsoGone?.has(message.info.id) === true);
-      return (visible.hasReasoning && !typedGone ? reasoningStepCost(typeof tokens === "number" ? tokens : undefined, estimateTokens(visible.text) * (args.proseRatio ?? 1), visible.opaque) : 0) + Math.ceil(estimateTokens(visible.inlineText) * (args.proseRatio ?? 1));
-    }
-  })), args.budget);
-}
-
 // src/hooks/magic-context/reasoning-budget-status.ts
 var sources = new Map;
 function captureOpencodeReasoningBudgetStatus(sessionId, messages, budget, prefixBound, proseRatio = 1) {
@@ -3347,14 +2525,14 @@ function retainedActiveThinkingParts(args) {
 }
 
 // src/features/magic-context/storage-caveman-rules.ts
-var NAMESPACE2 = "caveman";
+var NAMESPACE = "caveman";
 var CURRENT_RULES_VERSION = 2;
 var ORIGINAL_RULES = {
   currentRules: false,
   englishWordRules: true,
   legacyReasoningTags: new Set
 };
-function parseState2(lane) {
+function parseState(lane) {
   if (!isRecord(lane) || lane.rules !== CURRENT_RULES_VERSION)
     return ORIGINAL_RULES;
   const tags = Array.isArray(lane.legacyReasoningTags) ? lane.legacyReasoningTags : [];
@@ -3366,7 +2544,7 @@ function parseState2(lane) {
 }
 function getCavemanReplayState(db, sessionId) {
   try {
-    return parseState2(readReplayEnvelope(db, sessionId)[NAMESPACE2]);
+    return parseState(readReplayEnvelope(db, sessionId)[NAMESPACE]);
   } catch (error) {
     if (error instanceof ReplayDocumentError)
       return ORIGINAL_RULES;
@@ -3376,11 +2554,11 @@ function getCavemanReplayState(db, sessionId) {
 function recordCavemanCurrentRules(db, sessionId, englishWordRules, legacyReasoningTags) {
   const tags = [...new Set(legacyReasoningTags)].sort((a, b) => a - b);
   const persisted = updateReplayDocument(db, sessionId, (doc) => {
-    const current = parseState2(doc[NAMESPACE2]);
+    const current = parseState(doc[NAMESPACE]);
     if (current.currentRules && current.englishWordRules === englishWordRules)
       return false;
     doc.version = 2;
-    doc[NAMESPACE2] = {
+    doc[NAMESPACE] = {
       rules: CURRENT_RULES_VERSION,
       legacyReasoningTags: current.currentRules ? [...current.legacyReasoningTags].sort((a, b) => a - b) : tags,
       ...englishWordRules ? {} : { englishWordRules: false }
@@ -5123,7 +4301,7 @@ function tagMessages(sessionId, messages, tagger, db, options = {}) {
         accAssignTag += performance.now() - _tAssignText;
         const persistedSource = sourceContents.get(tagId);
         if (persistedSource !== undefined) {
-          textPart.text = persistedSource;
+          textPart.text = options.normalizeRestoredAssistantText && message.info.role === "assistant" ? options.normalizeRestoredAssistantText(persistedSource) : persistedSource;
         } else {
           const sourceContent = stripTagPrefix(textPart.text);
           if (sourceContent.trim().length > 0) {
@@ -5978,6 +5156,7 @@ async function runPostTransformPhase2(args) {
   }
   const reasoningMutationExemptMessage = findLatestAssistantReasoningMutationExemptMessage(args.messages);
   const pendingMaterializationAtPassStart = args.pendingMaterializationSessions.has(args.sessionId);
+  const pendingOrigin = pendingMaterializationOrigin(args.pendingMaterializationSessions, args.sessionId);
   const deferredMaterializationAtPassStart = args.deferredMaterializationSessions.has(args.sessionId);
   let isExplicitFlush = pendingMaterializationAtPassStart;
   const deferredMaterializationWasPending = deferredMaterializationAtPassStart;
@@ -6163,6 +5342,11 @@ async function runPostTransformPhase2(args) {
     }
     sessionLog2(args.sessionId, `m[0] HARD fold decision: reason=${m0MaterializeReason ?? foldDueDecision.reason ?? (foldExecutedThisPass ? "drift" : "soft_refresh")} executed=${foldExecutedThisPass} bustsServedPrefix=${foldBustsServedPrefixThisPass}`);
   }
+  if (args.normalizeRecoveryTail && (foldBustsServedPrefixThisPass || firstRenderBust)) {
+    args.normalizeRecoveryTail();
+    args.tags = getTagsBySession2(args.db, args.sessionId);
+    newTargets = protectNewTagMutations(args.messages, args.targets, retainedThinking, args.thinkingBindingRecoveryEnabledForModel === true);
+  }
   logTransformTiming(args.sessionId, "pp.prefixPreflight", tPostprocessSetup, `foldExecuted=${foldExecutedThisPass} m1Refreshed=${publishedM1RefreshedThisPass}`);
   const tPassDecisions = performance.now();
   const frontToolCandidates = args.tags.filter((tag) => tag.type === "tool" && tag.status === "active" && args.targets.get(tag.tagNumber)?.canDrop?.());
@@ -6178,7 +5362,7 @@ async function runPostTransformPhase2(args) {
   const pendingOps = shouldReadPendingOps ? getPendingOps(args.db, args.sessionId) : [];
   const hasPendingUserOps = pendingOps.length > 0;
   if (args.schedulerDecision === "execute" && pendingOps.some((op) => newTargets.get(op.tagId)?.thinkingDropProtected))
-    args.pendingMaterializationSessions.add(args.sessionId);
+    requestPendingMaterialization(args.pendingMaterializationSessions, args.sessionId, "thinking_hold");
   const formatPendingOpsDepth = () => {
     const depth = getPendingOpsCount(args.db, args.sessionId);
     return depth === null ? "not loaded (deferred pass)" : String(depth);
@@ -6269,7 +5453,7 @@ async function runPostTransformPhase2(args) {
   }
   if (shouldRunHeuristics) {
     const subagentRerun = !args.fullFeatureMode && alreadyRanThisTurn && args.schedulerDecision === "execute" && !isExplicitFlush && !forceMaterialization;
-    const reason = isExplicitFlush ? "explicit_flush" : deferredMaterialize ? "deferred_materialization" : forceMaterialization ? `force_materialization (${args.contextUsage.percentage.toFixed(1)}% >= ${args.forceMaterializationPercentage}%)` : foldBustsServedPrefixThisPass && args.schedulerDecision !== "execute" ? `m0_hard_fold (drain folded into executed m[0] bust, scheduler=${args.schedulerDecision})` : subagentRerun ? `${reclaimRideLabel(rideSignals)} subagent_rerun (pendingOps=${pendingOps.length}, scheduler=${args.schedulerDecision})` : `${reclaimRideLabel(rideSignals)} (pendingOps=${pendingOps.length}, scheduler=${args.schedulerDecision})`;
+    const reason = isExplicitFlush ? `pending_materialization origin=${pendingOrigin}` : deferredMaterialize ? "deferred_materialization" : forceMaterialization ? `force_materialization (${args.contextUsage.percentage.toFixed(1)}% >= ${args.forceMaterializationPercentage}%)` : foldBustsServedPrefixThisPass && args.schedulerDecision !== "execute" ? `m0_hard_fold (drain folded into executed m[0] bust, scheduler=${args.schedulerDecision})` : subagentRerun ? `${reclaimRideLabel(rideSignals)} subagent_rerun (pendingOps=${pendingOps.length}, scheduler=${args.schedulerDecision})` : `${reclaimRideLabel(rideSignals)} (pendingOps=${pendingOps.length}, scheduler=${args.schedulerDecision})`;
     sessionLog2(args.sessionId, `heuristics WILL RUN — reason=${reason}, context=${args.contextUsage.percentage.toFixed(1)}%, turn=${args.currentTurnId}`);
   } else if (args.schedulerDeferReason !== undefined && args.schedulerDeferReason !== null) {
     sessionLog2(args.sessionId, `heuristics WILL NOT RUN — reason=${args.schedulerDeferReason}`);
@@ -6332,7 +5516,7 @@ async function runPostTransformPhase2(args) {
   logTransformTiming(args.sessionId, "pp.passDecisions", tPassDecisions, `pendingOps=${pendingOps.length}`);
   try {
     if (shouldApplyPendingOps) {
-      const applyReason = isExplicitFlush ? "explicit_flush" : deferredMaterialize ? "deferred_materialization" : foldBustsServedPrefixThisPass && args.schedulerDecision !== "execute" ? `m0_hard_fold (drain folded into executed m[0] bust, scheduler=${args.schedulerDecision})` : `${reclaimRideLabel(rideSignals)} (scheduler=${args.schedulerDecision})`;
+      const applyReason = isExplicitFlush ? `pending_materialization origin=${pendingOrigin}` : deferredMaterialize ? "deferred_materialization" : foldBustsServedPrefixThisPass && args.schedulerDecision !== "execute" ? `m0_hard_fold (drain folded into executed m[0] bust, scheduler=${args.schedulerDecision})` : `${reclaimRideLabel(rideSignals)} (scheduler=${args.schedulerDecision})`;
       sessionLog2(args.sessionId, `pending ops WILL APPLY — reason=${applyReason}, pendingOps=${formatPendingOpsDepth()}, context=${args.contextUsage.percentage.toFixed(1)}%`);
       const tApply = performance.now();
       pendingOpsDidMutate = applyPendingOperations(args.sessionId, args.db, newTargets, new Set([
@@ -6497,7 +5681,7 @@ async function runPostTransformPhase2(args) {
       heuristicOrReasoningEditBesidesTrim = heuristicMutationCount + clearedReasoning + strippedInline > 0;
       droppedCount += clearedReasoning + strippedInline + removedReasoningMessages;
       if (pendingMaterializationAtPassStart && !freezeM0M1 && !pendingOps.some((op) => newTargets.get(op.tagId)?.thinkingDropProtected)) {
-        args.pendingMaterializationSessions.delete(args.sessionId);
+        clearPendingMaterialization(args.pendingMaterializationSessions, args.sessionId);
       }
       if (args.currentTurnId) {
         args.lastHeuristicsTurnId.set(args.sessionId, args.currentTurnId);
@@ -6630,15 +5814,13 @@ async function runPostTransformPhase2(args) {
     try {
       const tImg = performance.now();
       const frozenImageIds = replaySnapshot.processedImageStrippedIds;
-      const imageResult = stripProcessedImages(args.messages, frozenImageIds, {
+      stripProcessedImages(args.messages, frozenImageIds, {
         detect: canEditWholePrefix && args.watermark > 0,
         watermark: args.watermark,
         messageTagNumbers: args.messageTagNumbers,
+        persistNewIds: (ids) => addProcessedImageStrippedIds(args.db, args.sessionId, ids),
         onFirstApplication: recordFirstApplicationAt
       });
-      if (isCacheBustingPass && imageResult.newlyStrippedIds.length > 0) {
-        addProcessedImageStrippedIds(args.db, args.sessionId, imageResult.newlyStrippedIds);
-      }
       logTransformTiming(args.sessionId, "stripProcessedImages", tImg);
     } catch (error) {
       failPass("image-strip-exception", error);
@@ -6955,7 +6137,7 @@ async function runPostTransformPhase2(args) {
       sessionLog2(args.sessionId, `sticky-injection GC: pruned ${prunedAnchors} note-nudge anchor(s)`);
     }
   }
-  const materializeReason = m0MaterializeReason ?? (explicitMaterializedSuccessfully ? "explicit_flush" : null);
+  const materializeReason = m0MaterializeReason ?? (explicitMaterializedSuccessfully ? pendingOrigin : null);
   const materialized = m0RematerializedThisPass || explicitMaterializedSuccessfully || deferredMaterializedSuccessfully;
   let bustedThisPass = firstApplicationEdits.any || firstRenderBust || pendingOpsDidMutate || heuristicOrReasoningDidMutate || autoReclaimDidMutateThisPass || convertedToolSkeletonsDidMutate || m0RematerializedThisPass || m0M1InjectedThisPass && historyWasConsumedThisPass || historyWasConsumedThisPass;
   const proactiveThinkingStripPermitted = isCacheBustingPass && !activeThinkingPrefixHold;
@@ -7341,7 +6523,7 @@ function checkM0MutationDriftAndSignal2(args) {
   const currentMaxMutationId = getMaxM0MutationId(args.db, args.sessionId) ?? 0;
   const cachedMaxMutationId = args.cachedM0MaxMutationId ?? 0;
   if (currentMaxMutationId !== cachedMaxMutationId) {
-    args.pendingMaterializationSessions.add(args.sessionId);
+    requestPendingMaterialization(args.pendingMaterializationSessions, args.sessionId, "mutation_drift");
     args.historyRefreshSessions?.add(args.sessionId);
     sessionLog2(args.sessionId, `m[0] drift watcher: mutation id changed ${cachedMaxMutationId} → ${currentMaxMutationId}; scheduling next-pass materialization`);
     return true;
@@ -7349,4 +6531,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, replayClearedReasoning, replayStrippedInlineThinking, stripClearedReasoning, findReasoningBearingAssistantIds, snapshotTrailingBlankSourceDecisions, projectOpencodeReasoningBudgetCutoff, resolveKeepReasoningTokens, reasoningBudgetCutoff, 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 { 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 };