opencode-acp 1.14.8-dev.1 → 1.14.8-dev.3

package/README.md

@@ -492,6 +492,25 @@ For the complete list with root cause analysis, see the [bug tracker](https://gi
 
 ## Changelog
 
+### v1.14.8-dev.3 — Dev Prerelease (1 PR since v1.14.8-dev.2)
+
+Dev prerelease covering PR #248. Published to `dev` npm tag for early testing.
+
+**PRs included**:
+- **#248** — Fix: auto-extend compression ranges to prevent splitting tool_use/tool_result pairs. When the model selects a compression boundary that falls between a tool call and its result, the orphaned tool_result references a non-existent tool_use_id → API rejection. New `adjustBoundariesForToolPairs` in `compress/search.ts` scans forward/backward (up to 20 messages) to include the matching pair. Excludes `compress` tool (force-protected) and only extends message boundaries (never block boundaries) to avoid tier misclassification. 11 tests.
+
+**Install**: `opencode plugin opencode-acp@dev --global`
+
+### v1.14.8-dev.2 — Dev Prerelease (2 PRs since v1.14.8-dev.1)
+
+Dev prerelease covering PRs #244–#245. Published to `dev` npm tag for early testing.
+
+**PRs included**:
+- **#245** — Fix: re-add HOW_TO_COMPRESS_RULES to nudge injection for high-attention summary guidance. v1.14.7 over-removed the rules from all 4 nudge locations (breakdown + 3 templates), leaving them only in system prompt. In long sessions, system prompt rules degrade due to "lost in the middle" effect — model needs rules at high attention (end of context) when nudge fires.
+- **#244** — Fix: acp_status hides consumed compress calls from PROTECTED list.
+
+**Install**: `opencode plugin opencode-acp@dev --global`
+
 ### v1.14.8-dev.1 — Dev Prerelease (7 PRs since v1.14.7)
 
 Dev prerelease covering PRs #238–#242. Published to `dev` npm tag for early testing.

package/README.zh-CN.md

@@ -446,6 +446,25 @@ ACP 是 DCP 的直接替代品。迁移步骤：
 
 ## 更新日志
 
+### v1.14.8-dev.3 — Dev 预发布（v1.14.8-dev.2 以来 1 个 PR）
+
+Dev 预发布，涵盖 PR #248。发布到 `dev` npm tag 供早期测试。
+
+**包含的 PR**：
+- **#248** — 修复：自动扩展压缩范围以防止拆分 tool_use/tool_result 配对。当模型选择的压缩边界落在 tool 调用与其结果之间时，孤立的 tool_result 引用不存在的 tool_use_id → API 拒绝。新增 `adjustBoundariesForToolPairs`（`compress/search.ts`）向前/向后扫描（最多 20 条消息）以包含匹配的配对。排除 `compress` 工具（强制保护）并仅扩展消息边界（从不扩展 block 边界）以避免层级错误分类。11 个测试。
+
+**安装**：`opencode plugin opencode-acp@dev --global`
+
+### v1.14.8-dev.2 — Dev 预发布（v1.14.8-dev.1 以来 2 个 PR）
+
+Dev 预发布，涵盖 PR #244–#245。发布到 `dev` npm tag 供早期测试。
+
+**包含的 PR**：
+- **#245** — 修复：重新将 HOW_TO_COMPRESS_RULES 加入 nudge 注入。v1.14.7 过度删除了所有 4 处 nudge 位置的规则（breakdown + 3 个模板），只保留在 system prompt。在长 session 中，system prompt 的规则因"lost in the middle"效应衰减——模型在 nudge 触发时需要规则在高注意力区（上下文末尾）。
+- **#244** — 修复：acp_status 隐藏 PROTECTED 列表中已消耗的 compress 调用。
+
+**安装**：`opencode plugin opencode-acp@dev --global`
+
 ### v1.14.8-dev.1 — Dev 预发布（v1.14.7 以来 7 个 PR）
 
 Dev 预发布，涵盖 PR #238–#242。发布到 `dev` npm tag 供早期测试。

package/dist/index.js

@@ -3040,8 +3040,79 @@ ${hint}` : body);
   if (startReference.rawIndex > endReference.rawIndex) {
     [startReference, endReference] = [endReference, startReference];
   }
+  const adjusted = adjustBoundariesForToolPairs(
+    context,
+    startReference.rawIndex,
+    endReference.rawIndex
+  );
+  if (adjusted.startIndex < startReference.rawIndex && startReference.kind === "message") {
+    const msg = context.rawMessages[adjusted.startIndex];
+    if (msg) {
+      startReference = {
+        kind: "message",
+        rawIndex: adjusted.startIndex,
+        messageId: msg.info.id
+      };
+    }
+  }
+  if (adjusted.endIndex > endReference.rawIndex && endReference.kind === "message") {
+    const msg = context.rawMessages[adjusted.endIndex];
+    if (msg) {
+      endReference = {
+        kind: "message",
+        rawIndex: adjusted.endIndex,
+        messageId: msg.info.id
+      };
+    }
+  }
   return { startReference, endReference };
 }
+function adjustBoundariesForToolPairs(context, startIdx, endIdx) {
+  const messages = context.rawMessages;
+  const callIdsInRange = /* @__PURE__ */ new Set();
+  for (let i = startIdx; i <= endIdx; i++) {
+    const msg = messages[i];
+    if (!msg) continue;
+    const parts = Array.isArray(msg.parts) ? msg.parts : [];
+    for (const part of parts) {
+      if (part.type !== "tool" || !part.callID) continue;
+      if (part.tool === "compress") continue;
+      callIdsInRange.add(part.callID);
+    }
+  }
+  if (callIdsInRange.size === 0) {
+    return { startIndex: startIdx, endIndex: endIdx };
+  }
+  let newEndIdx = endIdx;
+  for (let i = endIdx + 1; i < messages.length && i <= endIdx + 20; i++) {
+    const msg = messages[i];
+    if (!msg) break;
+    const parts = Array.isArray(msg.parts) ? msg.parts : [];
+    const hasMatch = parts.some(
+      (part) => part.type === "tool" && part.callID && callIdsInRange.has(part.callID)
+    );
+    if (hasMatch) {
+      newEndIdx = i;
+    } else if (newEndIdx > endIdx) {
+      break;
+    }
+  }
+  let newStartIdx = startIdx;
+  for (let i = startIdx - 1; i >= 0 && i >= startIdx - 20; i--) {
+    const msg = messages[i];
+    if (!msg) break;
+    const parts = Array.isArray(msg.parts) ? msg.parts : [];
+    const hasMatch = parts.some(
+      (part) => part.type === "tool" && part.callID && callIdsInRange.has(part.callID)
+    );
+    if (hasMatch) {
+      newStartIdx = i;
+    } else if (newStartIdx < startIdx) {
+      break;
+    }
+  }
+  return { startIndex: newStartIdx, endIndex: newEndIdx };
+}
 function buildBoundaryRecoveryHint(context, state) {
   const visibleRefs = [];
   for (const [messageRef, messageId] of state.messageIds.byRef) {
@@ -7609,6 +7680,8 @@ Breakdown: ${sysPart}${fmt(composition.toolTokens)} tool (${pct2(composition.too
       if (recommendedRanges.length > 0) {
         breakdown += `
 
+${HOW_TO_COMPRESS_RULES}
+
 ${formatCompressibleRanges(recommendedRanges, contextRanges.protected)}`;
         breakdown += `
 \u{1F4A1} Compress all ranges in one call (pass multiple content entries: \`content: [{...}, {...}]\`).`;
@@ -7618,7 +7691,7 @@ Use \`acp_status({scope:"uncompressed"})\` to re-fetch compressible ranges after
       appendToLastTextPart(suffixMessage, breakdown);
     }
     if (effectiveTipsVariant === "maxLimit") {
-      tipsText = '\n\n\u26A0\uFE0F Context limit reached \u2014 compress now. Prioritize consumed tool outputs.\n\n{ "topic": "...", "content": [{ "startId": "<ID>", "endId": "<ID>", "summary": "..." }] }\n\nOnly use IDs from visible messages above. Compress older work first.';
+      tipsText = "\n\n\u26A0\uFE0F Context limit reached \u2014 compress now. Prioritize consumed tool outputs.\n\n" + HOW_TO_COMPRESS_RULES + '\n\n{ "topic": "...", "content": [{ "startId": "<ID>", "endId": "<ID>", "summary": "..." }] }\n\nOnly use IDs from visible messages above. Compress older work first.';
     }
     state.nudges.lastNudgeShownTokens = currentTokens;
     {
@@ -8258,6 +8331,64 @@ function createDecompressTool(factoryCtx) {
 
 // lib/compress/status.ts
 import { tool as tool4 } from "@opencode-ai/plugin";
+
+// lib/compress/parts.ts
+var STRUCTURAL_PART_TYPES = /* @__PURE__ */ new Set(["step-start", "step-finish", "reasoning"]);
+function hasMeaningfulContent(parts) {
+  return parts.some((p) => !STRUCTURAL_PART_TYPES.has(p.type));
+}
+
+// lib/compress/hide-consumed.ts
+var KEEP_LAST_ORPHANED = 2;
+function hideConsumedCompressCalls(state, messages) {
+  const activeCallIds = /* @__PURE__ */ new Set();
+  const allBlockCallIds = /* @__PURE__ */ new Set();
+  for (const block of state.prune.messages.blocksById.values()) {
+    if (block.compressCallId) {
+      allBlockCallIds.add(block.compressCallId);
+      if (block.active && !block.deactivatedByUser && !block.deactivatedByUserDeep) {
+        activeCallIds.add(block.compressCallId);
+      }
+    }
+  }
+  const lastOrphanedCallIds = [];
+  for (let i = messages.length - 1; i >= 0 && lastOrphanedCallIds.length < KEEP_LAST_ORPHANED; i--) {
+    const parts = Array.isArray(messages[i]?.parts) ? messages[i].parts : [];
+    for (let j = parts.length - 1; j >= 0 && lastOrphanedCallIds.length < KEEP_LAST_ORPHANED; j--) {
+      const p = parts[j];
+      if (p.type === "tool" && p.tool === "compress" && p.callID && !allBlockCallIds.has(p.callID)) {
+        lastOrphanedCallIds.push(p.callID);
+      }
+    }
+  }
+  const keepCallIds = /* @__PURE__ */ new Set([...activeCallIds, ...lastOrphanedCallIds]);
+  let hidden = 0;
+  for (let i = 0; i < messages.length; i++) {
+    const msg = messages[i];
+    const parts = Array.isArray(msg.parts) ? msg.parts : [];
+    let changed = false;
+    const remaining = parts.filter((p) => {
+      if (p.type === "tool" && p.tool === "compress") {
+        if (p.callID && keepCallIds.has(p.callID)) return true;
+        hidden++;
+        changed = true;
+        return false;
+      }
+      return true;
+    });
+    if (changed) {
+      if (hasMeaningfulContent(remaining)) {
+        messages[i] = { ...msg, parts: remaining };
+      } else {
+        messages.splice(i, 1);
+        i--;
+      }
+    }
+  }
+  return hidden;
+}
+
+// lib/compress/status.ts
 var ACP_STATUS_TOOL_DESCRIPTION = `Show context status \u2014 overview includes compressible ranges by default.
 
 No args: Overview with totals, compressed blocks, and compressible ranges.
@@ -8648,6 +8779,7 @@ function createAcpStatusTool(factoryCtx) {
         if (scope === "uncompressed") return "(unable to fetch messages)";
         rawMessages = [];
       }
+      hideConsumedCompressCalls(ctx.state, rawMessages);
       return buildStatusReport(
         { state: ctx.state, config: ctx.config },
         rawMessages,
@@ -8714,55 +8846,6 @@ Call with blockId to get the full summary: acp_context_recap({ blockId: N })`);
   });
 }
 
-// lib/compress/parts.ts
-var STRUCTURAL_PART_TYPES = /* @__PURE__ */ new Set(["step-start", "step-finish", "reasoning"]);
-function hasMeaningfulContent(parts) {
-  return parts.some((p) => !STRUCTURAL_PART_TYPES.has(p.type));
-}
-
-// lib/compress/hide-consumed.ts
-function hideConsumedCompressCalls(state, messages) {
-  if (state.prune.messages.blocksById.size === 0) {
-    return 0;
-  }
-  const consumedMessageIds = /* @__PURE__ */ new Set();
-  for (const block of state.prune.messages.blocksById.values()) {
-    if (block.active) continue;
-    if (block.deactivatedByUser) continue;
-    if (block.deactivatedByUserDeep) continue;
-    if (block.deactivatedByBlockId === void 0) continue;
-    if (!block.compressMessageId) continue;
-    consumedMessageIds.add(block.compressMessageId);
-  }
-  if (consumedMessageIds.size === 0) {
-    return 0;
-  }
-  let hidden = 0;
-  for (let i = 0; i < messages.length; i++) {
-    const msg = messages[i];
-    if (!consumedMessageIds.has(msg.info.id)) continue;
-    const parts = Array.isArray(msg.parts) ? msg.parts : [];
-    let changed = false;
-    const remaining = parts.filter((p) => {
-      if (p.type === "tool" && p.tool === "compress") {
-        hidden++;
-        changed = true;
-        return false;
-      }
-      return true;
-    });
-    if (changed) {
-      if (hasMeaningfulContent(remaining)) {
-        messages[i] = { ...msg, parts: remaining };
-      } else {
-        messages.splice(i, 1);
-        i--;
-      }
-    }
-  }
-  return hidden;
-}
-
 // lib/compress/hide-failed.ts
 function hideFailedCompressCalls(messages) {
   let mostRecentFailedId;
@@ -8809,7 +8892,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.8-dev.1" : "dev";
+var LOG_VERSION = true ? "1.14.8-dev.3" : "dev";
 var Logger = class {
   logDir;
   enabled;