opencode-acp 1.14.2 → 1.14.3

package/README.md

@@ -528,6 +528,14 @@ For the complete list with root cause analysis, see the [bug tracker](https://gi
 
 ## Changelog
 
+### v1.14.3 — Soften Protected Zone + Reduce Defaults (PR #212)
+
+**Problem**: `checkProtectedRange` hard-rejected any compress call covering protected recent messages (last N messages + last N tokens). The model got an error and had to retry with a different range or use `dangerous: true`. Additionally, the default `preserveRecentMessages: 20` and `preserveRecentTokens: 20000` (≈40 messages) were too aggressive — protecting nearly half the conversation in autonomous sessions.
+
+**Fix**: (1) Converted `checkProtectedRange` hard-reject to `filterProtectedRecentMessages` soft-filter — protected messages are filtered from the compress plan (same pattern as `filterLastUserMessage` and `filterProtectedToolMessages`), non-protected messages compress normally. Compress always succeeds unless ALL messages are protected. (2) Reduced `preserveRecentMessages` default 20 → 5 and `preserveRecentTokens` default 20000 → 5000. (3) `dangerous` parameter is now a no-op (no hard-reject to bypass; stays in schema for backward compat). 922 tests pass.
+
+Files: `lib/config.ts`, `lib/compress/{protected-content,pipeline,range,message}.ts`, `lib/messages/inject/utils.ts`. Tests: `tests/soft-block.test.ts`. No persisted-state schema changes. Config defaults changed; existing configs with explicit values are unaffected.
+
 ### v1.14.2 — Split Protected Ranges + Soften Last-User-Message (PR #210)
 
 **Problem**: In autonomous agentic sessions (1 user message + many assistant/tool messages), `buildCompressibleRanges` created one giant compressible group because grouping only breaks on user messages — and tool results are `assistant` role in OpenCode. The giant group's endRef fell in the protected zone → `excludeProtectedRanges` removed the entire range → zero recommendations → nudge suppressed → model could never compress. Additionally, `preserveLastUserMessage` hard-rejected any compress call covering the last user message, blocking deliberate compressions of surrounding tool output.

package/README.zh-CN.md

@@ -482,6 +482,14 @@ ACP 在首次启动时自动将配置从 `dcp.jsonc` 迁移到 `acp.jsonc`，将
 
 ## 更新日志
 
+### v1.14.3 — 软化保护区 + 减小默认值（PR #212）
+
+**问题**：`checkProtectedRange` 硬拒绝任何覆盖保护区最近消息的压缩调用（最后 N 条消息 + 最后 N tokens）。模型收到错误后必须换范围重试或使用 `dangerous: true`。此外，默认 `preserveRecentMessages: 20` 和 `preserveRecentTokens: 20000`（约 40 条消息）过于激进 —— 在自主会话中保护了近一半的对话。
+
+**修复**：(1) 将 `checkProtectedRange` 硬拒绝转为 `filterProtectedRecentMessages` 软过滤 —— 保护区消息从压缩计划中过滤掉（与 `filterLastUserMessage` 和 `filterProtectedToolMessages` 同模式），非保护区消息正常压缩。除非所有消息都在保护区内，压缩总能成功。(2) 减小 `preserveRecentMessages` 默认值 20 → 5，`preserveRecentTokens` 默认值 20000 → 5000。(3) `dangerous` 参数现在无实际效果（没有硬拒绝了，不需要 bypass；保留在 schema 中向后兼容）。922 项测试通过。
+
+文件：`lib/config.ts`、`lib/compress/{protected-content,pipeline,range,message}.ts`、`lib/messages/inject/utils.ts`。测试：`tests/soft-block.test.ts`。无持久化状态 schema 变更。配置默认值改变；已设置显式值的配置不受影响。
+
 ### v1.14.2 — 拆分保护区范围 + 软化最后用户消息保护（PR #210）
 
 **问题**：在自主代理会话中（1 条用户消息 + 多条 assistant/tool 消息），`buildCompressibleRanges` 创建了一个巨型可压缩组，因为分组只在用户消息处断开 —— 而 OpenCode 中 tool 结果是 `assistant` 角色。巨型组的 endRef 落在保护区内 → `excludeProtectedRanges` 移除整个范围 → 零推荐 → nudge 被抑制 → 模型永远无法压缩。此外，`preserveLastUserMessage` 硬拒绝任何覆盖最后用户消息的压缩调用，阻塞了对周围 tool 输出的有意压缩。

package/dist/index.js

@@ -1648,8 +1648,8 @@ var defaultConfig = {
     maxVisibleSegments: 50,
     keepEmbedMaxChars: 2e3,
     lastSegmentSoftBlock: true,
-    preserveRecentMessages: 20,
-    preserveRecentTokens: 2e4,
+    preserveRecentMessages: 5,
+    preserveRecentTokens: 5e3,
     preserveLastUserMessage: true
   },
   strategies: {
@@ -3095,6 +3095,58 @@ function filterLastUserMessage(selection, searchContext, state, compress) {
     messageTokenById: filteredMessageTokenById
   };
 }
+function filterProtectedRecentMessages(selection, searchContext, state, compress) {
+  if (compress.lastSegmentSoftBlock === false) return selection;
+  const preserveN = compress.preserveRecentMessages ?? 5;
+  const preserveTokens = compress.preserveRecentTokens ?? 5e3;
+  if (preserveN <= 0 && preserveTokens <= 0) return selection;
+  const protectedIds = /* @__PURE__ */ new Set();
+  const visible = [];
+  for (const msg of searchContext.rawMessages) {
+    const id = msg?.info?.id;
+    if (!id || typeof id !== "string") continue;
+    if (isSyntheticMessage(msg)) continue;
+    if (isIgnoredUserMessage(msg)) continue;
+    if (state.prune.messages.byMessageId.has(id)) continue;
+    let tokens = 0;
+    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);
+      }
+    }
+    visible.push({ id, tokens });
+  }
+  if (preserveN > 0) {
+    for (const m of visible.slice(-preserveN)) {
+      protectedIds.add(m.id);
+    }
+  }
+  if (preserveTokens > 0) {
+    let tokenAccum = 0;
+    for (let i = visible.length - 1; i >= 0 && tokenAccum < preserveTokens; i--) {
+      protectedIds.add(visible[i].id);
+      tokenAccum += visible[i].tokens;
+    }
+  }
+  if (protectedIds.size === 0) return selection;
+  const hasProtected = selection.messageIds.some((id) => protectedIds.has(id));
+  if (!hasProtected) return selection;
+  const filteredMessageIds = selection.messageIds.filter((id) => !protectedIds.has(id));
+  const filteredMessageTokenById = /* @__PURE__ */ new Map();
+  for (const id of filteredMessageIds) {
+    const tokens = selection.messageTokenById.get(id);
+    if (tokens !== void 0) {
+      filteredMessageTokenById.set(id, tokens);
+    }
+  }
+  return {
+    ...selection,
+    messageIds: filteredMessageIds,
+    messageTokenById: filteredMessageTokenById
+  };
+}
 
 // lib/compress/state.ts
 var DEFAULT_PROMOTION_THRESHOLD = 5;
@@ -6429,66 +6481,6 @@ function checkPhantomBlock(state, plans) {
   }
   return null;
 }
-function computeProtectedRawIds(rawMessages, state, compress) {
-  const preserveN = compress.preserveRecentMessages ?? 20;
-  const preserveTokens = compress.preserveRecentTokens ?? 2e4;
-  const result = /* @__PURE__ */ new Set();
-  const visible = [];
-  for (const msg of rawMessages) {
-    const id = msg?.info?.id;
-    if (!id || typeof id !== "string") continue;
-    if (isSyntheticMessage(msg)) continue;
-    if (isIgnoredUserMessage(msg)) continue;
-    if (state.prune.messages.byMessageId.has(id)) continue;
-    let tokens = 0;
-    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);
-      }
-    }
-    visible.push({ id, tokens, isUser: msg.info.role === "user" });
-  }
-  if (preserveN > 0) {
-    for (const m of visible.slice(-preserveN)) {
-      result.add(m.id);
-    }
-  }
-  if (preserveTokens > 0) {
-    let tokenAccum = 0;
-    for (let i = visible.length - 1; i >= 0 && tokenAccum < preserveTokens; i--) {
-      result.add(visible[i].id);
-      tokenAccum += visible[i].tokens;
-    }
-  }
-  return result;
-}
-function checkProtectedRange(ctx, allPlanMessageIds, rawMessages, dangerous) {
-  if (ctx.config.compress.lastSegmentSoftBlock === false) return null;
-  const protectedIds = computeProtectedRawIds(rawMessages, ctx.state, ctx.config.compress);
-  if (protectedIds.size === 0) return null;
-  const coveredProtected = [];
-  for (const ids of allPlanMessageIds) {
-    for (const id of ids) {
-      if (protectedIds.has(id)) {
-        coveredProtected.push(id);
-      }
-    }
-  }
-  if (coveredProtected.length === 0) return null;
-  if (dangerous) return null;
-  const sample = coveredProtected.slice(0, 3).join(", ");
-  const nMsgs = ctx.config.compress.preserveRecentMessages ?? 20;
-  const nToks = ctx.config.compress.preserveRecentTokens ?? 2e4;
-  return new Error(
-    `This range includes ${coveredProtected.length} protected recent message(s) (${sample}), which are likely still needed for the current task step.
-
-Protected zone: last ${nMsgs} messages + last ${nToks >= 1e3 ? `${nToks / 1e3}K` : nToks} tokens.
-If you are certain this content is genuinely consumed and must be compressed, re-issue the call with \`dangerous: true\`.
-Otherwise, compress older ranges that do not include the tail of the conversation.`
-  );
-}
 
 // lib/compress/keep-markers.ts
 var KEEP_REGEX = /\[\[KEEP:(m\d+)\]\]/g;
@@ -6667,6 +6659,14 @@ function createCompressMessageTool(factoryCtx) {
           ctx.state,
           ctx.config.compress
         )
+      })).map((plan) => ({
+        ...plan,
+        selection: filterProtectedRecentMessages(
+          plan.selection,
+          searchContext,
+          ctx.state,
+          ctx.config.compress
+        )
       })).filter((plan) => plan.selection.messageIds.length > 0);
       if (filteredPlans.length === 0) {
         throw new Error(
@@ -6693,14 +6693,6 @@ function createCompressMessageTool(factoryCtx) {
           );
         }
       }
-      const dangerous = args.dangerous === true;
-      const lastSegmentError = checkProtectedRange(
-        ctx,
-        filteredPlans.map((p) => p.selection.messageIds),
-        rawMessages,
-        dangerous
-      );
-      if (lastSegmentError) throw lastSegmentError;
       const notifications = [];
       const preparedPlans = [];
       for (const plan of filteredPlans) {
@@ -6895,6 +6887,14 @@ function createCompressRangeTool(factoryCtx) {
           ctx.state,
           ctx.config.compress
         )
+      })).map((plan) => ({
+        ...plan,
+        selection: filterProtectedRecentMessages(
+          plan.selection,
+          searchContext,
+          ctx.state,
+          ctx.config.compress
+        )
       })).filter((plan) => plan.selection.messageIds.length > 0);
       if (filteredPlans.length === 0) {
         throw new Error(
@@ -6921,14 +6921,6 @@ function createCompressRangeTool(factoryCtx) {
           );
         }
       }
-      const dangerous = args.dangerous === true;
-      const lastSegmentError = checkProtectedRange(
-        ctx,
-        filteredPlans.map((p) => p.selection.messageIds),
-        rawMessages,
-        dangerous
-      );
-      if (lastSegmentError) throw lastSegmentError;
       const notifications = [];
       const preparedPlans = [];
       let totalCompressedMessages = 0;
@@ -8429,8 +8421,8 @@ ${lines.join("\n")}`;
 }
 function computeProtectedRefs(messages, state, compress) {
   if (compress.lastSegmentSoftBlock === false) return /* @__PURE__ */ new Set();
-  const preserveN = compress.preserveRecentMessages ?? 20;
-  const preserveTokens = compress.preserveRecentTokens ?? 2e4;
+  const preserveN = compress.preserveRecentMessages ?? 5;
+  const preserveTokens = compress.preserveRecentTokens ?? 5e3;
   const result = /* @__PURE__ */ new Set();
   const visible = [];
   for (const msg of messages) {
@@ -10070,7 +10062,7 @@ import { writeFile as writeFile2, mkdir as mkdir2 } from "fs/promises";
 import { join as join3 } from "path";
 import { existsSync as existsSync3 } from "fs";
 import { homedir as homedir3 } from "os";
-var LOG_VERSION = true ? "1.14.2" : "dev";
+var LOG_VERSION = true ? "1.14.3" : "dev";
 var Logger = class {
   logDir;
   enabled;