opencode-acp 1.14.1 → 1.14.2

package/README.md

@@ -528,6 +528,14 @@ For the complete list with root cause analysis, see the [bug tracker](https://gi
 
 ## Changelog
 
+### 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.
+
+**Fix**: (1) `buildCompressibleRanges` now accepts `protectedZoneRefs` and splits groups at the protected-zone boundary — the unprotected head survives as a recommended range while the protected tail is excluded. (2) `preserveLastUserMessage` moved from hard-reject (`checkProtectedRange` throw) to soft-filter (`filterLastUserMessage` excludes from compress plan, following Bug 39's `filterProtectedToolMessages` pattern). The last user message survives in visible context; surrounding tool output compresses normally. (3) Added `allInProtectedZone` condition to `nothingToCompress` to cover the case where all messages are in the protected zone. (4) Fixed stale error messages and added empty-plan guard in both range and message modes. Dual-agent reviewed (both APPROVE with minor fixes; all WARNINGs addressed in follow-up commit). 922 tests pass.
+
+Files: `lib/messages/inject/{utils,inject}.ts`, `lib/compress/{pipeline,protected-content,range,message,status}.ts`. Tests: `tests/{preserve-recent,soft-block,protected-tool-exclusion}.test.ts`. No persisted-state schema changes. `preserveLastUserMessage` config semantics changed from hard-reject to soft-filter (intentional fix; `lastSegmentSoftBlock: false` disables all protection including the new soft filter).
+
 ### v1.14.1 — Log Version Info + Growth Baseline Fix (PRs #205, #207)
 
 **Problem**: Two issues since v1.14.0. (1) **Unidentifiable logs** (PR #205): ACP daily logs and per-request context logs carried no version marker, so when users shared debug logs it was impossible to tell which ACP version produced them — making regression triage across versions guesswork. (2) **Growth-baseline feedback loop in short sessions** (PR #207): When the growth threshold was met (`nudgeAllowed`) but every compressible range was filtered out (`nothingToCompress`, e.g. all ranges inside the protected zone in a short session or subagent), the code reset `state.nudges.lastPerMessageNudgeTokens = currentTokens`. This ate the accumulated growth every cycle, so the baseline chased the current context and the model never saw a nudge even though context had grown well past the threshold.

package/README.zh-CN.md

@@ -482,6 +482,14 @@ ACP 在首次启动时自动将配置从 `dcp.jsonc` 迁移到 `acp.jsonc`，将
 
 ## 更新日志
 
+### v1.14.2 — 拆分保护区范围 + 软化最后用户消息保护（PR #210）
+
+**问题**：在自主代理会话中（1 条用户消息 + 多条 assistant/tool 消息），`buildCompressibleRanges` 创建了一个巨型可压缩组，因为分组只在用户消息处断开 —— 而 OpenCode 中 tool 结果是 `assistant` 角色。巨型组的 endRef 落在保护区内 → `excludeProtectedRanges` 移除整个范围 → 零推荐 → nudge 被抑制 → 模型永远无法压缩。此外，`preserveLastUserMessage` 硬拒绝任何覆盖最后用户消息的压缩调用，阻塞了对周围 tool 输出的有意压缩。
+
+**修复**：(1) `buildCompressibleRanges` 现在接受 `protectedZoneRefs` 参数，在保护区边界处拆分组 —— 非保护区头部保留为推荐范围，保护区尾部被排除。(2) `preserveLastUserMessage` 从硬拒绝（`checkProtectedRange` 抛错）改为软过滤（`filterLastUserMessage` 从压缩计划中排除，遵循 Bug 39 的 `filterProtectedToolMessages` 模式）。最后用户消息保留在可见上下文中；周围的 tool 输出正常压缩。(3) 在 `nothingToCompress` 中添加了 `allInProtectedZone` 条件，覆盖所有消息都在保护区内的情况。(4) 修复了过时的错误消息，在 range 和 message 模式中都添加了空计划守卫。双 agent 审查通过（均 APPROVE WITH MINOR FIXES；所有 WARNING 在后续 commit 中解决）。922 项测试通过。
+
+文件：`lib/messages/inject/{utils,inject}.ts`、`lib/compress/{pipeline,protected-content,range,message,status}.ts`。测试：`tests/{preserve-recent,soft-block,protected-tool-exclusion}.test.ts`。无持久化状态 schema 变更。`preserveLastUserMessage` 配置语义从硬拒绝变为软过滤（有意的修复；`lastSegmentSoftBlock: false` 禁用所有保护包括新的软过滤）。
+
 ### v1.14.1 — 日志版本信息 + 增长基线修复（PR #205, #207）
 
 **问题**：v1.14.0 之后的两个问题。(1) **日志无法识别版本**（PR #205）：ACP daily 日志和每请求 context 日志没有任何版本标记，用户分享调试日志时无法判断是哪个 ACP 版本产生的 —— 跨版本回归排查只能靠猜。(2) **短会话中的增长基线反馈循环**（PR #207）：当增长阈值已满足（`nudgeAllowed`）但所有可压缩范围都被过滤掉时（`nothingToCompress`，例如短会话或子代理中所有范围都在保护区内），旧代码会重置 `state.nudges.lastPerMessageNudgeTokens = currentTokens`。这会每轮吃掉累积增长，基线一路追逐当前上下文，即使上下文早已远超阈值，模型也永远等不到 nudge。

package/dist/index.js

@@ -3062,6 +3062,39 @@ function filterProtectedToolMessages(selection, searchContext, protectedTools, p
     toolIds: filteredToolIds
   };
 }
+function filterLastUserMessage(selection, searchContext, state, compress) {
+  if (compress.lastSegmentSoftBlock === false) return selection;
+  if (!(compress.preserveLastUserMessage ?? true)) return selection;
+  let lastUserMessageId = null;
+  for (let i = searchContext.rawMessages.length - 1; i >= 0; i--) {
+    const msg = searchContext.rawMessages[i];
+    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;
+    if (msg.info.role === "user") {
+      lastUserMessageId = id;
+      break;
+    }
+  }
+  if (!lastUserMessageId || !selection.messageIds.includes(lastUserMessageId)) {
+    return selection;
+  }
+  const filteredMessageIds = selection.messageIds.filter((id) => id !== lastUserMessageId);
+  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;
@@ -6399,7 +6432,6 @@ function checkPhantomBlock(state, plans) {
 function computeProtectedRawIds(rawMessages, state, compress) {
   const preserveN = compress.preserveRecentMessages ?? 20;
   const preserveTokens = compress.preserveRecentTokens ?? 2e4;
-  const preserveLastUser = compress.preserveLastUserMessage ?? true;
   const result = /* @__PURE__ */ new Set();
   const visible = [];
   for (const msg of rawMessages) {
@@ -6430,14 +6462,6 @@ function computeProtectedRawIds(rawMessages, state, compress) {
       tokenAccum += visible[i].tokens;
     }
   }
-  if (preserveLastUser) {
-    for (let i = visible.length - 1; i >= 0; i--) {
-      if (visible[i].isUser) {
-        result.add(visible[i].id);
-        break;
-      }
-    }
-  }
   return result;
 }
 function checkProtectedRange(ctx, allPlanMessageIds, rawMessages, dangerous) {
@@ -6460,7 +6484,7 @@ function checkProtectedRange(ctx, allPlanMessageIds, rawMessages, dangerous) {
   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 + most recent user message.
+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.`
   );
@@ -6635,14 +6659,25 @@ function createCompressMessageTool(factoryCtx) {
         ctx.state,
         ctx.config
       );
-      if (plans.length === 0 && skippedCount > 0) {
-        throw new Error(formatIssues(skippedIssues, skippedCount));
+      const filteredPlans = plans.map((plan) => ({
+        ...plan,
+        selection: filterLastUserMessage(
+          plan.selection,
+          searchContext,
+          ctx.state,
+          ctx.config.compress
+        )
+      })).filter((plan) => plan.selection.messageIds.length > 0);
+      if (filteredPlans.length === 0) {
+        throw new Error(
+          skippedCount > 0 ? formatIssues(skippedIssues, skippedCount) : "All selected messages were filtered out (protected tool outputs and/or the last user message). They must remain in visible context."
+        );
       }
       const minCompressRange = ctx.config.compress.minCompressRange;
       if (minCompressRange > 0) {
         let totalChars = 0;
         const counted = /* @__PURE__ */ new Set();
-        for (const plan of plans) {
+        for (const plan of filteredPlans) {
           for (const messageId of plan.selection.messageIds) {
             if (counted.has(messageId)) continue;
             counted.add(messageId);
@@ -6661,14 +6696,14 @@ function createCompressMessageTool(factoryCtx) {
       const dangerous = args.dangerous === true;
       const lastSegmentError = checkProtectedRange(
         ctx,
-        plans.map((p) => p.selection.messageIds),
+        filteredPlans.map((p) => p.selection.messageIds),
         rawMessages,
         dangerous
       );
       if (lastSegmentError) throw lastSegmentError;
       const notifications = [];
       const preparedPlans = [];
-      for (const plan of plans) {
+      for (const plan of filteredPlans) {
         const summaryWithPromptInfo = appendProtectedPromptInfo(
           plan.entry.summary,
           plan.selection,
@@ -6778,7 +6813,7 @@ function createCompressMessageTool(factoryCtx) {
         ctx.state.qualityGateRetryPending = qualityGateRetryPendingBefore;
         throw error;
       }
-      return formatResult(plans.length, skippedIssues, skippedCount);
+      return formatResult(filteredPlans.length, skippedIssues, skippedCount);
     }
   });
 }
@@ -6852,10 +6887,18 @@ function createCompressRangeTool(factoryCtx) {
           ctx.config.compress.protectedTools,
           ctx.config.protectedFilePatterns
         )
+      })).map((plan) => ({
+        ...plan,
+        selection: filterLastUserMessage(
+          plan.selection,
+          searchContext,
+          ctx.state,
+          ctx.config.compress
+        )
       })).filter((plan) => plan.selection.messageIds.length > 0);
       if (filteredPlans.length === 0) {
         throw new Error(
-          "All selected messages contain protected tool outputs and cannot be compressed. Protected tools (task, skill, todowrite, etc.) must remain in visible context."
+          "All selected messages were filtered out (protected tool outputs and/or the last user message). They must remain in visible context."
         );
       }
       const minCompressRange = ctx.config.compress.minCompressRange;
@@ -8122,7 +8165,7 @@ function refNum(ref) {
   const n = parseInt(ref.slice(1), 10);
   return Number.isNaN(n) ? -1 : n;
 }
-function buildCompressibleRanges(messages, state, protectedTools = [], protectedFilePatterns = []) {
+function buildCompressibleRanges(messages, state, protectedTools = [], protectedFilePatterns = [], protectedZoneRefs) {
   const msgInfo = [];
   const protectedMsgInfo = [];
   for (const msg of messages) {
@@ -8174,6 +8217,14 @@ function buildCompressibleRanges(messages, state, protectedTools = [], protected
   let cur = null;
   let prevRefNum = -2;
   for (const info of msgInfo) {
+    if (protectedZoneRefs?.has(info.ref)) {
+      if (cur) {
+        groups.push(cur);
+        cur = null;
+      }
+      prevRefNum = info.refNum;
+      continue;
+    }
     const hasGap = info.refNum > prevRefNum + 1;
     if (cur && (info.isUser && cur.count >= 3 || hasGap)) {
       groups.push(cur);
@@ -8380,7 +8431,6 @@ function computeProtectedRefs(messages, state, compress) {
   if (compress.lastSegmentSoftBlock === false) return /* @__PURE__ */ new Set();
   const preserveN = compress.preserveRecentMessages ?? 20;
   const preserveTokens = compress.preserveRecentTokens ?? 2e4;
-  const preserveLastUser = compress.preserveLastUserMessage ?? true;
   const result = /* @__PURE__ */ new Set();
   const visible = [];
   for (const msg of messages) {
@@ -8411,14 +8461,6 @@ function computeProtectedRefs(messages, state, compress) {
       tokenAccum += visible[i].tokens;
     }
   }
-  if (preserveLastUser) {
-    for (let i = visible.length - 1; i >= 0; i--) {
-      if (visible[i].isUser) {
-        result.add(visible[i].ref);
-        break;
-      }
-    }
-  }
   return result;
 }
 function excludeProtectedRanges(ranges, protectedRefs) {
@@ -8600,13 +8642,14 @@ var injectCompressNudges = (state, config, logger, messages, prompts, compressio
     config.compress.protectedTools,
     config.protectedFilePatterns
   );
+  const protectedRefs = computeProtectedRefs(messages, state, config.compress);
   const contextRanges = buildCompressibleRanges(
     messages,
     state,
     config.compress.protectedTools,
-    config.protectedFilePatterns
+    config.protectedFilePatterns,
+    protectedRefs
   );
-  const protectedRefs = computeProtectedRefs(messages, state, config.compress);
   const unprotectedCompressible = excludeProtectedRanges(contextRanges.compressible, protectedRefs);
   const recommendedRanges = filterRecommendedRanges(
     unprotectedCompressible,
@@ -8635,7 +8678,8 @@ var injectCompressNudges = (state, config, logger, messages, prompts, compressio
   }
   const filterSuppressed = contextRanges.compressible.length > 0 && !hasRecommendations;
   const allProtected = contextRanges.compressible.length === 0 && contextRanges.protected.length > 0;
-  const nothingToCompress = filterSuppressed || allProtected;
+  const allInProtectedZone = protectedRefs.size > 0 && unprotectedCompressible.length === 0;
+  const nothingToCompress = filterSuppressed || allProtected || allInProtectedZone;
   let shouldInject = nudgeAllowed && (!nothingToCompress || emergencyOverride);
   if (nudgeAllowed && nothingToCompress && !emergencyOverride) {
     state.nudges.lastNudgeShownTokens = void 0;
@@ -9634,11 +9678,13 @@ function renderOverview(visibleMessages, summaryTokens, blocks, fetchFailed, raw
       const entry = pruneMap.get(msgId);
       return !entry || entry.activeBlockIds.length === 0;
     });
+    const protectedRefs = ctx.config?.compress ? computeProtectedRefs(visibleRaw, ctx.state, ctx.config.compress) : /* @__PURE__ */ new Set();
     const contextRanges = buildCompressibleRanges(
       visibleRaw,
       ctx.state,
       ctx.config?.compress?.protectedTools ?? [],
-      ctx.config?.protectedFilePatterns ?? []
+      ctx.config?.protectedFilePatterns ?? [],
+      protectedRefs
     );
     if (contextRanges.compressible.length > 0 || contextRanges.protected.length > 0) {
       lines.push("");
@@ -9661,11 +9707,13 @@ function renderUncompressedRanges(rawMessages, ctx) {
     const entry = pruneMap.get(msgId);
     return !entry || entry.activeBlockIds.length === 0;
   });
+  const protectedRefs = ctx.config?.compress ? computeProtectedRefs(visibleMessages, ctx.state, ctx.config.compress) : /* @__PURE__ */ new Set();
   const contextRanges = buildCompressibleRanges(
     visibleMessages,
     ctx.state,
     ctx.config?.compress?.protectedTools ?? [],
-    ctx.config?.protectedFilePatterns ?? []
+    ctx.config?.protectedFilePatterns ?? [],
+    protectedRefs
   );
   const compressible = contextRanges.compressible;
   const totalTokens = compressible.reduce((s, r) => s + r.tokens, 0);
@@ -10022,7 +10070,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.1" : "dev";
+var LOG_VERSION = true ? "1.14.2" : "dev";
 var Logger = class {
   logDir;
   enabled;