acp-kernel 0.0.81 → 0.0.82-pr.165.206

package/dist/compress.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"compress.d.ts","sourceRoot":"","sources":["../src/compress.ts"],"names":[],"mappings":"AAIA,OAAO,EAAkC,kBAAkB,EAAE,MAAM,YAAY,CAAC;AAgBhF,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAcvD,OAAO,EAGL,KAAK,YAAY,EAGlB,MAAM,eAAe,CAAC;AACvB,OAAO,KAAK,EACV,sBAAsB,EACtB,gBAAgB,EAChB,gBAAgB,EAEhB,MAAM,EAEN,WAAW,EAGX,iBAAiB,EAEjB,YAAY,EACb,MAAM,YAAY,CAAC;AAEpB,MAAM,WAAW,KAAK;IACpB,WAAW,CAAC,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,MAAM,CAAC;CACxC;AAED,MAAM,WAAW,eAAe;IAC9B,WAAW,CAAC,KAAK,EAAE,gBAAgB,GAAG,iBAAiB,CAAC;IACxD,gBAAgB,CAAC,KAAK,EAAE,qBAAqB,GAAG,sBAAsB,CAAC;IACvE,YAAY,IAAI,YAAY,EAAE,CAAC;IAC/B,UAAU,CACR,OAAO,EAAE,MAAM,EACf,KAAK,EAAE,gBAAgB,GACtB,gBAAgB,GAAG,SAAS,CAAC;IAChC,MAAM,CAAC,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,gBAAgB,GAAG,gBAAgB,EAAE,CAAC;IACnE,MAAM,CACJ,KAAK,EAAE,gBAAgB,EACvB,UAAU,EAAE,MAAM,EAClB,MAAM,EAAE,MAAM,GACb,YAAY,CAAC;CACjB;AAED,MAAM,WAAW,gBAAgB;IAC/B,QAAQ,EAAE,WAAW,EAAE,CAAC;IACxB,KAAK,EAAE,gBAAgB,CAAC;IACxB,MAAM,EAAE,MAAM,CAAC;IACf,UAAU,EAAE,MAAM,CAAC;IACnB;;;;;;;;;;;OAWG;IACH,UAAU,CAAC,EAAE,cAAc,CAAC;CAC7B;AAED,MAAM,WAAW,qBAAqB;IACpC,MAAM,EAAE;QACN,QAAQ,EAAE,MAAM,CAAC;QACjB,MAAM,EAAE,MAAM,CAAC;QACf,OAAO,EAAE,MAAM,CAAC;QAChB,KAAK,CAAC,EAAE,MAAM,CAAC;QACf,cAAc,CAAC,EAAE,MAAM,CAAC;QACxB,eAAe,CAAC,EAAE,MAAM,CAAC;KAC1B,EAAE,CAAC;IACJ,QAAQ,EAAE,WAAW,EAAE,CAAC;IACxB,KAAK,EAAE,gBAAgB,CAAC;IACxB,MAAM,EAAE,MAAM,CAAC;IACf,mBAAmB,CAAC,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC;CACnC;AA2GD,wBAAgB,UAAU,CAAC,KAAK,GAAE,KAAU,GAAG,eAAe,CAgV7D;AAwkCD,OAAO,EAAE,kBAAkB,EAAE,CAAC"}
+{"version":3,"file":"compress.d.ts","sourceRoot":"","sources":["../src/compress.ts"],"names":[],"mappings":"AAIA,OAAO,EAAkC,kBAAkB,EAAE,MAAM,YAAY,CAAC;AAgBhF,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAcvD,OAAO,EAGL,KAAK,YAAY,EAGlB,MAAM,eAAe,CAAC;AACvB,OAAO,KAAK,EACV,sBAAsB,EACtB,gBAAgB,EAChB,gBAAgB,EAEhB,MAAM,EAEN,WAAW,EAGX,iBAAiB,EAEjB,YAAY,EACb,MAAM,YAAY,CAAC;AAEpB,MAAM,WAAW,KAAK;IACpB,WAAW,CAAC,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,MAAM,CAAC;CACxC;AAED,MAAM,WAAW,eAAe;IAC9B,WAAW,CAAC,KAAK,EAAE,gBAAgB,GAAG,iBAAiB,CAAC;IACxD,gBAAgB,CAAC,KAAK,EAAE,qBAAqB,GAAG,sBAAsB,CAAC;IACvE,YAAY,IAAI,YAAY,EAAE,CAAC;IAC/B,UAAU,CACR,OAAO,EAAE,MAAM,EACf,KAAK,EAAE,gBAAgB,GACtB,gBAAgB,GAAG,SAAS,CAAC;IAChC,MAAM,CAAC,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,gBAAgB,GAAG,gBAAgB,EAAE,CAAC;IACnE,MAAM,CACJ,KAAK,EAAE,gBAAgB,EACvB,UAAU,EAAE,MAAM,EAClB,MAAM,EAAE,MAAM,GACb,YAAY,CAAC;CACjB;AAED,MAAM,WAAW,gBAAgB;IAC/B,QAAQ,EAAE,WAAW,EAAE,CAAC;IACxB,KAAK,EAAE,gBAAgB,CAAC;IACxB,MAAM,EAAE,MAAM,CAAC;IACf,UAAU,EAAE,MAAM,CAAC;IACnB;;;;;;;;;;;OAWG;IACH,UAAU,CAAC,EAAE,cAAc,CAAC;CAC7B;AAED,MAAM,WAAW,qBAAqB;IACpC,MAAM,EAAE;QACN,QAAQ,EAAE,MAAM,CAAC;QACjB,MAAM,EAAE,MAAM,CAAC;QACf,OAAO,EAAE,MAAM,CAAC;QAChB,KAAK,CAAC,EAAE,MAAM,CAAC;QACf,cAAc,CAAC,EAAE,MAAM,CAAC;QACxB,eAAe,CAAC,EAAE,MAAM,CAAC;KAC1B,EAAE,CAAC;IACJ,QAAQ,EAAE,WAAW,EAAE,CAAC;IACxB,KAAK,EAAE,gBAAgB,CAAC;IACxB,MAAM,EAAE,MAAM,CAAC;IACf,mBAAmB,CAAC,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC;CACnC;AA2GD,wBAAgB,UAAU,CAAC,KAAK,GAAE,KAAU,GAAG,eAAe,CAgV7D;AAmmCD,OAAO,EAAE,kBAAkB,EAAE,CAAC"}

package/dist/index.js

@@ -2938,10 +2938,29 @@ function applySingleRange(input) {
     messages: input.messages,
     state: input.state
   });
-  const rangeMessageIds = applyPairBoundaryAdjustments(
-    resolved,
-    input.messages
-  ).filter((id) => !isSummaryMessageId(id));
+  const plainRange = resolved.boundaryKind !== "block";
+  const liveCarrierIds = /* @__PURE__ */ new Set();
+  if (plainRange) {
+    for (const message of input.messages) {
+      const carrierOf = message.summaryOfBlockId;
+      if (carrierOf === void 0) continue;
+      if (blockById(input.state, carrierOf)?.active) {
+        liveCarrierIds.add(message.id);
+      }
+    }
+  }
+  const adjustedIds = applyPairBoundaryAdjustments(resolved, input.messages);
+  const skippedCarriers = adjustedIds.filter((id) => liveCarrierIds.has(id));
+  if (skippedCarriers.length > 0) {
+    warnings.push(
+      `Excluded ${skippedCarriers.length} checkpoint message(s) ${skippedCarriers.join(
+        ", "
+      )} from the compression range \u2014 they carry the visible summary of still-active block(s), which a plain message-ref range does not supersede. The checkpoints stay visible; to fold them, reference the block ids (bN..bM) instead.`
+    );
+  }
+  const rangeMessageIds = adjustedIds.filter(
+    (id) => !isSummaryMessageId(id) && !liveCarrierIds.has(id)
+  );
   if (rangeMessageIds.length > resolved.messageIds.length) {
     const indexByMessageId = /* @__PURE__ */ new Map();
     input.messages.forEach((m, i) => indexByMessageId.set(m.id, i));
@@ -3885,7 +3904,7 @@ function collectVisible(messages, state, countTokens) {
     if (!ref) return;
     const tokens = countMessageTokens(message, countTokens);
     const tool = isToolMessage(message) ? message.toolName ?? (message.toolCallId ? toolCallNames.get(message.toolCallId) : void 0) ?? "tool" : "text";
-    if (tokens > 0) visible.push({ ref, tokens, tool, index });
+    if (tokens > 0) visible.push({ ref, tokens, tool, index, isUser: message.role === "user" });
   });
   return { visible, summaryTokens };
 }
@@ -3904,7 +3923,7 @@ function buildStatusReport(state, messages, countTokens, options = {}) {
     if (view === "messages") {
       return renderMessageDrilldown(visible, toolFilter, sort, limit);
     }
-    return renderUncompressedRanges(visible);
+    return renderUncompressedRanges(visible, sort, limit);
   }
   return renderOverview(visible, summaryTokens, activeBlocks2, state, countTokens, limit, options.meta);
 }
@@ -3972,7 +3991,7 @@ function renderOverview(visible, summaryTokens, blocks, state, countTokens, limi
   );
   return lines.join("\n");
 }
-function renderUncompressedRanges(visible) {
+function renderUncompressedRanges(visible, sort, limit) {
   const lines = [];
   const totalTokens = visible.reduce((s, m) => s + m.tokens, 0);
   lines.push(`UNCOMPRESSED \u2014 ${formatTokens2(totalTokens)} | ${visible.length} visible messages`);
@@ -4000,7 +4019,9 @@ function renderUncompressedRanges(visible) {
   for (const m of visible) {
     const num = refNum2(m.ref);
     const last = merged[merged.length - 1];
-    if (last && num === last.startNum + last.count) {
+    const contiguous = !!last && num === last.startNum + last.count;
+    const turnBoundary = !!last && m.isUser && last.count >= 3;
+    if (contiguous && !turnBoundary) {
       last.endRef = m.ref;
       last.count += 1;
       last.tokens += m.tokens;
@@ -4010,12 +4031,16 @@ function renderUncompressedRanges(visible) {
       merged.push({ startRef: m.ref, endRef: m.ref, startNum: num, count: 1, tokens: m.tokens, toolTokens });
     }
   }
-  for (const r of merged.slice(0, 30)) {
+  if (sort !== "time") merged.sort((a, b) => b.tokens - a.tokens || a.startNum - b.startNum);
+  lines.push(`Sorted by ${sort === "time" ? "time" : "size"}`);
+  lines.push("");
+  const shown = merged.slice(0, limit);
+  for (const r of shown) {
     const range = r.count === 1 ? r.startRef : `${r.startRef}\u2013${r.endRef}`;
     lines.push(`  ${range}  (${r.count} msgs, ${formatTokens2(r.tokens)}${r.count > 1 ? ` (${Math.round(r.tokens / r.count)}/msg)` : ""}) ${dominantTool(r.toolTokens)}`);
   }
-  if (merged.length > 30) {
-    lines.push(`  ... and ${merged.length - 30} more ranges`);
+  if (merged.length > shown.length) {
+    lines.push(`  ... and ${merged.length - shown.length} more ranges`);
   }
   return lines.join("\n");
 }