@cortexkit/opencode-magic-context 0.49.6 → 0.49.8

package/dist/v2/{server-fby0cxbq.js → server-xj4mewze.js}

@@ -3,7 +3,7 @@ import {
 } from "./server-pavzsdc6.js";
 import {
   prepareCachedStatement2
-} from "./server-0nnd4bry.js";
+} from "./server-wafzvyhg.js";
 import {
   UNKNOWN_FIT_RATIO,
   resolveDecisionCalibration,
@@ -23,7 +23,7 @@ import {
   TAG_SELECT_COLUMNS2,
   getCandidateToolOwners2,
   pickNearestPriorOwner2
-} from "./server-yd01snxq.js";
+} from "./server-jjsf29aq.js";
 import {
   OMO_INTERNAL_INITIATOR_MARKER,
   isSystemDirective,
@@ -40,18 +40,18 @@ import {
   formatBlock,
   compactTextForSummary,
   mergeCommitHashes
-} from "./server-kzns2hbz.js";
+} from "./server-s6jqh8bj.js";
 import {
   sessionLog2
-} from "./server-t4k4qexw.js";
+} from "./server-9e5r8y60.js";
 import {
   stableStringify
-} from "./server-6byqfbqf.js";
+} from "./server-shme41gj.js";
 import {
   renderToolTemplate,
   resolveModelConfigValue,
   deriveDefaultProtectedTokens
-} from "./server-cw6521wn.js";
+} from "./server-7e087rvk.js";
 import {
   readRawSessionMessagesFromDb2,
   readRawSessionMessagePageFromDb2,
@@ -68,25 +68,25 @@ import {
   readRawSeedTailFromDb2,
   readRawSessionBoundaryEndpointsFromDb2,
   prewarmRawSessionOrdinalsForDb
-} from "./server-387vkhjq.js";
+} from "./server-bx59ezg6.js";
 import {
   openCodeDbExists,
   withReadOnlySessionDb,
   getRawSessionMessageCountFromDb,
   getMessageTimesFromOpenCodeDb
-} from "./server-4tn95znb.js";
+} from "./server-zrwaj29a.js";
 import {
   getToolDefinitionMeasurementSignature,
   getLargestMeasuredToolDefinitionTokens,
   getMeasuredToolDefinitionTokens
-} from "./server-7ekna9zs.js";
+} from "./server-adfte03x.js";
 import {
   canonicalModelIdentity,
   piModelRefToCanonical
 } from "./server-avwt563y.js";
 import {
   logSlowWriteTransaction
-} from "./server-3t0q2cqx.js";
+} from "./server-7dv9wt9r.js";
 
 // src/features/magic-context/overflow-detection.ts
 var OVERFLOW_PATTERNS = [
@@ -1696,6 +1696,12 @@ function safeSlice(str, maxLen) {
 function isEditTool(name) {
   return name === "edit" || name === "write";
 }
+function needsEditMarker(input) {
+  return Object.keys(input).some((key) => {
+    const value = input[key];
+    return DIFF_KEYS.has(key) && typeof value === "string" && value.length > EDIT_REGION_HINT_LEN && !value.endsWith(TRUNCATION_SENTINEL);
+  });
+}
 function applyEditMarkerToInput(input) {
   for (const key of Object.keys(input)) {
     if (PATH_KEYS.has(key))
@@ -2101,8 +2107,25 @@ function getProtectionWindowForSession(db, sessionId, floor) {
 }
 
 // src/features/magic-context/storage-replay-document.ts
+import { AsyncLocalStorage } from "node:async_hooks";
 var CAS_RETRY_LIMIT = 5;
 var MISSING_REPLAY_DOCUMENT_COLUMN = Symbol("missing replay document column");
+var replaySnapshots = new AsyncLocalStorage;
+async function withReplayEnvelopeSnapshot(db, sessionId, work) {
+  const snapshot = { db, sessionId, active: true, loaded: false };
+  return replaySnapshots.run(snapshot, async () => {
+    try {
+      return await work();
+    } finally {
+      snapshot.active = false;
+    }
+  });
+}
+function invalidateReplayEnvelopeSnapshot(db, sessionId) {
+  const snapshot = replaySnapshots.getStore();
+  if (snapshot?.db === db && snapshot.sessionId === sessionId)
+    snapshot.loaded = false;
+}
 function isRustMarkerAdmissionFenced(db, sessionId) {
   const row = db.prepare("SELECT COALESCE(json_extract(NULLIF(trailing_blank_decisions, ''), '$.rustMarkerAdmissionFence'), 0) AS fenced FROM session_meta WHERE session_id=?").get(sessionId);
   return row?.fenced === 1;
@@ -2225,16 +2248,30 @@ function readDecisionRows(db, sessionId, messageIds) {
   return db.prepare(`SELECT message_id, decision FROM session_replay_decisions
              WHERE session_id = ? AND message_id IN (SELECT value FROM json_each(?))`).all(sessionId, JSON.stringify(messageIds));
 }
-function readRawReplayDocument(db, sessionId) {
+function readRawReplayDocument(db, sessionId, fresh = false) {
+  const snapshot = replaySnapshots.getStore();
+  const reusable = !fresh && snapshot?.active && snapshot.db === db && snapshot.sessionId === sessionId;
+  if (reusable && snapshot.loaded)
+    return snapshot.raw;
   try {
     const row = db.prepare("SELECT trailing_blank_decisions FROM session_meta WHERE session_id = ?").get(sessionId);
     const raw = row?.trailing_blank_decisions;
-    if (raw === null || raw === undefined || typeof raw === "string")
+    if (raw === null || raw === undefined || typeof raw === "string") {
+      if (reusable) {
+        snapshot.raw = raw;
+        snapshot.loaded = true;
+      }
       return raw;
+    }
     throw invalidReplayDocument("stored value is not text");
   } catch (error) {
-    if (isMissingReplayDocumentColumn(error))
+    if (isMissingReplayDocumentColumn(error)) {
+      if (reusable) {
+        snapshot.raw = MISSING_REPLAY_DOCUMENT_COLUMN;
+        snapshot.loaded = true;
+      }
       return MISSING_REPLAY_DOCUMENT_COLUMN;
+    }
     throw error;
   }
 }
@@ -2333,9 +2370,10 @@ function readAllTrailingBlankDecisions(db, sessionId, rawColumn) {
   return decisions;
 }
 function updateReplayDocument(db, sessionId, mutate) {
+  invalidateReplayEnvelopeSnapshot(db, sessionId);
   let initial;
   try {
-    initial = readRawReplayDocument(db, sessionId);
+    initial = readRawReplayDocument(db, sessionId, true);
   } catch (error) {
     if (error instanceof ReplayDocumentError)
       return false;
@@ -2347,7 +2385,7 @@ function updateReplayDocument(db, sessionId, mutate) {
   for (let attempt = 0;attempt < CAS_RETRY_LIMIT; attempt += 1) {
     let raw;
     try {
-      raw = readRawReplayDocument(db, sessionId);
+      raw = readRawReplayDocument(db, sessionId, true);
     } catch (error) {
       if (error instanceof ReplayDocumentError)
         return false;
@@ -2402,7 +2440,7 @@ function updateTrailingBlankDecisions(db, sessionId, messageIds, decide) {
   }
   let initial;
   try {
-    initial = readRawReplayDocument(db, sessionId);
+    initial = readRawReplayDocument(db, sessionId, true);
   } catch (error) {
     if (error instanceof ReplayDocumentError)
       return false;
@@ -2414,7 +2452,7 @@ function updateTrailingBlankDecisions(db, sessionId, messageIds, decide) {
   for (let attempt = 0;attempt < CAS_RETRY_LIMIT; attempt += 1) {
     let columnDecisions;
     try {
-      const raw = readRawReplayDocument(db, sessionId);
+      const raw = readRawReplayDocument(db, sessionId, true);
       if (raw === MISSING_REPLAY_DOCUMENT_COLUMN)
         return false;
       columnDecisions = parseReplayDocument(raw).trailingBlank;
@@ -2469,6 +2507,7 @@ function updateTrailingBlankDecisions(db, sessionId, messageIds, decide) {
   return false;
 }
 function writeReplayDocument(db, sessionId, doc) {
+  invalidateReplayEnvelopeSnapshot(db, sessionId);
   if (!hasReplayDecisionTable(db)) {
     db.prepare("UPDATE session_meta SET trailing_blank_decisions = ? WHERE session_id = ?").run(serializeReplayDocument(doc), sessionId);
     return;
@@ -3814,10 +3853,32 @@ function addStaleReduceStrippedIds(db, sessionId, ids) {
   return false;
 }
 function getProcessedImageStrippedIds(db, sessionId) {
+  return new Set(getProcessedImageMarkers(db, sessionId).keys());
+}
+function parseProcessedImageMarkers(raw) {
+  if (!raw)
+    return new Map;
+  try {
+    const parsed = JSON.parse(raw);
+    const ids = Array.isArray(parsed) ? parsed : parsed?.ids;
+    const textIds = new Set(Array.isArray(parsed?.textMarkerIds) ? parsed.textMarkerIds : []);
+    return new Map((Array.isArray(ids) ? ids : []).filter((id) => typeof id === "string").map((id) => [id, textIds.has(id) ? "[image stripped]" : ""]));
+  } catch {
+    return new Map;
+  }
+}
+function serializeProcessedImageMarkers(markers) {
+  const ids = [...markers.keys()];
+  if (ids.length === 0)
+    return "";
+  const textMarkerIds = ids.filter((id) => markers.get(id) === "[image stripped]");
+  return JSON.stringify(textMarkerIds.length > 0 ? { ids, textMarkerIds } : ids);
+}
+function getProcessedImageMarkers(db, sessionId) {
   const row = db.prepare("SELECT processed_image_stripped_ids FROM session_meta WHERE session_id = ?").get(sessionId);
-  return new Set(parseStrippedBlob(row?.processed_image_stripped_ids));
+  return parseProcessedImageMarkers(row?.processed_image_stripped_ids);
 }
-function addProcessedImageStrippedIds(db, sessionId, ids) {
+function addProcessedImageStrippedIds(db, sessionId, ids, marker = "") {
   const add = [...ids];
   if (add.length === 0)
     return true;
@@ -3825,17 +3886,17 @@ function addProcessedImageStrippedIds(db, sessionId, ids) {
   for (let attempt = 0;attempt < CAS_RETRY_LIMIT2; attempt += 1) {
     const row = db.prepare("SELECT processed_image_stripped_ids FROM session_meta WHERE session_id = ?").get(sessionId);
     const rawStored = row ? row.processed_image_stripped_ids ?? null : null;
-    const current = new Set(parseStrippedBlob(rawStored));
+    const current = parseProcessedImageMarkers(rawStored);
     let changed = false;
     for (const id of add) {
       if (!current.has(id)) {
-        current.add(id);
+        current.set(id, typeof marker === "string" ? marker : marker.get(id) ?? "");
         changed = true;
       }
     }
     if (!changed)
       return true;
-    const nextBlob = JSON.stringify([...current]);
+    const nextBlob = serializeProcessedImageMarkers(current);
     const result = db.prepare("UPDATE session_meta SET processed_image_stripped_ids = ? WHERE session_id = ? AND processed_image_stripped_ids IS ?").run(nextBlob, sessionId, rawStored);
     if (result.changes > 0)
       return true;
@@ -3889,7 +3950,8 @@ function loadPostprocessReplaySnapshot(db, sessionId) {
   const thinkingBindingRecoveryTarget = row?.thinking_binding_recovery_target;
   return {
     staleReduceStrippedIds: new Set(parseStrippedBlob(row?.stale_reduce_stripped_ids)),
-    processedImageStrippedIds: new Set(parseStrippedBlob(row?.processed_image_stripped_ids)),
+    processedImageStrippedIds: new Set(parseProcessedImageMarkers(row?.processed_image_stripped_ids).keys()),
+    processedImageMarkers: parseProcessedImageMarkers(row?.processed_image_stripped_ids),
     strippedPlaceholderIds: new Set(placeholders.ids),
     hiddenSeamPlaceholderIds: new Set(placeholders.hiddenSeamIds),
     noteNudgeAnchors: parseJsonArray(row?.note_nudge_anchors, isValidNoteNudgeAnchor),
@@ -3933,15 +3995,22 @@ function getPendingPiCompactionMarkerState(db, sessionId) {
       return parsed;
     }
   } catch {}
-  db.prepare("UPDATE session_meta SET pending_pi_compaction_marker_state = NULL WHERE session_id = ? AND pending_pi_compaction_marker_state = ?").run(sessionId, raw);
+  const cleared = db.prepare("UPDATE session_meta SET pending_pi_compaction_marker_state = NULL WHERE session_id = ? AND pending_pi_compaction_marker_state = ?").run(sessionId, raw);
+  if (cleared.changes > 0)
+    sessionLog2(sessionId, "Pi compaction-marker clear: reason=malformed-state");
   return null;
 }
-function clearPendingPiCompactionMarkerStateIf(db, sessionId, expected) {
+function clearPendingPiCompactionMarkerStateIf(db, sessionId, expected, reason = "explicit-clear") {
   const expectedBlob = stableStringify(expected);
   const result = db.prepare(`UPDATE session_meta SET pending_pi_compaction_marker_state = NULL
              WHERE session_id = ? AND pending_pi_compaction_marker_state = ?`).run(sessionId, expectedBlob);
+  if (result.changes > 0 && reason !== null)
+    logPiCompactionMarkerClear(sessionId, expected, reason);
   return result.changes > 0;
 }
+function logPiCompactionMarkerClear(sessionId, marker, reason) {
+  sessionLog2(sessionId, `Pi compaction-marker clear: reason=${reason} endMessageId=${marker.endMessageId} ordinal=${marker.ordinal} firstKeptEntryId=${marker.firstKeptEntryId ?? "<none>"}`);
+}
 function setSessionWorkMetrics(db, sessionId, newWorkTokens, totalInputTokens) {
   ensureSessionMetaRow(db, sessionId);
   db.prepare(`UPDATE session_meta
@@ -4329,6 +4398,27 @@ function hasAnthropicReasoning(messages) {
   });
 }
 
+// src/shared/processed-image-eligibility.ts
+function createProcessedImageEligibility(messages, messageTagNumbers, options) {
+  const ageTags = new Map;
+  let nextTag;
+  for (let index = messages.length - 1;index >= 0; index--) {
+    const message = messages[index];
+    const ownTag = messageTagNumbers.get(message);
+    if (ownTag !== undefined && Number.isFinite(ownTag) && ownTag > 0)
+      nextTag = ownTag;
+    if (nextTag !== undefined)
+      ageTags.set(message, nextTag);
+  }
+  return {
+    ageTags,
+    mayStrip: (message) => {
+      const age = ageTags.get(message);
+      return options.watermark > 0 && age !== undefined && age <= options.watermark && ((options.contextPercentage ?? 0) >= 95 || options.protectedCutoff == null || age < options.protectedCutoff);
+    }
+  };
+}
+
 // src/hooks/magic-context/strip-content.ts
 var MARKER_ONLY_PATTERN = /^(?:(?:§\d+§|\[dropped(?: §\d+§)?\]|\[cleared\])\s*)+$/;
 function isMarkerOnlyText(text) {
@@ -4878,59 +4968,142 @@ function stripReasoningFromMergedAssistants(messages, providerID, options) {
   }
   return stripped;
 }
+var emptyImageParts = new WeakMap;
+function getEmptyImageParts(messages) {
+  return emptyImageParts.get(messages) ?? new Map;
+}
+function imageOmissionBreaksStructure(messages, index, omitted) {
+  let before = index - 1;
+  let after = index + 1;
+  while (omitted.has(before))
+    before--;
+  while (omitted.has(after))
+    after++;
+  const previous = messages[before];
+  const next = messages[after];
+  return previous !== undefined && next !== undefined && previous.info.role === next.info.role;
+}
 function stripProcessedImages(messages, frozenIds, options) {
-  const { detect, watermark, messageTagNumbers } = options;
+  const omissions = new Map;
+  emptyImageParts.set(messages, omissions);
+  const { detect, messageTagNumbers } = options;
+  const eligibility = createProcessedImageEligibility(messages, messageTagNumbers, options);
   let stripped = 0;
   const newlyStrippedIds = [];
   const planned = [];
+  const newMarkers = new Map;
   let hasAssistantResponse = false;
   for (let i = messages.length - 1;i >= 0; i--) {
     const msg = messages[i];
+    const answered = hasAssistantResponse;
     if (msg.info.role === "assistant") {
       hasAssistantResponse = true;
-      continue;
     }
-    if (msg.info.role !== "user") {
+    if (msg.info.role !== "user" && msg.info.role !== "assistant") {
       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;
+    const isNewDetection = !inFrozen && detect && answered && id !== undefined && eligibility.mayStrip(msg) && !options.protectedMessageIds?.has(id);
     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) {
-        planned.push({ message: msg, partIndex: j, firstApplication: isNewDetection });
+      const tool = msg.info.role === "assistant" && isRecord(part) && part.type === "tool" && isRecord(part.state) && part.state.status === "completed";
+      const images = tool && isRecord(part) && isRecord(part.state) && Array.isArray(part.state.attachments) ? part.state.attachments : msg.info.role === "user" ? [part] : [];
+      if (images.some(isProcessedImagePart)) {
+        planned.push({
+          message: msg,
+          partIndex: j,
+          firstApplication: isNewDetection,
+          tool
+        });
         touchedThisMsg = true;
       }
     }
     if (touchedThisMsg && isNewDetection && id !== undefined) {
       newlyStrippedIds.push(id);
+      newMarkers.set(id, msg.info.role === "assistant" ? "[image stripped]" : options.replacementText ?? "");
     }
   }
-  const persisted = newlyStrippedIds.length === 0 || options.persistNewIds?.(newlyStrippedIds) !== false;
+  const imageIndices = new Map;
+  for (const { message, partIndex, tool } of planned) {
+    if (tool)
+      continue;
+    const indices = imageIndices.get(message) ?? new Set;
+    indices.add(partIndex);
+    imageIndices.set(message, indices);
+  }
+  const emptiedRows = new Set;
+  const newEmptyRows = [];
+  for (let index = 0;index < messages.length; index++) {
+    const message = messages[index];
+    if (message.parts.every((part) => isRecord(part) && part.type === "text" && part.text === ""))
+      emptiedRows.add(index);
+    const id = message.info.id;
+    const indices = imageIndices.get(message);
+    if (!id || !indices)
+      continue;
+    const marker = options.frozenMarkers?.get(id) ?? newMarkers.get(id) ?? "";
+    if (marker !== "" || !message.parts.every((part, partIndex) => indices.has(partIndex) || isRecord(part) && part.type === "text" && part.text === ""))
+      continue;
+    if (newMarkers.has(id))
+      newEmptyRows.push({ index, id });
+    else
+      emptiedRows.add(index);
+  }
+  for (const { index, id } of newEmptyRows) {
+    if (imageOmissionBreaksStructure(messages, index, emptiedRows))
+      newMarkers.set(id, "[image stripped]");
+    else
+      emptiedRows.add(index);
+  }
+  const persisted = newlyStrippedIds.length === 0 || options.persistNewIds?.(newlyStrippedIds, newMarkers) !== false;
   if (!persisted)
     newlyStrippedIds.length = 0;
-  for (const { message, partIndex, firstApplication } of planned) {
+  for (const { message, partIndex, firstApplication, tool } of planned) {
     if (firstApplication && !persisted)
       continue;
     if (firstApplication)
       options.onFirstApplication?.(message, partIndex);
-    message.parts[partIndex] = makeSentinel(message.parts[partIndex]);
-    stripped++;
+    const marker = tool ? "[image stripped]" : options.frozenMarkers?.get(message.info.id ?? "") ?? (firstApplication ? newMarkers.get(message.info.id ?? "") : "") ?? "";
+    const original = message.parts[partIndex];
+    if (tool && isRecord(original) && isRecord(original.state) && Array.isArray(original.state.attachments)) {
+      const attachments = original.state.attachments;
+      const count = attachments.filter(isProcessedImagePart).length;
+      const output = typeof original.state.output === "string" ? original.state.output : "";
+      message.parts[partIndex] = {
+        ...original,
+        state: {
+          ...original.state,
+          output: [output, ...Array(count).fill(marker)].filter(Boolean).join(`
+`),
+          attachments: attachments.filter((part) => !isProcessedImagePart(part))
+        }
+      };
+      stripped += count;
+    } else {
+      message.parts[partIndex] = { ...makeSentinel(original), text: marker };
+      if (marker === "" && message.info.id) {
+        const indices = omissions.get(message.info.id) ?? new Set;
+        indices.add(partIndex);
+        omissions.set(message.info.id, indices);
+      }
+      stripped++;
+    }
   }
   return { stripped, newlyStrippedIds };
 }
+function isProcessedImagePart(part) {
+  if (isRecord(part) && part.type === "media" && isRecord(part.media)) {
+    const { source, mediaType } = part.media;
+    const inlineLength = isRecord(source) ? source.type === "base64" && typeof source.data === "string" ? source.data.length : source.type === "bytes" && source.data instanceof Uint8Array ? Math.ceil(source.data.byteLength / 3) * 4 : 0 : 0;
+    return typeof mediaType === "string" && mediaType.startsWith("image/") && inlineLength > 0 && inlineLength + `data:${mediaType};base64,`.length > 200;
+  }
+  return isRecord(part) && part.type === "file" && typeof part.mime === "string" && part.mime.startsWith("image/") && typeof part.url === "string" && part.url.startsWith("data:") && part.url.length > 200;
+}
 
 // src/hooks/magic-context/reasoning-budget.ts
 function projectOpencodeReasoningBudgetCutoff(db, sessionId, messages, budget, watermark, proseRatio) {
@@ -5545,24 +5718,18 @@ function setToolContent(part, content) {
   }
 }
 function clonePart(part) {
-  if (part === null || typeof part !== "object")
-    return part;
-  try {
-    return structuredClone(part);
-  } catch {
-    try {
-      return JSON.parse(JSON.stringify(part));
-    } catch {
-      return part;
-    }
-  }
+  return {
+    ...part,
+    ...isRecord(part.state) ? { state: { ...part.state } } : {}
+  };
 }
 function clampCloneInPlace(occurrence, clamp) {
-  const clone = clonePart(occurrence.part);
-  clamp(clone);
   const parts = occurrence.message.parts;
   const index = parts.indexOf(servedPart(occurrence));
   if (index >= 0) {
+    const clone = clamp(occurrence.part);
+    if (clone === servedPart(occurrence))
+      return;
     parts[index] = clone;
     occurrence.served = clone;
   }
@@ -5572,17 +5739,24 @@ function servedPart(occurrence) {
 }
 function skeletonRealToolPart(part, tagId, stripAttachments = false) {
   if (!isRecord(part))
-    return;
+    return part;
   const sentinel = `[dropped §${tagId}§]`;
   if (part.type === "tool" && isRecord(part.state)) {
-    part.state.output = sentinel;
+    if (part.state.output === sentinel && !needsAttachmentStrip(part.state, stripAttachments))
+      return part;
+    const clone = clonePart(part);
+    const state = clone.state;
+    state.output = sentinel;
     if (stripAttachments)
-      part.state.attachments = [];
-    return;
-  }
-  if (part.type === "tool_result") {
-    part.content = sentinel;
+      state.attachments = [];
+    return clone;
   }
+  if (part.type === "tool_result" && part.content !== sentinel)
+    return { ...part, content: sentinel };
+  return part;
+}
+function needsAttachmentStrip(state, strip) {
+  return strip && (!Array.isArray(state.attachments) || state.attachments.length !== 0);
 }
 function readToolPartRawInput(part) {
   if (!isRecord(part))
@@ -5595,51 +5769,62 @@ function readToolPartRawInput(part) {
     return part.input;
   return;
 }
+function isDroppedInput(input, sentinel) {
+  return isRecord(input) && Object.keys(input).length === 1 && Object.hasOwn(input, "dropped") && input.dropped === sentinel;
+}
 function truncateToolPart(part, tagId) {
   if (!isRecord(part))
-    return;
+    return part;
   const sentinel = `[dropped §${tagId}§]`;
   if (part.type === "tool" && isRecord(part.state)) {
-    const state = part.state;
+    if (part.state.output === sentinel && isDroppedInput(part.state.input, sentinel))
+      return part;
+    const clone = clonePart(part);
+    const state = clone.state;
     state.output = sentinel;
     state.input = droppedInputMarker(tagId);
-    return;
+    return clone;
   }
   if (part.type === "tool_result") {
-    part.content = sentinel;
-    return;
+    return part.content === sentinel ? part : { ...part, content: sentinel };
   }
   if (part.type === "tool-invocation") {
-    part.args = droppedInputMarker(tagId);
-    return;
+    return isDroppedInput(part.args, sentinel) ? part : { ...part, args: droppedInputMarker(tagId) };
   }
   if (part.type === "tool_use") {
-    part.input = droppedInputMarker(tagId);
+    return isDroppedInput(part.input, sentinel) ? part : { ...part, input: droppedInputMarker(tagId) };
   }
+  return part;
 }
 function editMarkerToolPart(part, tagId, stripAttachments = false) {
   if (!isRecord(part))
-    return;
+    return part;
   const sentinel = `[dropped §${tagId}§]`;
+  const input = readToolPartInput(part);
+  const rewriteInput = input !== null && needsEditMarker(input);
   if (part.type === "tool" && isRecord(part.state)) {
-    part.state.output = sentinel;
+    if (part.state.output === sentinel && !rewriteInput && !needsAttachmentStrip(part.state, stripAttachments))
+      return part;
+    const clone = clonePart(part);
+    const state = clone.state;
+    state.output = sentinel;
     if (stripAttachments)
-      part.state.attachments = [];
-    if (isRecord(part.state.input))
-      applyEditMarkerToInput(part.state.input);
-    return;
+      state.attachments = [];
+    if (rewriteInput) {
+      state.input = { ...input };
+      applyEditMarkerToInput(state.input);
+    }
+    return clone;
   }
   if (part.type === "tool_result") {
-    part.content = sentinel;
-    return;
-  }
-  if (part.type === "tool-invocation" && isRecord(part.args)) {
-    applyEditMarkerToInput(part.args);
-    return;
+    return part.content === sentinel ? part : { ...part, content: sentinel };
   }
-  if (part.type === "tool_use" && isRecord(part.input)) {
-    applyEditMarkerToInput(part.input);
+  if (rewriteInput) {
+    const markedInput = { ...input };
+    applyEditMarkerToInput(markedInput);
+    return { ...part, [part.type === "tool-invocation" ? "args" : "input"]: markedInput };
   }
+  return part;
 }
 function readToolPartInput(part) {
   if (!isRecord(part))
@@ -5868,9 +6053,7 @@ function createToolDropTarget(compositeKey, thinkingParts, index, batch, tagId)
         parts
       });
       const before = count(parts);
-      const retained = skeleton ? structuredClone(parts) : [];
-      for (const part of retained)
-        skeletonRealToolPart(part, tagId);
+      const retained = skeleton ? parts.map((part) => skeletonRealToolPart(part, tagId)) : [];
       const after = count(retained);
       return {
         beforeTools: before.toolCall,
@@ -5918,6 +6101,10 @@ function createToolDropTarget(compositeKey, thinkingParts, index, batch, tagId)
         return false;
       return batch.wouldStrandConversationEnd(entry.occurrences);
     },
+    prepareDrop: () => {
+      const entry = index.get(compositeKey);
+      return !!entry && entry.occurrences.length > 0 && entry.hasResult;
+    },
     canDrop: () => {
       const entry = index.get(compositeKey);
       return !!entry && entry.occurrences.length > 0 && entry.hasResult && !entry.occurrences.some((occurrence) => toolPartHasUserAnswer(occurrence.part));
@@ -6180,6 +6367,21 @@ function visitRawSessionMessages2(sessionId, fromOrdinal, toOrdinal, visit, opti
     after = last ? { timeCreated: last.createdAt ?? 0, id: last.id } : undefined;
   }
 }
+async function visitRawSessionMessagesAsync2(sessionId, fromOrdinal, toOrdinal, visit, options = {}) {
+  const from = Math.max(1, Math.floor(fromOrdinal));
+  const to = Math.floor(toOrdinal);
+  if (to < from)
+    return;
+  const provider = sessionProviders.get(sessionId)?.provider;
+  if (!provider?.iterateMessageRangeAsync) {
+    visitRawSessionMessages2(sessionId, from, to, visit, options);
+    return;
+  }
+  for await (const message of provider.iterateMessageRangeAsync(from, to)) {
+    if (!visit(message))
+      return;
+  }
+}
 function readRawSessionMessageRange2(sessionId, fromOrdinal, toOrdinal) {
   const from = Math.max(1, Math.floor(fromOrdinal));
   const to = Math.floor(toOrdinal);
@@ -6403,13 +6605,20 @@ function readRawSessionMessageOrdinalById2(sessionId, messageId) {
     return null;
   return withReadOnlySessionDb((db) => readRawSessionMessageOrdinalByIdFromDb2(db, sessionId, messageId));
 }
+function readRawSessionMessageOrderPosition(sessionId, messageId) {
+  const provider = sessionProviders.get(sessionId)?.provider;
+  if (provider) {
+    return provider.readMessageOrderById ? provider.readMessageOrderById(messageId) : provider.readMessageOrdinalById?.(messageId) ?? null;
+  }
+  return readRawSessionMessageOrdinalById2(sessionId, messageId);
+}
 function compareRawSessionMessageOrder2(sessionId, leftId, rightId) {
   const provider = sessionProviders.get(sessionId)?.provider;
   if (provider) {
-    if (!provider.readMessageOrdinalById)
+    if (!provider.readMessageOrderById && !provider.readMessageOrdinalById)
       return null;
-    const left = provider.readMessageOrdinalById(leftId);
-    const right = provider.readMessageOrdinalById(rightId);
+    const left = readRawSessionMessageOrderPosition(sessionId, leftId);
+    const right = readRawSessionMessageOrderPosition(sessionId, rightId);
     return left === null || right === null ? null : left - right;
   }
   if (!openCodeDbExists())
@@ -6605,7 +6814,10 @@ function readSessionChunk2(sessionId, tokenBudget, offset = 1, eligibleEndOrdina
         if (state?.input === undefined && state?.output !== undefined && typeof p.callID === "string") {
           const call = calls.get(p.callID);
           if (call) {
-            const expansion = expandToolPart({ ...call, state: { ...call.state, output: state.output } }, options.expandTools);
+            const expansion = expandToolPart({
+              ...call,
+              state: { ...call.state, output: state.output }
+            }, options.expandTools);
             if (expansion !== null) {
               expandedParts.set(call, expansion);
               expandedResults.add(part);
@@ -6888,4 +7100,4 @@ function readRawSessionSeedTail2(sessionId, boundaryId, onQuery) {
   });
 }
 
-export { detectLatestTurnThinkingMismatch, isPrefixBoundThinkingModel, detectOverflow, SESSION_META_SELECT_COLUMNS, META_COLUMNS, BOOLEAN_META_KEYS, NULL_BIND_META_KEYS, isSessionMetaRow, getDefaultSessionMeta, ensureSessionMetaRow, toSessionMeta, persistCachedM0, clearCachedM0M1, expandToolPart, markHostUnservedRow, retreatPastHostUnservedRows, snapTerminalCompartmentToServedRow, isHostRenderedSystemMessage, completedToolArcCrossesBoundary, estimateTrueRawMessageTokens, buildToolArcs, fenceBoundaryForCompletedToolArcs, fenceBoundaryForToolArcs, buildTrueRawTokenIndex, computeRawRangeFingerprint, stripSystemInjection, isTextPart, isToolPartWithOutput, isFilePart, buildFileSourceContent, toolPartHasUserAnswer, DreamTokenBudgetExceeded, TOKEN_BUDGET_FINALIZE_MESSAGE, registerBudgetFinalizeChild, releaseBudgetFinalizeChild, createDreamTokenBudget, recordToolParameters, createDroppedInputGuard, assertExecutableToolInput, isEditTool, MERGED_REASONING_PARTS_PREFIX, decodeMergedReasoningParts, MAX_EXECUTE_THRESHOLD, escalationBands, HYGIENE_PROVIDER_UNITS_VERSION, sessionDecisionCalibration, transitionSessionHygieneUnits, getProtectionWindowForSession, isRustMarkerAdmissionFenced, setRustMarkerAdmissionFence, ReplayDocumentError, readReplayEnvelope, readReplayDocument, updateReplayDocument, writeReplayDocument, isEmergencyRecoveryArmed, isProviderOverflowReconfirmed, isProviderOverflowFailClosedProven, getEmergencyRecoveryArmedAt, describeProtectedTailDrainBudgetSkip, loadPersistedUsage, loadProtectedTailMeta, markProtectedTailPolicyV3Seeded, recordProtectedTailPublicationFloor, recordProtectedTailNoEligibleHead, resetProtectedTailNoEligibleHead, getWrapupInProgressState, isWrapupInProgress, acquireWrapupInProgress, updateWrapupInProgress, releaseWrapupInProgress, resolveCompactionModeRecord, getCompactionModeRecord, setCompactionModeRecord, getProtectedTailDrainBudgetSkip, reserveProtectedTailDrainTokens, clearEmergencyDrainLatch, recordHistorianDrainFailure, clearHistorianDrainFailure, rollbackProtectedTailDrainReservation, clearPersistedReasoningWatermark, getEmergencyInputSample, setEmergencyDropSample, clearEmergencyDropSample, getLastNudgeUndropped, setLastNudgeUndropped, getChannel1NudgeState, setChannel1NudgeState, markChannel1PostReduceGracePending, captureChannel1PostReduceGraceBaseline, getChannel2NudgeState, setChannel2NudgeState, casChannel2NudgeState, claimChannel2NudgeState, casChannel2NudgeClaim, getPersistedNoteNudge, setPersistedNoteNudgeTrigger, setPersistedNoteNudgeTriggerMessageId, getNoteNudgeAnchors, getAutoSearchHintDecisions, deliverNoteNudgeAtomic, appendAutoSearchHintDecision, pruneNoteNudgeAnchors, queueAutoSearchHintDecisionRetirement, flushAutoSearchHintDecisionRetirement, getPersistedTodoPermissionDenied, setPersistedTodoPermissionDenied, getPersistedTodoSyntheticAnchor, setPersistedTodoSyntheticAnchor, clearPersistedTodoSyntheticAnchor, getNoteLastReadAt, setNoteLastReadAt, getHistorianFailureState, incrementHistorianFailure, clearHistorianFailureState, getOverflowState, loadTransformPassStateSnapshot, recordOverflowDetected, recordDetectedContextLimit, clearEmergencyRecovery, clearDetectedContextLimit, getPersistedCompactionMarkerState, setPersistedCompactionMarkerState, getDeferredClearedCompactionMarkerState, retireDeferredClearedCompactionMarkerState, parseStrippedPlaceholderState, serializeStrippedPlaceholderState, getStrippedPlaceholderIds, applyStrippedPlaceholderDelta, THINKING_BINDING_RECOVERY_FROZEN_PREFIX, THINKING_BINDING_STRIP_ORDER_END_MARKER, thinkingBindingRecoveryFrozenId, getThinkingBindingRecoveryTarget, clearThinkingBindingRecoveryIf, getMergedReasoningStrippedIds, addMergedReasoningStrippedIds, getTrailingBlankDecisions, addTrailingBlankDecisions, demoteTrailingBlankKeepDecisions, getStaleReduceStrippedIds, addStaleReduceStrippedIds, getProcessedImageStrippedIds, addProcessedImageStrippedIds, getPendingCompactionMarkerState, getCompactionMarkerHealth, loadPostprocessReplaySnapshot, setPendingCompactionMarkerState, replacePendingCompactionMarkerStateIf, clearPendingCompactionMarkerStateIf, getPendingPiCompactionMarkerState, clearPendingPiCompactionMarkerStateIf, setSessionWorkMetrics, getObservedEpochFloor, resolveEpochFloorForPass, getReasoningRemovalState, addRemovedReasoningIds, markDropLeavesReasoning, modelAcceptsEmptyContent, isAnthropicFamilyRoute, neutralizeDroppedReasoningPart, restoreNeutralizedReasoningPart, isNeutralizedReasoningPart, variantChangeBustsProviderCache, makeSentinel, makeWholeMessageSentinel, isSentinel, replaySentinelByMessageIds, isInActiveAnthropicTurn, activeAnthropicTurnStart, hasAnthropicReasoning, stripSystemInjectedMessages, stripDroppedPlaceholderMessages, replayClearedReasoning, replayStrippedInlineThinking, clearOldReasoning, stripClearedReasoning, stripInlineThinking, findReasoningBearingAssistantIds, findLatestAssistantReasoningMutationExemptMessage, snapshotTrailingBlankSourceDecisions, findTrailingBlankDecisionCandidates, applyFrozenTrailingBlankDecisions, stripReasoningFromAssistantIds, findMergedReasoningStripDecisions, stripReasoningFromMergedAssistants, stripProcessedImages, projectOpencodeReasoningBudgetCutoff, DEFAULT_KEEP_REASONING_TOKENS, resolveKeepReasoningTokens, reasoningBudgetCutoff, reasoningTextAndOpaque, opencodeReasoningBudgetCutoff, describeFinalWireTail, estimateMessageTokens, wireContentBytes, createFinalWireUsageTracker, estimateFinalWireInputTokens, estimateAppendedWireTokens, SKELETON_REAL_INPUT_MAX_BYTES, partHasCompletedResult, extractToolCallObservation, ToolMutationBatch, createToolDropTarget, resolveHostServedBoundaryId2, hasRawMessageProvider2, setRawMessageProvider2, setBoundedRawMessageProvider2, withRawMessageProvider2, cleanUserText2, withRawSessionMessageCache2, readRawSessionMessages2, readRawSessionMessagePage2, getRawSessionMessageOrdinalCount2, RAW_MESSAGE_VISIT_PAGE_SIZE2, visitRawSessionMessages2, readRawSessionMessageRange2, prepareRawSessionOrdinals2, primeTailRawMessageCache2, getCachedAbsoluteMessageCount2, primeInMemoryTailRawMessageCache2, readRawSessionMessageOrdinalPage2, getRawSessionStoredMessageCount2, readRawSessionMessageIdOrdinalsForRange2, readRawSessionMessageIdOrdinals2, readRawSessionMessagePartsById2, readRawSessionBoundaryEndpoints2, hasRawSessionMessageById2, readRawSessionMessageOrdinalById2, compareRawSessionMessageOrder2, readRawSessionMessageById2, getRawSessionMessageCount2, RAW_SESSION_TAG_KEY_PAGE_SIZE2, getRawSessionTagKeysThrough2, getLegacyProtectedTailStartOrdinal2, getProtectedTailStartOrdinal2, readSessionChunk2, getRawSessionMessageIdsThrough2, readRawSessionSeedTail2 };
+export { detectLatestTurnThinkingMismatch, isPrefixBoundThinkingModel, detectOverflow, SESSION_META_SELECT_COLUMNS, META_COLUMNS, BOOLEAN_META_KEYS, NULL_BIND_META_KEYS, isSessionMetaRow, getDefaultSessionMeta, ensureSessionMetaRow, toSessionMeta, persistCachedM0, clearCachedM0M1, expandToolPart, markHostUnservedRow, retreatPastHostUnservedRows, snapTerminalCompartmentToServedRow, isHostRenderedSystemMessage, completedToolArcCrossesBoundary, estimateTrueRawMessageTokens, buildToolArcs, fenceBoundaryForCompletedToolArcs, fenceBoundaryForToolArcs, buildTrueRawTokenIndex, computeRawRangeFingerprint, stripSystemInjection, isTextPart, isToolPartWithOutput, isFilePart, buildFileSourceContent, toolPartHasUserAnswer, DreamTokenBudgetExceeded, TOKEN_BUDGET_FINALIZE_MESSAGE, registerBudgetFinalizeChild, releaseBudgetFinalizeChild, createDreamTokenBudget, recordToolParameters, createDroppedInputGuard, assertExecutableToolInput, isEditTool, MERGED_REASONING_PARTS_PREFIX, decodeMergedReasoningParts, MAX_EXECUTE_THRESHOLD, escalationBands, HYGIENE_PROVIDER_UNITS_VERSION, sessionDecisionCalibration, transitionSessionHygieneUnits, getProtectionWindowForSession, withReplayEnvelopeSnapshot, invalidateReplayEnvelopeSnapshot, isRustMarkerAdmissionFenced, setRustMarkerAdmissionFence, ReplayDocumentError, readReplayEnvelope, readReplayDocument, updateReplayDocument, writeReplayDocument, isEmergencyRecoveryArmed, isProviderOverflowReconfirmed, isProviderOverflowFailClosedProven, getEmergencyRecoveryArmedAt, describeProtectedTailDrainBudgetSkip, loadPersistedUsage, loadProtectedTailMeta, markProtectedTailPolicyV3Seeded, recordProtectedTailPublicationFloor, recordProtectedTailNoEligibleHead, resetProtectedTailNoEligibleHead, getWrapupInProgressState, isWrapupInProgress, acquireWrapupInProgress, updateWrapupInProgress, releaseWrapupInProgress, resolveCompactionModeRecord, getCompactionModeRecord, setCompactionModeRecord, getProtectedTailDrainBudgetSkip, reserveProtectedTailDrainTokens, clearEmergencyDrainLatch, recordHistorianDrainFailure, clearHistorianDrainFailure, rollbackProtectedTailDrainReservation, clearPersistedReasoningWatermark, getEmergencyInputSample, setEmergencyDropSample, clearEmergencyDropSample, getLastNudgeUndropped, setLastNudgeUndropped, getChannel1NudgeState, setChannel1NudgeState, markChannel1PostReduceGracePending, captureChannel1PostReduceGraceBaseline, getChannel2NudgeState, setChannel2NudgeState, casChannel2NudgeState, claimChannel2NudgeState, casChannel2NudgeClaim, getPersistedNoteNudge, setPersistedNoteNudgeTrigger, setPersistedNoteNudgeTriggerMessageId, getNoteNudgeAnchors, getAutoSearchHintDecisions, deliverNoteNudgeAtomic, appendAutoSearchHintDecision, pruneNoteNudgeAnchors, queueAutoSearchHintDecisionRetirement, flushAutoSearchHintDecisionRetirement, getPersistedTodoPermissionDenied, setPersistedTodoPermissionDenied, getPersistedTodoSyntheticAnchor, setPersistedTodoSyntheticAnchor, clearPersistedTodoSyntheticAnchor, getNoteLastReadAt, setNoteLastReadAt, getHistorianFailureState, incrementHistorianFailure, clearHistorianFailureState, getOverflowState, loadTransformPassStateSnapshot, recordOverflowDetected, recordDetectedContextLimit, clearEmergencyRecovery, clearDetectedContextLimit, getPersistedCompactionMarkerState, setPersistedCompactionMarkerState, getDeferredClearedCompactionMarkerState, retireDeferredClearedCompactionMarkerState, parseStrippedPlaceholderState, serializeStrippedPlaceholderState, getStrippedPlaceholderIds, applyStrippedPlaceholderDelta, THINKING_BINDING_RECOVERY_FROZEN_PREFIX, THINKING_BINDING_STRIP_ORDER_END_MARKER, thinkingBindingRecoveryFrozenId, getThinkingBindingRecoveryTarget, clearThinkingBindingRecoveryIf, getMergedReasoningStrippedIds, addMergedReasoningStrippedIds, getTrailingBlankDecisions, addTrailingBlankDecisions, demoteTrailingBlankKeepDecisions, getStaleReduceStrippedIds, addStaleReduceStrippedIds, getProcessedImageStrippedIds, parseProcessedImageMarkers, serializeProcessedImageMarkers, getProcessedImageMarkers, addProcessedImageStrippedIds, getPendingCompactionMarkerState, getCompactionMarkerHealth, loadPostprocessReplaySnapshot, setPendingCompactionMarkerState, replacePendingCompactionMarkerStateIf, clearPendingCompactionMarkerStateIf, getPendingPiCompactionMarkerState, clearPendingPiCompactionMarkerStateIf, logPiCompactionMarkerClear, setSessionWorkMetrics, getObservedEpochFloor, resolveEpochFloorForPass, getReasoningRemovalState, addRemovedReasoningIds, markDropLeavesReasoning, modelAcceptsEmptyContent, isAnthropicFamilyRoute, neutralizeDroppedReasoningPart, restoreNeutralizedReasoningPart, isNeutralizedReasoningPart, variantChangeBustsProviderCache, makeSentinel, makeWholeMessageSentinel, isSentinel, replaySentinelByMessageIds, isInActiveAnthropicTurn, activeAnthropicTurnStart, hasAnthropicReasoning, stripSystemInjectedMessages, stripDroppedPlaceholderMessages, replayClearedReasoning, replayStrippedInlineThinking, clearOldReasoning, stripClearedReasoning, stripInlineThinking, findReasoningBearingAssistantIds, findLatestAssistantReasoningMutationExemptMessage, snapshotTrailingBlankSourceDecisions, findTrailingBlankDecisionCandidates, applyFrozenTrailingBlankDecisions, stripReasoningFromAssistantIds, findMergedReasoningStripDecisions, stripReasoningFromMergedAssistants, getEmptyImageParts, stripProcessedImages, projectOpencodeReasoningBudgetCutoff, DEFAULT_KEEP_REASONING_TOKENS, resolveKeepReasoningTokens, reasoningBudgetCutoff, reasoningTextAndOpaque, opencodeReasoningBudgetCutoff, describeFinalWireTail, estimateMessageTokens, wireContentBytes, createFinalWireUsageTracker, estimateFinalWireInputTokens, estimateAppendedWireTokens, SKELETON_REAL_INPUT_MAX_BYTES, partHasCompletedResult, extractToolCallObservation, ToolMutationBatch, createToolDropTarget, resolveHostServedBoundaryId2, hasRawMessageProvider2, setRawMessageProvider2, setBoundedRawMessageProvider2, withRawMessageProvider2, cleanUserText2, withRawSessionMessageCache2, readRawSessionMessages2, readRawSessionMessagePage2, getRawSessionMessageOrdinalCount2, RAW_MESSAGE_VISIT_PAGE_SIZE2, visitRawSessionMessages2, visitRawSessionMessagesAsync2, readRawSessionMessageRange2, prepareRawSessionOrdinals2, primeTailRawMessageCache2, getCachedAbsoluteMessageCount2, primeInMemoryTailRawMessageCache2, readRawSessionMessageOrdinalPage2, getRawSessionStoredMessageCount2, readRawSessionMessageIdOrdinalsForRange2, readRawSessionMessageIdOrdinals2, readRawSessionMessagePartsById2, readRawSessionBoundaryEndpoints2, hasRawSessionMessageById2, readRawSessionMessageOrdinalById2, compareRawSessionMessageOrder2, readRawSessionMessageById2, getRawSessionMessageCount2, RAW_SESSION_TAG_KEY_PAGE_SIZE2, getRawSessionTagKeysThrough2, getLegacyProtectedTailStartOrdinal2, getProtectedTailStartOrdinal2, readSessionChunk2, getRawSessionMessageIdsThrough2, readRawSessionSeedTail2 };