opencode-acp 1.14.25-pr.348.70 → 1.14.25-pr.348.72

package/dist/index.js

@@ -7378,7 +7378,18 @@ function resolveKnownWindow(config, state, providerId, modelId) {
 function estimateWireTokens(state, messages) {
   const base = getCurrentTokenUsage(state, messages);
   if (base > 0) {
-    return base + WIRE_SAFETY_MARGIN;
+    let trailing = 0;
+    const lastAsst = [...messages].reverse().find((m) => m.info.role === "assistant");
+    if (lastAsst) {
+      const parts = Array.isArray(lastAsst.parts) ? lastAsst.parts : [];
+      for (let i = parts.length - 1; i >= 0; i--) {
+        const p = parts[i];
+        if (p?.type !== "tool") break;
+        if (p.state.status !== "completed") break;
+        trailing += countTokens2(extractCompletedToolOutput(p) ?? "");
+      }
+    }
+    return base + trailing + WIRE_SAFETY_MARGIN;
   }
   let total = 0;
   for (const msg of messages) {
@@ -7430,7 +7441,6 @@ function pruneToFit(state, config, logger, messages) {
       clearedCount++;
     }
   }
-  if (clearedCount === 0) return;
   const after = estimate - freed;
   const detail = {
     session: state.sessionId,
@@ -7442,6 +7452,10 @@ function pruneToFit(state, config, logger, messages) {
     freedTokens: Math.round(freed),
     afterTokens: Math.round(after)
   };
+  if (clearedCount === 0) {
+    logger.error("ACP overflow guard: over window but no clearable tool outputs", detail);
+    return;
+  }
   if (after <= safeBudget) {
     logger.warn("ACP overflow guard: cleared tool outputs to fit context window", detail);
   } else {
@@ -9258,7 +9272,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.25-pr.348.70" : "dev";
+var LOG_VERSION = true ? "1.14.25-pr.348.72" : "dev";
 var LEVEL_RANK = {
   debug: 10,
   info: 20,
@@ -11701,7 +11715,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.25-pr.348.70" : "dev",
+    version: true ? "1.14.25-pr.348.72" : "dev",
     workspace: ctx.directory,
     logLevel: logger.level,
     debug: config.debug,