@retaw106/mmc-oc 2.3.0 → 2.5.0

package/dist/{index-z2w1eq3y.js → index-1vxffj5j.js}

@@ -7,7 +7,7 @@ import {
 } from "./index-x37vg474.js";
 import {
   getTagIdentityWriteGeneration
-} from "./index-czba8tw3.js";
+} from "./index-pte3cfs9.js";
 import {
   getHarness,
   sessionLog
@@ -28,7 +28,7 @@ import {
   withReadOnlySessionDb,
   getRawSessionMessageCountFromDb,
   getMessageTimesFromOpenCodeDb
-} from "./index-18yrysyj.js";
+} from "./index-bpjjcdy9.js";
 
 // src/shared/protected-tools-policy.ts
 var DEFAULT_PROTECTED_TOOLS = {
@@ -102,7 +102,27 @@ function isSystemDirective(text) {
   return text.trimStart().startsWith(SYSTEM_DIRECTIVE_PREFIX);
 }
 function removeSystemReminders(text) {
-  return text.replace(/<system-reminder>[\s\S]*?<\/system-reminder>/gi, "").trim();
+  return removeNestedBlocks(text, ["system-reminder"]).trim();
+}
+function removeNestedBlocks(text, names) {
+  const tags = new RegExp(`<(/?)(${names.join("|")})(?:\\s[^<>]*?)?\\s*(/?)>`, "gi");
+  const stack = [];
+  let end = 0;
+  let result = "";
+  for (const match of text.matchAll(tags)) {
+    if (stack.length === 0)
+      result += text.slice(end, match.index);
+    const name = match[2].toLowerCase();
+    if (match[1]) {
+      if (stack[stack.length - 1] === name)
+        stack.pop();
+    } else if (!match[3])
+      stack.push(name);
+    end = match.index + match[0].length;
+  }
+  if (stack.length === 0)
+    result += text.slice(end);
+  return result;
 }
 
 // src/hooks/magic-context/token-count-exact.ts
@@ -807,13 +827,16 @@ function stripDanglingTagNotationGlobally(value) {
 function stripTagSectionCharacters(value) {
   return value.replace(STRAY_SECTION_CHAR_REGEX, "");
 }
-function stripPersistedAssistantText(value) {
+function stripPersistedAssistantText(value, acceptsEmpty = true) {
+  if (!acceptsEmpty && !value.includes("§") && !value.trim())
+    return value;
   let text = stripWellFormedLeadingTagPrefix(value);
   text = stripCompleteTagPairsGlobally(text);
   text = stripMalformedTagNotationGlobally(text);
   text = stripDanglingTagNotationGlobally(text);
   text = stripTagSectionCharacters(text);
-  return text.trim();
+  const stripped = text.trim();
+  return !acceptsEmpty && value.trim().length > 0 && stripped.length === 0 ? value : stripped;
 }
 function byteSize(value) {
   return encoder.encode(value).length;
@@ -847,6 +870,21 @@ function isThinkingPart(part) {
   return candidate.type === "thinking" || candidate.type === "reasoning";
 }
 
+// src/hooks/magic-context/tail-hygiene-output-count.ts
+var CURRENT_OUTPUT_COUNT = Symbol.for("magic-context.current-reclaimable-tool-output-count");
+function countReclaimableToolOutputs(parts) {
+  return parts.filter((part) => part.kind === "toolOutput" && part.uTokens > 0).length;
+}
+function rememberCurrentToolOutputCount(baseline, measurement) {
+  return Object.assign(baseline, {
+    [CURRENT_OUTPUT_COUNT]: countReclaimableToolOutputs(measurement.parts)
+  });
+}
+function currentReclaimableToolOutputCount(baseline) {
+  if (!baseline || !Object.hasOwn(baseline, CURRENT_OUTPUT_COUNT))
+    return 0;
+  return baseline[CURRENT_OUTPUT_COUNT];
+}
 // src/shared/record-type-guard.ts
 function isRecord(value) {
   return typeof value === "object" && value !== null && !Array.isArray(value);
@@ -855,32 +893,32 @@ function isRecord(value) {
 // src/shared/stable-json.ts
 function stableStringify(value, seen = new WeakSet) {
   const pieces = [];
-  writeStable(value, seen, pieces);
+  writeStable(value, seen, (piece) => pieces.push(piece));
   return pieces.join("");
 }
-function writeStable(value, seen, pieces) {
+function writeStable(value, seen, write) {
   if (value === undefined) {
-    pieces.push("undefined");
+    write("undefined");
     return;
   }
   if (value === null || typeof value !== "object") {
-    pieces.push(JSON.stringify(value) ?? String(value));
+    write(JSON.stringify(value) ?? String(value));
     return;
   }
   if (seen.has(value)) {
-    pieces.push('"[Circular]"');
+    write('"[Circular]"');
     return;
   }
   seen.add(value);
   if (Array.isArray(value)) {
-    pieces.push("[");
+    write("[");
     for (let index = 0;index < value.length; index += 1) {
       if (index > 0)
-        pieces.push(",");
+        write(",");
       if (index in value)
-        writeStable(value[index], seen, pieces);
+        writeStable(value[index], seen, write);
     }
-    pieces.push("]");
+    write("]");
     return;
   }
   const entries = Object.entries(value).sort(([a], [b]) => {
@@ -890,14 +928,34 @@ function writeStable(value, seen, pieces) {
       return 1;
     return 0;
   });
-  pieces.push("{");
+  if (entries.length > 0 && entries.length <= 16 && entries.every(([key, child]) => key.length <= 4096 && !/^(0|[1-9]\d*)$/.test(key) && (child === null || typeof child === "number" || typeof child === "boolean" || typeof child === "string" && child.length <= 4096))) {
+    write(JSON.stringify(Object.fromEntries(entries)));
+    return;
+  }
+  write("{");
   entries.forEach(([key, child], index) => {
     if (index > 0)
-      pieces.push(",");
-    pieces.push(JSON.stringify(key), ":");
-    writeStable(child, seen, pieces);
+      write(",");
+    write(JSON.stringify(key));
+    write(":");
+    writeStable(child, seen, write);
   });
-  pieces.push("}");
+  write("}");
+}
+function stableStringifyHash(value, prefix = "") {
+  const sink = jsonHashSink(prefix);
+  writeStable(value, new WeakSet, sink.write);
+  return sink.digest();
+}
+function jsonHashSink(prefix = "") {
+  let hash = 2166136261;
+  const write = (piece) => {
+    for (let index = 0;index < piece.length; index++) {
+      hash = Math.imul(hash ^ piece.charCodeAt(index), 16777619);
+    }
+  };
+  write(prefix);
+  return { write, digest: () => (hash >>> 0).toString(16).padStart(8, "0") };
 }
 
 // src/shared/tag-owner-id.ts
@@ -914,6 +972,127 @@ function contentTagOwnerMessageId(contentId) {
   return contentId;
 }
 
+// src/shared/tail-hygiene-json.ts
+var MAX_MEMO_BYTES = 64 * 1024 * 1024;
+var MAX_MEMO_ENTRIES = 1e4;
+
+class TailHygieneJsonMemo {
+  entries = new Map;
+  bytes = 0;
+  passText = new WeakMap;
+  passHash = new WeakMap;
+  beginPass() {
+    this.passText = new WeakMap;
+    this.passHash = new WeakMap;
+  }
+  get(key, value, compute, fingerprint = false) {
+    const pass = fingerprint ? this.passHash : this.passText;
+    const object = value !== null && typeof value === "object" ? value : undefined;
+    const local = object ? pass.get(object) : undefined;
+    if (local !== undefined)
+      return local;
+    const previous = this.entries.get(key);
+    if (previous && sameJson(previous.snapshot, value)) {
+      if (object)
+        pass.set(object, previous.result);
+      return previous.result;
+    }
+    const result = compute();
+    if (previous) {
+      this.bytes -= previous.bytes;
+      this.entries.delete(key);
+    }
+    try {
+      const copy = copyJson(value);
+      const bytes = copy.bytes + (key.length + result.length) * 2;
+      if (bytes <= MAX_MEMO_BYTES) {
+        this.entries.set(key, { snapshot: copy.value, result, bytes });
+        this.bytes += bytes;
+        if (object)
+          pass.set(object, result);
+      }
+    } catch {}
+    while (this.bytes > MAX_MEMO_BYTES || this.entries.size > MAX_MEMO_ENTRIES) {
+      const oldest = this.entries.entries().next().value;
+      if (!oldest)
+        break;
+      this.bytes -= oldest[1].bytes;
+      this.entries.delete(oldest[0]);
+    }
+    return result;
+  }
+}
+function copyJson(value) {
+  const seen = new Map;
+  let bytes = 0;
+  const copy = (current) => {
+    bytes += 16;
+    if (typeof current === "string")
+      bytes += current.length * 2;
+    if (bytes > MAX_MEMO_BYTES)
+      throw new Error("memo capacity");
+    if (current === null || typeof current !== "object") {
+      if (["function", "symbol", "bigint"].includes(typeof current))
+        throw new Error("exotic");
+      return current;
+    }
+    if (seen.has(current))
+      return seen.get(current);
+    const prototype = Object.getPrototypeOf(current);
+    if (!Array.isArray(current) && prototype !== Object.prototype && prototype !== null)
+      throw new Error("exotic");
+    const result = Array.isArray(current) ? new Array(current.length) : Object.create(prototype);
+    seen.set(current, result);
+    for (const key of Object.keys(current)) {
+      const descriptor = Object.getOwnPropertyDescriptor(current, key);
+      if (!descriptor || !("value" in descriptor))
+        throw new Error("accessor");
+      bytes += key.length * 2 + 16;
+      if (key === "__proto__") {
+        Object.defineProperty(result, key, {
+          value: copy(descriptor.value),
+          enumerable: true,
+          writable: true,
+          configurable: true
+        });
+      } else
+        result[key] = copy(descriptor.value);
+    }
+    return result;
+  };
+  return { value: copy(value), bytes };
+}
+function sameJson(before, after) {
+  const forward = new Map;
+  const reverse = new Set;
+  const same = (left, right) => {
+    if (left === null || right === null || typeof left !== "object" || typeof right !== "object")
+      return Object.is(left, right);
+    if (forward.has(left))
+      return forward.get(left) === right;
+    if (reverse.has(right) || Object.getPrototypeOf(left) !== Object.getPrototypeOf(right))
+      return false;
+    forward.set(left, right);
+    reverse.add(right);
+    if (Array.isArray(left) && (!Array.isArray(right) || left.length !== right.length))
+      return false;
+    const keys = Object.keys(left);
+    const otherKeys = Object.keys(right);
+    if (keys.length !== otherKeys.length)
+      return false;
+    for (let index = 0;index < keys.length; index++) {
+      const key = keys[index];
+      if (key !== otherKeys[index])
+        return false;
+      const descriptor = Object.getOwnPropertyDescriptor(right, key);
+      if (!descriptor || !("value" in descriptor) || !same(left[key], descriptor.value))
+        return false;
+    }
+    return true;
+  };
+  return same(before, after);
+}
+
 // src/hooks/magic-context/image-token-estimate.ts
 var IMAGE_TOKEN_DIVISOR = 750;
 var IMAGE_FALLBACK_TOKENS = 1200;
@@ -1106,6 +1285,151 @@ function readUint32BE(b, offset) {
   return (b[offset] << 24 | b[offset + 1] << 16 | b[offset + 2] << 8 | b[offset + 3]) >>> 0;
 }
 
+// src/hooks/magic-context/provider-visible-parts.ts
+function isRecord2(value) {
+  return value !== null && typeof value === "object" && !Array.isArray(value);
+}
+var KEPT_TOOL_STATE_FIELDS = new Set([
+  "status",
+  "input",
+  "output",
+  "error",
+  "attachments",
+  "content"
+]);
+var KEPT_TOOL_STATE_TIME_FIELD = "compacted";
+function tailProviderVisibleToolState(state, openCode1) {
+  const view = {};
+  for (const key of Object.keys(state)) {
+    if (tailToolStateFieldIsKept(key, openCode1)) {
+      view[key] = state[key];
+    } else if (key === "time" && openCode1) {
+      const value = state.time;
+      if (isRecord2(value)) {
+        view.time = value[KEPT_TOOL_STATE_TIME_FIELD] === undefined ? {} : { [KEPT_TOOL_STATE_TIME_FIELD]: value[KEPT_TOOL_STATE_TIME_FIELD] };
+      }
+    } else if (key === "metadata" && openCode1 && state.status === "error") {
+      const metadata = state.metadata;
+      if (isRecord2(metadata) && metadata.interrupted === true) {
+        const output = metadata.output;
+        if (typeof output === "string")
+          view.metadata = { interrupted: true, output };
+      }
+    }
+  }
+  return view;
+}
+function tailToolStateFieldIsKept(key, openCode1) {
+  return KEPT_TOOL_STATE_FIELDS.has(key) && (key !== "content" || !openCode1);
+}
+function tailToolStateIsReduced(state, openCode1) {
+  for (const key of Object.keys(state)) {
+    if (tailToolStateFieldIsKept(key, openCode1))
+      continue;
+    return false;
+  }
+  return true;
+}
+function providerVisiblePart(part) {
+  if (!isRecord2(part) || part.type !== "tool" || !isRecord2(part.state))
+    return part;
+  if (toolStateIsReduced(part.state))
+    return part;
+  return { ...part, state: providerVisibleToolState(part.state) };
+}
+function providerVisiblePartForTailHygiene(part) {
+  return providerVisiblePartForHost(part, true);
+}
+function providerVisiblePartForOpenCode2(part) {
+  return providerVisiblePartForHost(part, false);
+}
+function providerVisiblePartForHost(part, openCode1) {
+  if (!isRecord2(part))
+    return part;
+  if (part.type !== "tool") {
+    if (!Object.hasOwn(part, "state"))
+      return part;
+    const view = {};
+    for (const key of Object.keys(part)) {
+      if (key !== "state")
+        view[key] = part[key];
+    }
+    return view;
+  }
+  if (!isRecord2(part.state))
+    return part;
+  if (tailToolStateIsReduced(part.state, openCode1))
+    return part;
+  return { ...part, state: tailProviderVisibleToolState(part.state, openCode1) };
+}
+var KEPT_ERROR_METADATA_FIELDS = ["interrupted", "output"];
+function providerVisibleToolState(state) {
+  const view = {};
+  for (const key of Object.keys(state)) {
+    const value = state[key];
+    if (KEPT_TOOL_STATE_FIELDS.has(key)) {
+      view[key] = value;
+    } else if (key === "time" && isRecord2(value)) {
+      view.time = value[KEPT_TOOL_STATE_TIME_FIELD] === undefined ? {} : { [KEPT_TOOL_STATE_TIME_FIELD]: value[KEPT_TOOL_STATE_TIME_FIELD] };
+    } else if (key === "metadata" && state.status === "error" && isRecord2(value)) {
+      const kept = {};
+      for (const field of KEPT_ERROR_METADATA_FIELDS) {
+        if (Object.hasOwn(value, field))
+          kept[field] = value[field];
+      }
+      view.metadata = kept;
+    }
+  }
+  return view;
+}
+function toolStateIsReduced(state) {
+  for (const key of Object.keys(state)) {
+    if (KEPT_TOOL_STATE_FIELDS.has(key))
+      continue;
+    const value = state[key];
+    if (key === "time" && isRecord2(value)) {
+      const keys = Object.keys(value);
+      if (keys.length === 0)
+        continue;
+      if (keys.length === 1 && keys[0] === KEPT_TOOL_STATE_TIME_FIELD)
+        continue;
+      return false;
+    }
+    if (key === "metadata" && state.status === "error" && isRecord2(value)) {
+      const extra = Object.keys(value).some((field) => !KEPT_ERROR_METADATA_FIELDS.includes(field));
+      if (!extra)
+        continue;
+    }
+    return false;
+  }
+  return true;
+}
+function providerVisibleMessage(message) {
+  return projectMessage(message, providerVisiblePart);
+}
+function providerVisibleMessageForTailHygiene(message) {
+  return projectMessage(message, providerVisiblePartForTailHygiene);
+}
+function providerVisibleMessageForOpenCode2(message) {
+  return projectMessage(message, providerVisiblePartForOpenCode2);
+}
+function projectMessage(message, projectPart) {
+  if (!isRecord2(message) || !Array.isArray(message.parts))
+    return message;
+  let parts;
+  for (let index = 0;index < message.parts.length; index += 1) {
+    const part = message.parts[index];
+    const view = projectPart(part);
+    if (view !== part) {
+      parts ??= message.parts.slice(0, index);
+      parts.push(view);
+    } else if (parts) {
+      parts.push(part);
+    }
+  }
+  return parts ? { ...message, parts } : message;
+}
+
 // src/hooks/magic-context/todo-view.ts
 import { createHash } from "node:crypto";
 var TODO_STATUS_PENDING = "pending";
@@ -1223,7 +1547,7 @@ function isTodoItem(value) {
 
 // src/hooks/magic-context/tail-hygiene-walk.ts
 var MAX_CONTENT_MEMO_ENTRIES = 1e5;
-var MAX_CONTENT_MEMO_BYTES = 64 * 1024 * 1024;
+var MAX_CONTENT_MEMO_BYTES = 256 * 1024 * 1024;
 var contentMemo = new Map;
 var contentMemoOrder = new Set;
 var contentMemoBytes = 0;
@@ -1407,41 +1731,46 @@ function stripChannel1ReminderSpans(output) {
   return stripped;
 }
 function isDropSentinel(content) {
-  const stripped = content.trimStart().replace(TAG_PREFIX, "").trimStart().toLowerCase();
-  return DROP_PREFIXES.some((prefix) => stripped.startsWith(prefix));
-}
-function toolOutputText(part) {
+  let stripped = content.trimStart();
+  const tag = TAG_PREFIX.exec(stripped);
+  if (tag)
+    stripped = stripped.slice(tag[0].length).trimStart();
+  return DROP_PREFIXES.some((prefix) => stripped.slice(0, prefix.length).toLowerCase() === prefix);
+}
+function toolOutputText(part, key) {
+  const serialize = (value) => partJsonMemo.get(key, value, () => safeStableStringify(value));
   if (part.type === "tool") {
     const state = isRecord(part.state) ? part.state : null;
     if (!state)
       return null;
     if (state.output !== undefined)
-      return safeStableStringify(state.output);
+      return serialize(state.output);
     if (state.error !== undefined)
-      return safeStableStringify(state.error);
+      return serialize(state.error);
     if (state.result !== undefined)
-      return safeStableStringify(state.result);
+      return serialize(state.result);
     return null;
   }
   if (part.type === "tool_result") {
     const value = part.content ?? part.output ?? part.result;
-    return value === undefined ? null : safeStableStringify(value);
+    return value === undefined ? null : serialize(value);
   }
   return null;
 }
-function toolInputText(part) {
+function toolInputText(part, key) {
+  const serialize = (value) => partJsonMemo.get(key, value, () => safeStableStringify(value));
   if (part.type === "tool") {
     const state = isRecord(part.state) ? part.state : null;
     if (!state || state.input === undefined)
       return null;
-    return safeStableStringify(state.input);
+    return serialize(state.input);
   }
   if (part.type === "tool-invocation") {
     const value = part.args ?? part.input;
-    return value === undefined ? null : safeStableStringify(value);
+    return value === undefined ? null : serialize(value);
   }
   if (part.type === "tool_use") {
-    return part.input === undefined ? null : safeStableStringify(part.input);
+    return part.input === undefined ? null : serialize(part.input);
   }
   return null;
 }
@@ -1452,8 +1781,8 @@ function messageIdForTag(tag) {
 }
 function resolveProtectedTagNumbers(tags, protectedTagNumbersInput, protectedToolTags) {
   const protectedNumbers = new Set(protectedTagNumbersInput);
-  const protectedExemplars = protectedToolTags ?? protectedToolTagNumbers(tags);
-  for (const tagNumber of protectedExemplars)
+  const protectedCtxReduceTags = protectedToolTags ?? protectedToolTagNumbers(tags);
+  for (const tagNumber of protectedCtxReduceTags)
     protectedNumbers.add(tagNumber);
   return protectedNumbers;
 }
@@ -1568,17 +1897,28 @@ function snapshot(args) {
     queuedForDrop
   };
 }
+var partJsonMemo = new TailHygieneJsonMemo;
 function excludedSnapshot(key, part) {
-  const content = safeStableStringify(part);
-  return snapshot({
+  const contentHash = partJsonMemo.get(key, part, () => {
+    if (part === null || part === undefined || typeof part === "string")
+      return memoizedContent("excluded", safeStableStringify(part)).hash;
+    try {
+      return stableStringifyHash(part, "excluded\x00");
+    } catch {
+      return memoizedContent("excluded", String(part)).hash;
+    }
+  }, true);
+  return {
     key,
+    contentHash,
     kind: "excluded",
-    content,
     tokens: 0,
-    tag: undefined,
-    protectedNumbers: new Set,
-    pendingDropTagNumbers: new Set
-  });
+    uTokens: 0,
+    tagNumber: null,
+    tagStatus: null,
+    protected: false,
+    queuedForDrop: false
+  };
 }
 function fileContentAndTokens(part) {
   const mime = typeof part.mime === "string" ? part.mime : "";
@@ -1618,12 +1958,12 @@ function structuralSize(value) {
   }
   return 0;
 }
-function tailHygieneStructuralSignature(messages) {
+function tailHygieneStructuralSignature(messages, opencode2 = false) {
   const partCounts = [];
   let totalBytes = 0;
   for (const message of messages) {
     partCounts.push(message.parts.length);
-    totalBytes += structuralSize(message);
+    totalBytes += structuralSize(opencode2 ? providerVisibleMessageForOpenCode2(message) : providerVisibleMessageForTailHygiene(message));
   }
   return { messageCount: messages.length, partCounts, totalBytes };
 }
@@ -1637,10 +1977,22 @@ function measureTailHygiene(input) {
   return measureWithReplay(input);
 }
 function measureWithReplay(input, replay) {
+  partJsonMemo.beginPass();
+  const projectPart = input.opencode2 ? providerVisiblePartForOpenCode2 : providerVisiblePartForTailHygiene;
+  const views = new WeakMap;
+  const excluded = (key, part) => {
+    let view = part !== null && typeof part === "object" ? views.get(part) : undefined;
+    if (view === undefined) {
+      view = projectPart(part);
+      if (part !== null && typeof part === "object")
+        views.set(part, view);
+    }
+    return excludedSnapshot(key, view);
+  };
   const pendingDropTagNumbers = input.pendingDropTagNumbers ?? new Set;
   const unchanged = input.messages.map((message, index) => {
     const previous = replay?.messages[index];
-    return previous !== undefined && sameReplayMessage(previous, message);
+    return previous !== undefined && sameReplayMessage(previous, message, projectPart);
   });
   const toolIdentities = collectToolPartIdentities(input.messages);
   const attribution = buildTagAttribution({
@@ -1650,7 +2002,7 @@ function measureWithReplay(input, replay) {
     protectedTagNumbers: input.protectedTagNumbers,
     protectedToolTags: input.protectedToolTags
   });
-  const toolOutputs = input.messages.map((message, index) => message.parts.map((part, partIndex) => unchanged[index] ? replay?.measured.toolOutputs[index][partIndex] ?? null : isRecord(part) ? toolOutputText(part) : null));
+  const toolOutputs = input.messages.map((message, index) => message.parts.map((part, partIndex) => unchanged[index] ? replay?.measured.toolOutputs[index][partIndex] ?? null : isRecord(part) ? toolOutputText(part, `${messageIdentity(message, index)}\x00${partIndex}\x00output`) : null));
   const outputByPart = new Map;
   input.messages.forEach((message, index) => {
     message.parts.forEach((part, partIndex) => {
@@ -1716,19 +2068,19 @@ function measureWithReplay(input, replay) {
       const part = message.parts[partIndex];
       const key = `${messageKey}\x00${partIndex}`;
       if (messageSynthetic || isSyntheticPart(part) || !isRecord(part)) {
-        parts.push(excludedSnapshot(`${key}\x00excluded`, part));
+        parts.push(excluded(`${key}\x00excluded`, part));
         continue;
       }
       const type = typeof part.type === "string" ? part.type : "";
       if (type === "reasoning" || type === "thinking" || type === "redacted_thinking" || type === "signature") {
-        parts.push(excludedSnapshot(`${key}\x00excluded`, part));
+        parts.push(excluded(`${key}\x00excluded`, part));
         continue;
       }
       if (type === "text") {
         const rawContent = firstString(part, ["text", "content"]);
         const content = rawContent === null ? null : stripChannel1ReminderSpans(rawContent);
         if (!content || isDropSentinel(content)) {
-          parts.push(excludedSnapshot(`${key}\x00excluded`, part));
+          parts.push(excluded(`${key}\x00excluded`, part));
           continue;
         }
         const tokens = memoizedTokens("text", content);
@@ -1750,7 +2102,7 @@ function measureWithReplay(input, replay) {
       if (type === "file" || type.includes("image") || type === "source") {
         const file = fileContentAndTokens(part);
         if (!file.content || isDropSentinel(file.content)) {
-          parts.push(excludedSnapshot(`${key}\x00excluded`, part));
+          parts.push(excluded(`${key}\x00excluded`, part));
           continue;
         }
         const tag = attribution.messageTags.get(`${message.info.id}:file${partIndex}`);
@@ -1772,11 +2124,11 @@ function measureWithReplay(input, replay) {
       if (toolIdentity) {
         const ownerKey = `${toolIdentity.ownerMessageId}\x00${toolIdentity.callId}`;
         if (droppedToolOwners.has(ownerKey)) {
-          parts.push(excludedSnapshot(`${key}\x00excluded`, part));
+          parts.push(excluded(`${key}\x00excluded`, part));
           continue;
         }
         const tag = attribution.toolTagsByPart.get(part);
-        const inputText = toolInputText(part);
+        const inputText = toolInputText(part, `${key}\x00input`);
         if (inputText !== null) {
           const tokens = memoizedTokens("toolInput", inputText);
           const measured = snapshot({
@@ -1796,7 +2148,7 @@ function measureWithReplay(input, replay) {
         if (rawOutput !== null) {
           const output = stripChannel1ReminderSpans(rawOutput);
           if (isDropSentinel(output)) {
-            parts.push(excludedSnapshot(`${key}\x00excludedOutput`, output));
+            parts.push(excluded(`${key}\x00excludedOutput`, output));
           } else {
             const tokens = memoizedTokens("toolOutput", output) + (part.type === "tool" ? estimateToolAttachmentImageTokens(part.state) : 0);
             const measured = snapshot({
@@ -1814,11 +2166,11 @@ function measureWithReplay(input, replay) {
           }
         }
         if (inputText === null && rawOutput === null) {
-          parts.push(excludedSnapshot(`${key}\x00excluded`, part));
+          parts.push(excluded(`${key}\x00excluded`, part));
         }
         continue;
       }
-      parts.push(excludedSnapshot(`${key}\x00excluded`, part));
+      parts.push(excluded(`${key}\x00excluded`, part));
     }
   }
   return {
@@ -1959,16 +2311,19 @@ function sameNumbers(before, after) {
       return false;
   return true;
 }
-function sameReplayMessage(left, right) {
-  return left.info.id === right.info.id && left.info.role === right.info.role && left.info.summary === right.info.summary && sameReplayValue(left.parts, right.parts);
+function sameReplayMessage(left, right, projectPart = providerVisiblePartForTailHygiene) {
+  return left.info.id === right.info.id && left.info.role === right.info.role && left.info.summary === right.info.summary && sameReplayValue(left.parts, right.parts.map(projectPart));
+}
+function replaySnapshotParts(parts, projectPart = providerVisiblePartForTailHygiene) {
+  return copyReplayValue(parts.map(projectPart));
 }
-function sameReplayMessages(before, after) {
+function sameReplayMessages(before, after, projectPart = providerVisiblePartForTailHygiene) {
   if (before.length !== after.length)
     return false;
   for (let index = 0;index < before.length; index += 1) {
     const left = before[index];
     const right = after[index];
-    if (!sameReplayMessage(left, right))
+    if (!sameReplayMessage(left, right, projectPart))
       return false;
   }
   return true;
@@ -2027,8 +2382,10 @@ function refreshTailHygieneBaseline(input) {
     protectedTagNumbers: new Set([...input.protectedTagNumbers, ...protectedToolTags])
   };
   const pendingDropTagNumbers = input.pendingDropTagNumbers ?? new Set;
-  const cached = input.previous ? baselineMeasurementMemo.get(input.previous.baselineParts) : undefined;
-  const hit = !input.cacheBusting && cached && sameReplayMessages(cached.messages, input.messages) && sameReplayValue(cached.tags, input.tags) && sameNumbers(cached.protectedTagNumbers, input.protectedTagNumbers) && sameNumbers(cached.pendingDropTagNumbers, pendingDropTagNumbers);
+  const priorMemo = input.previous ? baselineMeasurementMemo.get(input.previous.baselineParts) : undefined;
+  const cached = priorMemo?.opencode2 === !!input.opencode2 ? priorMemo : undefined;
+  const projectPart = input.opencode2 ? providerVisiblePartForOpenCode2 : providerVisiblePartForTailHygiene;
+  const hit = !input.cacheBusting && cached && sameReplayMessages(cached.messages, input.messages, projectPart) && sameReplayValue(cached.tags, input.tags) && sameNumbers(cached.protectedTagNumbers, input.protectedTagNumbers) && sameNumbers(cached.pendingDropTagNumbers, pendingDropTagNumbers);
   const rawMeasured = hit ? cached.measured : measureWithReplay(input, cached);
   const frozenCalibration = !input.cacheBusting && input.previous ? {
     toolsRatio: input.previous.toolsRatio,
@@ -2048,19 +2405,20 @@ function refreshTailHygieneBaseline(input) {
     })
   };
   const memo = hit ? cached : {
-    messages: input.messages.map((message, index) => cached?.messages[index] && sameReplayMessage(cached.messages[index], message) ? cached.messages[index] : {
+    opencode2: !!input.opencode2,
+    messages: input.messages.map((message, index) => cached?.messages[index] && sameReplayMessage(cached.messages[index], message, projectPart) ? cached.messages[index] : {
       info: {
         id: message.info.id,
         role: message.info.role,
         summary: message.info.summary
       },
-      parts: copyReplayValue(message.parts)
+      parts: replaySnapshotParts(message.parts, projectPart)
     }),
     tags: structuredClone(input.tags),
     protectedTagNumbers: new Set(input.protectedTagNumbers),
     pendingDropTagNumbers: new Set(pendingDropTagNumbers),
     measured: rawMeasured,
-    size: 2 * structuralSize(input.messages) + 512 * input.tags.length
+    size: 2 * structuralSize(input.messages.map(input.opencode2 ? providerVisibleMessageForOpenCode2 : providerVisibleMessageForTailHygiene)) + 512 * input.tags.length
   };
   if (!hit) {
     const owners = new Map;
@@ -2077,8 +2435,9 @@ function refreshTailHygieneBaseline(input) {
   const refrozen = (mismatch) => {
     const frozen = freezeTailHygieneMeasurement(measured);
     retainBaselineMeasurement(frozen.baselineParts, memo);
-    return {
+    return rememberCurrentToolOutputCount({
       ...frozen,
+      protectedToolsPolicy,
       hygieneUnitsVersion: frozenCalibration.hygieneUnitsVersion,
       toolsRatio: frozenCalibration.toolsRatio,
       proseRatio: frozenCalibration.proseRatio,
@@ -2088,9 +2447,8 @@ function refreshTailHygieneBaseline(input) {
       generationInvalidated: false,
       contentSignature: measured.contentSignature,
       channel1PostReduceGrace: input.previous?.channel1PostReduceGrace,
-      lastPrefixMismatch: mismatch,
-      protectedToolsPolicy
-    };
+      lastPrefixMismatch: mismatch
+    }, measured);
   };
   if (input.cacheBusting || !input.previous)
     return refrozen();
@@ -2106,7 +2464,7 @@ function refreshTailHygieneBaseline(input) {
     if (part.kind !== "toolOutput" || !part.protected)
       turnDeltaU += part.uTokens;
   }
-  return {
+  return rememberCurrentToolOutputCount({
     ...input.previous,
     protectedToolsPolicy,
     turnDeltaU,
@@ -2115,7 +2473,7 @@ function refreshTailHygieneBaseline(input) {
     generationInvalidated: false,
     contentSignature: measured.contentSignature,
     lastPrefixMismatch: undefined
-  };
+  }, measured);
 }
 function effectiveTailHygiene(baseline) {
   const t = Math.ceil(Math.max(0, baseline.baselineT + baseline.turnDeltaT));
@@ -2387,7 +2745,7 @@ function formatOldestReclaimableHint(hint) {
 oldest reclaimable: ${rendered}.` : "";
 }
 function reclaimableToolOutputCount(parts) {
-  return parts.filter((part) => part.kind === "toolOutput" && part.uTokens > 0).length;
+  return countReclaimableToolOutputs(parts);
 }
 function formatReclaimableOutputSummary(count, tokens) {
   const outputCount = Math.max(0, Math.floor(count));
@@ -2497,9 +2855,11 @@ function planEmergencyDrop(input) {
   const workingSpan = Math.max(ceilingTokens - fixedFloor, 0);
   const target = fixedFloor + TARGET_FRACTION * workingSpan;
   const reclaimTokens = Math.round(currentTotalInputTokens - target);
-  const floorNote = fixedFloor > ceilingTokens ? `; fixed floor ≈${Math.round(fixedFloor)} already exceeds ceiling ${Math.round(ceilingTokens)}: tool drops cannot reach the target` : "";
+  if (fixedFloor > ceilingTokens) {
+    return noop(`fixed floor ≈${Math.round(fixedFloor)} already exceeds ceiling ${Math.round(ceilingTokens)}: tool drops cannot reach the target`);
+  }
   if (reclaimTokens <= EMERGENCY_REARM_MIN_TOKENS) {
-    return noop(`reclaim<=min (${reclaimTokens} <= ${EMERGENCY_REARM_MIN_TOKENS})${floorNote}`);
+    return noop(`reclaim<=min (${reclaimTokens} <= ${EMERGENCY_REARM_MIN_TOKENS})`);
   }
   const cutoff = input.protectedCutoff;
   const windowYields = absoluteEmergency;
@@ -2554,16 +2914,16 @@ function planEmergencyDrop(input) {
       }
     }
   if (selected.length === 0) {
-    return noop(`no-candidates${floorNote}`);
+    return noop("no-candidates");
   }
   if (!input.passAlreadyPriced && reclaimed < EMERGENCY_MIN_ACHIEVABLE_RECLAIM_TOKENS) {
-    return noop(`achievable reclaim below minimum (${selected.length} tags, reclaim≈${Math.round(reclaimed)} < ${EMERGENCY_MIN_ACHIEVABLE_RECLAIM_TOKENS} against gap ${reclaimTokens})${floorNote}`);
+    return noop(`achievable reclaim below minimum (${selected.length} tags, reclaim≈${Math.round(reclaimed)} < ${EMERGENCY_MIN_ACHIEVABLE_RECLAIM_TOKENS} against gap ${reclaimTokens})`);
   }
   return {
     shouldDrop: true,
     tagNumbers: selected,
     reclaimTokens,
-    reason: `tiered drop: ${selected.length} tags, reclaim≈${reclaimed}/${reclaimTokens} tokens (floor≈${fixedFloor}, ceiling=${Math.round(ceilingTokens)})${floorNote}`
+    reason: `tiered drop: ${selected.length} tags, reclaim≈${reclaimed}/${reclaimTokens} tokens (floor≈${fixedFloor}, ceiling=${Math.round(ceilingTokens)})`
   };
 }
 function measureEmergencyTag(tag, target, calibration, skeleton) {
@@ -3418,6 +3778,19 @@ function insertTag(db, sessionId, messageId, type, byteSize, tagNumber, reasonin
 function updateTagStatus(db, sessionId, tagId, status) {
   getUpdateTagStatusStatement(db).run(status, sessionId, tagId);
 }
+var droppedTagStatements = new WeakMap;
+function markTagDropped(db, sessionId, tagId, mode) {
+  if (!mode) {
+    updateTagStatus(db, sessionId, tagId, "dropped");
+    return;
+  }
+  let statement = droppedTagStatements.get(db);
+  if (!statement) {
+    statement = db.prepare("UPDATE tags SET status = ?, drop_mode = ? WHERE session_id = ? AND tag_number = ?");
+    droppedTagStatements.set(db, statement);
+  }
+  statement.run("dropped", mode, sessionId, tagId);
+}
 var inertWhitespaceStatements = new WeakMap;
 function markWhitespaceAssistantTagInert(db, sessionId, tagNumber, contentId) {
   db.prepare(`UPDATE tags
@@ -3868,7 +4241,7 @@ function getNewestToolTagNumbers(db, sessionId, limit) {
   let statement = newestToolTagNumberStatements.get(db);
   if (!statement) {
     statement = db.prepare(`SELECT tag_number FROM tags
-              WHERE session_id = ? AND type = 'tool'
+              WHERE session_id = ? AND +type = 'tool'
                 AND typeof(message_id) = 'text'
                 AND typeof(status) = 'text'
                 AND typeof(byte_size) IN ('integer', 'real')
@@ -4375,84 +4748,34 @@ function isHostRenderedSystemMessage(message) {
   const id = message.info.id;
   return (typeof id !== "string" || id.length === 0) && message.info.role === "system";
 }
-
-// src/hooks/magic-context/provider-visible-parts.ts
-function isRecord2(value) {
-  return value !== null && typeof value === "object" && !Array.isArray(value);
+var COVERED_INSTRUCTION_ROW = "coveredInstructionRow";
+function markCoveredInstructionRow(target) {
+  Object.defineProperty(target, COVERED_INSTRUCTION_ROW, {
+    value: true,
+    enumerable: false,
+    configurable: true
+  });
+  return target;
 }
-var KEPT_TOOL_STATE_FIELDS = new Set([
-  "status",
-  "input",
-  "output",
-  "error",
-  "attachments",
-  "content"
-]);
-var KEPT_TOOL_STATE_TIME_FIELD = "compacted";
-var KEPT_ERROR_METADATA_FIELDS = ["interrupted", "output"];
-function providerVisibleToolState(state) {
-  const view = {};
-  for (const key of Object.keys(state)) {
-    const value = state[key];
-    if (KEPT_TOOL_STATE_FIELDS.has(key)) {
-      view[key] = value;
-    } else if (key === "time" && isRecord2(value)) {
-      view.time = value[KEPT_TOOL_STATE_TIME_FIELD] === undefined ? {} : { [KEPT_TOOL_STATE_TIME_FIELD]: value[KEPT_TOOL_STATE_TIME_FIELD] };
-    } else if (key === "metadata" && state.status === "error" && isRecord2(value)) {
-      const kept = {};
-      for (const field of KEPT_ERROR_METADATA_FIELDS) {
-        if (Object.hasOwn(value, field))
-          kept[field] = value[field];
-      }
-      view.metadata = kept;
-    }
-  }
-  return view;
+function isCoveredInstructionRow(value) {
+  return typeof value === "object" && value !== null && value[COVERED_INSTRUCTION_ROW] === true;
 }
-function toolStateIsReduced(state) {
-  for (const key of Object.keys(state)) {
-    if (KEPT_TOOL_STATE_FIELDS.has(key))
-      continue;
-    const value = state[key];
-    if (key === "time" && isRecord2(value)) {
-      const keys = Object.keys(value);
-      if (keys.length === 0)
-        continue;
-      if (keys.length === 1 && keys[0] === KEPT_TOOL_STATE_TIME_FIELD)
-        continue;
-      return false;
-    }
-    if (key === "metadata" && state.status === "error" && isRecord2(value)) {
-      const extra = Object.keys(value).some((field) => !KEPT_ERROR_METADATA_FIELDS.includes(field));
-      if (!extra)
-        continue;
-    }
-    return false;
+function takeCoveredInstructionRows(messages) {
+  const taken = messages.filter((message) => isCoveredInstructionRow(message.info));
+  if (taken.length > 0) {
+    const kept = messages.filter((message) => !isCoveredInstructionRow(message.info));
+    messages.splice(0, messages.length, ...kept);
   }
-  return true;
+  return taken;
 }
-function providerVisiblePart(part) {
-  if (!isRecord2(part) || part.type !== "tool" || !isRecord2(part.state))
-    return part;
-  if (toolStateIsReduced(part.state))
-    return part;
-  return { ...part, state: providerVisibleToolState(part.state) };
-}
-function providerVisibleMessage(message) {
-  if (!isRecord2(message) || !Array.isArray(message.parts))
-    return message;
-  let parts;
-  for (let index = 0;index < message.parts.length; index += 1) {
-    const part = message.parts[index];
-    const view = providerVisiblePart(part);
-    if (view !== part) {
-      parts ??= message.parts.slice(0, index);
-      parts.push(view);
-    } else if (parts) {
-      parts.push(part);
-    }
-  }
-  return parts ? { ...message, parts } : message;
+function cloneKeepingCoveredInstructionMarks(messages) {
+  const copy = structuredClone(messages);
+  messages.forEach((message, index) => {
+    const copied = copy[index];
+    if (copied && isCoveredInstructionRow(message.info))
+      markCoveredInstructionRow(copied.info);
+  });
+  return copy;
 }
 
 // src/hooks/magic-context/read-session-true-raw-tokens.ts
@@ -5086,11 +5409,6 @@ function isFilePart(part) {
   const p = part;
   return p.type === "file" && typeof p.url === "string";
 }
-function buildFileSourceContent(parts) {
-  const content = parts.filter(isTextPart).map((part) => stripTagPrefix(part.text)).join(`
-`).trim();
-  return content.length > 0 ? content : null;
-}
 
 // src/shared/user-answer.ts
 function hasUserAnswerMetadata(value) {
@@ -5292,6 +5610,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))
@@ -5453,6 +5777,17 @@ function serializedTokens(value, bounded = false) {
     return Buffer.byteLength(serialized);
   return serialized ? wireTextTokens(serialized) : 0;
 }
+function estimatePartImageTokens(raw) {
+  if (!raw || typeof raw !== "object")
+    return 0;
+  const part = raw;
+  if (part.ignored)
+    return 0;
+  if (part.type === "file" && part.mime?.startsWith("image/")) {
+    return typeof part.url === "string" && part.url.startsWith("data:") ? estimateImageTokensFromDataUrl(part.url) : 1200;
+  }
+  return part.type === "tool" ? estimateToolAttachmentImageTokens(part.state) : 0;
+}
 function visitWireContent(message, visit) {
   for (const part of message.parts) {
     if (!part || typeof part !== "object")
@@ -5481,15 +5816,13 @@ function visitWireContent(message, visit) {
         text(p.data);
         break;
       case "file":
-        if (typeof p.mime === "string" && p.mime.startsWith("image/")) {
-          visit.image("conversation", typeof p.url === "string" && p.url.startsWith("data:") ? estimateImageTokensFromDataUrl(p.url) : 1200);
-        }
+        visit.image("conversation", estimatePartImageTokens(part));
         break;
       case "tool":
         tool(p.state?.input ?? p.input ?? p.args);
         tool(p.state?.output ?? p.state?.content ?? p.output ?? p.result ?? p.content);
         tool(p.state?.error);
-        visit.image("toolCall", estimateToolAttachmentImageTokens(p.state));
+        visit.image("toolCall", estimatePartImageTokens(part));
         break;
       case "tool-call":
         tool(p.input ?? p.args);
@@ -6139,24 +6472,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;
   }
@@ -6166,17 +6493,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))
@@ -6189,51 +6523,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;
+    return part.content === sentinel ? part : { ...part, content: sentinel };
   }
-  if (part.type === "tool-invocation" && isRecord(part.args)) {
-    applyEditMarkerToInput(part.args);
-    return;
-  }
-  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))
@@ -6320,7 +6665,7 @@ class ToolMutationBatch {
     this.partsToRemove.add(servedPart(occurrence));
     this.affectedMessages.add(occurrence.message);
   }
-  wouldStrandConversationEnd(occurrences) {
+  wouldStrandConversationEnd(occurrences, plannedRemovals) {
     const served = this.servedMessages ?? this.messages;
     let end;
     for (let i = served.length - 1;i >= 0 && end === undefined; i -= 1) {
@@ -6330,7 +6675,7 @@ class ToolMutationBatch {
     if (!end || !occurrences.some((occurrence) => occurrence.message === end))
       return false;
     const leaving = new Set(occurrences.map(servedPart));
-    const survives = (part) => !leaving.has(part) && !this.partsToRemove.has(part);
+    const survives = (part) => !leaving.has(part) && !this.partsToRemove.has(part) && !plannedRemovals?.has(part);
     return end.info.role === "assistant" ? !end.parts.some((part) => partHasCompletedResult(part) && survives(part)) : !end.parts.some((part) => hasMeaningfulPart(part) && survives(part));
   }
   finalize() {
@@ -6462,9 +6807,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,
@@ -6506,11 +6849,16 @@ function createToolDropTarget(compositeKey, thinkingParts, index, batch, tagId)
         return null;
       return toolInputStringBytes(readRawInput());
     },
-    wouldStrandConversationEnd: () => {
+    wouldStrandConversationEnd: (plannedRemovals) => {
       const entry = index.get(compositeKey);
       if (!entry || entry.occurrences.length === 0)
         return false;
-      return batch.wouldStrandConversationEnd(entry.occurrences);
+      return batch.wouldStrandConversationEnd(entry.occurrences, plannedRemovals);
+    },
+    notePlannedRemoval: (plannedRemovals) => {
+      for (const occurrence of index.get(compositeKey)?.occurrences ?? []) {
+        plannedRemovals.add(servedPart(occurrence));
+      }
     },
     prepareDrop: () => {
       const entry = index.get(compositeKey);
@@ -6602,9 +6950,8 @@ function setBoundedRawMessageProvider2(sessionId, provider) {
   }
   return setRawMessageProvider(sessionId, wrapper);
 }
-var SYSTEM_REMINDER_BLOCK_REGEX = /<system-reminder>[\s\S]*?<\/system-reminder>/gi;
 function cleanUserText2(text) {
-  return stripOutsideSteeringWrappers(text, (segment) => segment.replace(SYSTEM_REMINDER_BLOCK_REGEX, "").replace(OMO_INTERNAL_INITIATOR_MARKER, "")).trim();
+  return stripOutsideSteeringWrappers(text, (segment) => removeSystemReminders(segment).replace(OMO_INTERNAL_INITIATOR_MARKER, "")).trim();
 }
 function hasMeaningfulChunkUserText(parts) {
   for (const part of parts) {
@@ -7374,4 +7721,4 @@ function readSessionChunk2(sessionId, tokenBudget, offset = 1, eligibleEndOrdina
     toolResultBoundaries
   };
 }
-export { toolTemplateError, DEFAULT_PROTECTED_TOOLS, normalizeProtectedToolName, mergeProtectedTools, isRecord, protectedToolTagNumbers, protectedToolTokenCount, textMentionsRecentCommit, removeSystemReminders, hasMeaningfulUserText2, extractTexts2, getTokenizerNativeMemoryStats, preloadTokenizer, estimateTokens, estimateFixedPromptTokens, stripWellFormedLeadingTagPrefix, stripPersistedAssistantText, byteSize, stripTagPrefix, peelLeadingMcTagNotation, prependTag, isThinkingPart, stableStringify, contentTagOwnerMessageId, estimateImageTokensFromDataUrl, estimateToolAttachmentImageTokens, normalizeTodoStateJson, buildSyntheticTodoPart, isSyntheticTodoPart, countRealUserMessages, tailHygieneStructuralSignature, sameTailHygieneStructuralSignature, formatTailHygienePrefixMismatch, refreshTailHygieneBaseline, effectiveTailHygiene, assertTailHygieneContentUnchangedIfEnabled, CHANNEL1_SENTINEL, CHANNEL1_FLOOR_TOKENS, isDroppedToolOutput, toolOutputTokens, decideChannel1, evaluateChannel2, formatChannel1Evaluation, formatChannel2Evaluation, reclaimableToolOutputCount, buildChannel2Reminder, buildChannel1Reminder, estimateEmergencyDropReclaimTokens, planEmergencyDrop, measureEmergencyTag, installV3PerfSchema, queuePendingOp, queuePendingDropForUnchangedTag, getPendingOps, getPendingOpsCount, clearPendingOps, removePendingOp, tagTombstoneOwnerRange, tagTombstoneOwnerKey, tagRevisionKey, tagIdentityRevisionKey, installTagIdentityRevisionTrigger, deleteTagIdentityRevisions, getRecentTagOwnerMessageIds, AGE_RECLAIM_MIN_TOKENS, getOldestActiveUnprotectedToolTags, getActiveToolTagsForAgeReclaim, getTriggerTagTokenUpperBound, getActiveTagTokenTotalsByMessage, getAllStatusTagTokenTotalsFlat, getReasoningTokenEstimatesByMessage, tryGetReasoningTokenEstimatesByMessage, getMaxTagNumberByOwnerMessage, scanTagOwnerSummary, isTagOwnerSummaryReady, tagTokenCountIsNull, backfillTagTokenCounts, insertTag, updateTagStatus, markWhitespaceAssistantTagInert, getInertWhitespaceAssistantTags, getInertWhitespaceAssistantTagsByNumbers, updateTagDropMode, updateCavemanDepth, updateTagMessageId, foldShrunkPartTags, markTagsCompactedByMessageIds, getMaxTagNumberBySession, getTagNumberByMessageId, getAssignableTagNumberByMessageId, deriveTagLoadFloor, TAG_SELECT_COLUMNS, getTagsBySession, getActiveTagsBySession, getTailHygieneTags, getTagsByNumbers, getNewestToolTagNumbers, getDroppedTagsByNumbers, getMaxDroppedTagNumber, getTagById, getToolTagNumberByOwner, getNullOwnerToolTag, adoptNullOwnerToolTag, getCandidateToolOwners, pickNearestPriorOwner, expandToolPart, markHostUnservedRow, retreatPastHostUnservedRows, snapTerminalCompartmentToServedRow, isHostRenderedSystemMessage, providerVisibleMessage, completedToolArcCrossesBoundary, estimateTrueRawMessageTokens, buildToolArcs, fenceBoundaryForCompletedToolArcs, fenceBoundaryForToolArcs, buildTrueRawTokenIndex, computeRawRangeFingerprint, stripSystemInjection, isTextPart, isToolPartWithOutput, isFilePart, buildFileSourceContent, toolPartHasUserAnswer, recordToolParameters, createDroppedInputGuard, assertExecutableToolInput, isEditTool, getCurrentToolSetHash, setDatabase, loadToolDefinitionMeasurements, recordToolDefinition, getMeasuredToolDefinitionTokens, describeFinalWireTail, estimateMessageTokens, wireContentBytes, createFinalWireUsageTracker, estimateFinalWireInputTokens, detectLatestTurnThinkingMismatch, isPrefixBoundThinkingModel, detectOverflow, modelAcceptsEmptyContent, isAnthropicFamilyRoute, neutralizeDroppedReasoningPart, restoreNeutralizedReasoningPart, isNeutralizedReasoningPart, neutralizedReasoningSource, variantChangeBustsProviderCache, makeSentinel, makeWholeMessageSentinel, neutralizeWholeMessage, isSentinel, replaySentinelByMessageIds, SKELETON_REAL_INPUT_MAX_BYTES, partHasCompletedResult, extractToolCallObservation, ToolMutationBatch, createToolDropTarget, resolveHostServedBoundaryId2, hasRawMessageProvider2, setBoundedRawMessageProvider2, cleanUserText2, withRawSessionMessageCache2, readRawSessionMessages2, readRawSessionMessagePage2, getRawSessionMessageOrdinalCount2, visitRawSessionMessages2, readRawSessionMessageRange2, prepareRawSessionOrdinals2, primeTailRawMessageCache2, getCachedAbsoluteMessageCount2, primeInMemoryTailRawMessageCache2, readRawSessionMessageIdOrdinalsForRange2, hasRawSessionMessageById2, readRawSessionMessageOrdinalById2, compareRawSessionMessageOrder2, readRawSessionMessageById2, getRawSessionMessageCount2, getRawSessionTagKeysThrough2, getLegacyProtectedTailStartOrdinal2, readSessionChunk2 };
+export { toolTemplateError, DEFAULT_PROTECTED_TOOLS, normalizeProtectedToolName, mergeProtectedTools, detectLatestTurnThinkingMismatch, isPrefixBoundThinkingModel, detectOverflow, stripWellFormedLeadingTagPrefix, stripPersistedAssistantText, byteSize, stripTagPrefix, peelLeadingMcTagNotation, prependTag, isThinkingPart, isRecord, protectedToolTagNumbers, protectedToolTokenCount, textMentionsRecentCommit, removeSystemReminders, removeNestedBlocks, hasMeaningfulUserText2, extractTexts2, getTokenizerNativeMemoryStats, preloadTokenizer, estimateTokens, estimateFixedPromptTokens, currentReclaimableToolOutputCount, stableStringify, contentTagOwnerMessageId, estimateImageTokensFromDataUrl, estimateToolAttachmentImageTokens, providerVisibleMessage, normalizeTodoStateJson, buildSyntheticTodoPart, isSyntheticTodoPart, countRealUserMessages, tailHygieneStructuralSignature, sameTailHygieneStructuralSignature, formatTailHygienePrefixMismatch, refreshTailHygieneBaseline, effectiveTailHygiene, assertTailHygieneContentUnchangedIfEnabled, CHANNEL1_SENTINEL, CHANNEL1_FLOOR_TOKENS, isDroppedToolOutput, toolOutputTokens, decideChannel1, evaluateChannel2, formatChannel1Evaluation, formatChannel2Evaluation, reclaimableToolOutputCount, buildChannel2Reminder, buildChannel1Reminder, estimateEmergencyDropReclaimTokens, planEmergencyDrop, measureEmergencyTag, installV3PerfSchema, queuePendingOp, queuePendingDropForUnchangedTag, getPendingOps, getPendingOpsCount, clearPendingOps, removePendingOp, TAG_TOMBSTONE_OWNER_PREFIX, tagTombstoneOwnerRange, tagTombstoneOwnerKey, tagRevisionKey, tagIdentityRevisionKey, installTagIdentityRevisionTrigger, deleteTagIdentityRevisions, getRecentTagOwnerMessageIds, AGE_RECLAIM_MIN_TOKENS, getOldestActiveUnprotectedToolTags, getActiveToolTagsForAgeReclaim, getTriggerTagTokenUpperBound, getActiveTagTokenTotalsByMessage, getAllStatusTagTokenTotalsFlat, getReasoningTokenEstimatesByMessage, tryGetReasoningTokenEstimatesByMessage, getMaxTagNumberByOwnerMessage, scanTagOwnerSummary, isTagOwnerSummaryReady, tagTokenCountIsNull, backfillTagTokenCounts, insertTag, updateTagStatus, markTagDropped, markWhitespaceAssistantTagInert, getInertWhitespaceAssistantTags, getInertWhitespaceAssistantTagsByNumbers, updateTagDropMode, updateCavemanDepth, updateTagMessageId, foldShrunkPartTags, markTagsCompactedByMessageIds, getMaxTagNumberBySession, getTagNumberByMessageId, getAssignableTagNumberByMessageId, deriveTagLoadFloor, TAG_SELECT_COLUMNS, getTagsBySession, getActiveTagsBySession, getTailHygieneTags, getTagsByNumbers, getNewestToolTagNumbers, getDroppedTagsByNumbers, getMaxDroppedTagNumber, getTagById, getToolTagNumberByOwner, getNullOwnerToolTag, adoptNullOwnerToolTag, getCandidateToolOwners, pickNearestPriorOwner, expandToolPart, markHostUnservedRow, retreatPastHostUnservedRows, snapTerminalCompartmentToServedRow, isHostRenderedSystemMessage, markCoveredInstructionRow, isCoveredInstructionRow, takeCoveredInstructionRows, cloneKeepingCoveredInstructionMarks, completedToolArcCrossesBoundary, estimateTrueRawMessageTokens, buildToolArcs, fenceBoundaryForCompletedToolArcs, fenceBoundaryForToolArcs, buildTrueRawTokenIndex, computeRawRangeFingerprint, stripSystemInjection, isTextPart, isToolPartWithOutput, isFilePart, toolPartHasUserAnswer, recordToolParameters, createDroppedInputGuard, assertExecutableToolInput, isEditTool, getCurrentToolSetHash, setDatabase, loadToolDefinitionMeasurements, recordToolDefinition, getMeasuredToolDefinitionTokens, describeFinalWireTail, estimatePartImageTokens, estimateMessageTokens, wireContentBytes, createFinalWireUsageTracker, estimateFinalWireInputTokens, modelAcceptsEmptyContent, isAnthropicFamilyRoute, neutralizeDroppedReasoningPart, restoreNeutralizedReasoningPart, isNeutralizedReasoningPart, neutralizedReasoningSource, variantChangeBustsProviderCache, makeSentinel, makeWholeMessageSentinel, neutralizeWholeMessage, isSentinel, replaySentinelByMessageIds, SKELETON_REAL_INPUT_MAX_BYTES, partHasCompletedResult, extractToolCallObservation, ToolMutationBatch, createToolDropTarget, resolveHostServedBoundaryId2, hasRawMessageProvider2, setBoundedRawMessageProvider2, cleanUserText2, withRawSessionMessageCache2, readRawSessionMessages2, readRawSessionMessagePage2, getRawSessionMessageOrdinalCount2, visitRawSessionMessages2, readRawSessionMessageRange2, prepareRawSessionOrdinals2, primeTailRawMessageCache2, getCachedAbsoluteMessageCount2, primeInMemoryTailRawMessageCache2, readRawSessionMessageIdOrdinalsForRange2, hasRawSessionMessageById2, readRawSessionMessageOrdinalById2, compareRawSessionMessageOrder2, readRawSessionMessageById2, getRawSessionMessageCount2, getRawSessionTagKeysThrough2, getLegacyProtectedTailStartOrdinal2, readSessionChunk2 };