opencode-acp 1.14.25-pr.348.70 → 1.14.25-pr.349.71

package/dist/index.js

@@ -888,6 +888,7 @@ var VALID_CONFIG_KEYS = /* @__PURE__ */ new Set([
   "compress.minContextLimit",
   "compress.modelMaxLimits",
   "compress.modelMinLimits",
+  "compress.contextLimitFallback",
   "compress.nudgeFrequency",
   "compress.minNudgeContextPercent",
   "compress.nudgeGrowthTokens",
@@ -908,8 +909,6 @@ var VALID_CONFIG_KEYS = /* @__PURE__ */ new Set([
   "compress.preserveRecentMessages",
   "compress.preserveRecentTokens",
   "compress.preserveLastUserMessage",
-  "compress.overflowGuard",
-  "compress.overflowGuardReserve",
   "gc",
   "gc.algorithm",
   "gc.promotionThreshold",
@@ -1263,27 +1262,6 @@ function validateConfigTypes(config) {
           actual: typeof compress.preserveLastUserMessage
         });
       }
-      if (compress.overflowGuard !== void 0 && typeof compress.overflowGuard !== "boolean") {
-        errors.push({
-          key: "compress.overflowGuard",
-          expected: "boolean",
-          actual: typeof compress.overflowGuard
-        });
-      }
-      if (compress.overflowGuardReserve !== void 0 && typeof compress.overflowGuardReserve !== "number") {
-        errors.push({
-          key: "compress.overflowGuardReserve",
-          expected: "number",
-          actual: typeof compress.overflowGuardReserve
-        });
-      }
-      if (typeof compress.overflowGuardReserve === "number" && compress.overflowGuardReserve < 0) {
-        errors.push({
-          key: "compress.overflowGuardReserve",
-          expected: "non-negative number (>= 0)",
-          actual: `${compress.overflowGuardReserve}`
-        });
-      }
       if (typeof compress.iterationNudgeThreshold === "number" && compress.iterationNudgeThreshold < 1) {
         errors.push({
           key: "compress.iterationNudgeThreshold",
@@ -1334,6 +1312,20 @@ function validateConfigTypes(config) {
       }
       validateModelLimits("compress.modelMaxLimits", compress.modelMaxLimits);
       validateModelLimits("compress.modelMinLimits", compress.modelMinLimits);
+      if (compress.contextLimitFallback !== void 0 && typeof compress.contextLimitFallback !== "number") {
+        errors.push({
+          key: "compress.contextLimitFallback",
+          expected: "number",
+          actual: typeof compress.contextLimitFallback
+        });
+      }
+      if (typeof compress.contextLimitFallback === "number" && compress.contextLimitFallback < 0) {
+        errors.push({
+          key: "compress.contextLimitFallback",
+          expected: "non-negative number (0 disables the fallback)",
+          actual: `${compress.contextLimitFallback}`
+        });
+      }
       const validValues = ["ask", "allow", "deny"];
       if (compress.permission !== void 0 && !validValues.includes(compress.permission)) {
         errors.push({
@@ -1511,6 +1503,7 @@ var defaultConfig = {
     summaryBuffer: true,
     maxContextLimit: "80%",
     minContextLimit: "80%",
+    contextLimitFallback: 128e3,
     nudgeFrequency: 5,
     minNudgeContextPercent: 15,
     iterationNudgeThreshold: 15,
@@ -1529,9 +1522,7 @@ var defaultConfig = {
     lastSegmentSoftBlock: true,
     preserveRecentMessages: 5,
     preserveRecentTokens: 5e3,
-    preserveLastUserMessage: true,
-    overflowGuard: true,
-    overflowGuardReserve: 32768
+    preserveLastUserMessage: true
   },
   gc: {
     algorithm: "truncate",
@@ -1648,6 +1639,7 @@ function mergeCompress(base, override) {
     minContextLimit: override.minContextLimit ?? base.minContextLimit,
     modelMaxLimits: override.modelMaxLimits ?? base.modelMaxLimits,
     modelMinLimits: override.modelMinLimits ?? base.modelMinLimits,
+    contextLimitFallback: override.contextLimitFallback ?? base.contextLimitFallback,
     nudgeFrequency: override.nudgeFrequency ?? base.nudgeFrequency,
     minNudgeContextPercent: override.minNudgeContextPercent ?? base.minNudgeContextPercent,
     nudgeGrowthTokens: override.nudgeGrowthTokens,
@@ -1667,9 +1659,7 @@ function mergeCompress(base, override) {
     lastSegmentSoftBlock: override.lastSegmentSoftBlock ?? base.lastSegmentSoftBlock,
     preserveRecentMessages: override.preserveRecentMessages ?? base.preserveRecentMessages,
     preserveRecentTokens: override.preserveRecentTokens ?? base.preserveRecentTokens,
-    preserveLastUserMessage: override.preserveLastUserMessage ?? base.preserveLastUserMessage,
-    overflowGuard: override.overflowGuard ?? base.overflowGuard,
-    overflowGuardReserve: override.overflowGuardReserve ?? base.overflowGuardReserve
+    preserveLastUserMessage: override.preserveLastUserMessage ?? base.preserveLastUserMessage
   };
 }
 function mergeCommands(base, override) {
@@ -2392,6 +2382,16 @@ function resetOnCompaction(state) {
     nextRef: 1
   };
 }
+function resolveEffectiveContextLimit(state, config) {
+  if (typeof state.modelContextLimit === "number" && state.modelContextLimit > 0) {
+    return { limit: state.modelContextLimit, source: "model" };
+  }
+  const fallback = config.compress.contextLimitFallback;
+  if (typeof fallback === "number" && fallback > 0) {
+    return { limit: fallback, source: "fallback" };
+  }
+  return void 0;
+}
 
 // lib/state/persistence.ts
 function getStorageDir() {
@@ -4237,6 +4237,24 @@ var SessionStateRegistry = class {
   hydrateModelLimitsFromClient(client) {
     return this.catalog.hydrateFromClient(client);
   }
+  // [FIX #346] The init-time seed (above) is fire-and-forget and races
+  // server readiness: in headless spawn+resume mode the provider-config
+  // call can fail before the server is up, leaving the catalog empty for
+  // the process's lifetime. During a request the server is guaranteed up
+  // (we are inside its pipeline), so on a catalog miss we retry hydration
+  // once per process before giving up (the fallback limit then applies).
+  lazyHydrated = false;
+  async hydrateAndResolve(client, providerId, modelId) {
+    const existing = this.catalog.resolve(providerId, modelId);
+    if (existing !== void 0) {
+      return existing;
+    }
+    if (!this.lazyHydrated) {
+      this.lazyHydrated = true;
+      await this.catalog.hydrateFromClient(client);
+    }
+    return this.catalog.resolve(providerId, modelId);
+  }
   get(sessionId) {
     return this.states.get(sessionId);
   }
@@ -4328,9 +4346,7 @@ function createSessionState() {
     modelProviderID: void 0,
     modelID: void 0,
     systemPromptTokens: void 0,
-    qualityGateRetryPending: false,
-    uncalibratedWindowTransforms: 0,
-    uncalibratedWindowWarned: false
+    qualityGateRetryPending: false
   };
 }
 function resetSessionState(state) {
@@ -4372,8 +4388,6 @@ function resetSessionState(state) {
   state.modelID = void 0;
   state.systemPromptTokens = void 0;
   state.qualityGateRetryPending = false;
-  state.uncalibratedWindowTransforms = 0;
-  state.uncalibratedWindowWarned = false;
 }
 async function ensureSessionInitialized(client, state, sessionId, logger, messages, config) {
   if (state.sessionId === sessionId) {
@@ -6420,66 +6434,159 @@ var filterCompressedRanges = (state, messages) => {
   messages.push(...result);
 };
 
-// lib/prompts/extensions/nudge.ts
-function buildCompressedBlockGuidance(state, context) {
-  const activeBlockIds = Array.from(state.prune.messages.activeBlockIds).filter((id) => Number.isInteger(id) && id > 0).sort((a, b) => a - b);
-  const blockCount = activeBlockIds.length;
-  const blocksForStats = activeBlockIds.map((id) => state.prune.messages.blocksById.get(id)).filter((b) => b !== void 0 && b.active);
-  const totalSummaryTokens = blocksForStats.reduce((s, b) => s + (b.summaryTokens ?? 0), 0);
-  const totalSummaryDisplay = totalSummaryTokens >= 1e3 ? `${(totalSummaryTokens / 1e3).toFixed(1)}K` : String(totalSummaryTokens);
-  const lastBlock = blocksForStats.length > 0 ? blocksForStats.reduce((latest, b) => b.createdAt > latest.createdAt ? b : latest) : null;
-  const ageStr = lastBlock ? formatAge(lastBlock.createdAt) : "never";
-  const lines = [
-    `- Compressed blocks: ${blockCount} (${totalSummaryDisplay} summary, last ${ageStr}). Use acp_status for details.`
-  ];
-  if (blockCount > 50) {
-    const oldBlockIds = activeBlockIds.slice(0, Math.max(0, blockCount - 20));
-    const allOldBlocks = oldBlockIds.map((id) => state.prune.messages.blocksById.get(id)).filter((b) => b !== void 0);
-    const visibleMessageIds = context?.visibleMessageIds;
-    const visibleOldBlocks = visibleMessageIds === void 0 ? allOldBlocks : allOldBlocks.filter((b) => b.anchorMessageId && visibleMessageIds.has(b.anchorMessageId));
-    if (visibleOldBlocks.length > 5) {
-      const blocksWithRef = visibleOldBlocks.map((block) => {
-        const ref = state.messageIds.byRawId.get(block.anchorMessageId);
-        return ref ? { block, ref } : null;
-      }).filter((x) => x !== null).sort((a, b) => a.ref.localeCompare(b.ref));
-      const totalTokens = blocksWithRef.reduce((s, x) => s + (x.block.summaryTokens ?? 0), 0);
-      const totalK = Math.max(1, Math.round(totalTokens / 1e3));
-      const targets = [];
-      const chunkSize = Math.ceil(blocksWithRef.length / 3);
-      for (let i = 0; i < 3 && i * chunkSize < blocksWithRef.length; i++) {
-        const chunk = blocksWithRef.slice(i * chunkSize, (i + 1) * chunkSize);
-        if (chunk.length < 2) continue;
-        const startRef = chunk[0].ref;
-        const endRef = chunk[chunk.length - 1].ref;
-        const chunkTokens = chunk.reduce((s, x) => s + (x.block.summaryTokens ?? 0), 0);
-        const chunkK = Math.max(1, Math.round(chunkTokens / 1e3));
-        targets.push(`  \u2022 compress ${startRef}\u2192${endRef}: ${chunk.length} blocks (~${chunkK}K tokens)`);
+// lib/messages/sync.ts
+function sortBlocksByCreation(a, b) {
+  const createdAtDiff = a.createdAt - b.createdAt;
+  if (createdAtDiff !== 0) {
+    return createdAtDiff;
+  }
+  return a.blockId - b.blockId;
+}
+var syncCompressionBlocks = (state, logger, messages) => {
+  const messagesState = state.prune.messages;
+  if (!messagesState?.blocksById?.size) {
+    return;
+  }
+  const messageIds = new Set(messages.map((msg) => msg.info.id));
+  const previousActiveBlockIds = new Set(
+    Array.from(messagesState.blocksById.values()).filter((block) => block.active).map((block) => block.blockId)
+  );
+  messagesState.activeBlockIds.clear();
+  messagesState.activeByAnchorMessageId.clear();
+  const now = Date.now();
+  const orderedBlocks = Array.from(messagesState.blocksById.values()).sort(sortBlocksByCreation);
+  for (const block of orderedBlocks) {
+    if (block.deactivatedByUser || block.deactivatedByUserDeep) {
+      block.active = false;
+      if (block.deactivatedAt === void 0) {
+        block.deactivatedAt = now;
       }
-      if (targets.length > 0) {
-        lines.push(`- \u{1F500} ${blocksWithRef.length} old blocks using ~${totalK}K tokens. Consolidate into ${targets.length}:`);
-        lines.push(...targets);
-        lines.push(`  System auto-detects blocks in range \u2014 no need to manually list (bN) placeholders. Just write your summary normally.`);
+      block.deactivatedByBlockId = void 0;
+      continue;
+    }
+    for (const consumedBlockId of block.consumedBlockIds) {
+      if (!messagesState.activeBlockIds.has(consumedBlockId)) {
+        continue;
+      }
+      const consumedBlock = messagesState.blocksById.get(consumedBlockId);
+      if (consumedBlock) {
+        consumedBlock.active = false;
+        consumedBlock.deactivatedAt = now;
+        consumedBlock.deactivatedByBlockId = block.blockId;
+        const mappedBlockId = messagesState.activeByAnchorMessageId.get(
+          consumedBlock.anchorMessageId
+        );
+        if (mappedBlockId === consumedBlock.blockId) {
+          messagesState.activeByAnchorMessageId.delete(consumedBlock.anchorMessageId);
+        }
       }
+      messagesState.activeBlockIds.delete(consumedBlockId);
+    }
+    block.active = true;
+    block.deactivatedAt = void 0;
+    block.deactivatedByBlockId = void 0;
+    messagesState.activeBlockIds.add(block.blockId);
+    if (messageIds.has(block.anchorMessageId)) {
+      messagesState.activeByAnchorMessageId.set(block.anchorMessageId, block.blockId);
     }
   }
-  return lines.join("\n");
-}
-function appendGuidanceToDcpTag(nudgeText, guidance) {
-  if (!guidance.trim()) {
-    return nudgeText;
+  for (const entry of messagesState.byMessageId.values()) {
+    const allBlockIds = Array.isArray(entry.allBlockIds) ? [...new Set(entry.allBlockIds.filter((id) => Number.isInteger(id) && id > 0))] : [];
+    entry.allBlockIds = allBlockIds;
+    entry.activeBlockIds = allBlockIds.filter((id) => messagesState.activeBlockIds.has(id));
   }
-  const closeTag = "</dcp-system-reminder>";
-  const closeTagIndex = nudgeText.lastIndexOf(closeTag);
-  if (closeTagIndex === -1) {
-    return nudgeText;
+  const nextActiveBlockIds = messagesState.activeBlockIds;
+  let deactivatedCount = 0;
+  let reactivatedCount = 0;
+  for (const blockId of previousActiveBlockIds) {
+    if (!nextActiveBlockIds.has(blockId)) {
+      deactivatedCount++;
+    }
   }
-  const beforeClose = nudgeText.slice(0, closeTagIndex).trimEnd();
-  const afterClose = nudgeText.slice(closeTagIndex);
-  return `${beforeClose}
+  for (const blockId of nextActiveBlockIds) {
+    if (!previousActiveBlockIds.has(blockId)) {
+      reactivatedCount++;
+    }
+  }
+  if (deactivatedCount > 0 || reactivatedCount > 0) {
+    logger.info("Synced compress block state", {
+      deactivatedCount,
+      reactivatedCount
+    });
+  }
+};
 
-${guidance}
-${afterClose}`;
-}
+// lib/host-permissions.ts
+var findLastMatchingRule = (rules, predicate) => {
+  for (let index = rules.length - 1; index >= 0; index -= 1) {
+    const rule = rules[index];
+    if (rule && predicate(rule)) {
+      return rule;
+    }
+  }
+  return void 0;
+};
+var wildcardMatch = (value, pattern) => {
+  const normalizedValue = value.replaceAll("\\", "/");
+  let escaped = pattern.replaceAll("\\", "/").replace(/[.+^${}()|[\]\\]/g, "\\$&").replace(/\*/g, ".*").replace(/\?/g, ".");
+  if (escaped.endsWith(" .*")) {
+    escaped = escaped.slice(0, -3) + "( .*)?";
+  }
+  const flags = process.platform === "win32" ? "si" : "s";
+  return new RegExp(`^${escaped}$`, flags).test(normalizedValue);
+};
+var getPermissionRules = (permissionConfigs) => {
+  const rules = [];
+  for (const permissionConfig of permissionConfigs) {
+    if (!permissionConfig) {
+      continue;
+    }
+    for (const [permission, value] of Object.entries(permissionConfig)) {
+      if (value === "ask" || value === "allow" || value === "deny") {
+        rules.push({ permission, pattern: "*", action: value });
+        continue;
+      }
+      for (const [pattern, action] of Object.entries(value)) {
+        if (action === "ask" || action === "allow" || action === "deny") {
+          rules.push({ permission, pattern, action });
+        }
+      }
+    }
+  }
+  return rules;
+};
+var compressDisabledByOpencode = (...permissionConfigs) => {
+  const match = findLastMatchingRule(
+    getPermissionRules(permissionConfigs),
+    (rule) => wildcardMatch("compress", rule.permission)
+  );
+  return match?.pattern === "*" && match.action === "deny";
+};
+var resolveEffectiveCompressPermission = (basePermission, hostPermissions, agentName) => {
+  if (basePermission === "deny") {
+    return "deny";
+  }
+  return compressDisabledByOpencode(
+    hostPermissions.global,
+    agentName ? hostPermissions.agents[agentName] : void 0
+  ) ? "deny" : basePermission;
+};
+var hasExplicitToolPermission = (permissionConfig, tool6) => {
+  return permissionConfig ? Object.prototype.hasOwnProperty.call(permissionConfig, tool6) : false;
+};
+
+// lib/compress-permission.ts
+var compressPermission = (state, config) => {
+  return state.compressPermission ?? config.compress.permission;
+};
+var syncCompressPermissionState = (state, config, hostPermissions, messages) => {
+  const activeAgent = getLastUserMessage(messages)?.info.agent;
+  state.compressPermission = resolveEffectiveCompressPermission(
+    config.compress.permission,
+    hostPermissions,
+    activeAgent
+  );
+};
 
 // lib/messages/utils.ts
 import { createHash } from "crypto";
@@ -6655,6 +6762,67 @@ var dropEmptyMessages = (messages) => {
   return removed;
 };
 
+// lib/prompts/extensions/nudge.ts
+function buildCompressedBlockGuidance(state, context) {
+  const activeBlockIds = Array.from(state.prune.messages.activeBlockIds).filter((id) => Number.isInteger(id) && id > 0).sort((a, b) => a - b);
+  const blockCount = activeBlockIds.length;
+  const blocksForStats = activeBlockIds.map((id) => state.prune.messages.blocksById.get(id)).filter((b) => b !== void 0 && b.active);
+  const totalSummaryTokens = blocksForStats.reduce((s, b) => s + (b.summaryTokens ?? 0), 0);
+  const totalSummaryDisplay = totalSummaryTokens >= 1e3 ? `${(totalSummaryTokens / 1e3).toFixed(1)}K` : String(totalSummaryTokens);
+  const lastBlock = blocksForStats.length > 0 ? blocksForStats.reduce((latest, b) => b.createdAt > latest.createdAt ? b : latest) : null;
+  const ageStr = lastBlock ? formatAge(lastBlock.createdAt) : "never";
+  const lines = [
+    `- Compressed blocks: ${blockCount} (${totalSummaryDisplay} summary, last ${ageStr}). Use acp_status for details.`
+  ];
+  if (blockCount > 50) {
+    const oldBlockIds = activeBlockIds.slice(0, Math.max(0, blockCount - 20));
+    const allOldBlocks = oldBlockIds.map((id) => state.prune.messages.blocksById.get(id)).filter((b) => b !== void 0);
+    const visibleMessageIds = context?.visibleMessageIds;
+    const visibleOldBlocks = visibleMessageIds === void 0 ? allOldBlocks : allOldBlocks.filter((b) => b.anchorMessageId && visibleMessageIds.has(b.anchorMessageId));
+    if (visibleOldBlocks.length > 5) {
+      const blocksWithRef = visibleOldBlocks.map((block) => {
+        const ref = state.messageIds.byRawId.get(block.anchorMessageId);
+        return ref ? { block, ref } : null;
+      }).filter((x) => x !== null).sort((a, b) => a.ref.localeCompare(b.ref));
+      const totalTokens = blocksWithRef.reduce((s, x) => s + (x.block.summaryTokens ?? 0), 0);
+      const totalK = Math.max(1, Math.round(totalTokens / 1e3));
+      const targets = [];
+      const chunkSize = Math.ceil(blocksWithRef.length / 3);
+      for (let i = 0; i < 3 && i * chunkSize < blocksWithRef.length; i++) {
+        const chunk = blocksWithRef.slice(i * chunkSize, (i + 1) * chunkSize);
+        if (chunk.length < 2) continue;
+        const startRef = chunk[0].ref;
+        const endRef = chunk[chunk.length - 1].ref;
+        const chunkTokens = chunk.reduce((s, x) => s + (x.block.summaryTokens ?? 0), 0);
+        const chunkK = Math.max(1, Math.round(chunkTokens / 1e3));
+        targets.push(`  \u2022 compress ${startRef}\u2192${endRef}: ${chunk.length} blocks (~${chunkK}K tokens)`);
+      }
+      if (targets.length > 0) {
+        lines.push(`- \u{1F500} ${blocksWithRef.length} old blocks using ~${totalK}K tokens. Consolidate into ${targets.length}:`);
+        lines.push(...targets);
+        lines.push(`  System auto-detects blocks in range \u2014 no need to manually list (bN) placeholders. Just write your summary normally.`);
+      }
+    }
+  }
+  return lines.join("\n");
+}
+function appendGuidanceToDcpTag(nudgeText, guidance) {
+  if (!guidance.trim()) {
+    return nudgeText;
+  }
+  const closeTag = "</dcp-system-reminder>";
+  const closeTagIndex = nudgeText.lastIndexOf(closeTag);
+  if (closeTagIndex === -1) {
+    return nudgeText;
+  }
+  const beforeClose = nudgeText.slice(0, closeTagIndex).trimEnd();
+  const afterClose = nudgeText.slice(closeTagIndex);
+  return `${beforeClose}
+
+${guidance}
+${afterClose}`;
+}
+
 // node_modules/context-compress-algorithms/dist/chunk-BZYW3CH5.js
 var NUDGE_GROWTH_FLOOR = 6e3;
 var NUDGE_GROWTH_CAP = 5e4;
@@ -6757,6 +6925,7 @@ function getModelInfo(messages) {
   };
 }
 function resolveContextTokenLimit(config, state, providerId, modelId, threshold) {
+  const effectiveLimit = resolveEffectiveContextLimit(state, config);
   const parseLimitValue = (limit) => {
     if (limit === void 0) {
       return void 0;
@@ -6764,7 +6933,7 @@ function resolveContextTokenLimit(config, state, providerId, modelId, threshold)
     if (typeof limit === "number") {
       return limit;
     }
-    if (!limit.endsWith("%") || state.modelContextLimit === void 0) {
+    if (!limit.endsWith("%") || effectiveLimit === void 0) {
       return void 0;
     }
     const parsedPercent = parseFloat(limit.slice(0, -1));
@@ -6773,7 +6942,7 @@ function resolveContextTokenLimit(config, state, providerId, modelId, threshold)
     }
     const roundedPercent = Math.round(parsedPercent);
     const clampedPercent = Math.max(0, Math.min(100, roundedPercent));
-    return Math.round(clampedPercent / 100 * state.modelContextLimit);
+    return Math.round(clampedPercent / 100 * effectiveLimit.limit);
   };
   const modelLimits = threshold === "max" ? config.compress.modelMaxLimits : config.compress.modelMinLimits;
   if (modelLimits && providerId !== void 0 && modelId !== void 0) {
@@ -6818,11 +6987,12 @@ function isContextOverLimits(config, state, providerId, modelId, messages) {
       if (!overMaxLimit) break;
     }
   }
+  const effectiveLimit = resolveEffectiveContextLimit(state, config);
   return {
     overMaxLimit,
     overMinLimit,
     currentTokens,
-    modelContextLimit: state.modelContextLimit
+    modelContextLimit: effectiveLimit?.limit
   };
 }
 ensureBuiltinTriggerPolicyRegistered();
@@ -7358,277 +7528,6 @@ function excludeProtectedRanges(ranges, protectedRefs) {
   );
 }
 
-// lib/messages/prune-to-fit.ts
-var WIRE_SAFETY_MARGIN = 8192;
-var CLEAR_PLACEHOLDER = "[cleared by ACP overflow guard \u2014 re-run tool if needed]";
-var MIN_CLEAR_TOKENS = 500;
-function resolveKnownWindow(config, state, providerId, modelId) {
-  if (state.modelContextLimit !== void 0) {
-    return state.modelContextLimit;
-  }
-  const maxLimits = config.compress.modelMaxLimits;
-  if (maxLimits && providerId !== void 0 && modelId !== void 0) {
-    const perModel = maxLimits[`${providerId}/${modelId}`];
-    if (typeof perModel === "number") return perModel;
-  }
-  const global = config.compress.maxContextLimit;
-  if (typeof global === "number") return global;
-  return void 0;
-}
-function estimateWireTokens(state, messages) {
-  const base = getCurrentTokenUsage(state, messages);
-  if (base > 0) {
-    return base + WIRE_SAFETY_MARGIN;
-  }
-  let total = 0;
-  for (const msg of messages) {
-    total += countAllMessageTokens(msg);
-  }
-  return total + (state.systemPromptTokens ?? 0) + WIRE_SAFETY_MARGIN;
-}
-function pruneToFit(state, config, logger, messages) {
-  if (!config.compress.overflowGuard) return;
-  const knownWindow = resolveKnownWindow(config, state, state.modelProviderID, state.modelID);
-  if (knownWindow === void 0) return;
-  const reserve = config.compress.overflowGuardReserve ?? 32768;
-  const safeBudget = knownWindow - reserve;
-  if (safeBudget <= 0) return;
-  const estimate = estimateWireTokens(state, messages);
-  if (estimate <= safeBudget) return;
-  const protectedRefs = computeProtectedRefs(messages, state, config.compress);
-  const lastNonIgnored = findLastNonIgnoredMessage(messages);
-  const lastMsgId = lastNonIgnored?.message.info.id;
-  const protectedTools = config.compress.protectedTools;
-  const protectedFilePatterns = config.protectedFilePatterns;
-  let freed = 0;
-  let clearedCount = 0;
-  for (const msg of messages) {
-    if (estimate - freed <= safeBudget) break;
-    if (msg.info.id === lastMsgId) continue;
-    if (msg.info.role === "user") continue;
-    const ref = state.messageIds.byRawId.get(msg.info.id);
-    if (ref && protectedRefs.has(ref)) continue;
-    const parts = Array.isArray(msg.parts) ? msg.parts : [];
-    for (const part of parts) {
-      if (estimate - freed <= safeBudget) break;
-      if (part?.type !== "tool") continue;
-      const toolState = part.state;
-      if (toolState.status !== "completed") continue;
-      const content = extractCompletedToolOutput(part);
-      if (content === void 0) continue;
-      if (content === CLEAR_PLACEHOLDER) continue;
-      if (content === COMPACTED_TOOL_OUTPUT_PLACEHOLDER) continue;
-      if (isToolNameProtected(part.tool, protectedTools)) continue;
-      if (protectedFilePatterns.length > 0) {
-        const filePaths = getFilePathsFromParameters(part.tool, toolState.input);
-        if (isFilePathProtected(filePaths, protectedFilePatterns)) continue;
-      }
-      const outputTokens = countTokens2(content);
-      if (outputTokens < MIN_CLEAR_TOKENS) continue;
-      toolState.output = CLEAR_PLACEHOLDER;
-      freed += outputTokens - countTokens2(CLEAR_PLACEHOLDER);
-      clearedCount++;
-    }
-  }
-  if (clearedCount === 0) return;
-  const after = estimate - freed;
-  const detail = {
-    session: state.sessionId,
-    estimate,
-    safeBudget,
-    knownWindow,
-    reserve,
-    clearedCount,
-    freedTokens: Math.round(freed),
-    afterTokens: Math.round(after)
-  };
-  if (after <= safeBudget) {
-    logger.warn("ACP overflow guard: cleared tool outputs to fit context window", detail);
-  } else {
-    logger.error(
-      "ACP overflow guard: cleared tool outputs but context STILL exceeds window",
-      detail
-    );
-  }
-}
-
-// lib/messages/uncalibrated-window.ts
-var UNCALIBRATED_WINDOW_WARN_THRESHOLD = 3;
-function trackUncalibratedWindow(state, logger) {
-  if (state.modelContextLimit === void 0) {
-    state.uncalibratedWindowTransforms++;
-    if (state.uncalibratedWindowTransforms >= UNCALIBRATED_WINDOW_WARN_THRESHOLD && !state.uncalibratedWindowWarned) {
-      state.uncalibratedWindowWarned = true;
-      logger.warn(
-        "Model reports no context window \u2014 ACP percentage thresholds are disabled",
-        {
-          session: state.sessionId,
-          provider: state.modelProviderID,
-          model: state.modelID,
-          transforms: state.uncalibratedWindowTransforms,
-          hint: 'set the model\'s `limit` in opencode.json (e.g. {"context": 262144, "output": 16384}) or use absolute compress.maxContextLimit / compress.minContextLimit in acp.jsonc; the request-side overflow guard also needs a known window to fire'
-        }
-      );
-    }
-  } else {
-    state.uncalibratedWindowTransforms = 0;
-  }
-}
-
-// lib/messages/sync.ts
-function sortBlocksByCreation(a, b) {
-  const createdAtDiff = a.createdAt - b.createdAt;
-  if (createdAtDiff !== 0) {
-    return createdAtDiff;
-  }
-  return a.blockId - b.blockId;
-}
-var syncCompressionBlocks = (state, logger, messages) => {
-  const messagesState = state.prune.messages;
-  if (!messagesState?.blocksById?.size) {
-    return;
-  }
-  const messageIds = new Set(messages.map((msg) => msg.info.id));
-  const previousActiveBlockIds = new Set(
-    Array.from(messagesState.blocksById.values()).filter((block) => block.active).map((block) => block.blockId)
-  );
-  messagesState.activeBlockIds.clear();
-  messagesState.activeByAnchorMessageId.clear();
-  const now = Date.now();
-  const orderedBlocks = Array.from(messagesState.blocksById.values()).sort(sortBlocksByCreation);
-  for (const block of orderedBlocks) {
-    if (block.deactivatedByUser || block.deactivatedByUserDeep) {
-      block.active = false;
-      if (block.deactivatedAt === void 0) {
-        block.deactivatedAt = now;
-      }
-      block.deactivatedByBlockId = void 0;
-      continue;
-    }
-    for (const consumedBlockId of block.consumedBlockIds) {
-      if (!messagesState.activeBlockIds.has(consumedBlockId)) {
-        continue;
-      }
-      const consumedBlock = messagesState.blocksById.get(consumedBlockId);
-      if (consumedBlock) {
-        consumedBlock.active = false;
-        consumedBlock.deactivatedAt = now;
-        consumedBlock.deactivatedByBlockId = block.blockId;
-        const mappedBlockId = messagesState.activeByAnchorMessageId.get(
-          consumedBlock.anchorMessageId
-        );
-        if (mappedBlockId === consumedBlock.blockId) {
-          messagesState.activeByAnchorMessageId.delete(consumedBlock.anchorMessageId);
-        }
-      }
-      messagesState.activeBlockIds.delete(consumedBlockId);
-    }
-    block.active = true;
-    block.deactivatedAt = void 0;
-    block.deactivatedByBlockId = void 0;
-    messagesState.activeBlockIds.add(block.blockId);
-    if (messageIds.has(block.anchorMessageId)) {
-      messagesState.activeByAnchorMessageId.set(block.anchorMessageId, block.blockId);
-    }
-  }
-  for (const entry of messagesState.byMessageId.values()) {
-    const allBlockIds = Array.isArray(entry.allBlockIds) ? [...new Set(entry.allBlockIds.filter((id) => Number.isInteger(id) && id > 0))] : [];
-    entry.allBlockIds = allBlockIds;
-    entry.activeBlockIds = allBlockIds.filter((id) => messagesState.activeBlockIds.has(id));
-  }
-  const nextActiveBlockIds = messagesState.activeBlockIds;
-  let deactivatedCount = 0;
-  let reactivatedCount = 0;
-  for (const blockId of previousActiveBlockIds) {
-    if (!nextActiveBlockIds.has(blockId)) {
-      deactivatedCount++;
-    }
-  }
-  for (const blockId of nextActiveBlockIds) {
-    if (!previousActiveBlockIds.has(blockId)) {
-      reactivatedCount++;
-    }
-  }
-  if (deactivatedCount > 0 || reactivatedCount > 0) {
-    logger.info("Synced compress block state", {
-      deactivatedCount,
-      reactivatedCount
-    });
-  }
-};
-
-// lib/host-permissions.ts
-var findLastMatchingRule = (rules, predicate) => {
-  for (let index = rules.length - 1; index >= 0; index -= 1) {
-    const rule = rules[index];
-    if (rule && predicate(rule)) {
-      return rule;
-    }
-  }
-  return void 0;
-};
-var wildcardMatch = (value, pattern) => {
-  const normalizedValue = value.replaceAll("\\", "/");
-  let escaped = pattern.replaceAll("\\", "/").replace(/[.+^${}()|[\]\\]/g, "\\$&").replace(/\*/g, ".*").replace(/\?/g, ".");
-  if (escaped.endsWith(" .*")) {
-    escaped = escaped.slice(0, -3) + "( .*)?";
-  }
-  const flags = process.platform === "win32" ? "si" : "s";
-  return new RegExp(`^${escaped}$`, flags).test(normalizedValue);
-};
-var getPermissionRules = (permissionConfigs) => {
-  const rules = [];
-  for (const permissionConfig of permissionConfigs) {
-    if (!permissionConfig) {
-      continue;
-    }
-    for (const [permission, value] of Object.entries(permissionConfig)) {
-      if (value === "ask" || value === "allow" || value === "deny") {
-        rules.push({ permission, pattern: "*", action: value });
-        continue;
-      }
-      for (const [pattern, action] of Object.entries(value)) {
-        if (action === "ask" || action === "allow" || action === "deny") {
-          rules.push({ permission, pattern, action });
-        }
-      }
-    }
-  }
-  return rules;
-};
-var compressDisabledByOpencode = (...permissionConfigs) => {
-  const match = findLastMatchingRule(
-    getPermissionRules(permissionConfigs),
-    (rule) => wildcardMatch("compress", rule.permission)
-  );
-  return match?.pattern === "*" && match.action === "deny";
-};
-var resolveEffectiveCompressPermission = (basePermission, hostPermissions, agentName) => {
-  if (basePermission === "deny") {
-    return "deny";
-  }
-  return compressDisabledByOpencode(
-    hostPermissions.global,
-    agentName ? hostPermissions.agents[agentName] : void 0
-  ) ? "deny" : basePermission;
-};
-var hasExplicitToolPermission = (permissionConfig, tool6) => {
-  return permissionConfig ? Object.prototype.hasOwnProperty.call(permissionConfig, tool6) : false;
-};
-
-// lib/compress-permission.ts
-var compressPermission = (state, config) => {
-  return state.compressPermission ?? config.compress.permission;
-};
-var syncCompressPermissionState = (state, config, hostPermissions, messages) => {
-  const activeAgent = getLastUserMessage(messages)?.info.agent;
-  state.compressPermission = resolveEffectiveCompressPermission(
-    config.compress.permission,
-    hostPermissions,
-    activeAgent
-  );
-};
-
 // lib/messages/inject/inject.ts
 var ACP_SUFFIX_SEED = "acp-dynamic-guidance";
 function createSuffixMessage(messages) {
@@ -8535,8 +8434,9 @@ function createDecompressTool(factoryCtx) {
     async execute(args, toolCtx) {
       const ctx = resolveToolContext(factoryCtx, toolCtx.sessionID);
       const { rawMessages } = await prepareDecompressSession(ctx, toolCtx);
-      const contextUsageBefore = ctx.state.modelContextLimit ? Math.round(
-        getCurrentTokenUsage(ctx.state, rawMessages) / ctx.state.modelContextLimit * 100
+      const effectiveLimitBefore = resolveEffectiveContextLimit(ctx.state, ctx.config);
+      const contextUsageBefore = effectiveLimitBefore ? Math.round(
+        getCurrentTokenUsage(ctx.state, rawMessages) / effectiveLimitBefore.limit * 100
       ) : void 0;
       const resolved = resolveTargets(args, ctx.state, rawMessages, ctx.logger);
       if (!resolved.ok) {
@@ -8600,8 +8500,9 @@ function createDecompressTool(factoryCtx) {
         0,
         ctx.state.stats.totalPruneTokens - restoredTokens
       );
-      const contextUsageAfter = ctx.state.modelContextLimit ? Math.round(
-        getCurrentTokenUsage(ctx.state, rawMessages) / ctx.state.modelContextLimit * 100
+      const effectiveLimitAfter = resolveEffectiveContextLimit(ctx.state, ctx.config);
+      const contextUsageAfter = effectiveLimitAfter ? Math.round(
+        getCurrentTokenUsage(ctx.state, rawMessages) / effectiveLimitAfter.limit * 100
       ) : void 0;
       await finalizeDecompressSession(ctx);
       const restoredContentPreview = buildRestoredContentPreview(
@@ -9258,7 +9159,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.348.70" : "dev";
+var LOG_VERSION = true ? "1.14.25-pr.349.71" : "dev";
 var LEVEL_RANK = {
   debug: 10,
   info: 20,
@@ -10082,6 +9983,7 @@ var MIN_OUTPUT_TOKENS = 1e3;
 var KEEP_PREFIX_CHARS = 2e3;
 var KEEP_SUFFIX_CHARS = 2e3;
 var PROTECT_RECENT_MESSAGES = 3;
+var OUTPUT_RESERVE_TOKENS = 16384;
 function parseGcThreshold(threshold, modelContextLimit) {
   if (typeof threshold === "number") return threshold;
   const str = threshold ?? "100%";
@@ -10090,10 +9992,22 @@ function parseGcThreshold(threshold, modelContextLimit) {
   return modelContextLimit;
 }
 function truncateLargeToolOutputs(state, config, logger, messages) {
-  if (!state.modelContextLimit) return;
+  const effective = resolveEffectiveContextLimit(state, config);
+  if (!effective) return;
   const currentTokens = getCurrentTokenUsage(state, messages);
   if (currentTokens === 0) return;
-  const threshold = parseGcThreshold(config.gc?.majorGcThresholdPercent, state.modelContextLimit);
+  const configuredThreshold = parseGcThreshold(config.gc?.majorGcThresholdPercent, effective.limit);
+  const overhead = (state.systemPromptTokens ?? 0) + OUTPUT_RESERVE_TOKENS;
+  const threshold = Math.min(configuredThreshold, effective.limit - overhead);
+  if (threshold <= 0) {
+    logger.error("ACP: model context window too small to fit overhead", {
+      session: state.sessionId,
+      limit: effective.limit,
+      contextLimitSource: effective.source,
+      overhead
+    });
+    return;
+  }
   if (currentTokens < threshold) return;
   const protectedIndex = messages.length - PROTECT_RECENT_MESSAGES;
   const candidates = [];
@@ -10138,7 +10052,9 @@ function truncateLargeToolOutputs(state, config, logger, messages) {
       truncatedCount,
       estimatedSavedTokens: Math.round(savedTokens),
       currentTokens,
-      threshold
+      threshold,
+      contextLimit: effective.limit,
+      contextLimitSource: effective.source
     });
   }
 }
@@ -11099,11 +11015,12 @@ function runBatchCleanup(state, config, logger, messages) {
     mergedCount: 0,
     savedTokens: 0
   };
-  if (!state.modelContextLimit || state.modelContextLimit <= 0) {
+  const effective = resolveEffectiveContextLimit(state, config);
+  if (!effective) {
     return noop;
   }
   const currentTokens = getCurrentTokenUsage(state, messages);
-  if (currentTokens < state.modelContextLimit) {
+  if (currentTokens < effective.limit) {
     return noop;
   }
   const maxMergedLength = config.gc.maxOldGenSummaryLength;
@@ -11120,7 +11037,8 @@ function runBatchCleanup(state, config, logger, messages) {
     mergedCount: result.mergedCount,
     savedTokens: result.savedTokens,
     currentTokens,
-    contextLimit: state.modelContextLimit
+    contextLimit: effective.limit,
+    contextLimitSource: effective.source
   });
   return {
     tier: 3,
@@ -11154,11 +11072,6 @@ function createSystemPromptHandler(registry4, logger, config, prompts) {
       input.model?.limit?.context
     );
     const state = input.sessionID ? registry4.get(input.sessionID) : void 0;
-    if (state && input.model?.limit?.context) {
-      state.modelContextLimit = input.model.limit.context;
-      state.modelProviderID = input.model?.providerID;
-      state.modelID = input.model?.id;
-    }
     if (!state || state.isSubAgent && !config.allowSubAgents) {
       return;
     }
@@ -11167,6 +11080,19 @@ function createSystemPromptHandler(registry4, logger, config, prompts) {
       logger.info("Skipping DCP system prompt injection for internal agent");
       return;
     }
+    if (input.model?.limit?.context) {
+      const limit = input.model.limit.context;
+      const providerID = input.model?.providerID;
+      const modelID = input.model?.id;
+      const changed = state.modelContextLimit !== limit || state.modelProviderID !== providerID || state.modelID !== modelID;
+      state.modelContextLimit = limit;
+      state.modelProviderID = providerID;
+      state.modelID = modelID;
+      if (changed) {
+        saveSessionState(state, logger).catch(() => {
+        });
+      }
+    }
     const effectivePermission = compressPermission(state, config);
     if (effectivePermission === "deny") {
       return;
@@ -11211,10 +11137,17 @@ function createChatMessageTransformHandler(client, registry4, logger, config, pr
         config
       );
       const requestModel = lastUserMessage.info.model;
-      const requestModelLimit = registry4.resolveModelLimit(
+      let requestModelLimit = registry4.resolveModelLimit(
         requestModel?.providerID,
         requestModel?.modelID
       );
+      if (requestModelLimit === void 0 && requestModel?.providerID && requestModel?.modelID) {
+        requestModelLimit = await registry4.hydrateAndResolve(
+          client,
+          requestModel.providerID,
+          requestModel.modelID
+        );
+      }
       const prevModelID = state.modelID;
       if (requestModelLimit !== void 0) {
         state.modelContextLimit = requestModelLimit;
@@ -11244,7 +11177,6 @@ function createChatMessageTransformHandler(client, registry4, logger, config, pr
         });
       }
       await updatePerTurnState(state, logger, messages);
-      trackUncalibratedWindow(state, logger);
     }
     syncCompressPermissionState(state, config, hostPermissions, output.messages);
     if (state.isSubAgent && !config.allowSubAgents) {
@@ -11252,10 +11184,11 @@ function createChatMessageTransformHandler(client, registry4, logger, config, pr
     }
     stripHallucinations(output.messages);
     ensureBuiltinFiltersRegistered();
+    const effectiveLimit = resolveEffectiveContextLimit(state, config);
     applyMessageFilters(output.messages, config.messageFilters, logger, {
       sessionId: state.sessionId ?? "",
       isSubAgent: state.isSubAgent,
-      modelContextLimit: state.modelContextLimit
+      modelContextLimit: effectiveLimit?.limit
     });
     cacheSystemPromptTokens(state, output.messages);
     assignMessageRefs(state, output.messages);
@@ -11275,7 +11208,6 @@ function createChatMessageTransformHandler(client, registry4, logger, config, pr
     const prePruneTokens = getCurrentTokenUsage(state, output.messages);
     prune(state, logger, config, output.messages);
     truncateLargeToolOutputs(state, config, logger, output.messages);
-    pruneToFit(state, config, logger, output.messages);
     hideConsumedCompressCalls(state, output.messages);
     assignMessageRefs(state, output.messages);
     const compressionPriorities = buildPriorityMap(config, state, output.messages);
@@ -11307,14 +11239,31 @@ ${text}`);
     stripStaleMetadata(output.messages);
     dropEmptyMessages(output.messages);
     const postTokens = getCurrentTokenUsage(state, output.messages);
+    if (postTokens !== void 0 && effectiveLimit) {
+      const budget = effectiveLimit.limit - (state.systemPromptTokens ?? 0) - OUTPUT_RESERVE_TOKENS;
+      if (postTokens > budget) {
+        logger.error(
+          "ACP hard guard: context exceeds model budget after in-flight reduction",
+          {
+            session: state.sessionId,
+            postTokens,
+            budget,
+            contextLimit: effectiveLimit.limit,
+            contextLimitSource: effectiveLimit.source,
+            hint: "request will likely be rejected; run /compact or start a new session"
+          }
+        );
+      }
+    }
     logger.info("Chat transform complete", {
       session: state.sessionId,
       model: state.modelID,
       messages: output.messages.length,
       prePruneTokens,
       postTokens,
-      contextLimit: state.modelContextLimit,
-      usagePct: postTokens !== void 0 && state.modelContextLimit ? `${(postTokens / state.modelContextLimit * 100).toFixed(1)}%` : void 0,
+      contextLimit: effectiveLimit?.limit,
+      contextLimitSource: effectiveLimit?.source,
+      usagePct: postTokens !== void 0 && effectiveLimit ? `${(postTokens / effectiveLimit.limit * 100).toFixed(1)}%` : void 0,
       nudged: state.nudges.shouldInjectThisTurn
     });
     if (state.sessionId) {
@@ -11701,7 +11650,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.348.70" : "dev",
+    version: true ? "1.14.25-pr.349.71" : "dev",
     workspace: ctx.directory,
     logLevel: logger.level,
     debug: config.debug,