opencode-acp 1.12.1 → 1.12.2

package/README.md

@@ -422,6 +422,14 @@ For the complete list with root cause analysis, see the [bug tracker](https://gi
 
 ## Changelog
 
+### v1.12.2 — Compress Failure Rollback + Sync Carve-out Removal (PR #126)
+
+**Problem**: Two bugs in post-compression-failure handling (issue #125). (1) The compress tool mutated in-memory state incrementally with no try/catch — if anything threw between the first `applyCompressionState` and `finalizeSession`, "ghost blocks" (active blocks never persisted) hid messages on subsequent transforms. (2) `syncCompressionBlocks` had a carve-out that kept blocks active when the anchor was missing from messages but tracked in `byMessageId`. This carve-out was intended for ACP-hidden anchors, but sync runs on the raw message list (before filtering), so it only triggered for externally-deleted anchors → messages hidden without recap injection → empty LLM requests.
+
+**Fix**: (1) Added `snapshotCompressionState()` / `restoreCompressionState()` to `lib/compress/pipeline.ts` using `structuredClone`. Wrapped the mutation phase in try/catch in both `lib/compress/range.ts` and `lib/compress/message.ts`. On failure, state (including `manualMode`) is restored to the pre-mutation snapshot — no ghost blocks. (2) Removed the carve-out in `lib/messages/sync.ts`. When anchor is gone from messages, always deactivate the block. Oracle-reviewed.
+
+Files: `lib/messages/sync.ts`, `lib/compress/pipeline.ts`, `lib/compress/range.ts`, `lib/compress/message.ts`. Tests: `tests/sync.test.ts` (updated), `tests/compress-rollback.test.ts` (NEW, 4 tests). 643 tests pass.
+
 ### v1.12.1 — Compression Recap Injection Fix + Stale Compress Stripping (PR #119)
 
 **Problem**: `acp_context_recap` was used to create synthetic tool-result recap messages but was NOT registered as a real tool — providers could strip/convert unregistered tool-results, causing the model to see compression summaries as plain text or user messages (echo/drift bugs). Additionally, compress tool-call inputs duplicated block recap content in context.

package/README.zh-CN.md

@@ -395,6 +395,14 @@ ACP 在首次启动时自动将配置从 `dcp.jsonc` 迁移到 `acp.jsonc`，将
 
 ## 更新日志
 
+### v1.12.2 — 压缩失败回滚 + Sync carve-out 移除（PR #126）
+
+**问题**：压缩失败后的处理存在两个 bug（issue #125）。（1）compress 工具在内存中增量修改状态，没有 try/catch——如果在 `applyCompressionState` 和 `finalizeSession` 之间抛出异常，"幽灵块"（未持久化的活跃块）会在后续 transform 中隐藏消息。（2）`syncCompressionBlocks` 有一个 carve-out：当块的锚点从消息中缺失但在 `byMessageId` 中有记录时，块保持活跃。这个 carve-out 本意是保护 ACP 隐藏的锚点，但 sync 运行在原始消息列表上（在过滤之前），所以它只在外部删除的锚点场景触发 → 块保持活跃但无法注入摘要 → 隐藏消息无替换 → **LLM 请求为空**。
+
+**修复**：（1）在 `lib/compress/pipeline.ts` 中新增 `snapshotCompressionState()` / `restoreCompressionState()`（使用 `structuredClone`）。在 `lib/compress/range.ts` 和 `lib/compress/message.ts` 中用 try/catch 包裹变更阶段。失败时，状态（包括 `manualMode`）恢复到变更前的快照——不会有幽灵块。（2）移除 `lib/messages/sync.ts` 中的 carve-out。锚点从消息中缺失时，总是停用块。经 Oracle 审查。
+
+文件：`lib/messages/sync.ts`、`lib/compress/pipeline.ts`、`lib/compress/range.ts`、`lib/compress/message.ts`。测试：`tests/sync.test.ts`（更新）、`tests/compress-rollback.test.ts`（新增，4 个测试）。643 个测试通过。
+
 ### v1.12.1 — 压缩摘要注入修复 + 历史压缩调用剥离（PR #119）
 
 **问题**：`acp_context_recap` 用于创建合成的 tool-result 摘要消息，但未注册为真实工具——provider 可能剥离/转换未注册的 tool-result，导致模型将压缩摘要视为纯文本或用户消息（回声/漂移 bug）。此外，compress 工具调用的输入与 block recap 内容重复占用上下文。

package/dist/index.js

@@ -5123,6 +5123,18 @@ async function sendIgnoredMessage(client, sessionID, text, params, logger) {
 }
 
 // lib/compress/pipeline.ts
+function snapshotCompressionState(state) {
+  return {
+    messages: structuredClone(state.prune.messages),
+    stats: { ...state.stats },
+    manualMode: state.manualMode
+  };
+}
+function restoreCompressionState(state, snapshot) {
+  state.prune.messages = structuredClone(snapshot.messages);
+  state.stats = { ...snapshot.stats };
+  state.manualMode = snapshot.manualMode;
+}
 async function prepareSession(ctx, toolCtx, title) {
   if (ctx.state.manualMode && ctx.state.manualMode !== "compress-pending") {
     throw new Error(
@@ -5302,7 +5314,9 @@ function buildSchema(maxSummaryLengthHard) {
         )
       })
     ).describe("Batch of individual message summaries to create in one tool call"),
-    summaryMaxChars: tool2.schema.number().optional().describe(`Override max summary length (default max: ${maxSummaryLengthHard} chars). Use when content is important and needs more detail \u2014 don't lose critical info just to fit the limit.`)
+    summaryMaxChars: tool2.schema.number().optional().describe(
+      `Override max summary length (default max: ${maxSummaryLengthHard} chars). Use when content is important and needs more detail \u2014 don't lose critical info just to fit the limit.`
+    )
   };
 }
 function createCompressMessageTool(ctx) {
@@ -5385,46 +5399,52 @@ function createCompressMessageTool(ctx) {
           summaryWithTools
         });
       }
+      const snapshot = snapshotCompressionState(ctx.state);
       const runId = allocateRunId(ctx.state);
-      for (const { plan, summaryWithTools } of preparedPlans) {
-        const blockId = allocateBlockId(ctx.state);
-        const keepResult = resolveKeepMarkers(
-          summaryWithTools,
-          rawMessages,
-          ctx.state,
-          ctx.config
-        );
-        const resolvedSummary = keepResult.summary;
-        const storedSummary = wrapCompressedSummary(blockId, resolvedSummary);
-        const summaryTokens = countTokens2(storedSummary);
-        applyCompressionState(
-          ctx.state,
-          {
-            topic: plan.entry.topic,
-            batchTopic: input.topic,
-            startId: plan.entry.messageId,
-            endId: plan.entry.messageId,
-            mode: "message",
+      try {
+        for (const { plan, summaryWithTools } of preparedPlans) {
+          const blockId = allocateBlockId(ctx.state);
+          const keepResult = resolveKeepMarkers(
+            summaryWithTools,
+            rawMessages,
+            ctx.state,
+            ctx.config
+          );
+          const resolvedSummary = keepResult.summary;
+          const storedSummary = wrapCompressedSummary(blockId, resolvedSummary);
+          const summaryTokens = countTokens2(storedSummary);
+          applyCompressionState(
+            ctx.state,
+            {
+              topic: plan.entry.topic,
+              batchTopic: input.topic,
+              startId: plan.entry.messageId,
+              endId: plan.entry.messageId,
+              mode: "message",
+              runId,
+              compressMessageId: toolCtx.messageID,
+              compressCallId: callId,
+              summaryTokens
+            },
+            plan.selection,
+            plan.anchorMessageId,
+            blockId,
+            storedSummary,
+            [],
+            ctx.config.gc
+          );
+          notifications.push({
+            blockId,
             runId,
-            compressMessageId: toolCtx.messageID,
-            compressCallId: callId,
+            summary: resolvedSummary,
             summaryTokens
-          },
-          plan.selection,
-          plan.anchorMessageId,
-          blockId,
-          storedSummary,
-          [],
-          ctx.config.gc
-        );
-        notifications.push({
-          blockId,
-          runId,
-          summary: resolvedSummary,
-          summaryTokens
-        });
+          });
+        }
+        await finalizeSession(ctx, toolCtx, rawMessages, notifications, input.topic);
+      } catch (error) {
+        restoreCompressionState(ctx.state, snapshot);
+        throw error;
       }
-      await finalizeSession(ctx, toolCtx, rawMessages, notifications, input.topic);
       return formatResult(plans.length, skippedIssues, skippedCount);
     }
   });
@@ -5448,7 +5468,9 @@ function buildSchema2(maxSummaryLengthHard) {
     ).describe(
       "One or more ranges to compress, each with start/end boundaries and a summary"
     ),
-    summaryMaxChars: tool3.schema.number().optional().describe(`Override max summary length (default max: ${maxSummaryLengthHard} chars). Use when content is important and needs more detail \u2014 don't lose critical info just to fit the limit.`)
+    summaryMaxChars: tool3.schema.number().optional().describe(
+      `Override max summary length (default max: ${maxSummaryLengthHard} chars). Use when content is important and needs more detail \u2014 don't lose critical info just to fit the limit.`
+    )
   };
 }
 function createCompressRangeTool(ctx) {
@@ -5584,47 +5606,53 @@ function createCompressRangeTool(ctx) {
           consumedBlockIds: mergeConsumedBlockIds
         });
       }
+      const snapshot = snapshotCompressionState(ctx.state);
       const runId = allocateRunId(ctx.state);
-      for (const preparedPlan of preparedPlans) {
-        const blockId = allocateBlockId(ctx.state);
-        const keepResult = resolveKeepMarkers(
-          preparedPlan.finalSummary,
-          rawMessages,
-          ctx.state,
-          ctx.config
-        );
-        preparedPlan.finalSummary = keepResult.summary;
-        const storedSummary = wrapCompressedSummary(blockId, preparedPlan.finalSummary);
-        const summaryTokens = countTokens2(storedSummary);
-        const applied = applyCompressionState(
-          ctx.state,
-          {
-            topic: input.topic,
-            batchTopic: input.topic,
-            startId: preparedPlan.entry.startId,
-            endId: preparedPlan.entry.endId,
-            mode: "range",
+      try {
+        for (const preparedPlan of preparedPlans) {
+          const blockId = allocateBlockId(ctx.state);
+          const keepResult = resolveKeepMarkers(
+            preparedPlan.finalSummary,
+            rawMessages,
+            ctx.state,
+            ctx.config
+          );
+          preparedPlan.finalSummary = keepResult.summary;
+          const storedSummary = wrapCompressedSummary(blockId, preparedPlan.finalSummary);
+          const summaryTokens = countTokens2(storedSummary);
+          const applied = applyCompressionState(
+            ctx.state,
+            {
+              topic: input.topic,
+              batchTopic: input.topic,
+              startId: preparedPlan.entry.startId,
+              endId: preparedPlan.entry.endId,
+              mode: "range",
+              runId,
+              compressMessageId: toolCtx.messageID,
+              compressCallId: callId,
+              summaryTokens
+            },
+            preparedPlan.selection,
+            preparedPlan.anchorMessageId,
+            blockId,
+            storedSummary,
+            preparedPlan.consumedBlockIds,
+            ctx.config.gc
+          );
+          totalCompressedMessages += applied.messageIds.length;
+          notifications.push({
+            blockId,
             runId,
-            compressMessageId: toolCtx.messageID,
-            compressCallId: callId,
+            summary: preparedPlan.finalSummary,
             summaryTokens
-          },
-          preparedPlan.selection,
-          preparedPlan.anchorMessageId,
-          blockId,
-          storedSummary,
-          preparedPlan.consumedBlockIds,
-          ctx.config.gc
-        );
-        totalCompressedMessages += applied.messageIds.length;
-        notifications.push({
-          blockId,
-          runId,
-          summary: preparedPlan.finalSummary,
-          summaryTokens
-        });
+          });
+        }
+        await finalizeSession(ctx, toolCtx, rawMessages, notifications, input.topic);
+      } catch (error) {
+        restoreCompressionState(ctx.state, snapshot);
+        throw error;
       }
-      await finalizeSession(ctx, toolCtx, rawMessages, notifications, input.topic);
       return `Compressed ${totalCompressedMessages} messages into ${COMPRESSED_BLOCK_HEADER}.
 IMPORTANT: This was an automatic context compression. You MUST continue your previous task exactly where you left off. Do NOT ask the user what to do next.
 \u{1F4A1} Tip: Use search_context('keyword') to find compressed content when you need it later.`;
@@ -6026,12 +6054,10 @@ var syncCompressionBlocks = (state, logger, messages) => {
       continue;
     }
     if (typeof block.anchorMessageId === "string" && block.anchorMessageId.length > 0 && !messageIds.has(block.anchorMessageId)) {
-      if (!messagesState.byMessageId.has(block.anchorMessageId)) {
-        block.active = false;
-        block.deactivatedAt = now;
-        block.deactivatedByBlockId = void 0;
-        continue;
-      }
+      block.active = false;
+      block.deactivatedAt = now;
+      block.deactivatedByBlockId = void 0;
+      continue;
     }
     for (const consumedBlockId of block.consumedBlockIds) {
       if (!messagesState.activeBlockIds.has(consumedBlockId)) {