opencode-acp 1.18.4-pr.483.216 → 1.18.4-pr.484.217

package/README.md

@@ -431,9 +431,15 @@ Each level overrides the previous, so project settings take priority over global
         // compression, so their thinking rides along every request as an
         // unreclaimable floor. Closed turns only; the active round is never
         // touched. Small thinkings under the threshold are kept.
+        // [#482] Pin the wire form of historical thinking: fold each assistant
+        // message's reasoning parts into one <thinking>-marked text part at
+        // request time, so serialized bytes stay deterministic across host
+        // metadata-table refreshes. On by default; set normalize:false for
+        // direct providers needing structured thinking replay.
         "reasoning": {
             "drop": true,
             "threshold": 2048,
+            "normalize": true
         },
         // [#478] Image archive: spill data-URL images to disk when they enter
         // the session so folded ranges keep re-readable pointers instead of

package/README.zh-CN.md

@@ -376,9 +376,14 @@ ACP 使用自己的配置文件，按以下顺序搜索：
         // compress 调用被硬排除在压缩之外，其思考内容会随每次请求原样重发，
         // 形成无法回收的上下文底座。仅作用于已关闭的轮次，活跃轮永不触碰；
         // 低于阈值的小思考保留。
+        // [#482] 钉死历史思考的 wire 形态：请求时把每个 assistant 消息的
+        // reasoning 部分折叠为一个带 <thinking> 标记的 text 部分，使序列化字节
+        // 在宿主元数据表刷新后保持确定。默认开启；直连需要结构化 thinking
+        // 回放的 provider 设 normalize:false。
         "reasoning": {
             "drop": true,
             "threshold": 2048,
+            "normalize": true
         },
         // [#478] 图片归档：图片（data-URL）进入会话时即落盘，折叠后摘要里保留
         // 可重读的路径指针，而不是把像素悄悄丢掉。文件落在

package/dist/index.js

@@ -916,6 +916,7 @@ var VALID_CONFIG_KEYS = /* @__PURE__ */ new Set([
   "compress.reasoning",
   "compress.reasoning.drop",
   "compress.reasoning.threshold",
+  "compress.reasoning.normalize",
   "compress.images",
   "compress.images.enabled",
   "compress.images.minBytes",
@@ -1292,7 +1293,7 @@ function validateConfigTypes(config) {
         if (typeof compress.reasoning !== "object" || compress.reasoning === null || Array.isArray(compress.reasoning)) {
           errors.push({
             key: "compress.reasoning",
-            expected: "object { drop?: boolean; threshold?: integer (>= 0) }",
+            expected: "object { drop?: boolean; threshold?: integer (>= 0); normalize?: boolean }",
             actual: JSON.stringify(compress.reasoning)
           });
         } else {
@@ -1310,6 +1311,13 @@ function validateConfigTypes(config) {
               actual: JSON.stringify(compress.reasoning.threshold)
             });
           }
+          if (compress.reasoning.normalize !== void 0 && typeof compress.reasoning.normalize !== "boolean") {
+            errors.push({
+              key: "compress.reasoning.normalize",
+              expected: "boolean",
+              actual: typeof compress.reasoning.normalize
+            });
+          }
         }
       }
       if (compress.images !== void 0) {
@@ -1496,7 +1504,7 @@ function validateConfigTypes(config) {
             if (typeof value !== "object" || value === null || Array.isArray(value)) {
               errors.push({
                 key,
-                expected: "object { drop?: boolean; threshold?: integer (>= 0) }",
+                expected: "object { drop?: boolean; threshold?: integer (>= 0); normalize?: boolean }",
                 actual: JSON.stringify(value)
               });
               break;
@@ -1516,6 +1524,13 @@ function validateConfigTypes(config) {
                 actual: JSON.stringify(reasoning.threshold)
               });
             }
+            if (reasoning.normalize !== void 0 && typeof reasoning.normalize !== "boolean") {
+              errors.push({
+                key: `${key}.normalize`,
+                expected: "boolean",
+                actual: typeof reasoning.normalize
+              });
+            }
             break;
         }
       };
@@ -1976,6 +1991,7 @@ function mergeCompress(base, override) {
   if (!override) {
     return base;
   }
+  const normalizeResolved = override.reasoning?.normalize ?? base.reasoning?.normalize;
   return {
     permission: override.permission ?? base.permission,
     showCompression: override.showCompression ?? base.showCompression,
@@ -2010,7 +2026,8 @@ function mergeCompress(base, override) {
     preserveLastUserMessage: override.preserveLastUserMessage ?? base.preserveLastUserMessage,
     reasoning: {
       drop: override.reasoning?.drop ?? base.reasoning?.drop ?? DEFAULT_COMPRESS_REASONING.drop,
-      threshold: override.reasoning?.threshold ?? base.reasoning?.threshold ?? DEFAULT_COMPRESS_REASONING.threshold
+      threshold: override.reasoning?.threshold ?? base.reasoning?.threshold ?? DEFAULT_COMPRESS_REASONING.threshold,
+      ...normalizeResolved !== void 0 ? { normalize: normalizeResolved } : {}
     },
     images: {
       enabled: override.images?.enabled ?? base.images?.enabled ?? DEFAULT_COMPRESS_IMAGES.enabled,
@@ -9884,6 +9901,8 @@ var injectMessageIds = (state, config, messages, compressionPriorities) => {
 };
 
 // lib/messages/reasoning-strip.ts
+var isReasoningWithText = (part) => part.type === "reasoning" && typeof part.text === "string";
+var isTextWithText = (part) => part.type === "text" && typeof part.text === "string";
 function stripStaleMetadata(messages) {
   const lastUserMessage = getLastUserMessage(messages);
   if (lastUserMessage?.info.role !== "user") {
@@ -9952,62 +9971,57 @@ function dropCompressReasoning(messages, threshold) {
   }
   return removed;
 }
-
-// lib/messages/reasoning-canonicalize.ts
-var CANONICAL_OPEN = "<thinking>\n";
-var CANONICAL_CLOSE = "\n</thinking>";
-function canonicalizeReasoningShape(messages) {
+function normalizeThinkingForm(messages) {
   let normalized = 0;
   for (const message of messages) {
     if (!message || message.info.role !== "assistant") {
       continue;
     }
     const parts = Array.isArray(message.parts) ? message.parts : [];
-    let allReasoning = "";
-    for (const part of parts) {
-      if (part.type === "reasoning") {
-        allReasoning += part.text;
-      }
-    }
-    if (allReasoning.length === 0) {
+    const reasoningParts = parts.filter(isReasoningWithText);
+    if (reasoningParts.length === 0) {
       continue;
     }
-    let allText = "";
+    const R = reasoningParts.map((part) => part.text).join("");
+    const textParts = parts.filter(isTextWithText);
+    const T = textParts.map((part) => part.text).join("");
+    const mergedText = `<thinking>
+${R}
+</thinking>` + (T.length > 0 ? `
+${T}` : "");
+    const donor = textParts[0];
+    const newParts = [];
+    let inserted = false;
     for (const part of parts) {
-      if (part.type === "text") {
-        allText += part.text;
+      if (part.type === "reasoning" || part.type === "text") {
+        if (!inserted) {
+          if (donor) {
+            newParts.push({ ...donor, text: mergedText });
+          } else {
+            newParts.push({
+              id: `${message.info.id}-acp-think`,
+              sessionID: message.info.sessionID,
+              messageID: message.info.id,
+              type: "text",
+              text: mergedText
+            });
+          }
+          inserted = true;
+        }
+        continue;
       }
+      newParts.push(part);
     }
-    const merged = allText.length > 0 ? `${CANONICAL_OPEN}${allReasoning}${CANONICAL_CLOSE}
-${allText}` : `${CANONICAL_OPEN}${allReasoning}${CANONICAL_CLOSE}`;
-    const rebuilt = [];
-    let placed = false;
-    const placeMerged = (carrier) => {
-      if (placed) {
-        return;
-      }
-      placed = true;
-      const part = {
-        id: carrier.id,
+    if (!inserted) {
+      newParts.unshift({
+        id: `${message.info.id}-acp-think`,
         sessionID: message.info.sessionID,
         messageID: message.info.id,
         type: "text",
-        text: merged
-      };
-      rebuilt.push(part);
-    };
-    for (const part of parts) {
-      if (part.type === "reasoning") {
-        placeMerged(part);
-        continue;
-      }
-      if (part.type === "text") {
-        placeMerged(part);
-        continue;
-      }
-      rebuilt.push(part);
+        text: mergedText
+      });
     }
-    message.parts = rebuilt;
+    message.parts = newParts;
     normalized++;
   }
   return normalized;
@@ -11389,7 +11403,7 @@ import { writeFile as writeFile2, mkdir as mkdir2 } from "fs/promises";
 import { join as join5 } from "path";
 import { existsSync as existsSync5 } from "fs";
 import { homedir as homedir3 } from "os";
-var LOG_VERSION = true ? "1.18.4-pr.483.216" : "dev";
+var LOG_VERSION = true ? "1.18.4-pr.484.217" : "dev";
 var LEVEL_RANK = {
   debug: 10,
   info: 20,
@@ -13588,11 +13602,13 @@ function createChatMessageTransformHandler(client, registry4, logger, config, pr
         });
       }
     }
-    const canonicalizedReasoning = canonicalizeReasoningShape(output.messages);
-    if (canonicalizedReasoning > 0) {
-      logger.debug("reasoning-canonicalize: pinned historical thinking shape", {
-        messages: canonicalizedReasoning
-      });
+    if (reasoningConfig?.normalize !== false) {
+      const normalizedThinking = normalizeThinkingForm(output.messages);
+      if (normalizedThinking > 0) {
+        logger.debug("compress.reasoning: pinned thinking wire form", {
+          normalizedMessages: normalizedThinking
+        });
+      }
     }
     ensureBuiltinFiltersRegistered();
     const effectiveLimit = resolveEffectiveContextLimit(state, config);
@@ -14105,7 +14121,7 @@ var server = (async (ctx) => {
   }
   const logger = new Logger(config.debug, config.debug ? "debug" : config.logLevel);
   logger.info("ACP plugin initialized", {
-    version: true ? "1.18.4-pr.483.216" : "dev",
+    version: true ? "1.18.4-pr.484.217" : "dev",
     workspace: ctx.directory,
     logLevel: logger.level,
     debug: config.debug,