@cortexkit/opencode-magic-context 0.43.2 → 0.44.1

package/dist/{index-tdrv6nd0.js → index-s6b7h12g.js}

@@ -1,12 +1,12 @@
 import {
   getHarness
-} from "./index-6z9g64js.js";
+} from "./index-s70wtd8k.js";
 import {
   openCodeDbExists,
   withReadOnlySessionDb,
   getRawSessionMessageCountFromDb,
   getMessageTimesFromOpenCodeDb
-} from "./index-bmzt6xgy.js";
+} from "./index-cz88kw0n.js";
 import {
   UNKNOWN_FIT_RATIO,
   resolveDecisionCalibration,
@@ -520,6 +520,23 @@ function estimateImageTokensFromDataUrl(url) {
   }
   return IMAGE_FALLBACK_TOKENS;
 }
+function estimateToolAttachmentImageTokens(state) {
+  if (!state || typeof state !== "object")
+    return 0;
+  const attachments = state.attachments;
+  if (!Array.isArray(attachments))
+    return 0;
+  let tokens = 0;
+  for (const attachment of attachments) {
+    if (!attachment || typeof attachment !== "object")
+      continue;
+    const { mime, url } = attachment;
+    if (typeof mime !== "string" || !mime.startsWith("image/"))
+      continue;
+    tokens += typeof url === "string" && url.startsWith("data:") ? estimateImageTokensFromDataUrl(url) : IMAGE_FALLBACK_TOKENS;
+  }
+  return tokens;
+}
 function clampImageTokens(n) {
   if (n < 1)
     return 1;
@@ -1260,7 +1277,7 @@ function measureTailHygiene(input) {
           if (isDropSentinel(output)) {
             parts.push(excludedSnapshot(`${key}\x00excludedOutput`, output));
           } else {
-            const tokens = memoizedTokens("toolOutput", output);
+            const tokens = memoizedTokens("toolOutput", output) + (part.type === "tool" ? estimateToolAttachmentImageTokens(part.state) : 0);
             const measured = snapshot({
               key: `${key}\x00toolOutput`,
               kind: "toolOutput",
@@ -1562,10 +1579,15 @@ var S_URGENT = 0.6;
 var CHANNEL2_SEVERITY_THRESHOLD = 0.75;
 var CHANNEL2_FLOOR_TOKENS = 50000;
 var LEVEL_RANK = { gentle: 1, firm: 2, urgent: 3 };
+var DROP_SENTINELS = ["[dropped", "[truncated"];
 function channel1RefireTokens(tailTokens) {
   const scaled = Math.round(0.08 * Math.max(0, tailTokens));
   return Math.max(CHANNEL1_REFIRE_FLOOR_TOKENS, scaled);
 }
+function isDroppedToolOutput(output) {
+  const head = output.trimStart().replace(/^§\d+§\s*/, "").slice(0, 16).toLowerCase();
+  return DROP_SENTINELS.some((sentinel) => head.startsWith(sentinel));
+}
 function toolOutputTokens(output) {
   return estimateTokens(stripChannel1ReminderSpans(output));
 }
@@ -1809,7 +1831,7 @@ function buildChannel2Reminder(undroppedTokens, reclaimableToolOutputs, hint) {
   const summary = formatReclaimableOutputSummary(reclaimableToolOutputs, undroppedTokens);
   const hintText = formatOldestReclaimableHint(hint);
   return `<system-reminder>
-` + `Routine housekeeping: ${summary} are reclaimable — make a ctx_reduce pass at a natural stopping point.${hintText}
+` + `Your next step: call ctx_reduce on the outputs you've already used (${summary}). Then continue your task.${hintText}
 ` + `</system-reminder>`;
 }
 var CHANNEL1_STICKY_REAL_USER_TURN_GAP = 5;
@@ -1820,19 +1842,19 @@ function buildChannel1Reminder(level, undroppedTokens, reclaimableToolOutputs, h
     return `
 
 <system-reminder>
-Reminder: ${summary} are still reclaimable — ctx_reduce them at a natural stopping point.${hintText}
+Still unstamped: ${summary}. Stamp the ones you've used with ctx_reduce now.${hintText}
 </system-reminder>`;
   }
   let body;
   switch (level) {
     case "gentle":
-      body = `Housekeeping: ${summary} are reclaimable — drop the ones you have already processed with ctx_reduce at a natural stopping point.`;
+      body = `Housekeeping: ${summary} are reclaimable. Stamp each output with ctx_reduce as soon as you've taken what you need from it; don't wait for the task to finish.`;
       break;
     case "firm":
-      body = `Housekeeping: ${summary} are reclaimable — make a ctx_reduce pass at a natural stopping point.`;
+      body = `${summary} are reclaimable. Make a ctx_reduce pass now over the outputs you've already used, then continue.`;
       break;
     case "urgent":
-      body = `Housekeeping backlog: ${summary} are reclaimable — a ctx_reduce pass is due.`;
+      body = `${summary} are still unstamped. Call ctx_reduce now, before your next tool call, on every output you've already used.`;
       break;
   }
   return `
@@ -2287,7 +2309,7 @@ function toTagEntry(row) {
     messageId: row.message_id,
     type,
     status,
-    dropMode: row.drop_mode === "truncated" ? "truncated" : row.drop_mode === "edit_marker" ? "edit_marker" : "full",
+    dropMode: row.drop_mode === "truncated" ? "truncated" : row.drop_mode === "skeleton_real" ? "skeleton_real" : row.drop_mode === "skeleton_stripped" ? "skeleton_stripped" : row.drop_mode === "edit_marker" ? "edit_marker" : row.drop_mode === "edit_marker_stripped" ? "edit_marker_stripped" : "full",
     toolName: row.tool_name ?? null,
     inputByteSize: row.input_byte_size ?? 0,
     byteSize: row.byte_size,
@@ -2369,8 +2391,22 @@ function maxNullableNumber(a, b) {
     return b;
   return null;
 }
+var foldStatements = new WeakMap;
+function foldStatement(db, sql) {
+  let statements = foldStatements.get(db);
+  if (!statements) {
+    statements = new Map;
+    foldStatements.set(db, statements);
+  }
+  let statement = statements.get(sql);
+  if (!statement) {
+    statement = db.prepare(sql);
+    statements.set(sql, statement);
+  }
+  return statement;
+}
 function mergeSizeAndTokenColumnsIntoSurvivor(db, sessionId, survivor, duplicate) {
-  db.prepare(`UPDATE tags
+  foldStatement(db, `UPDATE tags
          SET byte_size = ?,
              reasoning_byte_size = ?,
              input_byte_size = ?,
@@ -2390,41 +2426,42 @@ function applyDroppedStatusIfNeeded(db, sessionId, survivor, duplicate) {
     return;
   if (duplicate.status !== "dropped")
     return;
-  db.prepare("UPDATE tags SET status = 'dropped' WHERE session_id = ? AND tag_number = ?").run(sessionId, survivor.tagNumber);
+  foldStatement(db, "UPDATE tags SET status = 'dropped' WHERE session_id = ? AND tag_number = ?").run(sessionId, survivor.tagNumber);
   survivor.status = "dropped";
 }
 function retargetPendingOps(db, sessionId, fromTagNumber, toTagNumber) {
-  const rows = db.prepare(`SELECT id, operation
-             FROM pending_ops
-             WHERE session_id = ? AND tag_id = ?
-             ORDER BY id ASC`).all(sessionId, fromTagNumber).filter(isPendingOpIdentityRow);
+  const rows = foldStatement(db, `SELECT id, operation
+         FROM pending_ops
+         WHERE session_id = ? AND tag_id = ?
+         ORDER BY id ASC`).all(sessionId, fromTagNumber).filter(isPendingOpIdentityRow);
   for (const row of rows) {
-    const existing = db.prepare(`SELECT 1
-                 FROM pending_ops
-                 WHERE session_id = ? AND tag_id = ? AND operation = ?
-                 LIMIT 1`).get(sessionId, toTagNumber, row.operation);
+    const existing = foldStatement(db, `SELECT 1
+             FROM pending_ops
+             WHERE session_id = ? AND tag_id = ? AND operation = ?
+             LIMIT 1`).get(sessionId, toTagNumber, row.operation);
     if (existing) {
-      db.prepare("DELETE FROM pending_ops WHERE session_id = ? AND id = ?").run(sessionId, row.id);
+      foldStatement(db, "DELETE FROM pending_ops WHERE session_id = ? AND id = ?").run(sessionId, row.id);
     } else {
-      db.prepare("UPDATE pending_ops SET tag_id = ? WHERE session_id = ? AND id = ?").run(toTagNumber, sessionId, row.id);
+      foldStatement(db, "UPDATE pending_ops SET tag_id = ? WHERE session_id = ? AND id = ?").run(toTagNumber, sessionId, row.id);
     }
   }
-  db.prepare("DELETE FROM pending_ops WHERE session_id = ? AND tag_id = ?").run(sessionId, fromTagNumber);
+  foldStatement(db, "DELETE FROM pending_ops WHERE session_id = ? AND tag_id = ?").run(sessionId, fromTagNumber);
 }
 function deleteFoldedDuplicateTag(db, sessionId, tagNumber) {
-  db.prepare("DELETE FROM source_contents WHERE session_id = ? AND tag_id = ?").run(sessionId, tagNumber);
-  db.prepare("DELETE FROM tags WHERE session_id = ? AND tag_number = ?").run(sessionId, tagNumber);
-  db.prepare("DELETE FROM pending_ops WHERE session_id = ? AND tag_id = ?").run(sessionId, tagNumber);
+  foldStatement(db, "DELETE FROM source_contents WHERE session_id = ? AND tag_id = ?").run(sessionId, tagNumber);
+  foldStatement(db, "DELETE FROM tags WHERE session_id = ? AND tag_number = ?").run(sessionId, tagNumber);
+  foldStatement(db, "DELETE FROM pending_ops WHERE session_id = ? AND tag_id = ?").run(sessionId, tagNumber);
 }
-function foldDuplicateIntoSurvivor(db, sessionId, survivor, duplicate) {
+function foldDuplicateIntoSurvivor(db, sessionId, survivor, duplicate, duplicateMayHaveQueuedOps = true) {
   mergeSizeAndTokenColumnsIntoSurvivor(db, sessionId, survivor, duplicate);
   applyDroppedStatusIfNeeded(db, sessionId, survivor, duplicate);
-  retargetPendingOps(db, sessionId, duplicate.tagNumber, survivor.tagNumber);
+  if (duplicateMayHaveQueuedOps) {
+    retargetPendingOps(db, sessionId, duplicate.tagNumber, survivor.tagNumber);
+  }
   deleteFoldedDuplicateTag(db, sessionId, duplicate.tagNumber);
 }
-function readPartTagRows(db, sessionId, messageId) {
-  const prefix = `${messageId}:p`;
-  return db.prepare(`SELECT tag_number AS tagNumber,
+function readPartTagRowsByMessage(db, sessionId) {
+  const rows = db.prepare(`SELECT tag_number AS tagNumber,
                     message_id AS messageId,
                     tool_owner_message_id AS toolOwnerMessageId,
                     type,
@@ -2438,22 +2475,39 @@ function readPartTagRows(db, sessionId, messageId) {
              FROM tags
              WHERE session_id = ?
                AND type = 'message'
-               AND message_id LIKE ? ESCAPE '\\'
-             ORDER BY tag_number ASC`).all(sessionId, `${escapeLikePattern(messageId)}:p%`).filter(isPiFallbackFoldTagRow).flatMap((row) => {
-    const suffix = row.messageId.startsWith(prefix) ? row.messageId.slice(prefix.length) : "";
+             ORDER BY tag_number ASC`).all(sessionId).filter(isPiFallbackFoldTagRow);
+  const byMessage = new Map;
+  for (const row of rows) {
+    const marker = row.messageId.lastIndexOf(":p");
+    if (marker < 0)
+      continue;
+    const suffix = row.messageId.slice(marker + 2);
     if (!/^\d+$/.test(suffix))
-      return [];
-    return [{ ...row, partIndex: Number.parseInt(suffix, 10) }];
-  }).sort((a, b) => a.partIndex - b.partIndex);
+      continue;
+    const messageId = row.messageId.slice(0, marker);
+    const group = byMessage.get(messageId);
+    const entry = { ...row, partIndex: Number.parseInt(suffix, 10) };
+    if (group)
+      group.push(entry);
+    else
+      byMessage.set(messageId, [entry]);
+  }
+  for (const group of byMessage.values())
+    group.sort((a, b) => a.partIndex - b.partIndex);
+  return byMessage;
 }
-function tagNumbersWithQueuedDrop(db, sessionId, tagNumbers) {
-  if (tagNumbers.length === 0)
-    return new Set;
-  const placeholders = tagNumbers.map(() => "?").join(", ");
-  const rows = db.prepare(`SELECT DISTINCT tag_id AS tagNumber
-             FROM pending_ops
-             WHERE session_id = ? AND operation = 'drop' AND tag_id IN (${placeholders})`).all(sessionId, ...tagNumbers);
-  return new Set(rows.flatMap((row) => typeof row.tagNumber === "number" ? [row.tagNumber] : []));
+function readQueuedTagNumbers(db, sessionId) {
+  const rows = db.prepare("SELECT tag_id AS tagNumber, operation FROM pending_ops WHERE session_id = ? AND tag_id IS NOT NULL").all(sessionId);
+  const any = new Set;
+  const drop = new Set;
+  for (const row of rows) {
+    if (typeof row.tagNumber !== "number")
+      continue;
+    any.add(row.tagNumber);
+    if (row.operation === "drop")
+      drop.add(row.tagNumber);
+  }
+  return { any, drop };
 }
 function foldShrunkPartTags(db, sessionId, messages) {
   const result = {
@@ -2461,17 +2515,25 @@ function foldShrunkPartTags(db, sessionId, messages) {
     rekeyedTagNumbers: [],
     discardedDropTagNumbers: []
   };
+  if (messages.length === 0)
+    return result;
+  const rowsByMessage = readPartTagRowsByMessage(db, sessionId);
+  const queuedTags = readQueuedTagNumbers(db, sessionId);
+  const discardDrop = foldStatement(db, "DELETE FROM pending_ops WHERE session_id = ? AND tag_id = ? AND operation = 'drop'");
+  const rekey = foldStatement(db, "UPDATE tags SET message_id = ? WHERE session_id = ? AND tag_number = ? AND type = 'message'");
   for (const { messageId, partCount } of messages) {
-    const rows = readPartTagRows(db, sessionId, messageId);
+    const rows = rowsByMessage.get(messageId) ?? [];
     if (rows.length === 0)
       continue;
     const orphans = rows.filter((row) => row.partIndex >= partCount);
     if (orphans.length === 0)
       continue;
-    const queued = tagNumbersWithQueuedDrop(db, sessionId, rows.map((row) => row.tagNumber));
-    if (queued.size > 0 && queued.size < rows.length) {
+    const queued = [
+      ...new Set(rows.map((row) => row.tagNumber).filter((tag) => queuedTags.drop.has(tag)))
+    ].sort((a, b) => a - b);
+    if (queued.length > 0 && queued.length < rows.length) {
       for (const tagNumber of queued) {
-        db.prepare("DELETE FROM pending_ops WHERE session_id = ? AND tag_id = ? AND operation = 'drop'").run(sessionId, tagNumber);
+        discardDrop.run(sessionId, tagNumber);
         result.discardedDropTagNumbers.push(tagNumber);
       }
     }
@@ -2480,14 +2542,14 @@ function foldShrunkPartTags(db, sessionId, messages) {
       const lowest = orphans[0];
       if (!lowest)
         continue;
-      db.prepare("UPDATE tags SET message_id = ? WHERE session_id = ? AND tag_number = ? AND type = 'message'").run(`${messageId}:p0`, sessionId, lowest.tagNumber);
+      rekey.run(`${messageId}:p0`, sessionId, lowest.tagNumber);
       result.rekeyedTagNumbers.push(lowest.tagNumber);
       survivor = { ...lowest, messageId: `${messageId}:p0`, partIndex: 0 };
     }
     for (const orphan of orphans) {
       if (orphan.tagNumber === survivor.tagNumber)
         continue;
-      foldDuplicateIntoSurvivor(db, sessionId, survivor, orphan);
+      foldDuplicateIntoSurvivor(db, sessionId, survivor, orphan, queuedTags.any.has(orphan.tagNumber));
       result.foldedTagNumbers.push(orphan.tagNumber);
     }
   }
@@ -2514,7 +2576,7 @@ function markTagsCompactedByMessageIds(db, sessionId, messageIds) {
       changed += update.all(sessionId, messageId, `${escaped}:p%`, `${escaped}:file%`, messageId).length;
     }
     return changed;
-  })();
+  }).immediate();
 }
 function deleteTagsByMessageId(db, sessionId, messageId) {
   const deleteTransaction = db.transaction(() => {
@@ -2989,11 +3051,23 @@ function readRawSessionMessagesFromDb(db, sessionId) {
   });
 }
 function readRawSessionMessagePageFromDb(db, sessionId, afterOrdinal, limit, finalWatermark = Number.MAX_SAFE_INTEGER) {
+  const messageRows = readRawMessagePageRows(db, sessionId, afterOrdinal, limit, finalWatermark);
+  if (messageRows.length === 0)
+    return [];
+  const placeholders = messageRows.map(() => "?").join(", ");
+  const partRows = db.prepare(`SELECT message_id, data, time_updated
+             FROM part
+             WHERE +session_id = ?
+               AND likelihood(message_id IN (${placeholders}), 0.000001)
+             ORDER BY message_id ASC, time_created ASC, id ASC`).all(sessionId, ...messageRows.map((row) => row.id)).filter(isRawPartRow);
+  return assembleRawMessagePage(messageRows, partRows);
+}
+function readRawMessagePageRows(db, sessionId, afterOrdinal, limit, finalWatermark) {
   const remaining = Math.max(0, Math.floor(finalWatermark) - Math.floor(afterOrdinal));
   const pageSize = Math.min(Math.max(1, Math.floor(limit)), remaining);
   if (pageSize === 0)
     return [];
-  const messageRows = db.prepare(`SELECT id, data, time_created, time_updated
+  return db.prepare(`SELECT id, data, time_created, time_updated
              FROM message
              WHERE session_id = ?
                AND NOT (
@@ -3009,14 +3083,8 @@ function readRawSessionMessagePageFromDb(db, sessionId, afterOrdinal, limit, fin
     ...row,
     ordinal: Math.floor(afterOrdinal) + index + 1
   }));
-  if (messageRows.length === 0)
-    return [];
-  const placeholders = messageRows.map(() => "?").join(", ");
-  const partRows = db.prepare(`SELECT message_id, data, time_updated
-             FROM part
-             WHERE +session_id = ?
-               AND likelihood(message_id IN (${placeholders}), 0.000001)
-             ORDER BY message_id ASC, time_created ASC, id ASC`).all(sessionId, ...messageRows.map((row) => row.id)).filter(isRawPartRow);
+}
+function assembleRawMessagePage(messageRows, partRows) {
   const partsByMessageId = new Map;
   for (const part of partRows) {
     const list = partsByMessageId.get(part.message_id) ?? [];
@@ -3035,6 +3103,49 @@ function readRawSessionMessagePageFromDb(db, sessionId, afterOrdinal, limit, fin
     };
   });
 }
+var RAW_SUMMARY_TEXT_MAX_CHARS = 8192;
+var RAW_SUMMARY_ARG_MAX_CHARS = 512;
+var RAW_SUMMARY_TOOL_INPUT_KEYS = [
+  "description",
+  "filePath",
+  "path",
+  "pattern",
+  "query",
+  "symbol",
+  "module",
+  "action"
+];
+function summaryStringField(jsonPath) {
+  return `CASE WHEN json_type(data, '${jsonPath}') = 'text' THEN substr(json_extract(data, '${jsonPath}'), 1, ${RAW_SUMMARY_ARG_MAX_CHARS}) END`;
+}
+var RAW_SUMMARY_PART_DATA_SQL = `CASE
+    WHEN json_extract(data, '$.type') = 'text'
+        THEN json_set(data, '$.text', substr(json_extract(data, '$.text'), 1, ${RAW_SUMMARY_TEXT_MAX_CHARS}))
+    ELSE json_object(
+        'type', 'tool',
+        'tool', ${summaryStringField("$.tool")},
+        'callID', ${summaryStringField("$.callID")},
+        'state', json_object(
+            'status', ${summaryStringField("$.state.status")},
+            'input', json_object(${RAW_SUMMARY_TOOL_INPUT_KEYS.map((key) => `'${key}', ${summaryStringField(`$.state.input.${key}`)}`).join(", ")}),
+            'metadata', json_object('description', ${summaryStringField("$.state.metadata.description")})
+        )
+    )
+END`;
+function readRawSessionMessageSummaryPageFromDb(db, sessionId, afterOrdinal, limit, finalWatermark = Number.MAX_SAFE_INTEGER) {
+  const messageRows = readRawMessagePageRows(db, sessionId, afterOrdinal, limit, finalWatermark);
+  if (messageRows.length === 0)
+    return [];
+  const placeholders = messageRows.map(() => "?").join(", ");
+  const partRows = db.prepare(`SELECT message_id, ${RAW_SUMMARY_PART_DATA_SQL} AS data, time_updated
+             FROM part
+             WHERE +session_id = ?
+               AND likelihood(message_id IN (${placeholders}), 0.000001)
+               AND json_valid(data) = 1
+               AND json_extract(data, '$.type') IN ('text', 'tool')
+             ORDER BY message_id ASC, time_created ASC, id ASC`).all(sessionId, ...messageRows.map((row) => row.id)).filter(isRawPartRow);
+  return assembleRawMessagePage(messageRows, partRows);
+}
 function countRawSessionMessageOrdinalsFromDb(db, sessionId) {
   const row = db.prepare(`SELECT COUNT(*) AS count
              FROM message
@@ -4252,6 +4363,7 @@ function estimateMessageTokens(message) {
         toolCall += serializedTokens(p.state?.input ?? p.input ?? p.args);
         toolCall += serializedTokens(p.state?.output ?? p.state?.content ?? p.output ?? p.result ?? p.content);
         toolCall += serializedTokens(p.state?.error);
+        toolCall += estimateToolAttachmentImageTokens(p.state);
         break;
       case "tool-call":
         toolCall += serializedTokens(p.input ?? p.args);
@@ -4348,6 +4460,28 @@ function hasCountableParts(message) {
   });
 }
 
+// src/hooks/magic-context/tool-input-size.ts
+var SKELETON_REAL_INPUT_MAX_BYTES = 1024;
+var encoder2 = new TextEncoder;
+function toolInputStringBytes(value) {
+  const seen = new WeakSet;
+  const visit = (candidate) => {
+    if (typeof candidate === "string")
+      return encoder2.encode(candidate).length;
+    if (candidate === null || typeof candidate !== "object")
+      return 0;
+    if (seen.has(candidate))
+      return 0;
+    seen.add(candidate);
+    let total = 0;
+    const values = Array.isArray(candidate) ? candidate : Object.values(candidate);
+    for (const item of values)
+      total += visit(item);
+    return total;
+  };
+  return visit(value);
+}
+
 // src/hooks/magic-context/tool-drop-target.ts
 var DROP_PREFIX = "[dropped";
 var IGNORE_PART_TYPES = new Set([
@@ -4400,9 +4534,39 @@ function clampCloneInPlace(occurrence, clamp) {
   const clone = clonePart(occurrence.part);
   clamp(clone);
   const parts = occurrence.message.parts;
-  const index = parts.indexOf(occurrence.part);
-  if (index >= 0)
+  const index = parts.indexOf(servedPart(occurrence));
+  if (index >= 0) {
     parts[index] = clone;
+    occurrence.served = clone;
+  }
+}
+function servedPart(occurrence) {
+  return occurrence.served ?? occurrence.part;
+}
+function skeletonRealToolPart(part, tagId, stripAttachments = false) {
+  if (!isRecord(part))
+    return;
+  const sentinel = `[dropped §${tagId}§]`;
+  if (part.type === "tool" && isRecord(part.state)) {
+    part.state.output = sentinel;
+    if (stripAttachments)
+      part.state.attachments = [];
+    return;
+  }
+  if (part.type === "tool_result") {
+    part.content = sentinel;
+  }
+}
+function readToolPartRawInput(part) {
+  if (!isRecord(part))
+    return;
+  if (part.type === "tool" && isRecord(part.state))
+    return part.state.input;
+  if (part.type === "tool-invocation")
+    return part.args;
+  if (part.type === "tool_use")
+    return part.input;
+  return;
 }
 function truncateToolPart(part, tagId) {
   if (!isRecord(part))
@@ -4426,12 +4590,14 @@ function truncateToolPart(part, tagId) {
     part.input = droppedInputMarker(tagId);
   }
 }
-function editMarkerToolPart(part, tagId) {
+function editMarkerToolPart(part, tagId, stripAttachments = false) {
   if (!isRecord(part))
     return;
   const sentinel = `[dropped §${tagId}§]`;
   if (part.type === "tool" && isRecord(part.state)) {
     part.state.output = sentinel;
+    if (stripAttachments)
+      part.state.attachments = [];
     if (isRecord(part.state.input))
       applyEditMarkerToInput(part.state.input);
     return;
@@ -4534,7 +4700,7 @@ class ToolMutationBatch {
     this.messages = messages;
   }
   markForRemoval(occurrence) {
-    this.partsToRemove.add(occurrence.part);
+    this.partsToRemove.add(servedPart(occurrence));
     this.affectedMessages.add(occurrence.message);
   }
   wouldStrandConversationEnd(occurrences) {
@@ -4546,7 +4712,7 @@ class ToolMutationBatch {
     }
     if (!end || !occurrences.some((occurrence) => occurrence.message === end))
       return false;
-    const leaving = new Set(occurrences.map((occurrence) => occurrence.part));
+    const leaving = new Set(occurrences.map(servedPart));
     const survives = (part) => !leaving.has(part) && !this.partsToRemove.has(part);
     return end.info.role === "assistant" ? !end.parts.some((part) => partHasCompletedResult(part) && survives(part)) : !end.parts.some((part) => hasMeaningfulPart(part) && survives(part));
   }
@@ -4597,7 +4763,7 @@ function createToolDropTarget(compositeKey, thinkingParts, index, batch, tagId)
     if (!entry.hasResult)
       return "incomplete";
     if (batch.wouldStrandConversationEnd(entry.occurrences))
-      return truncate();
+      return skeletonReal();
     for (const occurrence of entry.occurrences) {
       batch.markForRemoval(occurrence);
     }
@@ -4617,14 +4783,50 @@ function createToolDropTarget(compositeKey, thinkingParts, index, batch, tagId)
     clearThinkingParts(thinkingParts);
     return "truncated";
   };
-  const editMarker = () => {
+  const skeletonReal = () => {
+    const entry = index.get(compositeKey);
+    if (!entry || entry.occurrences.length === 0)
+      return "absent";
+    if (!entry.hasResult)
+      return "incomplete";
+    for (const occurrence of entry.occurrences) {
+      clampCloneInPlace(occurrence, (part) => skeletonRealToolPart(part, tagId));
+    }
+    clearThinkingParts(thinkingParts);
+    return "truncated";
+  };
+  const skeletonStripped = () => {
     const entry = index.get(compositeKey);
     if (!entry || entry.occurrences.length === 0)
       return "absent";
     if (!entry.hasResult)
       return "incomplete";
     for (const occurrence of entry.occurrences) {
-      clampCloneInPlace(occurrence, (part) => editMarkerToolPart(part, tagId));
+      clampCloneInPlace(occurrence, (part) => skeletonRealToolPart(part, tagId, true));
+    }
+    clearThinkingParts(thinkingParts);
+    return "truncated";
+  };
+  const hasAttachments = () => index.get(compositeKey)?.occurrences.some(({ part }) => isRecord(part) && isRecord(part.state) && Array.isArray(part.state.attachments) && part.state.attachments.length > 0) ?? false;
+  const readRawInput = () => {
+    const entry = index.get(compositeKey);
+    if (!entry)
+      return;
+    for (const occurrence of entry.occurrences) {
+      const input = readToolPartRawInput(occurrence.part);
+      if (input !== undefined)
+        return input;
+    }
+    return;
+  };
+  const applyEditMarker = (stripAttachments) => {
+    const entry = index.get(compositeKey);
+    if (!entry || entry.occurrences.length === 0)
+      return "absent";
+    if (!entry.hasResult)
+      return "incomplete";
+    for (const occurrence of entry.occurrences) {
+      clampCloneInPlace(occurrence, (part) => editMarkerToolPart(part, tagId, stripAttachments));
     }
     clearThinkingParts(thinkingParts);
     return "truncated";
@@ -4640,7 +4842,7 @@ function createToolDropTarget(compositeKey, thinkingParts, index, batch, tagId)
       const before = count(parts);
       const retained = skeleton ? structuredClone(parts) : [];
       for (const part of retained)
-        truncateToolPart(part, tagId);
+        skeletonRealToolPart(part, tagId);
       const after = count(retained);
       return {
         beforeTools: before.toolCall,
@@ -4671,7 +4873,23 @@ function createToolDropTarget(compositeKey, thinkingParts, index, batch, tagId)
     },
     drop,
     truncate,
-    editMarker,
+    skeletonReal,
+    skeletonStripped,
+    hasAttachments,
+    editMarker: () => applyEditMarker(false),
+    editMarkerStripped: () => applyEditMarker(true),
+    inputStringBytes: () => {
+      const entry = index.get(compositeKey);
+      if (!entry || entry.occurrences.length === 0)
+        return null;
+      return toolInputStringBytes(readRawInput());
+    },
+    wouldStrandConversationEnd: () => {
+      const entry = index.get(compositeKey);
+      if (!entry || entry.occurrences.length === 0)
+        return false;
+      return batch.wouldStrandConversationEnd(entry.occurrences);
+    },
     canDrop: () => {
       const entry = index.get(compositeKey);
       return !!entry && entry.occurrences.length > 0 && entry.hasResult;
@@ -4832,6 +5050,45 @@ function readRawSessionMessageRangeFromSource(sessionId, fromOrdinal, toOrdinal)
   }
   return messages;
 }
+var RAW_MESSAGE_VISIT_PAGE_SIZE = 50;
+function visitRawSessionMessages2(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);
+  if (provider && !provider.readMessagePage) {
+    for (const message of provider.readMessages()) {
+      if (message.ordinal < from || message.ordinal > to)
+        continue;
+      if (!visit(message))
+        return;
+    }
+    return;
+  }
+  if (!provider && !openCodeDbExists())
+    return;
+  const pageSize = Math.max(1, Math.floor(options.pageSize ?? RAW_MESSAGE_VISIT_PAGE_SIZE));
+  let afterOrdinal = from - 1;
+  while (afterOrdinal < to) {
+    const limit = Math.min(pageSize, to - afterOrdinal);
+    const cursor = afterOrdinal;
+    const page = provider?.readMessagePage ? provider.readMessagePage(cursor, limit, to) : withReadOnlySessionDb((db) => options.summary ? readRawSessionMessageSummaryPageFromDb(db, sessionId, cursor, limit, to) : readRawSessionMessagePageFromDb(db, sessionId, cursor, limit, to));
+    if (page.length === 0)
+      return;
+    let nextOrdinal = afterOrdinal;
+    for (const message of page) {
+      if (message.ordinal < from || message.ordinal > to)
+        continue;
+      if (!visit(message))
+        return;
+      nextOrdinal = Math.max(nextOrdinal, message.ordinal);
+    }
+    if (nextOrdinal <= afterOrdinal)
+      return;
+    afterOrdinal = nextOrdinal;
+  }
+}
 function readRawSessionMessageRange2(sessionId, fromOrdinal, toOrdinal) {
   const from = Math.max(1, Math.floor(fromOrdinal));
   const to = Math.floor(toOrdinal);
@@ -5008,6 +5265,30 @@ function readRawSessionMessageOrdinalById2(sessionId, messageId) {
     return null;
   return withReadOnlySessionDb((db) => readRawSessionMessageOrdinalByIdFromDb(db, sessionId, messageId));
 }
+function compareRawSessionMessageOrder2(sessionId, leftId, rightId) {
+  const provider = sessionProviders.get(sessionId);
+  if (provider) {
+    if (!provider.readMessageOrdinalById)
+      return null;
+    const left = provider.readMessageOrdinalById(leftId);
+    const right = provider.readMessageOrdinalById(rightId);
+    return left === null || right === null ? null : left - right;
+  }
+  if (!openCodeDbExists())
+    return null;
+  return withReadOnlySessionDb((db) => {
+    const lookup = db.prepare("SELECT time_created, id FROM message WHERE session_id = ? AND id = ? LIMIT 1");
+    const left = lookup.get(sessionId, leftId);
+    const right = lookup.get(sessionId, rightId);
+    if (typeof left?.time_created !== "number" || typeof right?.time_created !== "number" || typeof left.id !== "string" || typeof right.id !== "string") {
+      return null;
+    }
+    if (left.time_created !== right.time_created) {
+      return left.time_created - right.time_created;
+    }
+    return left.id < right.id ? -1 : left.id > right.id ? 1 : 0;
+  });
+}
 function readRawSessionMessageById2(sessionId, messageId) {
   const provider = sessionProviders.get(sessionId);
   if (provider?.readMessageById) {
@@ -5406,4 +5687,4 @@ function readRawSessionSeedTail2(sessionId, boundaryId, onQuery) {
   });
 }
 
-export { textMentionsRecentCommit, removeSystemReminders, hasMeaningfulUserText2, extractTexts2, extractToolCallSummaries, getTokenizerNativeMemoryStats, preloadTokenizer, estimateTokens, normalizeText, stableStringify, getCurrentToolSetHash, setDatabase, loadToolDefinitionMeasurements, recordToolDefinition, getMeasuredToolDefinitionTokens, CTX_REDUCE_KEEP, newestCtxReduceTagNumbers, stripWellFormedLeadingTagPrefix, stripPersistedAssistantText, byteSize, stripTagPrefix, peelLeadingMcTagNotation, prependTag, isThinkingPart, isRecord, estimateImageTokensFromDataUrl, normalizeTodoStateJson, buildSyntheticTodoPart, computeSyntheticCallId, isSyntheticTodoPart, countRealUserMessages, tailHygieneStructuralSignature, sameTailHygieneStructuralSignature, formatTailHygienePrefixMismatch, refreshTailHygieneBaseline, effectiveTailHygiene, assertTailHygieneContentUnchanged, CHANNEL1_SENTINEL, CHANNEL1_FLOOR_TOKENS, toolOutputTokens, decideChannel1, evaluateChannel2, formatChannel1Evaluation, formatChannel2Evaluation, reclaimableToolOutputCount, buildChannel2Reminder, buildChannel1Reminder, estimateEmergencyDropReclaimTokens, planEmergencyDrop, measureEmergencyTag, getRecentTagOwnerMessageIds, AGE_RECLAIM_MIN_TOKENS, getOldestActiveUnprotectedToolTags, getActiveToolTagsForAgeReclaim, getTriggerTagTokenUpperBound, getActiveTagTokenTotalsByMessage, getAllStatusTagTokenTotalsFlat, tagTokenCountIsNull, backfillTagTokenCounts, insertTag, updateTagStatus, markWhitespaceAssistantTagInert, getInertWhitespaceAssistantTags, updateTagDropMode, updateCavemanDepth, updateTagMessageId, foldShrunkPartTags, markTagsCompactedByMessageIds, deleteTagsByMessageId, getMaxTagNumberBySession, getTagNumberByMessageId, getAssignableTagNumberByMessageId, deriveTagLoadFloor, TAG_SELECT_COLUMNS, getTagsBySession, getActiveTagsBySession, getTailHygieneTags, getDroppedTagsBySession, getTagsByNumbers, getDroppedTagsByNumbers, getMaxDroppedTagNumber, getTagById, getToolTagNumberByOwner, getNullOwnerToolTag, adoptNullOwnerToolTag, getCandidateToolOwners, pickNearestPriorOwner, markHostUnservedRow, retreatPastHostUnservedRows, snapTerminalCompartmentToServedRow, isHostRenderedSystemMessage, isStrictGapHealingMessage, isRawCompactionSummaryInfo, extractInMemoryMessageViews, buildInMemoryTailRawMessages, completedToolArcCrossesBoundary, estimateTrueRawMessageTokens, buildToolArcs, fenceBoundaryForCompletedToolArcs, fenceBoundaryForToolArcs, buildTrueRawTokenIndex, computeRawRangeFingerprint, invalidateTrueRawTokenCache, isTextPart, isToolPartWithOutput, isFilePart, buildFileSourceContent, recordToolParameters, createDroppedInputGuard, assertExecutableToolInput, createDroppedInputToolExecuteBeforeHook, isEditTool, describeFinalWireTail, estimateMessageTokens, estimateFinalWireInputTokens, partHasCompletedResult, extractToolCallObservation, ToolMutationBatch, createToolDropTarget, resolveHostServedBoundaryId2, hasRawMessageProvider2, setRawMessageProvider2, setBoundedRawMessageProvider2, cleanUserText2, withRawSessionMessageCache2, readRawSessionMessages2, readRawSessionMessagePage2, getRawSessionMessageOrdinalCount2, readRawSessionMessageRange2, primeTailRawMessageCache2, getCachedAbsoluteMessageCount2, primeInMemoryTailRawMessageCache2, readRawSessionMessageOrdinalPage2, getRawSessionStoredMessageCount2, readRawSessionMessageIdOrdinalsForRange2, readRawSessionMessagePartsById2, hasRawSessionMessageById2, readRawSessionMessageOrdinalById2, readRawSessionMessageById2, getRawSessionMessageCount2, getRawSessionTagKeysThrough2, getLegacyProtectedTailStartOrdinal2, readSessionChunk2, readRawSessionSeedTail2 };
+export { textMentionsRecentCommit, removeSystemReminders, hasMeaningfulUserText2, extractTexts2, extractToolCallSummaries, getTokenizerNativeMemoryStats, preloadTokenizer, estimateTokens, normalizeText, stableStringify, getCurrentToolSetHash, setDatabase, loadToolDefinitionMeasurements, recordToolDefinition, getMeasuredToolDefinitionTokens, CTX_REDUCE_KEEP, newestCtxReduceTagNumbers, stripWellFormedLeadingTagPrefix, stripPersistedAssistantText, byteSize, stripTagPrefix, peelLeadingMcTagNotation, prependTag, isThinkingPart, isRecord, estimateImageTokensFromDataUrl, estimateToolAttachmentImageTokens, normalizeTodoStateJson, buildSyntheticTodoPart, computeSyntheticCallId, isSyntheticTodoPart, countRealUserMessages, tailHygieneStructuralSignature, sameTailHygieneStructuralSignature, formatTailHygienePrefixMismatch, refreshTailHygieneBaseline, effectiveTailHygiene, assertTailHygieneContentUnchanged, CHANNEL1_SENTINEL, CHANNEL1_FLOOR_TOKENS, isDroppedToolOutput, toolOutputTokens, decideChannel1, evaluateChannel2, formatChannel1Evaluation, formatChannel2Evaluation, reclaimableToolOutputCount, buildChannel2Reminder, buildChannel1Reminder, estimateEmergencyDropReclaimTokens, planEmergencyDrop, measureEmergencyTag, getRecentTagOwnerMessageIds, AGE_RECLAIM_MIN_TOKENS, getOldestActiveUnprotectedToolTags, getActiveToolTagsForAgeReclaim, getTriggerTagTokenUpperBound, getActiveTagTokenTotalsByMessage, getAllStatusTagTokenTotalsFlat, tagTokenCountIsNull, backfillTagTokenCounts, insertTag, updateTagStatus, markWhitespaceAssistantTagInert, getInertWhitespaceAssistantTags, updateTagDropMode, updateCavemanDepth, updateTagMessageId, foldShrunkPartTags, markTagsCompactedByMessageIds, deleteTagsByMessageId, getMaxTagNumberBySession, getTagNumberByMessageId, getAssignableTagNumberByMessageId, deriveTagLoadFloor, TAG_SELECT_COLUMNS, getTagsBySession, getActiveTagsBySession, getTailHygieneTags, getDroppedTagsBySession, getTagsByNumbers, getDroppedTagsByNumbers, getMaxDroppedTagNumber, getTagById, getToolTagNumberByOwner, getNullOwnerToolTag, adoptNullOwnerToolTag, getCandidateToolOwners, pickNearestPriorOwner, markHostUnservedRow, retreatPastHostUnservedRows, snapTerminalCompartmentToServedRow, isHostRenderedSystemMessage, isStrictGapHealingMessage, isRawCompactionSummaryInfo, extractInMemoryMessageViews, buildInMemoryTailRawMessages, completedToolArcCrossesBoundary, estimateTrueRawMessageTokens, buildToolArcs, fenceBoundaryForCompletedToolArcs, fenceBoundaryForToolArcs, buildTrueRawTokenIndex, computeRawRangeFingerprint, invalidateTrueRawTokenCache, isTextPart, isToolPartWithOutput, isFilePart, buildFileSourceContent, recordToolParameters, createDroppedInputGuard, assertExecutableToolInput, createDroppedInputToolExecuteBeforeHook, isEditTool, describeFinalWireTail, estimateMessageTokens, estimateFinalWireInputTokens, SKELETON_REAL_INPUT_MAX_BYTES, partHasCompletedResult, extractToolCallObservation, ToolMutationBatch, createToolDropTarget, resolveHostServedBoundaryId2, hasRawMessageProvider2, setRawMessageProvider2, setBoundedRawMessageProvider2, cleanUserText2, withRawSessionMessageCache2, readRawSessionMessages2, readRawSessionMessagePage2, getRawSessionMessageOrdinalCount2, visitRawSessionMessages2, readRawSessionMessageRange2, primeTailRawMessageCache2, getCachedAbsoluteMessageCount2, primeInMemoryTailRawMessageCache2, readRawSessionMessageOrdinalPage2, getRawSessionStoredMessageCount2, readRawSessionMessageIdOrdinalsForRange2, readRawSessionMessagePartsById2, hasRawSessionMessageById2, readRawSessionMessageOrdinalById2, compareRawSessionMessageOrder2, readRawSessionMessageById2, getRawSessionMessageCount2, getRawSessionTagKeysThrough2, getLegacyProtectedTailStartOrdinal2, readSessionChunk2, readRawSessionSeedTail2 };