opencode-acp 1.18.3-pr.475.210 → 1.18.3-pr.477.211

package/dist/index.js

@@ -2908,7 +2908,8 @@ function saveSessionState(sessionState, logger, sessionName) {
     lastCompaction: sessionState.lastCompaction,
     modelContextLimit: sessionState.modelContextLimit,
     modelProviderID: sessionState.modelProviderID,
-    modelID: sessionState.modelID
+    modelID: sessionState.modelID,
+    usageSanity: sessionState.usageSanity
   };
   const key = saveQueueKey(sessionState.sessionId, sessionState.storageDir);
   let queue = saveQueues.get(key);
@@ -3763,18 +3764,32 @@ function adjustBoundariesForToolPairs(context, startIdx, endIdx) {
   return { startIndex: newStartIdx, endIndex: newEndIdx };
 }
 function buildBoundaryRecoveryHint(context, state) {
-  const visibleRefs = [];
+  const visibleIndexes = [];
   for (const [messageRef, messageId] of state.messageIds.byRef) {
-    if (context.rawMessagesById.has(messageId)) {
-      visibleRefs.push(messageRef);
-    }
+    if (!context.rawMessagesById.has(messageId)) continue;
+    const idx = parseMessageRef(messageRef);
+    if (idx !== null) visibleIndexes.push(idx);
   }
+  visibleIndexes.sort((a, b) => a - b);
+  const renderSpan = (start, end) => start === end ? formatMessageRef(start) : `${formatMessageRef(start)}\u2013${formatMessageRef(end)}`;
   const parts = [];
-  if (visibleRefs.length > 0) {
-    visibleRefs.sort();
-    const first = visibleRefs[0];
-    const last = visibleRefs[visibleRefs.length - 1];
-    parts.push(`Current visible: ${first}\u2013${last} (${visibleRefs.length} msgs).`);
+  if (visibleIndexes.length > 0) {
+    const spans = [];
+    let spanStart = visibleIndexes[0];
+    let spanPrev = visibleIndexes[0];
+    for (let i = 1; i < visibleIndexes.length; i++) {
+      const idx = visibleIndexes[i];
+      if (idx !== spanPrev + 1) {
+        spans.push(renderSpan(spanStart, spanPrev));
+        spanStart = idx;
+      }
+      spanPrev = idx;
+    }
+    spans.push(renderSpan(spanStart, spanPrev));
+    const MAX_SPANS = 8;
+    const shown = spans.slice(0, MAX_SPANS);
+    const overflow = spans.length - shown.length;
+    parts.push(`Free ranges: ${shown.join(", ")}${overflow > 0 ? ` (+${overflow} more)` : ""}.`);
   }
   const blockCount = context.summaryByBlockId.size;
   if (blockCount > 0) {
@@ -3783,7 +3798,7 @@ function buildBoundaryRecoveryHint(context, state) {
   if (parts.length === 0) {
     return "";
   }
-  return `${parts.join(" ")} Call acp_status() to see which blocks consumed which IDs, then retry with valid IDs.`;
+  return `${parts.join(" ")} Retry with IDs inside the free ranges.`;
 }
 function clampMessageRef(requested, context, state) {
   if (state.messageIds.byRef.has(requested.ref)) return null;
@@ -5232,6 +5247,14 @@ async function ensureSessionInitialized(client, state, sessionId, logger, messag
     state.modelProviderID = persisted.modelProviderID;
     state.modelID = persisted.modelID;
   }
+  if (persisted.usageSanity) {
+    const { reported, estimated } = persisted.usageSanity;
+    if (Number.isFinite(reported) && Number.isFinite(estimated) && reported >= 0 && estimated >= 0) {
+      state.usageSanity = { reported, estimated };
+    } else {
+      state.usageSanity = void 0;
+    }
+  }
   const applied = applyPendingCompressionDurations(state);
   if (applied > 0) {
     await saveSessionState(state, logger);
@@ -6784,6 +6807,49 @@ ${guidance}
 ${afterClose}`;
 }
 
+// lib/usage-sanity.ts
+var RELAY_INFLATION_RATIO = 1.5;
+var PAYLOAD_FLOOR_TOKENS = 5e3;
+function estimatePayloadTokens(messages) {
+  let total = 0;
+  for (const msg of messages) {
+    if (isSyntheticMessage(msg)) continue;
+    if (isIgnoredUserMessage(msg)) continue;
+    total += estimateAllMessageTokensFast(msg);
+  }
+  return total;
+}
+function resolveCurrentUsage(state, messages, logger) {
+  const reported = getCurrentTokenUsage(state, messages);
+  if (reported === 0) {
+    return { tokens: 0, source: "reported", inflationDetected: false };
+  }
+  const estimated = estimatePayloadTokens(messages) + (state.systemPromptTokens ?? 0);
+  const prev = state.usageSanity;
+  let inflationDetected = false;
+  if (prev !== void 0 && prev.reported > 0 && prev.estimated >= PAYLOAD_FLOOR_TOKENS && estimated >= PAYLOAD_FLOOR_TOKENS) {
+    const reportRatio = reported / prev.reported;
+    const payloadRatio = estimated / prev.estimated;
+    if (reportRatio > RELAY_INFLATION_RATIO && payloadRatio <= RELAY_INFLATION_RATIO) {
+      inflationDetected = true;
+    }
+  }
+  state.usageSanity = { reported, estimated };
+  if (inflationDetected) {
+    logger?.warn("Relay usage inflation detected \u2014 re-estimating context size", {
+      session: state.sessionId,
+      reported,
+      previousReported: prev.reported,
+      reportRatio: +(reported / prev.reported).toFixed(3),
+      estimated,
+      previousEstimated: prev.estimated,
+      payloadRatio: +(estimated / prev.estimated).toFixed(3)
+    });
+    return { tokens: estimated, source: "reestimated", inflationDetected: true };
+  }
+  return { tokens: reported, source: "reported", inflationDetected: false };
+}
+
 // lib/messages/utils.ts
 import { createHash as createHash2 } from "crypto";
 var SUMMARY_ID_HASH_LENGTH = 16;
@@ -7134,7 +7200,7 @@ function isContextOverLimits(config, state, providerId, modelId, messages) {
   );
   const maxContextLimit = resolvedMaxContextLimit === void 0 ? void 0 : resolvedMaxContextLimit + summaryTokenExtension;
   const minContextLimit = resolveContextTokenLimit(config, state, providerId, modelId, "min");
-  const currentTokens = getCurrentTokenUsage(state, messages);
+  const currentTokens = resolveCurrentUsage(state, messages).tokens;
   let overMaxLimit = maxContextLimit === void 0 ? false : currentTokens > maxContextLimit;
   const overMinLimit = minContextLimit === void 0 ? false : currentTokens >= minContextLimit;
   if (overMaxLimit) {
@@ -9286,7 +9352,8 @@ var injectCompressNudges = (state, config, logger, messages, prompts, compressio
   const allInProtectedZone = protectedRefs.size > 0 && unprotectedCompressible.length === 0;
   const allBelowMin = contextRanges.compressible.length > 0 && recommendedRanges.length === 0;
   const noExecutableCandidates = candidatesEnabled && nudgeAllowed && candidateMessages !== void 0 && candidatePlan.candidates.length === 0;
-  const nothingToCompress = candidatesEnabled && candidateMessages !== void 0 ? noExecutableCandidates : allProtected || allInProtectedZone || allBelowMin;
+  const noRangesAtAll = contextRanges.compressible.length === 0 && contextRanges.protected.length === 0;
+  const nothingToCompress = (candidatesEnabled && candidateMessages !== void 0 ? noExecutableCandidates : allProtected || allInProtectedZone || allBelowMin) || noRangesAtAll;
   const emergencyNoTargets = emergencyOverride && nothingToCompress;
   const noticeCadenceMet = state.nudges.lastNudgeShownTokens === void 0 || growthSinceBaseline !== void 0 && growthSinceBaseline >= growthFloor;
   let shouldInjectNudge = nudgeAllowed && !nothingToCompress;
@@ -9491,7 +9558,7 @@ ${rules}`;
   } else if (nudgeAllowed && nothingToCompress) {
     logger.info("Nudge suppressed: nothing to compress", {
       session: state.sessionId,
-      reason: allProtected ? "all_protected" : allInProtectedZone ? "in_protected_zone" : allBelowMin ? "below_effective_floor" : "no_executable_candidates",
+      reason: allProtected ? "all_protected" : allInProtectedZone ? "in_protected_zone" : allBelowMin ? "below_effective_floor" : noRangesAtAll ? "no_compressible_ranges" : "no_executable_candidates",
       currentTokens,
       usagePct,
       compressibleRanges: contextRanges.compressible.length
@@ -11109,7 +11176,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.18.3-pr.475.210" : "dev";
+var LOG_VERSION = true ? "1.18.3-pr.477.211" : "dev";
 var LEVEL_RANK = {
   debug: 10,
   info: 20,
@@ -13330,7 +13397,7 @@ function createChatMessageTransformHandler(client, registry4, logger, config, pr
       saveSessionState(state, logger).catch(() => {
       });
     }
-    const prePruneTokens = getCurrentTokenUsage(state, output.messages);
+    const prePruneTokens = resolveCurrentUsage(state, output.messages, logger).tokens;
     const candidateMessages = config.compress.candidates === true ? output.messages.slice() : void 0;
     prune(state, logger, config, output.messages);
     hideConsumedCompressCalls(state, output.messages);
@@ -13379,7 +13446,7 @@ ${text}`);
     if (state.sessionId && smartPlanEnabled === true) {
       recordVisibleMessages(state.sessionId, output.messages);
     }
-    const postTokens = getCurrentTokenUsage(state, output.messages);
+    const postTokens = resolveCurrentUsage(state, output.messages, logger).tokens;
     if (postTokens !== void 0 && effectiveLimit) {
       const budget = effectiveLimit.limit - (state.systemPromptTokens ?? 0) - OUTPUT_RESERVE_TOKENS;
       if (postTokens > budget) {
@@ -13805,7 +13872,7 @@ var server = (async (ctx) => {
   }
   const logger = new Logger(config.debug, config.debug ? "debug" : config.logLevel);
   logger.info("ACP plugin initialized", {
-    version: true ? "1.18.3-pr.475.210" : "dev",
+    version: true ? "1.18.3-pr.477.211" : "dev",
     workspace: ctx.directory,
     logLevel: logger.level,
     debug: config.debug,