opencode-acp 1.16.0-pr.360.124 → 1.16.0-pr.365.125

package/dist/index.js

@@ -2159,6 +2159,56 @@ 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;
@@ -7034,10 +7084,13 @@ function buildCompressibleRanges(messages, state, protectedTools = [], protected
     if (!ref) continue;
     const rn = parseInt(ref.slice(1), 10);
     if ((protectedTools.length > 0 || protectedFilePatterns.length > 0) && messageContainsProtectedTool(msg, protectedTools, protectedFilePatterns)) {
-      const tokens2 = Math.round(countMessageCharacters(msg) / 4);
+      let tokens2 = 0;
       const tools = /* @__PURE__ */ new Set();
       for (const part of msg.parts || []) {
-        if (part.type !== "text" && part.type !== "reasoning") {
+        if (part.type === "text" && typeof part.text === "string") {
+          tokens2 += Math.round(part.text.length / 4);
+        } else if (part.type !== "text" && part.type !== "reasoning") {
+          tokens2 += Math.round(JSON.stringify(part).length / 4);
           const toolName = part?.tool;
           const callID = part?.callID;
           if (toolName && callID) {
@@ -7058,13 +7111,15 @@ function buildCompressibleRanges(messages, state, protectedTools = [], protected
       protectedMsgInfo.push({ ref, refNum: rn, tokens: tokens2, tools: [...tools] });
       continue;
     }
-    const tokens = Math.round(countMessageCharacters(msg) / 4);
+    let tokens = 0;
     let isTool = false;
     let hasMeaningfulPart = false;
     for (const part of msg.parts || []) {
       if (part.type === "text" && typeof part.text === "string") {
+        tokens += Math.round(part.text.length / 4);
         if (part.text.trim().length > 0) hasMeaningfulPart = true;
       } else if (part.type !== "text" && part.type !== "reasoning") {
+        tokens += Math.round(JSON.stringify(part).length / 4);
         isTool = true;
         hasMeaningfulPart = true;
       }
@@ -7888,8 +7943,11 @@ var injectCompressNudges = (state, config, logger, messages, prompts, compressio
       state.nudges.iterationNudgeAnchors.clear();
       state.nudges.lastNudgeShownTokens = void 0;
       state.nudges.lastToolOutputNudgeTokens = void 0;
-      state.nudges.lastTier2NudgeTokens = currentTokens;
-      state.nudges.lastTier3NudgeTokens = currentTokens;
+      const captureOnly = isCaptureOnlyCompress(lastCompressMsg);
+      if (!captureOnly) {
+        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;
@@ -9525,7 +9583,7 @@ import { writeFile as writeFile2, mkdir as mkdir2 } from "fs/promises";
 import { join as join4 } from "path";
 import { existsSync as existsSync4 } from "fs";
 import { homedir as homedir3 } from "os";
-var LOG_VERSION = true ? "1.16.0-pr.360.124" : "dev";
+var LOG_VERSION = true ? "1.16.0-pr.365.125" : "dev";
 var LEVEL_RANK = {
   debug: 10,
   info: 20,
@@ -12016,7 +12074,7 @@ var server = (async (ctx) => {
   }
   const logger = new Logger(config.debug, config.debug ? "debug" : config.logLevel);
   logger.info("ACP plugin initialized", {
-    version: true ? "1.16.0-pr.360.124" : "dev",
+    version: true ? "1.16.0-pr.365.125" : "dev",
     workspace: ctx.directory,
     logLevel: logger.level,
     debug: config.debug,