opencode-acp 1.18.4-pr.483.218 → 1.18.4-pr.486.219

package/dist/index.js

@@ -921,6 +921,7 @@ var VALID_CONFIG_KEYS = /* @__PURE__ */ new Set([
   "compress.images.minBytes",
   "compress.images.ttlDays",
   "compress.completionReserveTokens",
+  "compress.emergencyTruncation",
   "gc",
   "gc.algorithm",
   "gc.promotionThreshold",
@@ -1350,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",
@@ -1422,6 +1430,7 @@ function validateConfigTypes(config) {
       const OVERRIDE_FIELD_TYPES = {
         showCompression: "boolean",
         summaryBuffer: "boolean",
+        emergencyTruncation: "boolean",
         protectTags: "boolean",
         protectUserMessages: "boolean",
         lastSegmentSoftBlock: "boolean",
@@ -1809,6 +1818,7 @@ var defaultConfig = {
     permission: "allow",
     showCompression: true,
     summaryBuffer: true,
+    emergencyTruncation: false,
     candidates: false,
     maxContextLimit: "80%",
     minContextLimit: "80%",
@@ -2017,7 +2027,8 @@ function mergeCompress(base, override) {
       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) {
@@ -2955,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);
@@ -5124,7 +5136,8 @@ function createSessionState() {
     qualityGateRetryPending: false,
     noContextLimitWarned: false,
     imageArchive: {},
-    imagePruneDone: false
+    imagePruneDone: false,
+    stickyTruncations: {}
   };
 }
 function resetSessionState(state) {
@@ -5170,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) {
@@ -5263,6 +5277,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 = {
@@ -9953,66 +9975,6 @@ function dropCompressReasoning(messages, threshold) {
   return removed;
 }
 
-// lib/messages/reasoning-canonicalize.ts
-var CANONICAL_OPEN = "<thinking>\n";
-var CANONICAL_CLOSE = "\n</thinking>";
-function canonicalizeReasoningShape(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) {
-      continue;
-    }
-    let allText = "";
-    for (const part of parts) {
-      if (part.type === "text") {
-        allText += part.text;
-      }
-    }
-    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,
-        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);
-    }
-    message.parts = rebuilt;
-    normalized++;
-  }
-  return normalized;
-}
-
 // lib/messages/priority.ts
 function buildPriorityMap(_config, _state, _messages) {
   return /* @__PURE__ */ new Map();
@@ -11389,7 +11351,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.218" : "dev";
+var LOG_VERSION = true ? "1.18.4-pr.486.219" : "dev";
 var LEVEL_RANK = {
   debug: 10,
   info: 20,
@@ -12284,6 +12246,71 @@ 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 (typeof part.state?.output !== "string" || 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;
+    if (typeof part.state?.output !== "string") continue;
+    snapshot.set(callID, part.state.output);
+  }
+  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 });
+  }
+}
+
 // lib/messages/enforce-budget.ts
 var DEFAULT_COMPLETION_RESERVE_TOKENS = 32768;
 var TRUNCATION_MARKER2 = "[truncated for context space";
@@ -13588,12 +13615,6 @@ 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
-      });
-    }
     ensureBuiltinFiltersRegistered();
     const effectiveLimit = resolveEffectiveContextLimit(state, config);
     applyMessageFilters(output.messages, config.messageFilters, logger, {
@@ -13660,13 +13681,18 @@ ${text}`);
       prePruneTokens,
       candidateMessages
     );
-    truncateLargeToolOutputs(
-      state,
-      config,
-      logger,
-      output.messages.filter((message) => !isSyntheticMessage(message))
-    );
-    enforceContextBudget(state, config, logger, output.messages);
+    if (config.compress?.emergencyTruncation === 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);
+      recordStickyTruncations(state, output.messages, toolOutputsBefore, logger);
+    }
     injectMessageIds(state, config, output.messages, compressionPriorities);
     hideFailedCompressCalls(output.messages);
     stripStaleMetadata(output.messages);
@@ -14105,7 +14131,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.218" : "dev",
+    version: true ? "1.18.4-pr.486.219" : "dev",
     workspace: ctx.directory,
     logLevel: logger.level,
     debug: config.debug,