opencode-acp 1.12.0 → 1.12.2

package/dist/index.js

@@ -2677,20 +2677,20 @@ function matchesGlob(inputPath, pattern) {
   regex += "$";
   return new RegExp(regex).test(input);
 }
-function getFilePathsFromParameters(tool7, parameters) {
+function getFilePathsFromParameters(tool8, parameters) {
   if (typeof parameters !== "object" || parameters === null) {
     return [];
   }
   const paths = [];
   const params = parameters;
-  if (tool7 === "apply_patch" && typeof params.patchText === "string") {
+  if (tool8 === "apply_patch" && typeof params.patchText === "string") {
     const pathRegex = /\*\*\* (?:Add|Delete|Update) File: ([^\n\r]+)/g;
     let match;
     while ((match = pathRegex.exec(params.patchText)) !== null) {
       paths.push(match[1].trim());
     }
   }
-  if (tool7 === "multiedit") {
+  if (tool8 === "multiedit") {
     if (typeof params.filePath === "string") {
       paths.push(params.filePath);
     }
@@ -4578,13 +4578,13 @@ var deduplicate = (state, logger, config, messages) => {
     logger.debug(`Marked ${newPruneIds.length} duplicate tool calls for pruning`);
   }
 };
-function createToolSignature(tool7, parameters) {
+function createToolSignature(tool8, parameters) {
   if (!parameters) {
-    return tool7;
+    return tool8;
   }
   const normalized = normalizeParameters(parameters);
   const sorted = sortObjectKeys(normalized);
-  return `${tool7}::${JSON.stringify(sorted)}`;
+  return `${tool8}::${JSON.stringify(sorted)}`;
 }
 function normalizeParameters(params) {
   if (typeof params !== "object" || params === null) return params;
@@ -4659,9 +4659,9 @@ var purgeErrors = (state, logger, config, messages) => {
 };
 
 // lib/ui/utils.ts
-function extractParameterKey(tool7, parameters) {
+function extractParameterKey(tool8, parameters) {
   if (!parameters) return "";
-  if (tool7 === "read" && parameters.filePath) {
+  if (tool8 === "read" && parameters.filePath) {
     const offset = parameters.offset;
     const limit = parameters.limit;
     if (offset !== void 0 && limit !== void 0) {
@@ -4675,10 +4675,10 @@ function extractParameterKey(tool7, parameters) {
     }
     return parameters.filePath;
   }
-  if ((tool7 === "write" || tool7 === "edit" || tool7 === "multiedit") && parameters.filePath) {
+  if ((tool8 === "write" || tool8 === "edit" || tool8 === "multiedit") && parameters.filePath) {
     return parameters.filePath;
   }
-  if (tool7 === "apply_patch" && typeof parameters.patchText === "string") {
+  if (tool8 === "apply_patch" && typeof parameters.patchText === "string") {
     const pathRegex = /\*\*\* (?:Add|Delete|Update) File: ([^\n\r]+)/g;
     const paths = [];
     let match;
@@ -4695,51 +4695,51 @@ function extractParameterKey(tool7, parameters) {
     }
     return "patch";
   }
-  if (tool7 === "list") {
+  if (tool8 === "list") {
     return parameters.path || "(current directory)";
   }
-  if (tool7 === "glob") {
+  if (tool8 === "glob") {
     if (parameters.pattern) {
       const pathInfo = parameters.path ? ` in ${parameters.path}` : "";
       return `"${parameters.pattern}"${pathInfo}`;
     }
     return "(unknown pattern)";
   }
-  if (tool7 === "grep") {
+  if (tool8 === "grep") {
     if (parameters.pattern) {
       const pathInfo = parameters.path ? ` in ${parameters.path}` : "";
       return `"${parameters.pattern}"${pathInfo}`;
     }
     return "(unknown pattern)";
   }
-  if (tool7 === "bash") {
+  if (tool8 === "bash") {
     if (parameters.description) return parameters.description;
     if (parameters.command) {
       return parameters.command.length > 50 ? parameters.command.substring(0, 50) + "..." : parameters.command;
     }
   }
-  if (tool7 === "webfetch" && parameters.url) {
+  if (tool8 === "webfetch" && parameters.url) {
     return parameters.url;
   }
-  if (tool7 === "websearch" && parameters.query) {
+  if (tool8 === "websearch" && parameters.query) {
     return `"${parameters.query}"`;
   }
-  if (tool7 === "codesearch" && parameters.query) {
+  if (tool8 === "codesearch" && parameters.query) {
     return `"${parameters.query}"`;
   }
-  if (tool7 === "todowrite") {
+  if (tool8 === "todowrite") {
     return `${parameters.todos?.length || 0} todos`;
   }
-  if (tool7 === "todoread") {
+  if (tool8 === "todoread") {
     return "read todo list";
   }
-  if (tool7 === "task" && parameters.description) {
+  if (tool8 === "task" && parameters.description) {
     return parameters.description;
   }
-  if (tool7 === "skill" && parameters.name) {
+  if (tool8 === "skill" && parameters.name) {
     return parameters.name;
   }
-  if (tool7 === "lsp") {
+  if (tool8 === "lsp") {
     const op = parameters.operation || "lsp";
     const path = parameters.filePath || "";
     const line = parameters.line;
@@ -4752,7 +4752,7 @@ function extractParameterKey(tool7, parameters) {
     }
     return op;
   }
-  if (tool7 === "question") {
+  if (tool8 === "question") {
     const questions = parameters.questions;
     if (Array.isArray(questions) && questions.length > 0) {
       const headers = questions.map((q) => q.header || "").filter(Boolean).slice(0, 3);
@@ -4896,7 +4896,22 @@ function formatPrunedItemsList(pruneToolIds, toolMetadata, workingDirectory) {
 var TOAST_BODY_MAX_LINES = 12;
 var TOAST_SUMMARY_MAX_CHARS = 600;
 var NOTIFICATION_SUMMARY_MAX_CHARS = 1500;
-var DETAILED_NOTIFICATION_SUMMARY_MAX_CHARS = 1e4;
+function formatEntryRanges(entries, state) {
+  const parts = [];
+  for (const entry of entries) {
+    const block = state.prune.messages.blocksById.get(entry.blockId);
+    if (!block) continue;
+    const startRef = block.startId;
+    const endRef = block.endId;
+    if (!startRef || !endRef) continue;
+    if (startRef === endRef) {
+      parts.push(`b${entry.blockId}: ${startRef}`);
+    } else {
+      parts.push(`b${entry.blockId}: ${startRef}\u2013${endRef}`);
+    }
+  }
+  return parts.length > 0 ? parts.join(", ") : null;
+}
 function truncateToastBody(body, maxLines = TOAST_BODY_MAX_LINES) {
   const lines = body.split("\n");
   if (lines.length <= maxLines) {
@@ -5014,6 +5029,7 @@ async function sendCompressNotification(client, logger, config, state, sessionId
     contextTokensBefore,
     contextTokensAfter
   )}`;
+  let displaySummary = summary;
   if (config.pruneNotification === "minimal") {
     message = `${notificationHeader} \u2014 ${compressionLabel}`;
   } else {
@@ -5035,6 +5051,11 @@ async function sendCompressNotification(client, logger, config, state, sessionId
 ${progressBar}`;
     message += `
 \u25A3 ${compressionLabel} ${formatCompressionMetrics(compressedTokens, summaryTokens)}`;
+    const rangeStr = formatEntryRanges(entries, state);
+    if (rangeStr) {
+      message += `
+\u2192 Range: ${rangeStr}`;
+    }
     message += `
 \u2192 Topic: ${topic}`;
     message += `
@@ -5045,25 +5066,17 @@ ${progressBar}`;
       message += ` compressed`;
     }
     if (config.compress.showCompression) {
-      const maxChars = config.pruneNotification === "detailed" ? DETAILED_NOTIFICATION_SUMMARY_MAX_CHARS : NOTIFICATION_SUMMARY_MAX_CHARS;
-      const displaySummary = summary.length > maxChars ? truncateToastSummary(summary, maxChars) : summary;
+      if (config.pruneNotification === "detailed") {
+        displaySummary = summary;
+      } else {
+        displaySummary = summary.length > NOTIFICATION_SUMMARY_MAX_CHARS ? truncateToastSummary(summary, NOTIFICATION_SUMMARY_MAX_CHARS) : summary;
+      }
       message += `
 \u2192 Compression (~${summaryTokensStr}): ${displaySummary}`;
     }
   }
   if (config.pruneNotificationType === "toast") {
     let toastMessage = message;
-    if (config.compress.showCompression) {
-      const truncatedSummary = truncateToastSummary(summary);
-      if (truncatedSummary !== summary) {
-        toastMessage = toastMessage.replace(
-          `
-\u2192 Compression (~${summaryTokensStr}): ${truncateToastSummary(summary, NOTIFICATION_SUMMARY_MAX_CHARS)}`,
-          `
-\u2192 Compression (~${summaryTokensStr}): ${truncatedSummary}`
-        );
-      }
-    }
     toastMessage = config.pruneNotification === "minimal" ? toastMessage : truncateToastBody(toastMessage);
     await client.tui.showToast({
       body: {
@@ -5110,6 +5123,18 @@ async function sendIgnoredMessage(client, sessionID, text, params, logger) {
 }
 
 // lib/compress/pipeline.ts
+function snapshotCompressionState(state) {
+  return {
+    messages: structuredClone(state.prune.messages),
+    stats: { ...state.stats },
+    manualMode: state.manualMode
+  };
+}
+function restoreCompressionState(state, snapshot) {
+  state.prune.messages = structuredClone(snapshot.messages);
+  state.stats = { ...snapshot.stats };
+  state.manualMode = snapshot.manualMode;
+}
 async function prepareSession(ctx, toolCtx, title) {
   if (ctx.state.manualMode && ctx.state.manualMode !== "compress-pending") {
     throw new Error(
@@ -5162,6 +5187,118 @@ async function finalizeSession(ctx, toolCtx, rawMessages, entries, batchTopic) {
   );
 }
 
+// lib/compress/keep-markers.ts
+var KEEP_REGEX = /\[\[KEEP:(m\d+)\]\]/g;
+var REF_REGEX = /\[\[REF:(m\d+)\|([^\]]+)\]\]/g;
+function resolveKeepMarkers(summary, messages, state, config) {
+  const msgByRef = /* @__PURE__ */ new Map();
+  for (const msg of messages) {
+    const ref = state.messageIds.byRawId.get(msg.info.id);
+    if (ref) msgByRef.set(ref, msg);
+  }
+  const maxChars = config.compress?.keepEmbedMaxChars ?? 2e3;
+  let expandedCount = 0;
+  let refCount = 0;
+  const unresolvedRefs = [];
+  const expanded = summary.replace(KEEP_REGEX, (match, ref) => {
+    const normalized = normalizeRef(ref);
+    const msg = normalized ? msgByRef.get(normalized) : void 0;
+    if (!msg) {
+      unresolvedRefs.push(ref);
+      return match;
+    }
+    expandedCount++;
+    return formatKeptMessage(msg, normalized, maxChars);
+  }).replace(REF_REGEX, (_match, ref, desc) => {
+    const normalized = normalizeRef(ref);
+    const msg = normalized ? msgByRef.get(normalized) : void 0;
+    if (!msg) {
+      unresolvedRefs.push(ref);
+      return _match;
+    }
+    refCount++;
+    return `[\u2192 ${normalized}: ${desc.trim()}]`;
+  });
+  return { summary: expanded, expandedCount, refCount, unresolvedRefs };
+}
+function normalizeRef(ref) {
+  const idx = parseMessageRef(ref);
+  if (idx === null) return null;
+  return formatMessageRef(idx);
+}
+function formatKeptMessage(msg, ref, maxChars) {
+  const formatted = formatByType(msg);
+  const truncated = truncate2(formatted, maxChars);
+  return `
+--- [${ref}: ${labelForMessage(msg)}] ---
+${truncated}
+--- end ---
+`;
+}
+function formatByType(msg) {
+  for (const part of msg.parts || []) {
+    if (part.type === "text" && typeof part.text === "string") {
+      return part.text;
+    }
+    if (part.type === "tool") {
+      const tool8 = part.tool || "unknown";
+      const state = part.state || {};
+      const input = state.input || {};
+      const output = state.output || "";
+      switch (tool8) {
+        case "bash":
+        case "interactive_bash": {
+          const cmd = typeof input === "string" ? input : input.command || JSON.stringify(input);
+          return `$ ${cmd}
+${output}`;
+        }
+        case "read": {
+          const fp = input.filePath || input.path || input.file || "";
+          return output;
+        }
+        case "write":
+        case "edit": {
+          const fp = input.filePath || input.path || "";
+          const content = input.content || input.newString || "";
+          return `${fp}:
+${content}`;
+        }
+        case "reply": {
+          return output || "[reply posted]";
+        }
+        case "grep":
+        case "glob": {
+          return output;
+        }
+        default: {
+          if (output && typeof output === "string" && output.length > 0) {
+            return output;
+          }
+          const compact = JSON.stringify({ tool: tool8, input }, null, 0);
+          return compact.length > 500 ? compact.slice(0, 500) + "..." : compact;
+        }
+      }
+    }
+  }
+  return "[empty message]";
+}
+function labelForMessage(msg) {
+  for (const part of msg.parts || []) {
+    if (part.type === "tool") {
+      const tool8 = part.tool || "unknown";
+      const input = part.state?.input || {};
+      const fp = input.filePath || input.path || input.command || "";
+      return fp ? `${tool8}: ${String(fp).slice(0, 60)}` : tool8;
+    }
+  }
+  return msg.info.role === "user" ? "user" : "text";
+}
+function truncate2(text, maxChars) {
+  if (text.length <= maxChars) return text;
+  return text.slice(0, maxChars) + `
+... [truncated, ${text.length} chars total]`;
+}
+
 // lib/compress/message.ts
 function buildSchema(maxSummaryLengthHard) {
   return {
@@ -5177,7 +5314,9 @@ function buildSchema(maxSummaryLengthHard) {
         )
       })
     ).describe("Batch of individual message summaries to create in one tool call"),
-    summaryMaxChars: tool2.schema.number().optional().describe(`Override max summary length (default max: ${maxSummaryLengthHard} chars). Use when content is important and needs more detail \u2014 don't lose critical info just to fit the limit.`)
+    summaryMaxChars: tool2.schema.number().optional().describe(
+      `Override max summary length (default max: ${maxSummaryLengthHard} chars). Use when content is important and needs more detail \u2014 don't lose critical info just to fit the limit.`
+    )
   };
 }
 function createCompressMessageTool(ctx) {
@@ -5260,39 +5399,52 @@ function createCompressMessageTool(ctx) {
           summaryWithTools
         });
       }
+      const snapshot = snapshotCompressionState(ctx.state);
       const runId = allocateRunId(ctx.state);
-      for (const { plan, summaryWithTools } of preparedPlans) {
-        const blockId = allocateBlockId(ctx.state);
-        const storedSummary = wrapCompressedSummary(blockId, summaryWithTools);
-        const summaryTokens = countTokens2(storedSummary);
-        applyCompressionState(
-          ctx.state,
-          {
-            topic: plan.entry.topic,
-            batchTopic: input.topic,
-            startId: plan.entry.messageId,
-            endId: plan.entry.messageId,
-            mode: "message",
+      try {
+        for (const { plan, summaryWithTools } of preparedPlans) {
+          const blockId = allocateBlockId(ctx.state);
+          const keepResult = resolveKeepMarkers(
+            summaryWithTools,
+            rawMessages,
+            ctx.state,
+            ctx.config
+          );
+          const resolvedSummary = keepResult.summary;
+          const storedSummary = wrapCompressedSummary(blockId, resolvedSummary);
+          const summaryTokens = countTokens2(storedSummary);
+          applyCompressionState(
+            ctx.state,
+            {
+              topic: plan.entry.topic,
+              batchTopic: input.topic,
+              startId: plan.entry.messageId,
+              endId: plan.entry.messageId,
+              mode: "message",
+              runId,
+              compressMessageId: toolCtx.messageID,
+              compressCallId: callId,
+              summaryTokens
+            },
+            plan.selection,
+            plan.anchorMessageId,
+            blockId,
+            storedSummary,
+            [],
+            ctx.config.gc
+          );
+          notifications.push({
+            blockId,
             runId,
-            compressMessageId: toolCtx.messageID,
-            compressCallId: callId,
+            summary: resolvedSummary,
             summaryTokens
-          },
-          plan.selection,
-          plan.anchorMessageId,
-          blockId,
-          storedSummary,
-          [],
-          ctx.config.gc
-        );
-        notifications.push({
-          blockId,
-          runId,
-          summary: summaryWithTools,
-          summaryTokens
-        });
+          });
+        }
+        await finalizeSession(ctx, toolCtx, rawMessages, notifications, input.topic);
+      } catch (error) {
+        restoreCompressionState(ctx.state, snapshot);
+        throw error;
       }
-      await finalizeSession(ctx, toolCtx, rawMessages, notifications, input.topic);
       return formatResult(plans.length, skippedIssues, skippedCount);
     }
   });
@@ -5300,113 +5452,6 @@ function createCompressMessageTool(ctx) {
 
 // lib/compress/range.ts
 import { tool as tool3 } from "@opencode-ai/plugin";
-
-// lib/compress/keep-markers.ts
-var KEEP_REGEX = /\[\[KEEP:(m\d+)\]\]/g;
-var REF_REGEX = /\[\[REF:(m\d+)\|([^\]]+)\]\]/g;
-function resolveKeepMarkers(summary, messages, state, config) {
-  const msgByRef = /* @__PURE__ */ new Map();
-  for (const msg of messages) {
-    const ref = state.messageIds.byRawId.get(msg.info.id);
-    if (ref) msgByRef.set(ref, msg);
-  }
-  const maxChars = config.compress?.keepEmbedMaxChars ?? 2e3;
-  let expandedCount = 0;
-  let refCount = 0;
-  const unresolvedRefs = [];
-  const expanded = summary.replace(KEEP_REGEX, (match, ref) => {
-    const msg = msgByRef.get(ref);
-    if (!msg) {
-      unresolvedRefs.push(ref);
-      return match;
-    }
-    expandedCount++;
-    return formatKeptMessage(msg, ref, maxChars);
-  }).replace(REF_REGEX, (_match, ref, desc) => {
-    const msg = msgByRef.get(ref);
-    if (!msg) {
-      unresolvedRefs.push(ref);
-      return _match;
-    }
-    refCount++;
-    return `[\u2192 ${ref}: ${desc.trim()}]`;
-  });
-  return { summary: expanded, expandedCount, refCount, unresolvedRefs };
-}
-function formatKeptMessage(msg, ref, maxChars) {
-  const formatted = formatByType(msg);
-  const truncated = truncate2(formatted, maxChars);
-  return `
---- [${ref}: ${labelForMessage(msg)}] ---
-${truncated}
---- end ---
-`;
-}
-function formatByType(msg) {
-  for (const part of msg.parts || []) {
-    if (part.type === "text" && typeof part.text === "string") {
-      return part.text;
-    }
-    if (part.type === "tool") {
-      const tool7 = part.tool || "unknown";
-      const state = part.state || {};
-      const input = state.input || {};
-      const output = state.output || "";
-      switch (tool7) {
-        case "bash":
-        case "interactive_bash": {
-          const cmd = typeof input === "string" ? input : input.command || JSON.stringify(input);
-          return `$ ${cmd}
-${output}`;
-        }
-        case "read": {
-          const fp = input.filePath || input.path || input.file || "";
-          return output;
-        }
-        case "write":
-        case "edit": {
-          const fp = input.filePath || input.path || "";
-          const content = input.content || input.newString || "";
-          return `${fp}:
-${content}`;
-        }
-        case "reply": {
-          return output || "[reply posted]";
-        }
-        case "grep":
-        case "glob": {
-          return output;
-        }
-        default: {
-          if (output && typeof output === "string" && output.length > 0) {
-            return output;
-          }
-          const compact = JSON.stringify({ tool: tool7, input }, null, 0);
-          return compact.length > 500 ? compact.slice(0, 500) + "..." : compact;
-        }
-      }
-    }
-  }
-  return "[empty message]";
-}
-function labelForMessage(msg) {
-  for (const part of msg.parts || []) {
-    if (part.type === "tool") {
-      const tool7 = part.tool || "unknown";
-      const input = part.state?.input || {};
-      const fp = input.filePath || input.path || input.command || "";
-      return fp ? `${tool7}: ${String(fp).slice(0, 60)}` : tool7;
-    }
-  }
-  return msg.info.role === "user" ? "user" : "text";
-}
-function truncate2(text, maxChars) {
-  if (text.length <= maxChars) return text;
-  return text.slice(0, maxChars) + `
-... [truncated, ${text.length} chars total]`;
-}
-
-// lib/compress/range.ts
 function buildSchema2(maxSummaryLengthHard) {
   return {
     topic: tool3.schema.string().describe("Short label (3-5 words) for display - e.g., 'Auth System Exploration'"),
@@ -5423,7 +5468,9 @@ function buildSchema2(maxSummaryLengthHard) {
     ).describe(
       "One or more ranges to compress, each with start/end boundaries and a summary"
     ),
-    summaryMaxChars: tool3.schema.number().optional().describe(`Override max summary length (default max: ${maxSummaryLengthHard} chars). Use when content is important and needs more detail \u2014 don't lose critical info just to fit the limit.`)
+    summaryMaxChars: tool3.schema.number().optional().describe(
+      `Override max summary length (default max: ${maxSummaryLengthHard} chars). Use when content is important and needs more detail \u2014 don't lose critical info just to fit the limit.`
+    )
   };
 }
 function createCompressRangeTool(ctx) {
@@ -5559,47 +5606,53 @@ function createCompressRangeTool(ctx) {
           consumedBlockIds: mergeConsumedBlockIds
         });
       }
+      const snapshot = snapshotCompressionState(ctx.state);
       const runId = allocateRunId(ctx.state);
-      for (const preparedPlan of preparedPlans) {
-        const blockId = allocateBlockId(ctx.state);
-        const keepResult = resolveKeepMarkers(
-          preparedPlan.finalSummary,
-          rawMessages,
-          ctx.state,
-          ctx.config
-        );
-        preparedPlan.finalSummary = keepResult.summary;
-        const storedSummary = wrapCompressedSummary(blockId, preparedPlan.finalSummary);
-        const summaryTokens = countTokens2(storedSummary);
-        const applied = applyCompressionState(
-          ctx.state,
-          {
-            topic: input.topic,
-            batchTopic: input.topic,
-            startId: preparedPlan.entry.startId,
-            endId: preparedPlan.entry.endId,
-            mode: "range",
+      try {
+        for (const preparedPlan of preparedPlans) {
+          const blockId = allocateBlockId(ctx.state);
+          const keepResult = resolveKeepMarkers(
+            preparedPlan.finalSummary,
+            rawMessages,
+            ctx.state,
+            ctx.config
+          );
+          preparedPlan.finalSummary = keepResult.summary;
+          const storedSummary = wrapCompressedSummary(blockId, preparedPlan.finalSummary);
+          const summaryTokens = countTokens2(storedSummary);
+          const applied = applyCompressionState(
+            ctx.state,
+            {
+              topic: input.topic,
+              batchTopic: input.topic,
+              startId: preparedPlan.entry.startId,
+              endId: preparedPlan.entry.endId,
+              mode: "range",
+              runId,
+              compressMessageId: toolCtx.messageID,
+              compressCallId: callId,
+              summaryTokens
+            },
+            preparedPlan.selection,
+            preparedPlan.anchorMessageId,
+            blockId,
+            storedSummary,
+            preparedPlan.consumedBlockIds,
+            ctx.config.gc
+          );
+          totalCompressedMessages += applied.messageIds.length;
+          notifications.push({
+            blockId,
             runId,
-            compressMessageId: toolCtx.messageID,
-            compressCallId: callId,
+            summary: preparedPlan.finalSummary,
             summaryTokens
-          },
-          preparedPlan.selection,
-          preparedPlan.anchorMessageId,
-          blockId,
-          storedSummary,
-          preparedPlan.consumedBlockIds,
-          ctx.config.gc
-        );
-        totalCompressedMessages += applied.messageIds.length;
-        notifications.push({
-          blockId,
-          runId,
-          summary: preparedPlan.finalSummary,
-          summaryTokens
-        });
+          });
+        }
+        await finalizeSession(ctx, toolCtx, rawMessages, notifications, input.topic);
+      } catch (error) {
+        restoreCompressionState(ctx.state, snapshot);
+        throw error;
       }
-      await finalizeSession(ctx, toolCtx, rawMessages, notifications, input.topic);
       return `Compressed ${totalCompressedMessages} messages into ${COMPRESSED_BLOCK_HEADER}.
 IMPORTANT: This was an automatic context compression. You MUST continue your previous task exactly where you left off. Do NOT ask the user what to do next.
 \u{1F4A1} Tip: Use search_context('keyword') to find compressed content when you need it later.`;
@@ -5934,6 +5987,40 @@ var filterCompressedRanges = (state, logger, config, messages) => {
   messages.length = 0;
   messages.push(...result);
 };
+function stripStaleCompressCalls(messages) {
+  const lastUserIdx = messages.findLastIndex(
+    (m) => m.info.role === "user" && !isIgnoredUserMessage(m)
+  );
+  if (lastUserIdx < 0) return 0;
+  let stripped = 0;
+  const result = [];
+  for (let i = 0; i < messages.length; i++) {
+    const msg = messages[i];
+    if (i >= lastUserIdx) {
+      result.push(msg);
+      continue;
+    }
+    const hasCompress = msg.parts.some(
+      (p) => p.type === "tool" && p.tool === "compress"
+    );
+    if (!hasCompress) {
+      result.push(msg);
+      continue;
+    }
+    const remaining = msg.parts.filter(
+      (p) => !(p.type === "tool" && p.tool === "compress")
+    );
+    stripped++;
+    if (remaining.length > 0) {
+      result.push({ ...msg, parts: remaining });
+    }
+  }
+  if (stripped > 0) {
+    messages.length = 0;
+    messages.push(...result);
+  }
+  return stripped;
+}
 
 // lib/messages/sync.ts
 function sortBlocksByCreation(a, b) {
@@ -5967,12 +6054,10 @@ var syncCompressionBlocks = (state, logger, messages) => {
       continue;
     }
     if (typeof block.anchorMessageId === "string" && block.anchorMessageId.length > 0 && !messageIds.has(block.anchorMessageId)) {
-      if (!messagesState.byMessageId.has(block.anchorMessageId)) {
-        block.active = false;
-        block.deactivatedAt = now;
-        block.deactivatedByBlockId = void 0;
-        continue;
-      }
+      block.active = false;
+      block.deactivatedAt = now;
+      block.deactivatedByBlockId = void 0;
+      continue;
     }
     for (const consumedBlockId of block.consumedBlockIds) {
       if (!messagesState.activeBlockIds.has(consumedBlockId)) {
@@ -6082,8 +6167,8 @@ var resolveEffectiveCompressPermission = (basePermission, hostPermissions, agent
     agentName ? hostPermissions.agents[agentName] : void 0
   ) ? "deny" : basePermission;
 };
-var hasExplicitToolPermission = (permissionConfig, tool7) => {
-  return permissionConfig ? Object.prototype.hasOwnProperty.call(permissionConfig, tool7) : false;
+var hasExplicitToolPermission = (permissionConfig, tool8) => {
+  return permissionConfig ? Object.prototype.hasOwnProperty.call(permissionConfig, tool8) : false;
 };
 
 // lib/compress-permission.ts
@@ -6660,7 +6745,7 @@ function estimateContextComposition(messages, state) {
   perTool.sort((a, b) => b.tokens - a.tokens);
   perCode.sort((a, b) => b.tokens - a.tokens);
   perText.sort((a, b) => b.tokens - a.tokens);
-  const toolTypeBreakdown = Array.from(toolTypeMap.entries()).map(([tool7, tokens]) => ({ tool: tool7, tokens })).sort((a, b) => b.tokens - a.tokens);
+  const toolTypeBreakdown = Array.from(toolTypeMap.entries()).map(([tool8, tokens]) => ({ tool: tool8, tokens })).sort((a, b) => b.tokens - a.tokens);
   return {
     toolTokens,
     codeTokens,
@@ -6795,7 +6880,7 @@ function createSuffixMessage(messages) {
   messages.push(synthetic);
   return synthetic;
 }
-var injectCompressNudges = (state, config, logger, messages, prompts, compressionPriorities, debugNotify) => {
+var injectCompressNudges = (state, config, logger, messages, prompts, compressionPriorities, debugNotify, preCompressTokens) => {
   if (compressPermission(state, config) === "deny") {
     return;
   }
@@ -6818,13 +6903,30 @@ var injectCompressNudges = (state, config, logger, messages, prompts, compressio
   const currentTurnStart = lastUserIdx >= 0 ? lastUserIdx + 1 : 0;
   const currentTurnHasCompress = messages.slice(currentTurnStart).some((m) => m.info.role === "assistant" && messageHasCompress(m));
   if (currentTurnHasCompress) {
+    const wasNudgeTriggered = state.nudges.lastNudgeShownTokens !== void 0;
     state.nudges.contextLimitAnchors.clear();
     state.nudges.turnNudgeAnchors.clear();
     state.nudges.iterationNudgeAnchors.clear();
     state.nudges.lastNudgeShownTokens = void 0;
     state.nudges.lastToolOutputNudgeTokens = void 0;
-    if (!state.nudges.compressBaselineSet) {
-      state.nudges.lastPerMessageNudgeTokens = currentTokens;
+    if (wasNudgeTriggered && !state.nudges.compressBaselineSet) {
+      const baseline = state.nudges.lastPerMessageNudgeTokens;
+      const postCompress = currentTokens;
+      const preCompress = preCompressTokens;
+      if (baseline !== void 0 && postCompress !== void 0 && preCompress !== void 0 && preCompress > postCompress) {
+        const growth = preCompress - baseline;
+        const compressed = preCompress - postCompress;
+        if (growth > 0 && compressed > 0) {
+          const ratio = Math.min(1, compressed / growth);
+          const adjustment = Math.min(1, ratio * 2);
+          const newBaseline = baseline + Math.round((postCompress - baseline) * adjustment);
+          state.nudges.lastPerMessageNudgeTokens = newBaseline;
+        } else {
+          state.nudges.lastPerMessageNudgeTokens = postCompress;
+        }
+      } else {
+        state.nudges.lastPerMessageNudgeTokens = postCompress;
+      }
       state.nudges.compressBaselineSet = true;
     }
     saveSessionState(state, logger).catch(() => {
@@ -6938,7 +7040,11 @@ Breakdown: ${fmt(composition.toolTokens)} tool (${pct2(composition.toolTokens)}%
         breakdown += `
 
 ${formatCompressibleRanges(ranges)}`;
+        breakdown += `
+\u{1F4A1} Compress all ranges in one call (pass multiple content entries: \`content: [{...}, {...}]\`).`;
       }
+      breakdown += `
+Use \`acp_status({scope:"uncompressed"})\` to re-fetch compressible ranges after compressing, or \`acp_status\` for compressed block details.`;
       if (decision.tipsVariant !== "maxLimit") {
         breakdown += `
 
@@ -6967,7 +7073,6 @@ ${HOW_TO_COMPRESS_RULES}`;
     if (tipsText && suffixMessage) {
       appendToLastTextPart(suffixMessage, tipsText);
     }
-    injectVisibleIdRange(state, config, messages, suffixMessage);
   }
   if (suffixMessage) {
     if (hasContent(suffixMessage)) {
@@ -7003,86 +7108,6 @@ function injectContextUsage(target, config, currentTokens, modelContextLimit) {
   }
   target.parts.push(createSyntheticTextPart(target, usageTag));
 }
-function refNumber(ref) {
-  const n = parseInt(ref.slice(1), 10);
-  return Number.isNaN(n) ? -1 : n;
-}
-function buildVisibleSegments(state, messages) {
-  const refInfo = /* @__PURE__ */ new Map();
-  for (const msg of messages) {
-    const ref = state.messageIds.byRawId.get(msg.info.id);
-    if (!ref) continue;
-    let tokens = 0;
-    let hasTool = false;
-    for (const part of msg.parts || []) {
-      if (part.type === "text" && typeof part.text === "string") {
-        tokens += Math.round(part.text.length / 4);
-      } else if (part.type !== "text" && part.type !== "reasoning") {
-        tokens += Math.round(JSON.stringify(part).length / 4);
-        hasTool = true;
-      }
-    }
-    refInfo.set(ref, { tokens, hasTool });
-  }
-  if (refInfo.size === 0) return [];
-  const refs = Array.from(refInfo.keys()).sort((a, b) => refNumber(a) - refNumber(b));
-  const segments = [];
-  let cur = null;
-  let prevNum = -2;
-  for (const ref of refs) {
-    const num = refNumber(ref);
-    const info = refInfo.get(ref);
-    if (cur && num === prevNum + 1) {
-      cur.endRef = ref;
-      cur.count++;
-      cur.tokens += info.tokens;
-      if (info.hasTool) cur.hasTool = true;
-    } else {
-      if (cur) segments.push(cur);
-      cur = { startRef: ref, endRef: ref, count: 1, tokens: info.tokens, hasTool: info.hasTool };
-    }
-    prevNum = num;
-  }
-  if (cur) segments.push(cur);
-  return segments;
-}
-function formatSegment(seg) {
-  return seg.startRef === seg.endRef ? seg.startRef : `${seg.startRef}\u2013${seg.endRef}`;
-}
-function formatVisibleGuidance(segments, maxSegs) {
-  if (segments.length === 0) return "";
-  const totalMsgs = segments.reduce((s, seg) => s + seg.count, 0);
-  const totalSegs = segments.length;
-  const fmt = (n) => n >= 1e3 ? `${(n / 1e3).toFixed(1)}K` : String(n);
-  if (totalSegs <= maxSegs) {
-    return `[Visible: ${segments.map(formatSegment).join(", ")} (${totalMsgs} msg${totalMsgs === 1 ? "" : "s"}, ${totalSegs} segment${totalSegs === 1 ? "" : "s"})]`;
-  }
-  const keepSet = new Set(
-    [...segments].sort((a, b) => {
-      if (a.hasTool !== b.hasTool) return a.hasTool ? -1 : 1;
-      return b.tokens - a.tokens;
-    }).slice(0, maxSegs)
-  );
-  const shown = segments.filter((s) => keepSet.has(s));
-  const omitted = segments.filter((s) => !keepSet.has(s));
-  const omittedTokens = omitted.reduce((sum, s) => sum + s.tokens, 0);
-  const omittedMsgs = omitted.reduce((sum, s) => sum + s.count, 0);
-  return `[Visible (top ${shown.length} of ${totalSegs} segments, ${totalMsgs} msgs): ${shown.map(formatSegment).join(", ")} | +${omitted.length} smaller segment${omitted.length === 1 ? "" : "s"} (~${fmt(omittedTokens)} tokens, ${omittedMsgs} msg${omittedMsgs === 1 ? "" : "s"}) omitted]`;
-}
-function injectVisibleIdRange(state, config, messages, target) {
-  if (!target) return;
-  const segments = buildVisibleSegments(state, messages);
-  if (segments.length === 0) return;
-  const maxSegs = config.compress?.maxVisibleSegments ?? 50;
-  const rangeTag = "\n\n" + formatVisibleGuidance(segments, maxSegs);
-  for (const part of target.parts) {
-    if (part.type === "text") {
-      appendToTextPart(part, rangeTag);
-      return;
-    }
-  }
-  target.parts.push(createSyntheticTextPart(target, rangeTag));
-}
 var injectMessageIds = (state, config, messages, compressionPriorities) => {
   if (compressPermission(state, config) === "deny") {
     return;
@@ -7705,7 +7730,7 @@ function renderOverview(visibleMessages, summaryTokens, blocks, fetchFailed, raw
     lines.push(
       `  ${formatTokens(total)} total | ${formatTokens(totalTool)} tool (${toolPct}%) | ${formatTokens(totalText)} text (${textPct}%) | ${formatTokens(summaryTokens)} summaries (${summaryPct}%)`
     );
-    const topTypes = Array.from(toolTypeMap.entries()).map(([tool7, tokens]) => ({ tool: tool7, tokens })).sort((a, b) => b.tokens - a.tokens).slice(0, 3);
+    const topTypes = Array.from(toolTypeMap.entries()).map(([tool8, tokens]) => ({ tool: tool8, tokens })).sort((a, b) => b.tokens - a.tokens).slice(0, 3);
     if (topTypes.length > 0) {
       lines.push(`  Top tools: ${topTypes.map((t) => `${t.tool} (${pct(t.tokens, total)}%)`).join(", ")}`);
     }
@@ -7897,8 +7922,67 @@ function createAcpStatusTool(ctx) {
   });
 }
 
-// lib/compress/prune-tool.ts
+// lib/compress/recap.ts
 import { tool as tool6 } from "@opencode-ai/plugin";
+function formatRange(startId, endId) {
+  const start = (startId || "").trim();
+  const end = (endId || "").trim();
+  if (!start || !end) return "\u2014";
+  if (start === end) return start;
+  return `${start}\u2013${end}`;
+}
+var RECAP_TOOL_DESCRIPTION = `Read-only retrieval of compression block summaries.
+
+This tool is primarily system-managed: ACP automatically injects compression summaries into context via this tool's result format. You can also call it directly to re-fetch a specific block's summary without decompressing the full original content.
+
+Args:
+- blockId: optional block number (e.g., 5). If omitted, lists all active blocks with brief info.`;
+function createAcpContextRecapTool(ctx) {
+  return tool6({
+    description: RECAP_TOOL_DESCRIPTION,
+    args: {
+      blockId: tool6.schema.number().optional().describe("Block number to retrieve (e.g., 5). If omitted, lists all active blocks.")
+    },
+    async execute(args) {
+      const msgState = ctx.state.prune.messages;
+      const activeIds = Array.from(msgState.activeBlockIds).sort((a, b) => a - b);
+      if (activeIds.length === 0) {
+        return "No active compression blocks.";
+      }
+      if (args.blockId !== void 0) {
+        const block = msgState.blocksById.get(args.blockId);
+        if (!block) {
+          return `Block b${args.blockId} not found. Active blocks: ${activeIds.map((id) => `b${id}`).join(", ")}`;
+        }
+        if (!block.active) {
+          return `Block b${args.blockId} is inactive (deactivated by GC or nested compression).`;
+        }
+        const range = formatRange(block.startId, block.endId);
+        return `[Compressed conversation section]
+${block.summary}
+
+[Block b${args.blockId} | ${range} | topic: "${block.topic || "(none)"}"]`;
+      }
+      const lines = [];
+      lines.push(`Active compression blocks (${activeIds.length}):`);
+      for (const id of activeIds) {
+        const block = msgState.blocksById.get(id);
+        if (!block || !block.active) continue;
+        const range = formatRange(block.startId, block.endId);
+        const summaryPreview = block.summary.slice(0, 200);
+        lines.push(`
+b${id} | ${range} | "${block.topic || "(none)"}"`);
+        lines.push(`  ${summaryPreview}${block.summary.length > 200 ? "..." : ""}`);
+      }
+      lines.push(`
+Call with blockId to get the full summary: acp_context_recap({ blockId: N })`);
+      return lines.join("\n");
+    }
+  });
+}
+
+// lib/compress/prune-tool.ts
+import { tool as tool7 } from "@opencode-ai/plugin";
 var PRUNE_TOOL_DESCRIPTION = `Remove old tool outputs by tool type \u2014 frees context without compression.
 
 Unlike compress (which creates summaries), prune directly strips tool call outputs from context. Use for disposable tool outputs where the content is no longer needed: old todowrite states, edit success echoes, repeated status checks.
@@ -7908,11 +7992,11 @@ Args:
 - keepLatest: how many recent calls to keep visible (default 3)`;
 function createPruneTool(ctx) {
   ctx.prompts.reload();
-  return tool6({
+  return tool7({
     description: PRUNE_TOOL_DESCRIPTION,
     args: {
-      toolType: tool6.schema.string().describe('Tool name to prune (e.g., "todowrite", "bash", "edit")'),
-      keepLatest: tool6.schema.number().optional().describe("How many recent calls to keep visible (default 3)")
+      toolType: tool7.schema.string().describe('Tool name to prune (e.g., "todowrite", "bash", "edit")'),
+      keepLatest: tool7.schema.number().optional().describe("How many recent calls to keep visible (default 3)")
     },
     async execute(args, toolCtx) {
       const keepLatest = args.keepLatest ?? 3;
@@ -9199,7 +9283,7 @@ var COMPRESS_TRIGGER_PROMPT = [
   "Follow the active compress mode, preserve all critical implementation details, and choose safe targets.",
   "Return after compress with a brief explanation of what content was compressed."
 ].join("\n\n");
-function getTriggerPrompt(tool7, state, config, userFocus) {
+function getTriggerPrompt(tool8, state, config, userFocus) {
   const base = COMPRESS_TRIGGER_PROMPT;
   const compressedBlockGuidance = config.compress.mode === "message" ? "" : buildCompressedBlockGuidance(state, config.gc);
   const sections = [base, compressedBlockGuidance];
@@ -9228,8 +9312,8 @@ async function handleManualToggleCommand(ctx, modeArg) {
   );
   logger.info("Manual mode toggled", { manualMode: state.manualMode });
 }
-async function handleManualTriggerCommand(ctx, tool7, userFocus) {
-  return getTriggerPrompt(tool7, ctx.state, ctx.config, userFocus);
+async function handleManualTriggerCommand(ctx, tool8, userFocus) {
+  return getTriggerPrompt(tool8, ctx.state, ctx.config, userFocus);
 }
 function applyPendingManualTrigger(state, messages, logger) {
   const pending = state.pendingManualTrigger;
@@ -10075,7 +10159,9 @@ function createChatMessageTransformHandler(client, state, logger, config, prompt
       saveSessionState(state, logger).catch(() => {
       });
     }
+    const prePruneTokens = getCurrentTokenUsage(state, output.messages);
     prune(state, logger, config, output.messages);
+    stripStaleCompressCalls(output.messages);
     assignMessageRefs(state, output.messages);
     await injectExtendedSubAgentResults(
       client,
@@ -10103,7 +10189,8 @@ ${text}`,
           logger
         ).catch(() => {
         });
-      } : void 0
+      } : void 0,
+      prePruneTokens
     );
     injectMessageIds(state, config, output.messages, compressionPriorities);
     applyPendingManualTrigger(state, output.messages, logger);
@@ -10509,7 +10596,8 @@ var server = (async (ctx) => {
         decompress: createDecompressTool(compressToolContext),
         prune: createPruneTool(compressToolContext),
         search_context: createSearchContextTool(compressToolContext),
-        acp_status: createAcpStatusTool(compressToolContext)
+        acp_status: createAcpStatusTool(compressToolContext),
+        acp_context_recap: createAcpContextRecapTool(compressToolContext)
       }
     },
     config: async (opencodeConfig) => {