opencode-acp 1.14.22-pr.325.39 → 1.14.22-pr.326.41

package/dist/index.js

@@ -7327,6 +7327,10 @@ function buildCompressibleRanges(messages, state, protectedTools = [], protected
   };
 }
 var EFFECTIVE_MIN_COMPRESSIBLE_TOKENS = 1250;
+function resolveEffectiveFloor(config) {
+  const minChars = config.compress?.minCompressRange ?? 5e3;
+  return minChars > 0 ? Math.floor(minChars / 4) : 0;
+}
 function filterRecommendedRanges(compressible, _protectedRanges, options) {
   const { logger } = options;
   const log = logger?.debug.bind(logger);
@@ -7334,9 +7338,10 @@ function filterRecommendedRanges(compressible, _protectedRanges, options) {
     log?.("filterRecommendedRanges: no compressible ranges, returning empty");
     return [];
   }
+  const floor = options.minEffectiveTokens ?? EFFECTIVE_MIN_COMPRESSIBLE_TOKENS;
   const kept = compressible.filter((r) => {
     const effective = r.effectiveTokens ?? r.tokens;
-    return effective >= EFFECTIVE_MIN_COMPRESSIBLE_TOKENS;
+    return effective > 0 && effective >= floor;
   });
   const result = kept.map(
     (r, i) => i === kept.length - 1 ? { ...r, dangerous: true } : r
@@ -7344,7 +7349,11 @@ function filterRecommendedRanges(compressible, _protectedRanges, options) {
   log?.("filterRecommendedRanges: effective-token floor applied", {
     inputRanges: compressible.length,
     outputRanges: result.length,
-    dropped: compressible.filter((r) => (r.effectiveTokens ?? r.tokens) < EFFECTIVE_MIN_COMPRESSIBLE_TOKENS).map((r) => `${r.startRef}\u2013${r.endRef} (${r.effectiveTokens ?? r.tokens} eff tokens)`)
+    floor,
+    dropped: compressible.filter((r) => {
+      const effective = r.effectiveTokens ?? r.tokens;
+      return effective <= 0 || effective < floor;
+    }).map((r) => `${r.startRef}\u2013${r.endRef} (${r.effectiveTokens ?? r.tokens} eff tokens)`)
   });
   return result;
 }
@@ -7661,15 +7670,18 @@ var injectCompressNudges = (state, config, logger, messages, prompts, compressio
   const recommendedRanges = filterRecommendedRanges(
     unprotectedCompressible,
     contextRanges.protected,
-    { logger }
+    { logger, minEffectiveTokens: resolveEffectiveFloor(config) }
   );
   const hasRecommendations = recommendedRanges.length > 0;
   const allProtected = contextRanges.compressible.length === 0 && contextRanges.protected.length > 0;
   const allInProtectedZone = protectedRefs.size > 0 && unprotectedCompressible.length === 0;
   const allBelowMin = contextRanges.compressible.length > 0 && recommendedRanges.length === 0;
   const nothingToCompress = allProtected || allInProtectedZone || allBelowMin;
-  const shouldInjectNudge = nudgeAllowed && (!nothingToCompress || emergencyOverride);
-  let shouldInject = shouldInjectNudge;
+  const emergencyNoTargets = emergencyOverride && nothingToCompress;
+  const noticeCadenceMet = state.nudges.lastNudgeShownTokens === void 0 || growthSinceBaseline !== void 0 && growthSinceBaseline >= growthFloor;
+  const shouldInjectNudge = nudgeAllowed && !nothingToCompress;
+  const shouldInjectNotice = emergencyNoTargets && noticeCadenceMet;
+  let shouldInject = shouldInjectNudge || shouldInjectNotice;
   if (shouldInjectNudge) {
     applyAnchoredNudges(state, config, messages, prompts, compressionPriorities, currentTokens, modelContextLimit, suffixMessage);
   }
@@ -7803,8 +7815,18 @@ ${formatCompressibleRanges(recommendedRanges, contextRanges.protected)}`;
 Use \`acp_status({scope:"uncompressed"})\` to re-fetch compressible ranges after compressing, or \`acp_status\` for compressed block details.`;
       appendToLastTextPart(suffixMessage, breakdown);
     }
-    if (effectiveTipsVariant === "maxLimit") {
+    if (effectiveTipsVariant === "maxLimit" && !emergencyNoTargets) {
       tipsText = "\n\n\u26A0\uFE0F Context limit reached \u2014 compress now. Prioritize consumed tool outputs.\n\n" + HOW_TO_COMPRESS_RULES + '\n\n{ "topic": "...", "content": [{ "startId": "<ID>", "endId": "<ID>", "summary": "..." }] }\n\nOnly use IDs from visible messages above. Compress older work first.';
+    } else if (shouldInjectNotice) {
+      const emergencyPct = currentTokens !== void 0 && modelContextLimit !== void 0 && modelContextLimit > 0 ? Math.round(currentTokens / modelContextLimit * 100) : void 0;
+      tipsText = `
+
+\u{1F6A8} Context is critically full${emergencyPct !== void 0 ? ` (${emergencyPct}% of limit)` : ""} and there is nothing left that can be safely compressed.
+Do NOT retry compress on the same ranges \u2014 they will keep failing.
+Recommended actions:
+1. Use OpenCode's built-in /compact to compact the whole session
+2. Or start a new session (this session's compression summaries remain available)
+3. Or ask the user to relax protected-tool / preserve-recent settings`;
     }
     state.nudges.lastNudgeShownTokens = currentTokens;
     {
@@ -9057,7 +9079,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.22-pr.325.39" : "dev";
+var LOG_VERSION = true ? "1.14.22-pr.326.41" : "dev";
 var Logger = class {
   logDir;
   enabled;