opencode-acp 1.13.7 → 1.13.9-dev.1

package/README.md

@@ -475,6 +475,20 @@ For the complete list with root cause analysis, see the [bug tracker](https://gi
 
 ## Changelog
 
+### v1.13.9-dev.1 — Remove Subagent History Rewriting (PR #180)
+
+**Problem**: `injectExtendedSubAgentResults` rewrote historical `<task_result>` tool outputs in the parent agent's message history on every transform run when `experimental.allowSubAgents: true`. The `subAgentResultCache` was cleared on every parent↔child session switch and was never persisted, so each transform run re-fetched the subagent session and produced a new historical message body — invalidating the provider prefix cache (observed: ~56% hit rate vs healthy 96–98%, prefix frozen at ~22K tokens).
+
+**Fix**: PR #180 — Removed `injectExtendedSubAgentResults` from the message-transform pipeline and `appendProtectedTools`. Deleted `lib/messages/inject/subagent-results.ts` (82 lines) and `lib/subagents/subagent-results.ts` (74 lines). Dropped `subAgentResultCache` field from `SessionState`. The rewrite was redundant: OpenCode natively appends a `state="completed"` message with the full subagent result immediately after the `task` call completes. `experimental.allowSubAgents` still controls whether ACP runs inside subagent sessions — only the parent-history rewriting is gone. Dual-agent reviewed (both APPROVE).
+
+Files: `lib/hooks.ts`, `lib/compress/protected-content.ts`, `lib/compress/{message,range}.ts`, `lib/state/{state,types}.ts`, `lib/messages/index.ts`, `AGENTS.md`. 851 tests pass.
+
+### v1.13.8-dev.1 — Dev Prerelease Sync (master @ v1.13.7)
+
+**Purpose**: Sync the `dev` npm tag with v1.13.7 stable. Content is identical to v1.13.7 — no new code changes. This brings `opencode-acp@dev` up to parity with `opencode-acp@latest` (1.13.7).
+
+Files: `package.json`, `README.md`, `README.zh-CN.md`. 851 tests pass (no source changes).
+
 ### v1.13.7 — Per-Session State + Inactive Block Fixes + Preserve First User Message (PRs #184, #193, #196)
 
 **Problem**: Three bugs since v1.13.6. (1) **Subagent state isolation failure** (PR #184): ACP stored a single global `SessionState` per plugin instance. When subagent (child) sessions ran interleaved with the parent, the child's state overwrote the parent's `modelContextLimit` — losing the 1M context window and falling back to the 6K adaptive floor, causing over-aggressive nudging in the parent. The `compressionTiming` tracker was also shared across sessions, risking cross-session collision. (2) **Inactive block opacity** (PR #193): `decompress` rejected inactive blocks with "not active — may have already been decompressed", and `acp_status` hid consumed/inactive blocks entirely. Users could not decompress blocks that were GC'd or consumed by secondary compression, and could not see them in status output. (3) **Zero-user session freeze** (PR #196): When compression pruned all user-role messages (all fell inside compressed ranges), zhipuai-lb rejected the request with HTTP 400 code 1214 (`"messages 参数非法"`, `isRetryable: false`), freezing the session. The v1.13.2 `preserve-last-user` fix searched the messages array for a pruned user to restore — but after OpenCode compaction removes pruned messages from the array, the search finds nothing and zero-user requests slip through.

package/README.zh-CN.md

@@ -443,6 +443,20 @@ ACP 在首次启动时自动将配置从 `dcp.jsonc` 迁移到 `acp.jsonc`，将
 
 ## 更新日志
 
+### v1.13.9-dev.1 — 移除子代理历史重写（PR #180）
+
+**问题**：`injectExtendedSubAgentResults` 在 `experimental.allowSubAgents: true` 时，每次消息变换都会重写父代理历史中的 `<task_result>` 工具输出。`subAgentResultCache` 在每次父↔子会话切换时被清空且从不持久化，导致每次变换都重新获取子代理会话并生成新的历史消息体 —— 使 provider prefix cache 失效（观察到的命中率约 56%，健康水平为 96-98%，prefix 冻结在约 22K tokens）。
+
+**修复**：PR #180 —— 从消息变换管道和 `appendProtectedTools` 中移除 `injectExtendedSubAgentResults`。删除 `lib/messages/inject/subagent-results.ts`（82 行）和 `lib/subagents/subagent-results.ts`（74 行）。从 `SessionState` 中移除 `subAgentResultCache` 字段。重写是冗余的：OpenCode 原生在 `task` 调用完成后立即追加一条 `state="completed"` 消息（含完整子代理结果）。`experimental.allowSubAgents` 仍然控制 ACP 是否在子代理会话中运行 —— 只是移除了父历史重写。经双 Agent 审查（均 APPROVE）。
+
+文件：`lib/hooks.ts`、`lib/compress/protected-content.ts`、`lib/compress/{message,range}.ts`、`lib/state/{state,types}.ts`、`lib/messages/index.ts`、`AGENTS.md`。851 项测试通过。
+
+### v1.13.8-dev.1 — Dev 预发布同步（master @ v1.13.7）
+
+**目的**：将 npm `dev` 标签同步到 v1.13.7 稳定版。内容与 v1.13.7 完全相同 —— 无新代码变更。使 `opencode-acp@dev` 与 `opencode-acp@latest`（1.13.7）保持一致。
+
+文件：`package.json`、`README.md`、`README.zh-CN.md`。851 项测试通过（无源码变更）。
+
 ### v1.13.7 — 每会话状态隔离 + 失活块修复 + 保留首条用户消息（PR #184、#193、#196）
 
 **问题**：v1.13.6 之后的三个 bug。（1）**子代理状态隔离失败**（PR #184）：ACP 为每个插件实例存储单个全局 `SessionState`。当子代理（child）会话与父会话交替运行时，子会话的状态覆盖了父会话的 `modelContextLimit` —— 丢失 1M 上下文窗口，回退到 6K 自适应下限，导致父会话中过度触发压缩提醒。`compressionTiming` 追踪器也跨会话共享，存在跨会话碰撞风险。（2）**失活块不可见**（PR #193）：`decompress` 拒绝失活块（"not active — may have already been decompressed"），`acp_status` 完全隐藏被消费/失活的块。用户无法解压被 GC 回收或被二次压缩消费的块，也无法在状态输出中看到它们。（3）**零用户消息会话冻结**（PR #196）：当压缩剪枝了所有 user 角色消息（全部落在压缩范围内）时，zhipuai-lb 拒绝请求（HTTP 400，code 1214，`"messages 参数非法"`，`isRetryable: false`），冻结会话。v1.13.2 的 `preserve-last-user` 修复在消息数组中搜索被剪枝的用户消息来恢复 —— 但 OpenCode 压缩移除被剪枝的消息后，搜索找不到任何内容，零用户请求仍然漏过。

package/dist/index.js

@@ -2851,64 +2851,6 @@ function isToolNameProtected(toolName, patterns) {
   return globPatterns.some((pattern) => matchesGlob(toolName, pattern));
 }
 
-// lib/subagents/subagent-results.ts
-var SUB_AGENT_RESULT_BLOCK_REGEX = /(<task_result>\s*)([\s\S]*?)(\s*<\/task_result>)/i;
-function getSubAgentId(part) {
-  const sessionId = part?.state?.metadata?.sessionId;
-  if (typeof sessionId !== "string") {
-    return null;
-  }
-  const value = sessionId.trim();
-  return value.length > 0 ? value : null;
-}
-function buildSubagentResultText(messages) {
-  const assistantMessages = messages.filter((message) => message.info.role === "assistant");
-  if (assistantMessages.length === 0) {
-    return "";
-  }
-  const lastAssistant = assistantMessages[assistantMessages.length - 1];
-  const lastText = getLastTextPart(lastAssistant);
-  if (assistantMessages.length < 2) {
-    return lastText;
-  }
-  const secondToLastAssistant = assistantMessages[assistantMessages.length - 2];
-  if (!assistantMessageHasCompressTool(secondToLastAssistant)) {
-    return lastText;
-  }
-  const secondToLastText = getLastTextPart(secondToLastAssistant);
-  return [secondToLastText, lastText].filter((text) => text.length > 0).join("\n\n");
-}
-function mergeSubagentResult(output, subAgentResultText) {
-  if (!subAgentResultText || typeof output !== "string") {
-    return output;
-  }
-  return output.replace(
-    SUB_AGENT_RESULT_BLOCK_REGEX,
-    (_match, openTag, _body, closeTag) => `${openTag}${subAgentResultText}${closeTag}`
-  );
-}
-function getLastTextPart(message) {
-  const parts = Array.isArray(message.parts) ? message.parts : [];
-  for (let index = parts.length - 1; index >= 0; index--) {
-    const part = parts[index];
-    if (part.type !== "text" || typeof part.text !== "string") {
-      continue;
-    }
-    const text = part.text.trim();
-    if (!text) {
-      continue;
-    }
-    return text;
-  }
-  return "";
-}
-function assistantMessageHasCompressTool(message) {
-  const parts = Array.isArray(message.parts) ? message.parts : [];
-  return parts.some(
-    (part) => part.type === "tool" && part.tool === "compress" && part.state?.status === "completed"
-  );
-}
-
 // lib/compress/protected-content.ts
 function appendProtectedUserMessages(summary, selection, searchContext, state, enabled) {
   if (!enabled) return summary;
@@ -2975,7 +2917,7 @@ function extractProtectedPromptInfo(text) {
   }
   return protectedTexts;
 }
-async function appendProtectedTools(client, state, allowSubAgents, summary, selection, searchContext, protectedTools, protectedFilePatterns = []) {
+async function appendProtectedTools(client, state, summary, selection, searchContext, protectedTools, protectedFilePatterns = []) {
   const protectedOutputs = [];
   for (const messageId of selection.messageIds) {
     const existingCompressionEntry = state.prune.messages.byMessageId.get(messageId);
@@ -3000,38 +2942,6 @@ async function appendProtectedTools(client, state, allowSubAgents, summary, sele
           if (part.state?.status === "completed" && part.state?.output) {
             output = typeof part.state.output === "string" ? part.state.output : JSON.stringify(part.state.output);
           }
-          if (allowSubAgents && part.tool === "task" && part.state?.status === "completed" && typeof part.state?.output === "string") {
-            const cachedSubAgentResult = state.subAgentResultCache.get(part.callID);
-            if (cachedSubAgentResult !== void 0) {
-              if (cachedSubAgentResult) {
-                output = mergeSubagentResult(
-                  part.state.output,
-                  cachedSubAgentResult
-                );
-              }
-            } else {
-              const subAgentSessionId = getSubAgentId(part);
-              if (subAgentSessionId) {
-                let subAgentResultText = "";
-                try {
-                  const subAgentMessages = await fetchSessionMessages(
-                    client,
-                    subAgentSessionId
-                  );
-                  subAgentResultText = buildSubagentResultText(subAgentMessages);
-                } catch {
-                  subAgentResultText = "";
-                }
-                if (subAgentResultText) {
-                  state.subAgentResultCache.set(part.callID, subAgentResultText);
-                  output = mergeSubagentResult(
-                    part.state.output,
-                    subAgentResultText
-                  );
-                }
-              }
-            }
-          }
           if (output) {
             protectedOutputs.push(`
 ### ${title}
@@ -4487,7 +4397,6 @@ function createSessionState() {
       pendingByCallId: /* @__PURE__ */ new Map()
     },
     toolParameters: /* @__PURE__ */ new Map(),
-    subAgentResultCache: /* @__PURE__ */ new Map(),
     toolIdList: [],
     messageIds: {
       byRawId: /* @__PURE__ */ new Map(),
@@ -4527,7 +4436,6 @@ function resetSessionState(state) {
     totalPruneTokens: 0
   };
   state.toolParameters.clear();
-  state.subAgentResultCache.clear();
   state.toolIdList = [];
   state.messageIds = {
     byRawId: /* @__PURE__ */ new Map(),
@@ -6535,7 +6443,6 @@ function createCompressMessageTool(factoryCtx) {
         const summaryWithTools = await appendProtectedTools(
           ctx.client,
           ctx.state,
-          ctx.config.experimental.allowSubAgents,
           summaryWithPromptInfo,
           plan.selection,
           searchContext,
@@ -6780,7 +6687,6 @@ function createCompressRangeTool(factoryCtx) {
         const summaryWithTools = await appendProtectedTools(
           ctx.client,
           ctx.state,
-          ctx.config.experimental.allowSubAgents,
           summaryWithPromptInfo,
           plan.selection,
           searchContext,
@@ -8608,65 +8514,6 @@ var injectMessageIds = (state, config, messages, compressionPriorities) => {
   }
 };
 
-// lib/messages/inject/subagent-results.ts
-async function fetchSubAgentMessages(client, sessionId) {
-  const response = await client.session.messages({
-    path: { id: sessionId }
-  });
-  return filterMessages(response?.data || response);
-}
-var injectExtendedSubAgentResults = async (client, state, logger, messages, allowSubAgents) => {
-  if (!allowSubAgents) {
-    return;
-  }
-  for (const message of messages) {
-    const parts = Array.isArray(message.parts) ? message.parts : [];
-    for (const part of parts) {
-      if (part.type !== "tool" || part.tool !== "task" || !part.callID) {
-        continue;
-      }
-      if (state.prune.tools.has(part.callID)) {
-        continue;
-      }
-      if (part.state?.status !== "completed" || typeof part.state.output !== "string") {
-        continue;
-      }
-      const cachedResult = state.subAgentResultCache.get(part.callID);
-      if (cachedResult !== void 0) {
-        if (cachedResult) {
-          part.state.output = stripHallucinationsFromString(
-            mergeSubagentResult(part.state.output, cachedResult)
-          );
-        }
-        continue;
-      }
-      const subAgentSessionId = getSubAgentId(part);
-      if (!subAgentSessionId) {
-        continue;
-      }
-      let subAgentMessages = [];
-      try {
-        subAgentMessages = await fetchSubAgentMessages(client, subAgentSessionId);
-      } catch (error) {
-        logger.warn("Failed to fetch subagent session for output expansion", {
-          subAgentSessionId,
-          callID: part.callID,
-          error: error instanceof Error ? error.message : String(error)
-        });
-        continue;
-      }
-      const subAgentResultText = buildSubagentResultText(subAgentMessages);
-      if (!subAgentResultText) {
-        continue;
-      }
-      state.subAgentResultCache.set(part.callID, subAgentResultText);
-      part.state.output = stripHallucinationsFromString(
-        mergeSubagentResult(part.state.output, subAgentResultText)
-      );
-    }
-  }
-};
-
 // lib/messages/reasoning-strip.ts
 function stripStaleMetadata(messages) {
   const lastUserMessage = getLastUserMessage(messages);
@@ -11777,13 +11624,6 @@ function createChatMessageTransformHandler(client, registry3, logger, config, pr
     const prePruneTokens = getCurrentTokenUsage(state, output.messages);
     prune(state, logger, config, output.messages);
     assignMessageRefs(state, output.messages);
-    await injectExtendedSubAgentResults(
-      client,
-      state,
-      logger,
-      output.messages,
-      config.experimental.allowSubAgents
-    );
     const compressionPriorities = buildPriorityMap(config, state, output.messages);
     prompts.reload();
     injectCompressNudges(