opencode-acp 1.14.25-pr.350.73 → 1.14.25-pr.350.76

package/dist/index.js

@@ -908,6 +908,7 @@ var VALID_CONFIG_KEYS = /* @__PURE__ */ new Set([
   "compress.preserveRecentMessages",
   "compress.preserveRecentTokens",
   "compress.preserveLastUserMessage",
+  "compress.completionReserveTokens",
   "gc",
   "gc.algorithm",
   "gc.promotionThreshold",
@@ -1261,6 +1262,20 @@ function validateConfigTypes(config) {
           actual: typeof compress.preserveLastUserMessage
         });
       }
+      if (compress.completionReserveTokens !== void 0 && typeof compress.completionReserveTokens !== "number") {
+        errors.push({
+          key: "compress.completionReserveTokens",
+          expected: "number",
+          actual: typeof compress.completionReserveTokens
+        });
+      }
+      if (typeof compress.completionReserveTokens === "number" && compress.completionReserveTokens < 0) {
+        errors.push({
+          key: "compress.completionReserveTokens",
+          expected: "non-negative number (>= 0)",
+          actual: `${compress.completionReserveTokens}`
+        });
+      }
       if (typeof compress.iterationNudgeThreshold === "number" && compress.iterationNudgeThreshold < 1) {
         errors.push({
           key: "compress.iterationNudgeThreshold",
@@ -9113,7 +9128,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.350.73" : "dev";
+var LOG_VERSION = true ? "1.14.25-pr.350.76" : "dev";
 var LEVEL_RANK = {
   debug: 10,
   info: 20,
@@ -10014,18 +10029,21 @@ function resolveContextWindow(state) {
 function estimateWireTokens(state, messages) {
   const base = getCurrentTokenUsage(state, messages);
   if (base > 0) {
-    let lastAssistant = -1;
+    let baseAssistant = -1;
     for (let i = messages.length - 1; i >= 0; i--) {
-      if (messages[i].info.role === "assistant") {
-        lastAssistant = i;
-        break;
-      }
+      if (messages[i].info.role !== "assistant") continue;
+      const tokens = messages[i].info.tokens;
+      if ((tokens?.input || 0) <= 0 && (tokens?.output || 0) <= 0) continue;
+      baseAssistant = i;
+      break;
     }
-    let additions = 0;
-    for (let i = lastAssistant + 1; i < messages.length; i++) {
-      additions += countAllMessageTokens(messages[i]);
+    if (baseAssistant >= 0) {
+      let additions = 0;
+      for (let i = baseAssistant + 1; i < messages.length; i++) {
+        additions += countAllMessageTokens(messages[i]);
+      }
+      return base + additions;
     }
-    return base + additions;
   }
   let total = 0;
   for (const m of messages) total += countAllMessageTokens(m);
@@ -10034,7 +10052,8 @@ function estimateWireTokens(state, messages) {
 function enforceContextBudget(state, config, logger, messages) {
   const window = resolveContextWindow(state);
   if (window === void 0) return void 0;
-  const reserve = config.compress?.completionReserveTokens ?? DEFAULT_COMPLETION_RESERVE_TOKENS;
+  const configuredReserve = config.compress?.completionReserveTokens;
+  const reserve = typeof configuredReserve === "number" && Number.isFinite(configuredReserve) && configuredReserve >= 0 ? configuredReserve : DEFAULT_COMPLETION_RESERVE_TOKENS;
   const budget = window - reserve;
   if (budget <= 0) return void 0;
   const estimatedTokens = estimateWireTokens(state, messages);
@@ -10085,6 +10104,7 @@ function enforceContextBudget(state, config, logger, messages) {
 ...${TRUNCATION_MARKER2} \u2014 original ~${c.tokens} tokens]...
 
 ` + suffix;
+    if (truncated.length >= c.content.length) continue;
     c.part.state.output = truncated;
     saved += c.tokens - countTokens2(truncated);
     truncatedCount++;
@@ -11244,7 +11264,7 @@ function createChatMessageTransformHandler(client, registry4, logger, config, pr
       if (state.modelContextLimit === void 0 && !state.noContextLimitWarned && requestModel?.providerID && requestModel?.modelID && registry4.resolveModelLimit(requestModel.providerID, requestModel.modelID) === void 0) {
         state.noContextLimitWarned = true;
         logger.warn(
-          'Model reports no context window and the catalog has no entry for it; all percentage thresholds (min/max/emergency, GC) and the context-budget guard are disabled. Set the model limit in opencode.json (e.g. "limit": {"context": 262144, "output": 16384}) or set an absolute compress.maxContextLimit in acp.jsonc.',
+          'Model reports no context window and the catalog has no entry for it; all percentage thresholds (min/max/emergency, GC) and the context-budget guard are disabled. Set the model limit in opencode.json (e.g. "limit": {"context": 262144, "output": 16384}) to enable them (also fixes the 32000 max_tokens fallback); an absolute compress.maxContextLimit in acp.jsonc only enables proactive nudges, not the guard.',
           {
             session: state.sessionId,
             model: `${requestModel.providerID}/${requestModel.modelID}`
@@ -11707,7 +11727,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.350.73" : "dev",
+    version: true ? "1.14.25-pr.350.76" : "dev",
     workspace: ctx.directory,
     logLevel: logger.level,
     debug: config.debug,