acp-kernel 0.0.81-pr.338.204 → 0.0.82-pr.165.206

package/dist/index.js

@@ -3904,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 };
 }
@@ -3923,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);
 }
@@ -3991,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`);
@@ -4019,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;
@@ -4029,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");
 }