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

package/dist/index.js

@@ -4330,7 +4330,8 @@ function createSessionState() {
     systemPromptTokens: void 0,
     qualityGateRetryPending: false,
     uncalibratedWindowTransforms: 0,
-    uncalibratedWindowWarned: false
+    uncalibratedWindowWarned: false,
+    overflowGuardStuckLogged: false
   };
 }
 function resetSessionState(state) {
@@ -4374,6 +4375,7 @@ function resetSessionState(state) {
   state.qualityGateRetryPending = false;
   state.uncalibratedWindowTransforms = 0;
   state.uncalibratedWindowWarned = false;
+  state.overflowGuardStuckLogged = false;
 }
 async function ensureSessionInitialized(client, state, sessionId, logger, messages, config) {
   if (state.sessionId === sessionId) {
@@ -7378,13 +7380,49 @@ function resolveKnownWindow(config, state, providerId, modelId) {
 function estimateWireTokens(state, messages) {
   const base = getCurrentTokenUsage(state, messages);
   if (base > 0) {
-    return base + WIRE_SAFETY_MARGIN;
+    let lastAsstIdx = -1;
+    for (let i = messages.length - 1; i >= 0; i--) {
+      if (messages[i].info.role === "assistant") {
+        lastAsstIdx = i;
+        break;
+      }
+    }
+    if (lastAsstIdx >= 0 && hasCompletedCompressPart(messages[lastAsstIdx])) {
+      return preciseWireTokens(state, messages);
+    }
+    let trailing = 0;
+    if (lastAsstIdx >= 0) {
+      const parts = Array.isArray(messages[lastAsstIdx].parts) ? messages[lastAsstIdx].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) ?? "");
+      }
+    }
+    let afterLastAsst = 0;
+    for (let i = lastAsstIdx + 1; i < messages.length; i++) {
+      afterLastAsst += countAllMessageTokens(messages[i]);
+    }
+    return base + trailing + afterLastAsst + WIRE_SAFETY_MARGIN;
   }
-  let total = 0;
+  return preciseWireTokens(state, messages);
+}
+function preciseWireTokens(state, messages) {
+  let total = state.systemPromptTokens ?? 0;
   for (const msg of messages) {
     total += countAllMessageTokens(msg);
   }
-  return total + (state.systemPromptTokens ?? 0) + WIRE_SAFETY_MARGIN;
+  return total + WIRE_SAFETY_MARGIN;
+}
+function hasCompletedCompressPart(message) {
+  const parts = Array.isArray(message.parts) ? message.parts : [];
+  for (const p of parts) {
+    if (p?.type === "tool" && p.tool === "compress" && p.state.status === "completed") {
+      return true;
+    }
+  }
+  return false;
 }
 function pruneToFit(state, config, logger, messages) {
   if (!config.compress.overflowGuard) return;
@@ -7394,7 +7432,10 @@ function pruneToFit(state, config, logger, messages) {
   const safeBudget = knownWindow - reserve;
   if (safeBudget <= 0) return;
   const estimate = estimateWireTokens(state, messages);
-  if (estimate <= safeBudget) return;
+  if (estimate <= safeBudget) {
+    state.overflowGuardStuckLogged = false;
+    return;
+  }
   const protectedRefs = computeProtectedRefs(messages, state, config.compress);
   const lastNonIgnored = findLastNonIgnoredMessage(messages);
   const lastMsgId = lastNonIgnored?.message.info.id;
@@ -7430,7 +7471,6 @@ function pruneToFit(state, config, logger, messages) {
       clearedCount++;
     }
   }
-  if (clearedCount === 0) return;
   const after = estimate - freed;
   const detail = {
     session: state.sessionId,
@@ -7442,6 +7482,13 @@ function pruneToFit(state, config, logger, messages) {
     freedTokens: Math.round(freed),
     afterTokens: Math.round(after)
   };
+  if (clearedCount === 0) {
+    if (!state.overflowGuardStuckLogged) {
+      state.overflowGuardStuckLogged = true;
+      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 +9305,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.74" : "dev";
 var LEVEL_RANK = {
   debug: 10,
   info: 20,
@@ -11701,7 +11748,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.74" : "dev",
     workspace: ctx.directory,
     logLevel: logger.level,
     debug: config.debug,