opencode-acp 1.14.21 → 1.14.22-pr.325.39

package/dist/index.js

@@ -4523,6 +4523,9 @@ function formatProgressBar(messageIds, prunedMessages, recentMessageIds, width =
   return `\u2502${bar.join("")}\u2502`;
 }
 function cacheSystemPromptTokens(state, messages) {
+  if (state.systemPromptTokens !== void 0 && state.systemPromptTokens > 0) {
+    return;
+  }
   let firstInputTokens = 0;
   for (const msg of messages) {
     if (msg.info.role !== "assistant") {
@@ -7165,7 +7168,7 @@ function estimateContextComposition(messages, state, protectedTools = [], protec
   perCode.sort((a, b) => b.tokens - a.tokens);
   perText.sort((a, b) => b.tokens - a.tokens);
   const toolTypeBreakdown = Array.from(toolTypeMap.entries()).map(([tool6, tokens]) => ({ tool: tool6, tokens })).sort((a, b) => b.tokens - a.tokens);
-  const systemTokens = estimateSystemPromptTokens(messages);
+  const systemTokens = state?.systemPromptTokens !== void 0 && state.systemPromptTokens > 0 ? state.systemPromptTokens : estimateSystemPromptTokens(messages);
   return {
     toolTokens,
     codeTokens,
@@ -7189,7 +7192,9 @@ function refNum(ref) {
 function buildCompressibleRanges(messages, state, protectedTools = [], protectedFilePatterns = [], protectedZoneRefs) {
   const msgInfo = [];
   const protectedMsgInfo = [];
-  for (const msg of messages) {
+  const lastUserRefIdx = [];
+  for (let mi = 0; mi < messages.length; mi++) {
+    const msg = messages[mi];
     if (isSyntheticMessage(msg)) continue;
     const ref = state.messageIds.byRawId.get(msg.info.id);
     if (!ref) continue;
@@ -7224,15 +7229,27 @@ 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;
       }
     }
-    msgInfo.push({ ref, refNum: rn, tokens, isTool, isUser: msg.info.role === "user" });
+    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;
   }
   const groups = [];
   let cur = null;
@@ -7258,6 +7275,7 @@ 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
       };
@@ -7265,6 +7283,7 @@ 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 {
@@ -7307,6 +7326,7 @@ function buildCompressibleRanges(messages, state, protectedTools = [], protected
     protected: protectedGroups
   };
 }
+var EFFECTIVE_MIN_COMPRESSIBLE_TOKENS = 1250;
 function filterRecommendedRanges(compressible, _protectedRanges, options) {
   const { logger } = options;
   const log = logger?.debug.bind(logger);
@@ -7314,12 +7334,17 @@ function filterRecommendedRanges(compressible, _protectedRanges, options) {
     log?.("filterRecommendedRanges: no compressible ranges, returning empty");
     return [];
   }
-  const result = compressible.map(
-    (r, i) => i === compressible.length - 1 ? { ...r, dangerous: true } : r
+  const kept = compressible.filter((r) => {
+    const effective = r.effectiveTokens ?? r.tokens;
+    return effective >= EFFECTIVE_MIN_COMPRESSIBLE_TOKENS;
+  });
+  const result = kept.map(
+    (r, i) => i === kept.length - 1 ? { ...r, dangerous: true } : r
   );
-  log?.("filterRecommendedRanges: passthrough (last segment marked dangerous)", {
+  log?.("filterRecommendedRanges: effective-token floor applied", {
     inputRanges: compressible.length,
-    outputRanges: result.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)`)
   });
   return result;
 }
@@ -7328,8 +7353,10 @@ 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  ${fmt(r.tokens)} [tool ${r.toolPct}% | text ${r.textPct}%]${suffix}`;
+      return `  ${r.startRef}\u2013${r.endRef}  ${r.count} msgs  ${size} [tool ${r.toolPct}% | text ${r.textPct}%]${suffix}`;
     });
     return `Compressible ranges (oldest first):
 ${lines2.join("\n")}`;
@@ -7345,7 +7372,7 @@ ${lines2.join("\n")}`;
       tokens: r.tokens,
       toolPct: r.toolPct,
       textPct: r.textPct,
-      compressibleTokens: r.tokens,
+      compressibleTokens: r.effectiveTokens ?? r.tokens,
       compressibleCount: r.count,
       protectedTokens: 0,
       protectedCount: 0,
@@ -7639,7 +7666,8 @@ var injectCompressNudges = (state, config, logger, messages, prompts, compressio
   const hasRecommendations = recommendedRanges.length > 0;
   const allProtected = contextRanges.compressible.length === 0 && contextRanges.protected.length > 0;
   const allInProtectedZone = protectedRefs.size > 0 && unprotectedCompressible.length === 0;
-  const nothingToCompress = allProtected || allInProtectedZone;
+  const allBelowMin = contextRanges.compressible.length > 0 && recommendedRanges.length === 0;
+  const nothingToCompress = allProtected || allInProtectedZone || allBelowMin;
   const shouldInjectNudge = nudgeAllowed && (!nothingToCompress || emergencyOverride);
   let shouldInject = shouldInjectNudge;
   if (shouldInjectNudge) {
@@ -8609,7 +8637,11 @@ function collectVisibleMessages(rawMessages, ctx) {
       result.push({ ref, tokens, tool: toolName || "text", index: idx });
     }
   });
-  return { messages: result, summaryTokens, systemTokens: estimateSystemPromptTokens(rawMessages) };
+  return {
+    messages: result,
+    summaryTokens,
+    systemTokens: ctx.state.systemPromptTokens !== void 0 && ctx.state.systemPromptTokens > 0 ? ctx.state.systemPromptTokens : estimateSystemPromptTokens(rawMessages)
+  };
 }
 function renderOverview(visibleMessages, summaryTokens, systemTokens, blocks, fetchFailed, rawMessages, ctx) {
   const lines = [];
@@ -9025,7 +9057,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.21" : "dev";
+var LOG_VERSION = true ? "1.14.22-pr.325.39" : "dev";
 var Logger = class {
   logDir;
   enabled;