opencode-acp 1.14.27-pr.365.102 → 1.14.27-pr.370.105

package/dist/index.js

@@ -909,6 +909,8 @@ var VALID_CONFIG_KEYS = /* @__PURE__ */ new Set([
   "compress.preserveRecentMessages",
   "compress.preserveRecentTokens",
   "compress.preserveLastUserMessage",
+  "compress.stripProtectedReasoning",
+  "compress.stripProtectedReasoningThreshold",
   "gc",
   "gc.algorithm",
   "gc.promotionThreshold",
@@ -1262,6 +1264,20 @@ function validateConfigTypes(config) {
           actual: typeof compress.preserveLastUserMessage
         });
       }
+      if (compress.stripProtectedReasoning !== void 0 && typeof compress.stripProtectedReasoning !== "boolean") {
+        errors.push({
+          key: "compress.stripProtectedReasoning",
+          expected: "boolean",
+          actual: typeof compress.stripProtectedReasoning
+        });
+      }
+      if (compress.stripProtectedReasoningThreshold !== void 0 && (typeof compress.stripProtectedReasoningThreshold !== "number" || !Number.isFinite(compress.stripProtectedReasoningThreshold) || compress.stripProtectedReasoningThreshold < 0)) {
+        errors.push({
+          key: "compress.stripProtectedReasoningThreshold",
+          expected: "number (>= 0)",
+          actual: JSON.stringify(compress.stripProtectedReasoningThreshold)
+        });
+      }
       if (typeof compress.iterationNudgeThreshold === "number" && compress.iterationNudgeThreshold < 1) {
         errors.push({
           key: "compress.iterationNudgeThreshold",
@@ -1659,7 +1675,9 @@ var defaultConfig = {
     lastSegmentSoftBlock: true,
     preserveRecentMessages: 5,
     preserveRecentTokens: 5e3,
-    preserveLastUserMessage: true
+    preserveLastUserMessage: true,
+    stripProtectedReasoning: true,
+    stripProtectedReasoningThreshold: 2048
   },
   gc: {
     algorithm: "truncate",
@@ -1829,7 +1847,9 @@ function mergeCompress(base, override) {
     lastSegmentSoftBlock: override.lastSegmentSoftBlock ?? base.lastSegmentSoftBlock,
     preserveRecentMessages: override.preserveRecentMessages ?? base.preserveRecentMessages,
     preserveRecentTokens: override.preserveRecentTokens ?? base.preserveRecentTokens,
-    preserveLastUserMessage: override.preserveLastUserMessage ?? base.preserveLastUserMessage
+    preserveLastUserMessage: override.preserveLastUserMessage ?? base.preserveLastUserMessage,
+    stripProtectedReasoning: override.stripProtectedReasoning ?? base.stripProtectedReasoning,
+    stripProtectedReasoningThreshold: override.stripProtectedReasoningThreshold ?? base.stripProtectedReasoningThreshold
   };
 }
 function mergeCommands(base, override) {
@@ -2092,56 +2112,6 @@ var messageHasCompressAttempt = (message) => {
   const parts = Array.isArray(message.parts) ? message.parts : [];
   return parts.some((part) => part.type === "tool" && part.tool === "compress");
 };
-var isCaptureOnlyCompress = (message) => {
-  if (!isMessageWithInfo(message)) {
-    return false;
-  }
-  if (message.info.role !== "assistant") {
-    return false;
-  }
-  const parts = Array.isArray(message.parts) ? message.parts : [];
-  let sawBoundary = false;
-  for (const part of parts) {
-    if (!(part.type === "tool" && part.tool === "compress")) {
-      continue;
-    }
-    for (const startId of extractCompressBoundaryIds(part.state?.input)) {
-      sawBoundary = true;
-      if (/^b\d+$/i.test(startId)) {
-        return false;
-      }
-    }
-  }
-  return sawBoundary;
-};
-function extractCompressBoundaryIds(rawInput) {
-  let content = [];
-  if (typeof rawInput === "string") {
-    try {
-      const parsed = JSON.parse(rawInput);
-      const c = parsed?.content;
-      content = Array.isArray(c) ? c : [];
-    } catch {
-      return [];
-    }
-  } else if (rawInput && typeof rawInput === "object") {
-    const c = rawInput.content;
-    content = Array.isArray(c) ? c : [];
-  }
-  const ids = [];
-  for (const entry of content) {
-    if (!entry || typeof entry !== "object") {
-      continue;
-    }
-    const { startId, endId } = entry;
-    for (const sid of [startId, endId]) {
-      if (typeof sid === "string" && sid.trim() !== "") {
-        ids.push(sid.trim());
-      }
-    }
-  }
-  return ids;
-}
 var isIgnoredUserMessage = (message) => {
   if (!isMessageWithInfo(message)) {
     return false;
@@ -7831,11 +7801,8 @@ var injectCompressNudges = (state, config, logger, messages, prompts, compressio
       state.nudges.iterationNudgeAnchors.clear();
       state.nudges.lastNudgeShownTokens = void 0;
       state.nudges.lastToolOutputNudgeTokens = void 0;
-      const captureOnly = isCaptureOnlyCompress(lastCompressMsg);
-      if (!captureOnly) {
-        state.nudges.lastTier2NudgeTokens = currentTokens;
-        state.nudges.lastTier3NudgeTokens = currentTokens;
-      }
+      state.nudges.lastTier2NudgeTokens = currentTokens;
+      state.nudges.lastTier3NudgeTokens = currentTokens;
       const currentTurnHasSuccessfulCompress = messages.slice(currentTurnStart).some((m) => m.info.role === "assistant" && messageHasCompress(m));
       if (currentTurnHasSuccessfulCompress && wasNudgeTriggered && !state.nudges.compressBaselineSet) {
         const baseline = state.nudges.lastPerMessageNudgeTokens;
@@ -8315,6 +8282,58 @@ function stripStaleMetadata(messages) {
     });
   });
 }
+function stripProtectedReasoning(messages, protectedTools, threshold) {
+  if (protectedTools.length === 0) {
+    return 0;
+  }
+  const lastUserMessage = getLastUserMessage(messages);
+  if (!lastUserMessage || lastUserMessage.info.role !== "user") {
+    return 0;
+  }
+  let lastUserIndex = -1;
+  for (let i = messages.length - 1; i >= 0; i--) {
+    if (messages[i] === lastUserMessage) {
+      lastUserIndex = i;
+      break;
+    }
+  }
+  if (lastUserIndex <= 0) {
+    return 0;
+  }
+  const protectedSet = new Set(protectedTools);
+  let removed = 0;
+  for (let i = 0; i < lastUserIndex; i++) {
+    const message = messages[i];
+    if (!message || message.info.role !== "assistant") {
+      continue;
+    }
+    const parts = Array.isArray(message.parts) ? message.parts : [];
+    let hasProtectedTool = false;
+    let reasoningLength = 0;
+    for (const part of parts) {
+      if (part.type === "tool") {
+        if (protectedSet.has(part.tool)) {
+          hasProtectedTool = true;
+        }
+      } else if (part.type === "reasoning") {
+        reasoningLength += part.text.length;
+      }
+    }
+    if (!hasProtectedTool) {
+      continue;
+    }
+    if (reasoningLength <= threshold) {
+      continue;
+    }
+    const filtered = parts.filter((part) => part.type !== "reasoning");
+    if (filtered.length === parts.length) {
+      continue;
+    }
+    message.parts = filtered;
+    removed += parts.length - filtered.length;
+  }
+  return removed;
+}
 
 // lib/messages/priority.ts
 function buildPriorityMap(_config, _state, _messages) {
@@ -9431,7 +9450,7 @@ import { writeFile as writeFile2, mkdir as mkdir2 } from "fs/promises";
 import { join as join3 } from "path";
 import { existsSync as existsSync3 } from "fs";
 import { homedir as homedir3 } from "os";
-var LOG_VERSION = true ? "1.14.27-pr.365.102" : "dev";
+var LOG_VERSION = true ? "1.14.27-pr.370.105" : "dev";
 var LEVEL_RANK = {
   debug: 10,
   info: 20,
@@ -11448,6 +11467,18 @@ function createChatMessageTransformHandler(client, registry4, logger, config, pr
     prune(state, logger, config, output.messages);
     truncateLargeToolOutputs(state, config, logger, output.messages);
     hideConsumedCompressCalls(state, output.messages);
+    if (config.compress.stripProtectedReasoning !== false) {
+      const removedReasoning = stripProtectedReasoning(
+        output.messages,
+        config.compress.protectedTools,
+        config.compress.stripProtectedReasoningThreshold ?? 2048
+      );
+      if (removedReasoning > 0) {
+        logger.debug("stripProtectedReasoning: removed reasoning parts from historical protected messages", {
+          removed: removedReasoning
+        });
+      }
+    }
     assignMessageRefs(state, output.messages);
     const compressionPriorities = buildPriorityMap(config, state, output.messages);
     prompts.reload();
@@ -11904,7 +11935,7 @@ var server = (async (ctx) => {
   }
   const logger = new Logger(config.debug, config.debug ? "debug" : config.logLevel);
   logger.info("ACP plugin initialized", {
-    version: true ? "1.14.27-pr.365.102" : "dev",
+    version: true ? "1.14.27-pr.370.105" : "dev",
     workspace: ctx.directory,
     logLevel: logger.level,
     debug: config.debug,