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

package/README.md

@@ -431,15 +431,9 @@ 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,14 +376,9 @@ 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,12 +916,12 @@ 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",
   "compress.images.ttlDays",
   "compress.completionReserveTokens",
+  "compress.emergencyTruncation",
   "gc",
   "gc.algorithm",
   "gc.promotionThreshold",
@@ -1293,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); normalize?: boolean }",
+            expected: "object { drop?: boolean; threshold?: integer (>= 0) }",
             actual: JSON.stringify(compress.reasoning)
           });
         } else {
@@ -1311,13 +1311,6 @@ 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) {
@@ -1358,6 +1351,13 @@ function validateConfigTypes(config) {
           actual: typeof compress.completionReserveTokens
         });
       }
+      if (compress.emergencyTruncation !== void 0 && typeof compress.emergencyTruncation !== "boolean") {
+        errors.push({
+          key: "compress.emergencyTruncation",
+          expected: "boolean",
+          actual: typeof compress.emergencyTruncation
+        });
+      }
       if (typeof compress.completionReserveTokens === "number" && compress.completionReserveTokens < 0) {
         errors.push({
           key: "compress.completionReserveTokens",
@@ -1430,6 +1430,7 @@ function validateConfigTypes(config) {
       const OVERRIDE_FIELD_TYPES = {
         showCompression: "boolean",
         summaryBuffer: "boolean",
+        emergencyTruncation: "boolean",
         protectTags: "boolean",
         protectUserMessages: "boolean",
         lastSegmentSoftBlock: "boolean",
@@ -1504,7 +1505,7 @@ function validateConfigTypes(config) {
             if (typeof value !== "object" || value === null || Array.isArray(value)) {
               errors.push({
                 key,
-                expected: "object { drop?: boolean; threshold?: integer (>= 0); normalize?: boolean }",
+                expected: "object { drop?: boolean; threshold?: integer (>= 0) }",
                 actual: JSON.stringify(value)
               });
               break;
@@ -1524,13 +1525,6 @@ 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;
         }
       };
@@ -1824,6 +1818,7 @@ var defaultConfig = {
     permission: "allow",
     showCompression: true,
     summaryBuffer: true,
+    emergencyTruncation: false,
     candidates: false,
     maxContextLimit: "80%",
     minContextLimit: "80%",
@@ -1991,7 +1986,6 @@ 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,
@@ -2026,15 +2020,15 @@ 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,
-      ...normalizeResolved !== void 0 ? { normalize: normalizeResolved } : {}
+      threshold: override.reasoning?.threshold ?? base.reasoning?.threshold ?? DEFAULT_COMPRESS_REASONING.threshold
     },
     images: {
       enabled: override.images?.enabled ?? base.images?.enabled ?? DEFAULT_COMPRESS_IMAGES.enabled,
       minBytes: override.images?.minBytes ?? base.images?.minBytes ?? DEFAULT_COMPRESS_IMAGES.minBytes,
       ttlDays: override.images?.ttlDays ?? base.images?.ttlDays ?? DEFAULT_COMPRESS_IMAGES.ttlDays
     },
-    completionReserveTokens: override.completionReserveTokens ?? base.completionReserveTokens
+    completionReserveTokens: override.completionReserveTokens ?? base.completionReserveTokens,
+    emergencyTruncation: override.emergencyTruncation ?? base.emergencyTruncation
   };
 }
 function mergeCommands(base, override) {
@@ -2972,7 +2966,8 @@ function saveSessionState(sessionState, logger, sessionName) {
     modelContextLimit: sessionState.modelContextLimit,
     modelProviderID: sessionState.modelProviderID,
     modelID: sessionState.modelID,
-    imageArchive: sessionState.imageArchive
+    imageArchive: sessionState.imageArchive,
+    stickyTruncations: sessionState.stickyTruncations
   };
   const key = saveQueueKey(sessionState.sessionId, sessionState.storageDir);
   let queue = saveQueues.get(key);
@@ -5141,7 +5136,8 @@ function createSessionState() {
     qualityGateRetryPending: false,
     noContextLimitWarned: false,
     imageArchive: {},
-    imagePruneDone: false
+    imagePruneDone: false,
+    stickyTruncations: {}
   };
 }
 function resetSessionState(state) {
@@ -5187,6 +5183,7 @@ function resetSessionState(state) {
   state.noContextLimitWarned = false;
   state.imageArchive = {};
   state.imagePruneDone = false;
+  state.stickyTruncations = {};
 }
 async function ensureSessionInitialized(client, state, sessionId, logger, messages, config, projectDir) {
   if (state.sessionId === sessionId) {
@@ -5215,6 +5212,13 @@ async function ensureSessionInitialized(client, state, sessionId, logger, messag
       if (parentSessionId) {
         try {
           const parent = await loadSessionState(parentSessionId, logger);
+          if (parent?.stickyTruncations) {
+            for (const [callID, output] of Object.entries(parent.stickyTruncations)) {
+              if (typeof output === "string") {
+                state.stickyTruncations[callID] = output;
+              }
+            }
+          }
           const response = parent ? await client.session.messages({ path: { id: parentSessionId } }) : void 0;
           const parentMessages = Array.isArray(response?.data) ? response.data : Array.isArray(response) ? response : [];
           if (parent && parentMessages.length > 0) {
@@ -5280,6 +5284,14 @@ async function ensureSessionInitialized(client, state, sessionId, logger, messag
       }
     }
   }
+  const persistedSticky = persisted.stickyTruncations;
+  if (persistedSticky && typeof persistedSticky === "object") {
+    for (const [callID, output] of Object.entries(persistedSticky)) {
+      if (typeof output === "string") {
+        state.stickyTruncations[callID] = output;
+      }
+    }
+  }
   const persistedAny = persisted;
   if (persistedAny._persistedMessageIds) {
     state.messageIds = {
@@ -9901,8 +9913,6 @@ 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") {
@@ -9971,61 +9981,6 @@ function dropCompressReasoning(messages, threshold) {
   }
   return removed;
 }
-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 : [];
-    const reasoningParts = parts.filter(isReasoningWithText);
-    if (reasoningParts.length === 0) {
-      continue;
-    }
-    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 === "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);
-    }
-    if (!inserted) {
-      newParts.unshift({
-        id: `${message.info.id}-acp-think`,
-        sessionID: message.info.sessionID,
-        messageID: message.info.id,
-        type: "text",
-        text: mergedText
-      });
-    }
-    message.parts = newParts;
-    normalized++;
-  }
-  return normalized;
-}
 
 // lib/messages/priority.ts
 function buildPriorityMap(_config, _state, _messages) {
@@ -11403,7 +11358,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.484.217" : "dev";
+var LOG_VERSION = true ? "1.18.4-pr.488.221" : "dev";
 var LEVEL_RANK = {
   debug: 10,
   info: 20,
@@ -12258,6 +12213,7 @@ function truncateLargeToolOutputs(state, config, logger, messages) {
       const part = parts[pi];
       if (part?.type !== "tool") continue;
       if (part.state?.status !== "completed") continue;
+      if (part.tool === "compress") continue;
       const content = extractCompletedToolOutput(part);
       if (content === void 0) continue;
       if (content === "[Old tool result content cleared]") continue;
@@ -12298,6 +12254,74 @@ function truncateLargeToolOutputs(state, config, logger, messages) {
   }
 }
 
+// lib/messages/sticky-truncation.ts
+function collectToolParts(messages) {
+  const parts = [];
+  for (const message of messages) {
+    const messageParts = Array.isArray(message.parts) ? message.parts : [];
+    for (const part of messageParts) {
+      if (part?.type === "tool") {
+        parts.push(part);
+      }
+    }
+  }
+  return parts;
+}
+function applyStickyTruncations(state, messages, logger) {
+  const frozen = state.stickyTruncations;
+  if (Object.keys(frozen).length === 0) return;
+  let replayed = 0;
+  const seen = /* @__PURE__ */ new Set();
+  for (const part of collectToolParts(messages)) {
+    const callID = typeof part.callID === "string" ? part.callID : void 0;
+    if (!callID) continue;
+    seen.add(callID);
+    const recorded = frozen[callID];
+    if (recorded === void 0) continue;
+    if (!part.state) continue;
+    if (part.state.output === recorded) continue;
+    part.state.output = recorded;
+    replayed++;
+  }
+  for (const callID of Object.keys(frozen)) {
+    if (!seen.has(callID)) delete frozen[callID];
+  }
+  if (replayed > 0) {
+    logger.debug("Sticky truncation: replayed frozen tool outputs", {
+      replayed,
+      frozen: Object.keys(frozen).length
+    });
+  }
+}
+function snapshotToolOutputs(messages) {
+  const snapshot = /* @__PURE__ */ new Map();
+  for (const part of collectToolParts(messages)) {
+    const callID = typeof part.callID === "string" ? part.callID : void 0;
+    if (!callID) continue;
+    const content = extractCompletedToolOutput(part);
+    if (content === void 0) continue;
+    snapshot.set(callID, content);
+  }
+  return snapshot;
+}
+function recordStickyTruncations(state, messages, before, logger) {
+  let recorded = 0;
+  for (const part of collectToolParts(messages)) {
+    const callID = typeof part.callID === "string" ? part.callID : void 0;
+    if (!callID) continue;
+    if (typeof part.state?.output !== "string") continue;
+    const prior = before.get(callID);
+    if (prior === void 0 || prior === part.state.output) continue;
+    if (state.stickyTruncations[callID] === part.state.output) continue;
+    state.stickyTruncations[callID] = part.state.output;
+    recorded++;
+  }
+  if (recorded > 0) {
+    logger.info("Sticky truncation: froze truncated tool outputs", { recorded });
+  }
+  return recorded;
+}
+
 // lib/messages/enforce-budget.ts
 var DEFAULT_COMPLETION_RESERVE_TOKENS = 32768;
 var TRUNCATION_MARKER2 = "[truncated for context space";
@@ -13602,14 +13626,6 @@ function createChatMessageTransformHandler(client, registry4, logger, config, pr
         });
       }
     }
-    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);
     applyMessageFilters(output.messages, config.messageFilters, logger, {
@@ -13676,13 +13692,32 @@ ${text}`);
       prePruneTokens,
       candidateMessages
     );
-    truncateLargeToolOutputs(
-      state,
+    const emergencyTruncationEnabled = applyCompressOverrides(
       config,
-      logger,
-      output.messages.filter((message) => !isSyntheticMessage(message))
-    );
-    enforceContextBudget(state, config, logger, output.messages);
+      dropReasoningModel?.providerID ?? state.modelProviderID,
+      dropReasoningModel?.modelID ?? state.modelID
+    ).compress.emergencyTruncation;
+    if (emergencyTruncationEnabled === true) {
+      applyStickyTruncations(state, output.messages, logger);
+      const toolOutputsBefore = snapshotToolOutputs(output.messages);
+      truncateLargeToolOutputs(
+        state,
+        config,
+        logger,
+        output.messages.filter((message) => !isSyntheticMessage(message))
+      );
+      enforceContextBudget(state, config, logger, output.messages);
+      const frozenCount = recordStickyTruncations(
+        state,
+        output.messages,
+        toolOutputsBefore,
+        logger
+      );
+      if (frozenCount > 0) {
+        saveSessionState(state, logger).catch(() => {
+        });
+      }
+    }
     injectMessageIds(state, config, output.messages, compressionPriorities);
     hideFailedCompressCalls(output.messages);
     stripStaleMetadata(output.messages);
@@ -14121,7 +14156,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.484.217" : "dev",
+    version: true ? "1.18.4-pr.488.221" : "dev",
     workspace: ctx.directory,
     logLevel: logger.level,
     debug: config.debug,