opencode-acp 1.5.1 → 1.6.0

package/dist/index.js

@@ -900,6 +900,9 @@ var VALID_CONFIG_KEYS = /* @__PURE__ */ new Set([
   "compress.protectedTools",
   "compress.protectTags",
   "compress.protectUserMessages",
+  "compress.maxSummaryLength",
+  "compress.maxSummaryLengthHard",
+  "compress.minCompressRange",
   "gc",
   "gc.algorithm",
   "gc.promotionThreshold",
@@ -1160,6 +1163,55 @@ function validateConfigTypes(config) {
           actual: typeof compress.protectUserMessages
         });
       }
+      if (compress.maxSummaryLength !== void 0 && typeof compress.maxSummaryLength !== "number") {
+        errors.push({
+          key: "compress.maxSummaryLength",
+          expected: "number",
+          actual: typeof compress.maxSummaryLength
+        });
+      }
+      if (typeof compress.maxSummaryLength === "number" && compress.maxSummaryLength < 1) {
+        errors.push({
+          key: "compress.maxSummaryLength",
+          expected: "positive number (>= 1)",
+          actual: `${compress.maxSummaryLength}`
+        });
+      }
+      if (compress.maxSummaryLengthHard !== void 0 && typeof compress.maxSummaryLengthHard !== "number") {
+        errors.push({
+          key: "compress.maxSummaryLengthHard",
+          expected: "number",
+          actual: typeof compress.maxSummaryLengthHard
+        });
+      }
+      if (typeof compress.maxSummaryLengthHard === "number" && compress.maxSummaryLengthHard < 1) {
+        errors.push({
+          key: "compress.maxSummaryLengthHard",
+          expected: "positive number (>= 1)",
+          actual: `${compress.maxSummaryLengthHard}`
+        });
+      }
+      if (typeof compress.maxSummaryLength === "number" && typeof compress.maxSummaryLengthHard === "number" && compress.maxSummaryLengthHard < compress.maxSummaryLength) {
+        errors.push({
+          key: "compress.maxSummaryLengthHard",
+          expected: `>= maxSummaryLength (${compress.maxSummaryLength})`,
+          actual: `${compress.maxSummaryLengthHard}`
+        });
+      }
+      if (compress.minCompressRange !== void 0 && typeof compress.minCompressRange !== "number") {
+        errors.push({
+          key: "compress.minCompressRange",
+          expected: "number",
+          actual: typeof compress.minCompressRange
+        });
+      }
+      if (typeof compress.minCompressRange === "number" && compress.minCompressRange < 0) {
+        errors.push({
+          key: "compress.minCompressRange",
+          expected: "non-negative number (>= 0)",
+          actual: `${compress.minCompressRange}`
+        });
+      }
       if (typeof compress.iterationNudgeThreshold === "number" && compress.iterationNudgeThreshold < 1) {
         errors.push({
           key: "compress.iterationNudgeThreshold",
@@ -1393,8 +1445,6 @@ var DEFAULT_PROTECTED_TOOLS = [
   "todoread",
   "compress",
   "decompress",
-  "mark_block",
-  "unmark_block",
   "batch",
   "plan_enter",
   "plan_exit",
@@ -1474,7 +1524,10 @@ var defaultConfig = {
     nudgeForce: "soft",
     protectedTools: [...COMPRESS_DEFAULT_PROTECTED_TOOLS],
     protectTags: false,
-    protectUserMessages: false
+    protectUserMessages: false,
+    maxSummaryLength: 200,
+    maxSummaryLengthHard: 800,
+    minCompressRange: 2e3
   },
   strategies: {
     deduplication: {
@@ -1626,7 +1679,10 @@ function mergeCompress(base, override) {
     nudgeForce: override.nudgeForce ?? base.nudgeForce,
     protectedTools: [.../* @__PURE__ */ new Set([...base.protectedTools, ...override.protectedTools ?? []])],
     protectTags: override.protectTags ?? base.protectTags,
-    protectUserMessages: override.protectUserMessages ?? base.protectUserMessages
+    protectUserMessages: override.protectUserMessages ?? base.protectUserMessages,
+    maxSummaryLength: override.maxSummaryLength ?? base.maxSummaryLength,
+    maxSummaryLengthHard: override.maxSummaryLengthHard ?? base.maxSummaryLengthHard,
+    minCompressRange: override.minCompressRange ?? base.minCompressRange
   };
 }
 function mergeCommands(base, override) {
@@ -1990,6 +2046,20 @@ function countAllMessageTokens(msg) {
   if (texts.length === 0) return 0;
   return estimateTokensBatch(texts);
 }
+function countMessageCharacters(msg) {
+  const parts = Array.isArray(msg.parts) ? msg.parts : [];
+  let total = 0;
+  for (const part of parts) {
+    if (part.type === "text" && typeof part.text === "string") {
+      total += part.text.length;
+    } else {
+      for (const content of extractToolContent(part)) {
+        total += content.length;
+      }
+    }
+  }
+  return total;
+}
 
 // lib/prompts/extensions/tool.ts
 var RANGE_FORMAT_EXTENSION = `
@@ -3550,20 +3620,20 @@ function matchesGlob(inputPath, pattern) {
   regex += "$";
   return new RegExp(regex).test(input);
 }
-function getFilePathsFromParameters(tool5, parameters) {
+function getFilePathsFromParameters(tool4, parameters) {
   if (typeof parameters !== "object" || parameters === null) {
     return [];
   }
   const paths = [];
   const params = parameters;
-  if (tool5 === "apply_patch" && typeof params.patchText === "string") {
+  if (tool4 === "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 (tool5 === "multiedit") {
+  if (tool4 === "multiedit") {
     if (typeof params.filePath === "string") {
       paths.push(params.filePath);
     }
@@ -3658,13 +3728,13 @@ var deduplicate = (state, logger, config, messages) => {
     logger.debug(`Marked ${newPruneIds.length} duplicate tool calls for pruning`);
   }
 };
-function createToolSignature(tool5, parameters) {
+function createToolSignature(tool4, parameters) {
   if (!parameters) {
-    return tool5;
+    return tool4;
   }
   const normalized = normalizeParameters(parameters);
   const sorted = sortObjectKeys(normalized);
-  return `${tool5}::${JSON.stringify(sorted)}`;
+  return `${tool4}::${JSON.stringify(sorted)}`;
 }
 function normalizeParameters(params) {
   if (typeof params !== "object" || params === null) return params;
@@ -3739,9 +3809,9 @@ var purgeErrors = (state, logger, config, messages) => {
 };
 
 // lib/ui/utils.ts
-function extractParameterKey(tool5, parameters) {
+function extractParameterKey(tool4, parameters) {
   if (!parameters) return "";
-  if (tool5 === "read" && parameters.filePath) {
+  if (tool4 === "read" && parameters.filePath) {
     const offset = parameters.offset;
     const limit = parameters.limit;
     if (offset !== void 0 && limit !== void 0) {
@@ -3755,10 +3825,10 @@ function extractParameterKey(tool5, parameters) {
     }
     return parameters.filePath;
   }
-  if ((tool5 === "write" || tool5 === "edit" || tool5 === "multiedit") && parameters.filePath) {
+  if ((tool4 === "write" || tool4 === "edit" || tool4 === "multiedit") && parameters.filePath) {
     return parameters.filePath;
   }
-  if (tool5 === "apply_patch" && typeof parameters.patchText === "string") {
+  if (tool4 === "apply_patch" && typeof parameters.patchText === "string") {
     const pathRegex = /\*\*\* (?:Add|Delete|Update) File: ([^\n\r]+)/g;
     const paths = [];
     let match;
@@ -3775,51 +3845,51 @@ function extractParameterKey(tool5, parameters) {
     }
     return "patch";
   }
-  if (tool5 === "list") {
+  if (tool4 === "list") {
     return parameters.path || "(current directory)";
   }
-  if (tool5 === "glob") {
+  if (tool4 === "glob") {
     if (parameters.pattern) {
       const pathInfo = parameters.path ? ` in ${parameters.path}` : "";
       return `"${parameters.pattern}"${pathInfo}`;
     }
     return "(unknown pattern)";
   }
-  if (tool5 === "grep") {
+  if (tool4 === "grep") {
     if (parameters.pattern) {
       const pathInfo = parameters.path ? ` in ${parameters.path}` : "";
       return `"${parameters.pattern}"${pathInfo}`;
     }
     return "(unknown pattern)";
   }
-  if (tool5 === "bash") {
+  if (tool4 === "bash") {
     if (parameters.description) return parameters.description;
     if (parameters.command) {
       return parameters.command.length > 50 ? parameters.command.substring(0, 50) + "..." : parameters.command;
     }
   }
-  if (tool5 === "webfetch" && parameters.url) {
+  if (tool4 === "webfetch" && parameters.url) {
     return parameters.url;
   }
-  if (tool5 === "websearch" && parameters.query) {
+  if (tool4 === "websearch" && parameters.query) {
     return `"${parameters.query}"`;
   }
-  if (tool5 === "codesearch" && parameters.query) {
+  if (tool4 === "codesearch" && parameters.query) {
     return `"${parameters.query}"`;
   }
-  if (tool5 === "todowrite") {
+  if (tool4 === "todowrite") {
     return `${parameters.todos?.length || 0} todos`;
   }
-  if (tool5 === "todoread") {
+  if (tool4 === "todoread") {
     return "read todo list";
   }
-  if (tool5 === "task" && parameters.description) {
+  if (tool4 === "task" && parameters.description) {
     return parameters.description;
   }
-  if (tool5 === "skill" && parameters.name) {
+  if (tool4 === "skill" && parameters.name) {
     return parameters.name;
   }
-  if (tool5 === "lsp") {
+  if (tool4 === "lsp") {
     const op = parameters.operation || "lsp";
     const path = parameters.filePath || "";
     const line = parameters.line;
@@ -3832,7 +3902,7 @@ function extractParameterKey(tool5, parameters) {
     }
     return op;
   }
-  if (tool5 === "question") {
+  if (tool4 === "question") {
     const questions = parameters.questions;
     if (Array.isArray(questions) && questions.length > 0) {
       const headers = questions.map((q) => q.header || "").filter(Boolean).slice(0, 3);
@@ -4411,7 +4481,7 @@ ${output}`);
 }
 
 // lib/compress/message.ts
-function buildSchema() {
+function buildSchema(maxSummaryLength) {
   return {
     topic: tool.schema.string().describe(
       "Short label (3-5 words) for the overall batch - e.g., 'Closed Research Notes'"
@@ -4420,7 +4490,9 @@ function buildSchema() {
       tool.schema.object({
         messageId: tool.schema.string().describe("Raw message ID to compress (e.g. m00001)"),
         topic: tool.schema.string().describe("Short label (3-5 words) for this one message summary"),
-        summary: tool.schema.string().describe("Complete technical summary replacing that one message")
+        summary: tool.schema.string().describe(
+          `Complete technical summary replacing that one message. Aim for <=${maxSummaryLength} chars; exceed only when strictly necessary to preserve critical detail (file paths, decisions, signatures, exact values). Never pad.`
+        )
       })
     ).describe("Batch of individual message summaries to create in one tool call")
   };
@@ -4430,10 +4502,18 @@ function createCompressMessageTool(ctx) {
   const runtimePrompts = ctx.prompts.getRuntimePrompts();
   return tool({
     description: runtimePrompts.compressMessage + MESSAGE_FORMAT_EXTENSION,
-    args: buildSchema(),
+    args: buildSchema(ctx.config.compress.maxSummaryLength),
     async execute(args, toolCtx) {
       const input = args;
       validateArgs(input);
+      const maxSummaryLengthHard = ctx.config.compress.maxSummaryLengthHard;
+      for (const entry of input.content) {
+        if (entry.summary.length > maxSummaryLengthHard) {
+          throw new Error(
+            `Summary too long (${entry.summary.length} chars, hard ceiling ${maxSummaryLengthHard}). Aim for <=${ctx.config.compress.maxSummaryLength}; exceed only when strictly necessary. Rewrite more concisely.`
+          );
+        }
+      }
       const callId = typeof toolCtx.callID === "string" ? toolCtx.callID : void 0;
       const { rawMessages, searchContext } = await prepareSession(
         ctx,
@@ -4449,6 +4529,26 @@ function createCompressMessageTool(ctx) {
       if (plans.length === 0 && skippedCount > 0) {
         throw new Error(formatIssues(skippedIssues, skippedCount));
       }
+      const minCompressRange = ctx.config.compress.minCompressRange;
+      if (minCompressRange > 0) {
+        let totalChars = 0;
+        const counted = /* @__PURE__ */ new Set();
+        for (const plan of plans) {
+          for (const messageId of plan.selection.messageIds) {
+            if (counted.has(messageId)) continue;
+            counted.add(messageId);
+            const rawMessage = searchContext.rawMessagesById.get(messageId);
+            if (rawMessage) {
+              totalChars += countMessageCharacters(rawMessage);
+            }
+          }
+        }
+        if (totalChars < minCompressRange) {
+          throw new Error(
+            `Range too small (${totalChars} chars, min ${minCompressRange}). Not worth compressing \u2014 overhead exceeds savings.`
+          );
+        }
+      }
       const notifications = [];
       const preparedPlans = [];
       for (const plan of plans) {
@@ -4633,7 +4733,13 @@ function validateSummaryPlaceholders(placeholders, requiredBlockIds, startRefere
   }
   placeholders.length = 0;
   placeholders.push(...validPlaceholders);
-  return strictRequiredIds.filter((id) => !keptPlaceholderIds.has(id));
+  const missingIds = strictRequiredIds.filter((id) => !keptPlaceholderIds.has(id));
+  if (missingIds.length > 0) {
+    console.warn(
+      `[ACP] compress summary omitted placeholders for required blocks: ${missingIds.map((id) => `b${id}`).join(", ")}. They will be auto-attached as consumed blocks.`
+    );
+  }
+  return missingIds;
 }
 function injectBlockPlaceholders(summary, _placeholders, _summaryByBlockId, _startReference, _endReference) {
   return {
@@ -4649,7 +4755,7 @@ function appendMissingBlockSummaries(summary, _missingBlockIds, _summaryByBlockI
 }
 
 // lib/compress/range.ts
-function buildSchema2() {
+function buildSchema2(maxSummaryLength) {
   return {
     topic: tool2.schema.string().describe("Short label (3-5 words) for display - e.g., 'Auth System Exploration'"),
     content: tool2.schema.array(
@@ -4658,7 +4764,9 @@ function buildSchema2() {
           "Message or block ID marking the beginning of range (e.g. m00001, b2)"
         ),
         endId: tool2.schema.string().describe("Message or block ID marking the end of range (e.g. m00012, b5)"),
-        summary: tool2.schema.string().describe("Complete technical summary replacing all content in range")
+        summary: tool2.schema.string().describe(
+          `Complete technical summary replacing all content in range. Aim for <=${maxSummaryLength} chars; exceed only when strictly necessary to preserve critical detail (file paths, decisions, signatures, exact values). Never pad.`
+        )
       })
     ).describe(
       "One or more ranges to compress, each with start/end boundaries and a summary"
@@ -4670,10 +4778,18 @@ function createCompressRangeTool(ctx) {
   const runtimePrompts = ctx.prompts.getRuntimePrompts();
   return tool2({
     description: runtimePrompts.compressRange + RANGE_FORMAT_EXTENSION,
-    args: buildSchema2(),
+    args: buildSchema2(ctx.config.compress.maxSummaryLength),
     async execute(args, toolCtx) {
       const input = args;
       validateArgs2(input);
+      const maxSummaryLengthHard = ctx.config.compress.maxSummaryLengthHard;
+      for (const entry of input.content) {
+        if (entry.summary.length > maxSummaryLengthHard) {
+          throw new Error(
+            `Summary too long (${entry.summary.length} chars, hard ceiling ${maxSummaryLengthHard}). Aim for <=${ctx.config.compress.maxSummaryLength}; exceed only when strictly necessary. Rewrite more concisely.`
+          );
+        }
+      }
       const callId = typeof toolCtx.callID === "string" ? toolCtx.callID : void 0;
       const { rawMessages, searchContext } = await prepareSession(
         ctx,
@@ -4682,6 +4798,26 @@ function createCompressRangeTool(ctx) {
       );
       const resolvedPlans = resolveRanges(input, searchContext, ctx.state);
       validateNonOverlapping(resolvedPlans);
+      const minCompressRange = ctx.config.compress.minCompressRange;
+      if (minCompressRange > 0) {
+        let totalChars = 0;
+        const counted = /* @__PURE__ */ new Set();
+        for (const plan of resolvedPlans) {
+          for (const messageId of plan.selection.messageIds) {
+            if (counted.has(messageId)) continue;
+            counted.add(messageId);
+            const rawMessage = searchContext.rawMessagesById.get(messageId);
+            if (rawMessage) {
+              totalChars += countMessageCharacters(rawMessage);
+            }
+          }
+        }
+        if (totalChars < minCompressRange) {
+          throw new Error(
+            `Range too small (${totalChars} chars, min ${minCompressRange}). Not worth compressing \u2014 overhead exceeds savings.`
+          );
+        }
+      }
       const notifications = [];
       const preparedPlans = [];
       let totalCompressedMessages = 0;
@@ -4731,10 +4867,19 @@ function createCompressRangeTool(ctx) {
           searchContext.summaryByBlockId,
           injected.consumedBlockIds
         );
-        const mergeConsumedBlockIds = extractBoundaryConsumedBlocks(
+        const boundaryConsumed = extractBoundaryConsumedBlocks(
           plan.selection.startReference,
           plan.selection.endReference
         );
+        const seenConsumed = /* @__PURE__ */ new Set();
+        const mergeConsumedBlockIds = [
+          ...plan.selection.requiredBlockIds,
+          ...boundaryConsumed
+        ].filter((id) => {
+          if (seenConsumed.has(id)) return false;
+          seenConsumed.add(id);
+          return true;
+        });
         preparedPlans.push({
           entry: plan.entry,
           selection: plan.selection,
@@ -4981,6 +5126,36 @@ var stripHallucinations = (messages) => {
 // lib/messages/prune.ts
 var prune = (state, logger, config, messages) => {
   filterCompressedRanges(state, logger, config, messages);
+  stripStepMarkers(messages);
+};
+var MAX_STEP_FINISH_REASON = 50;
+var stripStepMarkers = (messages) => {
+  for (const msg of messages) {
+    const parts = Array.isArray(msg.parts) ? msg.parts : [];
+    let changed = false;
+    const filtered = [];
+    for (const part of parts) {
+      if (part.type === "step-start") {
+        changed = true;
+        continue;
+      }
+      if (part.type === "step-finish") {
+        const reason = part.reason;
+        if (typeof reason === "string" && reason.length > MAX_STEP_FINISH_REASON) {
+          const truncated = reason.slice(0, MAX_STEP_FINISH_REASON) + "...";
+          if (truncated !== reason) {
+            filtered.push({ ...part, reason: truncated });
+            changed = true;
+            continue;
+          }
+        }
+      }
+      filtered.push(part);
+    }
+    if (changed) {
+      msg.parts = filtered;
+    }
+  }
 };
 var filterCompressedRanges = (state, logger, config, messages) => {
   if (state.prune.messages.byMessageId.size === 0 && state.prune.messages.activeByAnchorMessageId.size === 0) {
@@ -5217,8 +5392,8 @@ var resolveEffectiveCompressPermission = (basePermission, hostPermissions, agent
     agentName ? hostPermissions.agents[agentName] : void 0
   ) ? "deny" : basePermission;
 };
-var hasExplicitToolPermission = (permissionConfig, tool5) => {
-  return permissionConfig ? Object.prototype.hasOwnProperty.call(permissionConfig, tool5) : false;
+var hasExplicitToolPermission = (permissionConfig, tool4) => {
+  return permissionConfig ? Object.prototype.hasOwnProperty.call(permissionConfig, tool4) : false;
 };
 
 // lib/compress-permission.ts
@@ -5250,13 +5425,42 @@ function buildCompressedBlockGuidance(state, gcConfig, context) {
   const lines = [
     "Compressed block context:",
     `- Active compressed blocks: ${blockCount} (${blockList})`,
-    "- If your selected compression range includes any listed block, include each required placeholder exactly once in the summary using `(bN)`."
+    "- System auto-detects blocks in range \u2014 no need to manually list (bN) placeholders. Just write a short prose summary."
   ];
   if (includeHint) {
     lines.push("- \u{1F4A1} When you've finished using tool outputs, compress them \u2014 you can decompress later if needed. Lean context improves accuracy.");
   }
   if (blockCount > 50) {
-    lines.push(`- \u{1F500} You have ${blockCount} blocks \u2014 consider merging adjacent same-topic blocks instead of finding new content to compress. This permanently reduces per-turn overhead.`);
+    const oldBlockIds = activeBlockIds.slice(0, Math.max(0, blockCount - 20));
+    const allOldBlocks = oldBlockIds.map((id) => state.prune.messages.blocksById.get(id)).filter((b) => b !== void 0);
+    const visibleMessageIds = context?.visibleMessageIds;
+    const visibleOldBlocks = visibleMessageIds === void 0 ? allOldBlocks : allOldBlocks.filter((b) => b.anchorMessageId && visibleMessageIds.has(b.anchorMessageId));
+    if (visibleOldBlocks.length > 5) {
+      const blocksWithRef = visibleOldBlocks.map((block) => {
+        const ref = state.messageIds.byRawId.get(block.anchorMessageId);
+        return ref ? { block, ref } : null;
+      }).filter((x) => x !== null).sort((a, b) => a.ref.localeCompare(b.ref));
+      const totalTokens = blocksWithRef.reduce((s, x) => s + (x.block.summaryTokens ?? 0), 0);
+      const totalK = Math.max(1, Math.round(totalTokens / 1e3));
+      const targets = [];
+      const chunkSize = Math.ceil(blocksWithRef.length / 3);
+      for (let i = 0; i < 3 && i * chunkSize < blocksWithRef.length; i++) {
+        const chunk = blocksWithRef.slice(i * chunkSize, (i + 1) * chunkSize);
+        if (chunk.length < 2) continue;
+        const startRef = chunk[0].ref;
+        const endRef = chunk[chunk.length - 1].ref;
+        const chunkTokens = chunk.reduce((s, x) => s + (x.block.summaryTokens ?? 0), 0);
+        const chunkK = Math.max(1, Math.round(chunkTokens / 1e3));
+        targets.push(`  \u2022 compress ${startRef}\u2192${endRef}: ${chunk.length} blocks (~${chunkK}K tokens)`);
+      }
+      if (targets.length > 0) {
+        lines.push(`- \u{1F500} ${blocksWithRef.length} old blocks using ~${totalK}K tokens. Consolidate into ${targets.length}:`);
+        lines.push(...targets);
+        lines.push(`  System auto-detects blocks in range \u2014 no need to manually list (bN) placeholders. Just write a short prose summary.`);
+      }
+    } else {
+      lines.push(`- \u{1F500} You have ${blockCount} blocks \u2014 use compress to consolidate adjacent same-topic blocks.`);
+    }
   }
   const usageRatio = context?.currentTokens && context?.modelContextLimit ? context.currentTokens / context.modelContextLimit : 0;
   if (gcConfig && usageRatio > 0.5) {
@@ -5617,11 +5821,11 @@ ${base}`;
   }
   let guidance;
   if (pct < minPct) {
-    guidance = " \u{1F4A1} Be frugal with context \u2014 if you see large completed outputs (>2000 tokens), compress them into summaries. If everything is already compressed, skip this nudge. You can decompress later if needed. Extract and keep what matters: user intent, key decisions, file paths, and important findings. Compress everything else.";
+    guidance = " \u{1F4A1} Be frugal with context. If any visible tool output exceeds 5000 characters and you've finished reading it, compress it into a summary now \u2014 don't keep large outputs 'just in case'. You can decompress later if needed.";
   } else if (pct < maxPct) {
-    guidance = " \u26A0\uFE0F Context is growing \u2014 compress completed sections and high-token waste now. Preserve key details.";
+    guidance = " \u26A0\uFE0F Context is growing \u2014 compress completed sections and high-token waste now.";
   } else {
-    guidance = " \u{1F525} Context is high \u2014 compress aggressively but selectively. Preserve only what is essential.";
+    guidance = " \u{1F525} Context is high \u2014 compress aggressively, preserve only what is essential.";
   }
   return `
 
@@ -5818,7 +6022,15 @@ var injectCompressNudges = (state, config, logger, messages, prompts, compressio
   const shouldNudge = shouldInjectPerMessageNudge(state, config, currentTokens, modelContextLimit);
   injectContextUsage(suffixMessage, config, currentTokens, modelContextLimit, !shouldNudge);
   if (config.compress.mode !== "message") {
-    const blockGuidance = buildCompressedBlockGuidance(state, config.gc, { currentTokens, modelContextLimit, includeHint: shouldNudge });
+    const visibleMessageIds = new Set(
+      messages.map((message) => message.info.id)
+    );
+    const blockGuidance = buildCompressedBlockGuidance(state, config.gc, {
+      currentTokens,
+      modelContextLimit,
+      includeHint: shouldNudge,
+      visibleMessageIds
+    });
     if (blockGuidance.trim() && suffixMessage) {
       appendToLastTextPart(suffixMessage, "\n\n" + blockGuidance);
     }
@@ -6365,109 +6577,6 @@ function createDecompressTool(ctx) {
   });
 }
 
-// lib/compress/mark-block.ts
-import { tool as tool4 } from "@opencode-ai/plugin";
-async function prepareMarkSession(ctx, toolCtx) {
-  await toolCtx.ask({
-    permission: "compress",
-    patterns: ["*"],
-    always: ["*"],
-    metadata: {}
-  });
-  toolCtx.metadata({ title: "Mark block" });
-  const rawMessages = await fetchSessionMessages(ctx.client, toolCtx.sessionID);
-  await ensureSessionInitialized(
-    ctx.client,
-    ctx.state,
-    toolCtx.sessionID,
-    ctx.logger,
-    rawMessages,
-    ctx.config.manualMode.enabled
-  );
-  assignMessageRefs(ctx.state, rawMessages);
-}
-var MARK_DESCRIPTION = `Marks a compressed block for batch merge-cleanup.
-
-Use this for blocks whose detailed content you no longer need, but whose summaries
-you want to keep in context for now (to preserve prompt cache). Marked blocks stay
-fully active with zero immediate effect on context or cache. When context pressure
-rises, all marked blocks are merge-compressed together into a single summary in one
-cache break, instead of being handled one at a time.
-
-Argument: blockId \u2014 the block reference to mark (e.g., "b1", "b3")
-
-Use mark_block instead of compress when you want deferred cleanup: the block keeps
-serving cache hits now and gets consolidated later only if context gets tight.`;
-var UNMARK_DESCRIPTION = `Removes the batch cleanup mark from a compressed block.
-
-Reverses mark_block. The block returns to normal handling and will not be
-auto-merged during batch cleanup.
-
-Argument: blockId \u2014 the block reference to unmark (e.g., "b1", "b3")`;
-function buildSchema4() {
-  return {
-    blockId: tool4.schema.string().describe('Block reference to mark (e.g., "b1", "b3")')
-  };
-}
-function buildUnmarkSchema() {
-  return {
-    blockId: tool4.schema.string().describe('Block reference to unmark (e.g., "b1", "b3")')
-  };
-}
-function createMarkBlockTool(ctx) {
-  return tool4({
-    description: MARK_DESCRIPTION,
-    args: buildSchema4(),
-    async execute(args, toolCtx) {
-      await prepareMarkSession(ctx, toolCtx);
-      const targetBlockId = parseBlockRef(String(args.blockId));
-      if (targetBlockId === null) {
-        return `Error: Invalid block ID "${args.blockId}". Use format "b0", "b1", etc.`;
-      }
-      const messagesState = ctx.state.prune.messages;
-      const block = messagesState.blocksById.get(targetBlockId);
-      if (!block) {
-        return `Error: Block ${formatBlockRef(targetBlockId)} does not exist.`;
-      }
-      if (!block.active) {
-        return `Error: Block ${formatBlockRef(targetBlockId)} is not active.`;
-      }
-      messagesState.markedForCleanup.add(targetBlockId);
-      await saveSessionState(ctx.state, ctx.logger);
-      const ref = formatBlockRef(targetBlockId);
-      const markedCount = messagesState.markedForCleanup.size;
-      ctx.logger.info("mark_block: block marked for cleanup", {
-        blockId: targetBlockId,
-        markedCount
-      });
-      return `Block ${ref} marked for cleanup. It will be merge-compressed together with other marked blocks when context pressure rises. No immediate effect on context or cache. (${markedCount} block(s) currently marked.)`;
-    }
-  });
-}
-function createUnmarkBlockTool(ctx) {
-  return tool4({
-    description: UNMARK_DESCRIPTION,
-    args: buildUnmarkSchema(),
-    async execute(args, toolCtx) {
-      await prepareMarkSession(ctx, toolCtx);
-      const targetBlockId = parseBlockRef(String(args.blockId));
-      if (targetBlockId === null) {
-        return `Error: Invalid block ID "${args.blockId}". Use format "b0", "b1", etc.`;
-      }
-      const messagesState = ctx.state.prune.messages;
-      if (!messagesState.markedForCleanup.has(targetBlockId)) {
-        return `Block ${formatBlockRef(targetBlockId)} was not marked for cleanup.`;
-      }
-      messagesState.markedForCleanup.delete(targetBlockId);
-      await saveSessionState(ctx.state, ctx.logger);
-      ctx.logger.info("unmark_block: block unmarked", {
-        blockId: targetBlockId
-      });
-      return `Block ${formatBlockRef(targetBlockId)} unmarked. It will no longer be auto-merged during batch cleanup.`;
-    }
-  });
-}
-
 // lib/logger.ts
 import { writeFile as writeFile2, mkdir as mkdir2 } from "fs/promises";
 import { join as join3 } from "path";
@@ -6676,7 +6785,7 @@ var SYSTEM = `
 
 You operate in a context-constrained environment. Context management helps preserve retrieval quality, but your primary goal is completing the task at hand. Do not let context management distract from the actual work.
 
-The tools you have for context management are \`compress\`, \`decompress\`, \`mark_block\`, and \`unmark_block\`. \`compress\` replaces older conversation content with technical summaries you produce. \`decompress\` restores previously compressed content when you need exact details. \`mark_block\` flags a compressed block for deferred batch merge-cleanup \u2014 it has zero immediate effect on context or cache, but marked blocks are merge-compressed together in a single cache break when context pressure rises. Use it for blocks you no longer need in detail but want to keep cached for now. \`unmark_block\` removes that flag.
+The tools you have for context management are \`compress\` and \`decompress\`. \`compress\` replaces older conversation content with technical summaries you produce. \`decompress\` restores previously compressed content when you need exact details.
 
 \`<dcp-message-id>\` and \`<dcp-system-reminder>\` tags are environment-injected metadata. Do not output them.
 
@@ -6690,9 +6799,9 @@ Target the largest UNCOMPRESSED content first. Savings scale with original size
 
 CONTEXT PRESSURE LEVELS
 
-- Normal: Be frugal \u2014 compress tool outputs you've finished using into summaries. You can decompress later. Extract and keep what matters from any message; compress verbose parts \u2014 including large logs in user messages or generated code.
-- Elevated: Context is growing. Compress completed sections and high-token waste more urgently.
-- Critical: Compress aggressively now. Every compression should free meaningful tokens. Preserve only what is essential for the current task.
+- Normal: Be frugal \u2014 compress large completed outputs into summaries. You can decompress later if needed.
+- Elevated: Context is growing \u2014 compress completed sections and high-token waste now.
+- Critical: Compress aggressively now \u2014 preserve only what is essential for the current task.
 
 WHAT TO COMPRESS FIRST (high value, low risk)
 
@@ -6756,33 +6865,18 @@ Directly quote user messages when they are short enough to include safely. Direc
 Yet be LEAN. Strip away the noise: failed attempts that led nowhere, verbose tool outputs, back-and-forth exploration. What remains should be pure signal - golden nuggets of detail that preserve full understanding with zero ambiguity.
 
 COMPRESSED BLOCK PLACEHOLDERS
-When the selected range includes previously compressed blocks, use this exact placeholder format when referencing one:
-
-- \`(bN)\`
+The system auto-detects any previously compressed blocks whose anchor messages fall inside your selected range. You do NOT need to manually list \`(bN)\` placeholders in your summary \u2014 every consumed block is tracked automatically.
 
 Compressed block sections in context are clearly marked with a header:
 
 - \`[Compressed conversation section]\`
 
-Compressed block IDs always use the \`bN\` form (never \`mNNNNN\`) and are represented in the same XML metadata tag format.
-
 Rules:
 
-- Include every required block placeholder exactly once.
+- Write a short prose summary. The system handles block consumption automatically.
 - Do not invent placeholders for blocks outside the selected range.
-- Treat \`(bN)\` placeholders as RESERVED TOKENS. Do not emit \`(bN)\` text anywhere except intentional placeholders.
-- If you need to mention a block in prose, use plain text like \`compressed bN\` (not as a placeholder).
-- Preflight check before finalizing: the set of \`(bN)\` placeholders in your summary must exactly match the required set, with no duplicates.
-
-These placeholders are semantic references. They will be replaced with the full stored compressed block content when the tool processes your output.
-
-FLOW PRESERVATION WITH PLACEHOLDERS
-When you use compressed block placeholders, write the surrounding summary text so it still reads correctly AFTER placeholder expansion.
-
-- Treat each placeholder as a stand-in for a full conversation segment, not as a short label.
-- Ensure transitions before and after each placeholder preserve chronology and causality.
-- Do not write text that depends on the placeholder staying literal (for example, "as noted in \`(b2)\`").
-- Your final meaning must be coherent once each placeholder is replaced with its full compressed block content.
+- Treat \`(bN)\` as a RESERVED TOKEN. Do not emit \`(bN)\` text anywhere in the summary.
+- If you need to mention a block in prose, use plain text like \`compressed bN\` (never as a placeholder).
 
 BOUNDARY IDS
 You specify boundaries by ID using the injected IDs visible in the conversation:
@@ -7707,7 +7801,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(tool5, state, config, userFocus) {
+function getTriggerPrompt(tool4, state, config, userFocus) {
   const base = COMPRESS_TRIGGER_PROMPT;
   const compressedBlockGuidance = config.compress.mode === "message" ? "" : buildCompressedBlockGuidance(state, config.gc);
   const sections = [base, compressedBlockGuidance];
@@ -7736,8 +7830,8 @@ async function handleManualToggleCommand(ctx, modeArg) {
   );
   logger.info("Manual mode toggled", { manualMode: state.manualMode });
 }
-async function handleManualTriggerCommand(ctx, tool5, userFocus) {
-  return getTriggerPrompt(tool5, ctx.state, ctx.config, userFocus);
+async function handleManualTriggerCommand(ctx, tool4, userFocus) {
+  return getTriggerPrompt(tool4, ctx.state, ctx.config, userFocus);
 }
 function applyPendingManualTrigger(state, messages, logger) {
   const pending = state.pendingManualTrigger;
@@ -8267,23 +8361,6 @@ function parseGcThreshold(limit, modelContextLimit) {
 }
 
 // lib/gc/merge.ts
-var DEFAULT_BATCH_CLEANUP = {
-  lowThreshold: "55%",
-  highThreshold: "75%",
-  forceThreshold: "90%"
-};
-var ESCALATE_MIN_MARKED = 3;
-var ESCALATE_MIN_RATIO = 0.4;
-function resolveBatchCleanup(gc) {
-  return gc.batchCleanup ?? DEFAULT_BATCH_CLEANUP;
-}
-function percentToTokens(value, modelContextLimit) {
-  if (typeof value === "number") return value;
-  const percent = parseFloat(value.slice(0, -1));
-  if (isNaN(percent)) return modelContextLimit;
-  const clamped = Math.max(0, Math.min(100, Math.round(percent)));
-  return Math.round(clamped / 100 * modelContextLimit);
-}
 function collectActiveOldGenBlocks(state, maxOldGenSummaryLength) {
   const blocks = [];
   const ids = Array.from(state.prune.messages.activeBlockIds).sort((a, b) => a - b);
@@ -8296,27 +8373,13 @@ function collectActiveOldGenBlocks(state, maxOldGenSummaryLength) {
   }
   return blocks;
 }
-function collectActiveMarkedBlocks(state) {
-  const messagesState = state.prune.messages;
-  const ids = Array.from(messagesState.markedForCleanup).sort((a, b) => a - b);
-  const blocks = [];
-  for (const id of ids) {
-    const block = messagesState.blocksById.get(id);
-    if (!block || !block.active) {
-      messagesState.markedForCleanup.delete(id);
-      continue;
-    }
-    blocks.push(block);
-  }
-  return blocks;
-}
 function extractSummaryBody(summary) {
   let body = summary;
   const headerPrefix = COMPRESSED_BLOCK_HEADER + "\n";
   if (body.startsWith(headerPrefix)) {
     body = body.slice(headerPrefix.length);
   }
-  body = body.replace(/\n<dcp-message-id[^>]*>b\d+<\/dcp-message-id>$/, "");
+  body = body.replace(/\n]*>b\d+<\/dcp-message-id>$/, "");
   return body.trim();
 }
 function truncateMergedSummary(merged, maxLength) {
@@ -8430,55 +8493,6 @@ function mergeMarkedBlocks(state, markedIds, maxMergedLength) {
   const savedTokens = Math.max(0, sourceTokens - newSummaryTokens);
   return { mergedCount: sourceBlocks.length, savedTokens };
 }
-function estimateTokens(blocks) {
-  return blocks.reduce(
-    (sum, block) => sum + (block.summaryTokens || Math.round(block.summary.length / 4)),
-    0
-  );
-}
-function buildNudgeText(state, maxMergedLength) {
-  const marked = collectActiveMarkedBlocks(state);
-  const oldGen = collectActiveOldGenBlocks(state, maxMergedLength);
-  if (oldGen.length === 0) return void 0;
-  const oldGenIds = new Set(oldGen.map((b) => b.blockId));
-  const markedOldGen = marked.filter((b) => oldGenIds.has(b.blockId));
-  const markedOldGenCount = markedOldGen.length;
-  const oldGenCount = oldGen.length;
-  const ratio = markedOldGenCount / oldGenCount;
-  const ratioPct = Math.round(ratio * 100);
-  const escalateMinPct = Math.round(ESCALATE_MIN_RATIO * 100);
-  if (markedOldGenCount >= ESCALATE_MIN_MARKED && ratio >= ESCALATE_MIN_RATIO) {
-    const refs = marked.map((b) => formatBlockRef(b.blockId)).join(", ");
-    const firstRef = formatBlockRef(marked[0].blockId);
-    const lastRef = formatBlockRef(marked[marked.length - 1].blockId);
-    const estimatedSavings = Math.max(0, estimateTokens(marked) - Math.round(maxMergedLength / 4));
-    return [
-      `\u{1F525} ${markedOldGenCount}/${oldGenCount} old-gen blocks marked (${ratioPct}%) \u2014 ready for batch cleanup.`,
-      `Compressing ${refs} (range ${firstRef}\u2013${lastRef}) would free ~${estimatedSavings} tokens in one cache break.`,
-      `Call compress with this range now to consolidate them.`
-    ].join(" ");
-  }
-  if (marked.length >= 1) {
-    const refs = marked.map((b) => formatBlockRef(b.blockId)).join(", ");
-    const estimatedSavings = Math.max(0, estimateTokens(marked) - Math.round(maxMergedLength / 4));
-    return [
-      `\u26A0\uFE0F ${marked.length} block(s) marked for batch cleanup (${refs}).`,
-      `Merge-compressing them would free ~${estimatedSavings} tokens.`,
-      marked.length >= 2 ? "They will auto-merge when context pressure reaches the high threshold." : "A single marked block won't auto-merge on its own \u2014 use compress to consolidate it, or unmark_block if no longer needed.",
-      `Mark more old-gen blocks (need \u2265${ESCALATE_MIN_MARKED} at \u2265${escalateMinPct}%) to trigger batch cleanup sooner.`,
-      "To act now, use compress with a range covering these blocks."
-    ].join(" ");
-  }
-  const shown = oldGen.slice(0, 5);
-  const oldGenRefs = shown.map((b) => formatBlockRef(b.blockId)).join(", ");
-  const more = oldGenCount > 5 ? ` (+${oldGenCount - 5} more)` : "";
-  return [
-    `\u{1F4CB} Context pressure rising \u2014 ${oldGenCount} old-gen compressed block(s) occupy ~${estimateTokens(oldGen)} tokens (${oldGenRefs}${more}).`,
-    `Review which blocks contain information you no longer need, and use mark_block to flag them.`,
-    `Once enough are marked (\u2265${ESCALATE_MIN_MARKED} at \u2265${escalateMinPct}% of old-gen), they'll be batch-merged in one cache break to preserve cache hit rate.`,
-    `Do NOT mark blocks you may still need.`
-  ].join(" ");
-}
 function runBatchCleanup(state, config, logger, messages) {
   const noop = {
     tier: 0,
@@ -8490,74 +8504,31 @@ function runBatchCleanup(state, config, logger, messages) {
     return noop;
   }
   const currentTokens = getCurrentTokenUsage(state, messages);
-  const limit = state.modelContextLimit;
-  const batchCleanup = resolveBatchCleanup(config.gc);
-  const maxMergedLength = config.gc.maxOldGenSummaryLength;
-  const forceTokens = percentToTokens(batchCleanup.forceThreshold, limit);
-  const highTokens = percentToTokens(batchCleanup.highThreshold, limit);
-  const lowTokens = percentToTokens(batchCleanup.lowThreshold, limit);
-  if (currentTokens >= forceTokens) {
-    const oldGenBlocks = collectActiveOldGenBlocks(state, maxMergedLength);
-    if (oldGenBlocks.length < 2) {
-      return noop;
-    }
-    const ids = oldGenBlocks.map((b) => b.blockId);
-    const result = mergeMarkedBlocks(state, ids, maxMergedLength);
-    if (result.mergedCount === 0) {
-      return noop;
-    }
-    logger.info("Batch cleanup tier 3 (force): merged old-gen blocks", {
-      mergedCount: result.mergedCount,
-      savedTokens: result.savedTokens,
-      currentTokens,
-      forceThreshold: batchCleanup.forceThreshold
-    });
-    return {
-      tier: 3,
-      action: "merge",
-      mergedCount: result.mergedCount,
-      savedTokens: result.savedTokens
-    };
+  if (currentTokens < state.modelContextLimit) {
+    return noop;
   }
-  if (currentTokens >= highTokens) {
-    const marked = collectActiveMarkedBlocks(state);
-    if (marked.length >= 2) {
-      const ids = marked.map((b) => b.blockId);
-      const result = mergeMarkedBlocks(state, ids, maxMergedLength);
-      if (result.mergedCount > 0) {
-        logger.info("Batch cleanup tier 2 (high): merged marked blocks", {
-          mergedCount: result.mergedCount,
-          savedTokens: result.savedTokens,
-          currentTokens,
-          highThreshold: batchCleanup.highThreshold
-        });
-        return {
-          tier: 2,
-          action: "merge",
-          mergedCount: result.mergedCount,
-          savedTokens: result.savedTokens
-        };
-      }
-    }
+  const maxMergedLength = config.gc.maxOldGenSummaryLength;
+  const oldGenBlocks = collectActiveOldGenBlocks(state, maxMergedLength);
+  if (oldGenBlocks.length < 2) {
+    return noop;
   }
-  if (currentTokens >= lowTokens) {
-    const nudgeText = buildNudgeText(state, maxMergedLength);
-    if (!nudgeText) {
-      return noop;
-    }
-    logger.info("Batch cleanup tier 1 (low): nudge injected", {
-      currentTokens,
-      lowThreshold: batchCleanup.lowThreshold
-    });
-    return {
-      tier: 1,
-      action: "nudge",
-      mergedCount: 0,
-      savedTokens: 0,
-      nudgeText
-    };
+  const ids = oldGenBlocks.map((b) => b.blockId);
+  const result = mergeMarkedBlocks(state, ids, maxMergedLength);
+  if (result.mergedCount === 0) {
+    return noop;
   }
-  return noop;
+  logger.info("Batch cleanup force fallback (100%): merged old-gen blocks", {
+    mergedCount: result.mergedCount,
+    savedTokens: result.savedTokens,
+    currentTokens,
+    contextLimit: state.modelContextLimit
+  });
+  return {
+    tier: 3,
+    action: "merge",
+    mergedCount: result.mergedCount,
+    savedTokens: result.savedTokens
+  };
 }
 
 // lib/hooks.ts
@@ -8668,11 +8639,6 @@ function runMajorGC(state, config, logger, messages) {
     void saveSessionState(state, logger);
   }
 }
-function appendBatchCleanupNudge(messages, nudgeText) {
-  const lastUser = getLastUserMessage(messages);
-  if (!lastUser) return;
-  appendToLastTextPart(lastUser, nudgeText);
-}
 function createChatMessageTransformHandler(client, state, logger, config, prompts, hostPermissions) {
   return async (input, output) => {
     const receivedMessages = Array.isArray(output.messages) ? output.messages.length : 0;
@@ -8704,9 +8670,6 @@ function createChatMessageTransformHandler(client, state, logger, config, prompt
     buildToolIdList(state, output.messages);
     runMajorGC(state, config, logger, output.messages);
     const batchResult = runBatchCleanup(state, config, logger, output.messages);
-    if (batchResult.tier === 1 && batchResult.nudgeText) {
-      appendBatchCleanupNudge(output.messages, batchResult.nudgeText);
-    }
     if (batchResult.mergedCount > 0) {
       void saveSessionState(state, logger);
     }
@@ -9128,9 +9091,7 @@ var server = (async (ctx) => {
     tool: {
       ...config.compress.permission !== "deny" && {
         compress: config.compress.mode === "message" ? createCompressMessageTool(compressToolContext) : createCompressRangeTool(compressToolContext),
-        decompress: createDecompressTool(compressToolContext),
-        mark_block: createMarkBlockTool(compressToolContext),
-        unmark_block: createUnmarkBlockTool(compressToolContext)
+        decompress: createDecompressTool(compressToolContext)
       }
     },
     config: async (opencodeConfig) => {
@@ -9146,7 +9107,7 @@ var server = (async (ctx) => {
       }
       const toolsToAdd = [];
       if (config.compress.permission !== "deny" && !config.experimental.allowSubAgents) {
-        toolsToAdd.push("compress", "decompress", "mark_block", "unmark_block");
+        toolsToAdd.push("compress", "decompress");
       }
       if (toolsToAdd.length > 0) {
         const existingPrimaryTools = opencodeConfig.experimental?.primary_tools ?? [];