acp-kernel 0.0.82-pr.343.218 → 0.0.82-pr.345.220

package/dist/index.js

@@ -2233,6 +2233,27 @@ function computeProtectedRefs(messages, state, config, countTokens = estimateTex
   }
   return result;
 }
+function computeOpenTurnMemberIds(messages) {
+  const resultCallIds = /* @__PURE__ */ new Set();
+  for (const msg of messages) {
+    if (msg.contentType === "tool-result" && typeof msg.toolCallId === "string") {
+      resultCallIds.add(msg.toolCallId);
+    }
+  }
+  const openCallIds = /* @__PURE__ */ new Set();
+  for (const msg of messages) {
+    if (msg.id && msg.role === "assistant" && msg.contentType === "tool-call" && typeof msg.toolCallId === "string" && !resultCallIds.has(msg.toolCallId)) {
+      openCallIds.add(msg.id);
+    }
+  }
+  if (openCallIds.size === 0) return /* @__PURE__ */ new Set();
+  const excluded = /* @__PURE__ */ new Set();
+  for (const group of computeTurnGroups(messages)) {
+    if (!group.some((id) => openCallIds.has(id))) continue;
+    for (const id of group) excluded.add(id);
+  }
+  return excluded;
+}
 function buildCompressibleRanges(messages, state, config, protectedZoneRefs, countTokens = estimateTextTokens) {
   let compressibleMsgs = [];
   const protectedMsgs = [];
@@ -2281,6 +2302,20 @@ function buildCompressibleRanges(messages, state, config, protectedZoneRefs, cou
     skipSinceCompressible = false;
     skipSinceProtected = true;
   }
+  const openTurnIds = computeOpenTurnMemberIds(messages);
+  if (openTurnIds.size > 0) {
+    let gapPending = false;
+    const kept = [];
+    for (const info of compressibleMsgs) {
+      if (openTurnIds.has(info.id)) {
+        gapPending = true;
+        continue;
+      }
+      kept.push(gapPending ? { ...info, gapBefore: true } : info);
+      gapPending = false;
+    }
+    compressibleMsgs = kept;
+  }
   const unfoldedIds = computeIntegrityWithdrawals(
     messages,
     new Set(compressibleMsgs.map((info) => info.id))
@@ -2298,6 +2333,13 @@ function buildCompressibleRanges(messages, state, config, protectedZoneRefs, cou
     }
     compressibleMsgs = kept;
   }
+  const gapCount = compressibleMsgs.reduce(
+    (s, info) => s + (info.gapBefore ? 1 : 0),
+    0
+  );
+  if (gapCount > 0) {
+    compressibleMsgs = refineSegmentsForFoldability(messages, compressibleMsgs);
+  }
   const compressible = [];
   let cur = null;
   for (const info of compressibleMsgs) {
@@ -2367,6 +2409,41 @@ function buildCompressibleRanges(messages, state, config, protectedZoneRefs, cou
     protected: protectedRanges
   };
 }
+var MAX_REFINEMENT_PASSES = 8;
+function refineSegmentsForFoldability(messages, infos) {
+  let current = infos;
+  for (let pass = 0; pass < MAX_REFINEMENT_PASSES; pass++) {
+    const segments = [];
+    for (const info of current) {
+      const seg = segments[segments.length - 1];
+      if (seg === void 0 || info.gapBefore) segments.push([info]);
+      else seg.push(info);
+    }
+    const removed = /* @__PURE__ */ new Set();
+    for (const seg of segments) {
+      const withdrawn = computeIntegrityWithdrawals(
+        messages,
+        new Set(seg.map((info) => info.id))
+      ).withdrawn;
+      for (const info of seg) {
+        if (withdrawn.has(info.id)) removed.add(info.id);
+      }
+    }
+    if (removed.size === 0) break;
+    let gapPending = false;
+    const kept = [];
+    for (const info of current) {
+      if (removed.has(info.id)) {
+        gapPending = true;
+        continue;
+      }
+      kept.push(gapPending ? { ...info, gapBefore: true } : info);
+      gapPending = false;
+    }
+    current = kept;
+  }
+  return current;
+}
 function mergeBatch(batch) {
   const first = batch[0];
   const last = batch[batch.length - 1];
@@ -2403,30 +2480,18 @@ function mergeRangesToThreshold(ranges, minChars) {
   const result = [];
   let batch = [];
   let batchChars = 0;
-  const closeBatch = () => {
-    if (batch.length > 0) {
-      if (batchChars >= minChars) result.push(mergeBatch(batch));
-      batch = [];
-      batchChars = 0;
-    }
-  };
   for (const r of ranges) {
-    const prev = batch[batch.length - 1];
-    if (prev && prev.endIndex !== void 0 && r.startIndex !== void 0 && r.startIndex > prev.endIndex + 1) {
-      closeBatch();
-    }
     batch.push(r);
     batchChars += rangeChars(r);
-    if (batchChars >= minChars) closeBatch();
+    if (batchChars >= minChars) {
+      result.push(mergeBatch(batch));
+      batch = [];
+      batchChars = 0;
+    }
   }
   if (batch.length > 0 && result.length > 0) {
     const prev = result[result.length - 1];
-    const contiguous = prev.endIndex === void 0 || batch[0].startIndex === void 0 || batch[0].startIndex <= prev.endIndex + 1;
-    if (contiguous) {
-      result[result.length - 1] = mergeBatch([prev, ...batch]);
-    } else if (batchChars >= minChars) {
-      result.push(mergeBatch(batch));
-    }
+    result[result.length - 1] = mergeBatch([prev, ...batch]);
   }
   return result;
 }