opencode-acp 1.14.22-pr.326.47 → 1.14.22-pr.327.45

package/README.md

@@ -123,8 +123,8 @@ stateDiagram-v2
 - **T1** fires when raw context exceeds the configured limit. The model sees
   compressible ranges and writes a detailed summary preserving file paths,
   signatures, decisions, and rationale.
-- **T2** fires when T1 summary tokens reach `nudgeGrowthTokens` (default 5% of
-  context window). The model distills old T1 blocks — keeping decisions and
+- **T2** fires when T1 summary tokens reach `nudgeGrowthTokens` (fixed default
+  50000). The model distills old T1 blocks — keeping decisions and
   outcomes, dropping verbose process details.
 - **T3** fires when T2 summary tokens reach the same threshold. The model
   condenses to bare facts (shipped releases, key bugs, architecture decisions).

package/README.zh-CN.md

@@ -100,7 +100,7 @@ stateDiagram-v2
 **触发机制：**
 
 - **T1** 在原始上下文超过配置限制时触发。模型看到可压缩范围，编写详细摘要，保留文件路径、函数签名、决策和理由。
-- **T2** 在 T1 摘要 token 达到 `nudgeGrowthTokens`（默认上下文窗口的 5%）时触发。模型蒸馏旧的 T1 块 — 保留决策和结果，丢弃冗长的过程细节。
+- **T2** 在 T1 摘要 token 达到 `nudgeGrowthTokens`（固定默认 50000）时触发。模型蒸馏旧的 T1 块 — 保留决策和结果，丢弃冗长的过程细节。
 - **T3** 在 T2 摘要 token 达到同样阈值时触发。模型浓缩为纯事实（已发布的版本、关键 bug、架构决策）。
 
 每层有**独立的节奏计数器** — T2 触发不阻塞 T3。T1 通过 `!shouldInject` 守卫获得优先级：如果 T1 触发了，T2/T3 等到下一轮。这确保原始上下文压缩优先发生（影响最大）。

package/dist/index.js

@@ -6953,13 +6953,7 @@ function computeShouldNudge2(params) {
   }
   return policy.computeShouldNudge(params);
 }
-function resolveAdaptiveNudgeGrowth2(modelContextLimit) {
-  const policy = getDefaultTriggerPolicy();
-  if (!policy) {
-    return 6e3;
-  }
-  return policy.resolveAdaptiveNudgeGrowth(modelContextLimit);
-}
+var DEFAULT_NUDGE_GROWTH_TOKENS = 5e4;
 function addAnchor(anchorMessageIds, anchorMessageId, anchorMessageIndex, messages, interval) {
   if (anchorMessageIndex < 0) {
     return false;
@@ -7192,9 +7186,7 @@ function refNum(ref) {
 function buildCompressibleRanges(messages, state, protectedTools = [], protectedFilePatterns = [], protectedZoneRefs) {
   const msgInfo = [];
   const protectedMsgInfo = [];
-  const lastUserRefIdx = [];
-  for (let mi = 0; mi < messages.length; mi++) {
-    const msg = messages[mi];
+  for (const msg of messages) {
     if (isSyntheticMessage(msg)) continue;
     const ref = state.messageIds.byRawId.get(msg.info.id);
     if (!ref) continue;
@@ -7229,27 +7221,15 @@ function buildCompressibleRanges(messages, state, protectedTools = [], protected
     }
     let tokens = 0;
     let isTool = false;
-    let hasMeaningfulPart = false;
     for (const part of msg.parts || []) {
       if (part.type === "text" && typeof part.text === "string") {
         tokens += Math.round(part.text.length / 4);
-        if (part.text.trim().length > 0) hasMeaningfulPart = true;
       } else if (part.type !== "text" && part.type !== "reasoning") {
         tokens += Math.round(JSON.stringify(part).length / 4);
         isTool = true;
-        hasMeaningfulPart = true;
       }
     }
-    if (msg.info.role === "user" && !isIgnoredUserMessage(msg)) {
-      lastUserRefIdx.length = 0;
-      lastUserRefIdx.push(msgInfo.length);
-    }
-    msgInfo.push({ ref, refNum: rn, tokens, effectiveTokens: 0, meaningful: hasMeaningfulPart, isTool, isUser: msg.info.role === "user" });
-  }
-  const lastUserIdx = lastUserRefIdx.length > 0 ? lastUserRefIdx[0] : -1;
-  for (let i = 0; i < msgInfo.length; i++) {
-    const info = msgInfo[i];
-    info.effectiveTokens = i !== lastUserIdx && info.meaningful ? info.tokens : 0;
+    msgInfo.push({ ref, refNum: rn, tokens, isTool, isUser: msg.info.role === "user" });
   }
   const groups = [];
   let cur = null;
@@ -7275,7 +7255,6 @@ function buildCompressibleRanges(messages, state, protectedTools = [], protected
         endRef: info.ref,
         count: 1,
         tokens: info.tokens,
-        effectiveTokens: info.effectiveTokens,
         toolPct: info.isTool ? 100 : 0,
         textPct: info.isTool ? 0 : 100
       };
@@ -7283,7 +7262,6 @@ function buildCompressibleRanges(messages, state, protectedTools = [], protected
       cur.endRef = info.ref;
       cur.count++;
       cur.tokens += info.tokens;
-      cur.effectiveTokens += info.effectiveTokens;
       if (info.isTool) {
         cur.toolPct = Math.round((cur.toolPct * (cur.count - 1) + 100) / cur.count);
       } else {
@@ -7326,11 +7304,6 @@ function buildCompressibleRanges(messages, state, protectedTools = [], protected
     protected: protectedGroups
   };
 }
-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);
@@ -7338,22 +7311,12 @@ 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 > 0 && effective >= floor;
-  });
-  const result = kept.map(
-    (r, i) => i === kept.length - 1 ? { ...r, dangerous: true } : r
+  const result = compressible.map(
+    (r, i) => i === compressible.length - 1 ? { ...r, dangerous: true } : r
   );
-  log?.("filterRecommendedRanges: effective-token floor applied", {
+  log?.("filterRecommendedRanges: passthrough (last segment marked dangerous)", {
     inputRanges: compressible.length,
-    outputRanges: result.length,
-    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)`)
+    outputRanges: result.length
   });
   return result;
 }
@@ -7362,10 +7325,8 @@ function formatCompressibleRanges(ranges, protectedRanges) {
   if (!protectedRanges || protectedRanges.length === 0) {
     if (ranges.length === 0) return "";
     const lines2 = ranges.map((r) => {
-      const eff = r.effectiveTokens ?? r.tokens;
-      const size = eff < r.tokens ? `${fmt(eff)} effective of ${fmt(r.tokens)}` : fmt(r.tokens);
       const suffix = r.dangerous ? "  \u26A0\uFE0F NOT recommended unless you are certain. If you MUST compress this, pass `dangerous: true`." : "";
-      return `  ${r.startRef}\u2013${r.endRef}  ${r.count} msgs  ${size} [tool ${r.toolPct}% | text ${r.textPct}%]${suffix}`;
+      return `  ${r.startRef}\u2013${r.endRef}  ${r.count} msgs  ${fmt(r.tokens)} [tool ${r.toolPct}% | text ${r.textPct}%]${suffix}`;
     });
     return `Compressible ranges (oldest first):
 ${lines2.join("\n")}`;
@@ -7381,7 +7342,7 @@ ${lines2.join("\n")}`;
       tokens: r.tokens,
       toolPct: r.toolPct,
       textPct: r.textPct,
-      compressibleTokens: r.effectiveTokens ?? r.tokens,
+      compressibleTokens: r.tokens,
       compressibleCount: r.count,
       protectedTokens: 0,
       protectedCount: 0,
@@ -7621,7 +7582,7 @@ var injectCompressNudges = (state, config, logger, messages, prompts, compressio
     }
   }
   const suffixMessage = createSuffixMessage(messages);
-  const nudgeGrowthTokens = config.compress?.nudgeGrowthTokens ?? resolveAdaptiveNudgeGrowth2(modelContextLimit);
+  const nudgeGrowthTokens = config.compress?.nudgeGrowthTokens ?? DEFAULT_NUDGE_GROWTH_TOKENS;
   const growthFloor = Math.max(
     config.compress?.minNudgeGrowthFloor ?? 5e3,
     (config.compress?.minNudgeGrowthRatio ?? 0.45) * nudgeGrowthTokens
@@ -7670,18 +7631,14 @@ var injectCompressNudges = (state, config, logger, messages, prompts, compressio
   const recommendedRanges = filterRecommendedRanges(
     unprotectedCompressible,
     contextRanges.protected,
-    { logger, minEffectiveTokens: resolveEffectiveFloor(config) }
+    { logger }
   );
   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 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;
+  const nothingToCompress = allProtected || allInProtectedZone;
+  const shouldInjectNudge = nudgeAllowed && (!nothingToCompress || emergencyOverride);
+  let shouldInject = shouldInjectNudge;
   if (shouldInjectNudge) {
     applyAnchoredNudges(state, config, messages, prompts, compressionPriorities, currentTokens, modelContextLimit, suffixMessage);
   }
@@ -7815,19 +7772,8 @@ ${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" && !emergencyNoTargets) {
+    if (effectiveTipsVariant === "maxLimit") {
       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.
-You cannot execute user commands yourself. Act now via your reply/message tool:
-- Inform the user that context is full and compression is exhausted
-- Recommend they run /acp export (archives compression summaries to a file), then /compact or start a new session
-- Alternatively, ask them to relax protected-tool / preserve-recent settings so compression becomes possible
-Then stop retrying and await the user's response.`;
     }
     state.nudges.lastNudgeShownTokens = currentTokens;
     {
@@ -9080,7 +9026,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.326.47" : "dev";
+var LOG_VERSION = true ? "1.14.22-pr.327.45" : "dev";
 var Logger = class {
   logDir;
   enabled;