acp-kernel 0.0.100-pr.499.359 → 0.0.100-pr.500.360

package/dist/index.js

@@ -180,8 +180,11 @@ function collectSummaryAnchors(state, baseIndexById, summaryIndexById) {
   anchors.sort((left, right) => left.insertAt - right.insertAt);
   return anchors;
 }
-function buildAnchorPairingIndex(messages) {
-  const n = messages.length;
+function pairSafeAnchorIndex(messages, index) {
+  let safe = index;
+  while (safe > 0 && safe < messages.length && messages[safe - 1].role === "assistant" && messages[safe].role === "assistant") {
+    safe--;
+  }
   const resultIndexByCallId = /* @__PURE__ */ new Map();
   messages.forEach((message, at) => {
     if (message.contentType !== "tool-result") return;
@@ -190,51 +193,27 @@ function buildAnchorPairingIndex(messages) {
       resultIndexByCallId.set(message.toolCallId, at);
     }
   });
-  const runStart = new Int32Array(n).fill(-1);
-  for (let i = 0; i < n; ) {
-    if (messages[i].role !== "assistant") {
-      i++;
-      continue;
-    }
-    let j = i;
-    while (j + 1 < n && messages[j + 1].role === "assistant") j++;
-    for (let k = i; k <= j; k++) runStart[k] = i;
-    i = j + 1;
-  }
-  const prefixEnd = new Int32Array(n + 1);
-  for (let i = 0; i < n; i++) {
-    const message = messages[i];
-    let end = 0;
-    if (message.role === "assistant" && message.contentType === "tool-call" && typeof message.toolCallId === "string") {
+  for (let guard = 0; guard < messages.length; guard++) {
+    let moved = safe;
+    for (let at = 0; at < safe && at < messages.length; at++) {
+      const message = messages[at];
+      if (message.role !== "assistant") continue;
+      if (message.contentType !== "tool-call") continue;
+      if (typeof message.toolCallId !== "string") continue;
       const resultIndex = resultIndexByCallId.get(message.toolCallId);
-      if (resultIndex !== void 0) end = resultIndex + 1;
-    }
-    prefixEnd[i + 1] = Math.max(prefixEnd[i], end);
-  }
-  return { runStart, prefixEnd };
-}
-function pairSafeAnchorIndex(messages, index, ix) {
-  const n = messages.length;
-  let safe = index;
-  if (safe > 0 && safe < n) {
-    const start = ix.runStart[safe];
-    if (start >= 0 && messages[safe - 1].role === "assistant") {
-      safe = start;
+      if (resultIndex !== void 0 && resultIndex >= safe && resultIndex + 1 > moved) {
+        moved = resultIndex + 1;
+      }
     }
-  }
-  if (safe < 0 || safe > n) return safe;
-  for (let guard = 0; guard < n; guard++) {
-    const next = Math.max(safe, ix.prefixEnd[safe]);
-    if (next === safe) break;
-    safe = next;
+    if (moved === safe) break;
+    safe = moved;
   }
   return safe;
 }
 function rebuildMessages(messages, coveredBases, firstUserIndex, anchors) {
-  const ix = anchors.length > 0 ? buildAnchorPairingIndex(messages) : null;
   const safeAnchors = anchors.map((anchor) => ({
     ...anchor,
-    insertAt: ix ? pairSafeAnchorIndex(messages, anchor.insertAt, ix) : anchor.insertAt
+    insertAt: pairSafeAnchorIndex(messages, anchor.insertAt)
   })).sort((left, right) => left.insertAt - right.insertAt);
   const result = [];
   const pending = [...safeAnchors];
@@ -4429,18 +4408,22 @@ function segmentGroups(items) {
 function estimateTextTokens(text) {
   return Math.ceil(text.length / 4);
 }
-function isSyntheticOrPruned(message, covered) {
-  if (message.text?.startsWith(SUMMARY_HEADER)) return true;
-  return covered.has(message.id);
+function isSyntheticOrPruned(message, state) {
+  if (message.text?.startsWith("[Compressed conversation section]"))
+    return true;
+  for (const block of state.blocks) {
+    if (block.active && block.effectiveMessageIds.includes(message.id))
+      return true;
+  }
+  return false;
 }
 function computeProtectedRefs(messages, state, config, countTokens = estimateTextTokens) {
   const preserveN = config.preserveRecentMessages;
   const preserveTokens = config.preserveRecentTokens;
-  const covered = coveredMessageIds(state);
   const result = /* @__PURE__ */ new Set();
   const visible = [];
   for (const msg of messages) {
-    if (isSyntheticOrPruned(msg, covered)) continue;
+    if (isSyntheticOrPruned(msg, state)) continue;
     if (isNeverPreserveRecent(
       msg,
       config.neverPreserveRecentTools,
@@ -4466,7 +4449,7 @@ function computeProtectedRefs(messages, state, config, countTokens = estimateTex
   if (preserveN > 0) {
     for (let i = messages.length - 1; i >= 0; i--) {
       const msg = messages[i];
-      if (msg.role !== "user" || isSyntheticOrPruned(msg, covered)) continue;
+      if (msg.role !== "user" || isSyntheticOrPruned(msg, state)) continue;
       const ref = state.messageRefs.byRaw[msg.id];
       if (ref && ref !== "BLOCKED") result.add(ref);
       break;
@@ -4477,7 +4460,6 @@ function computeProtectedRefs(messages, state, config, countTokens = estimateTex
 function buildCompressibleRanges(messages, state, config, protectedZoneRefs, countTokens = estimateTextTokens) {
   let compressibleMsgs = [];
   const protectedMsgs = [];
-  const covered = coveredMessageIds(state);
   const protectedCallIds = collectProtectedToolCallIds(messages, config);
   const latest = collectLatestProtected(messages, config);
   for (const id of latest.callIds) protectedCallIds.add(id);
@@ -4488,7 +4470,7 @@ function buildCompressibleRanges(messages, state, config, protectedZoneRefs, cou
     msgIndex++;
     const ref = state.messageRefs.byRaw[msg.id];
     if (!ref || ref === "BLOCKED") continue;
-    if (isSyntheticOrPruned(msg, covered)) {
+    if (isSyntheticOrPruned(msg, state)) {
       skipSinceCompressible = true;
       skipSinceProtected = true;
       continue;