opencode-acp 1.14.25-pr.352.85 → 1.14.26-pr.353.86

package/dist/index.js

@@ -888,7 +888,6 @@ var VALID_CONFIG_KEYS = /* @__PURE__ */ new Set([
   "compress.minContextLimit",
   "compress.modelMaxLimits",
   "compress.modelMinLimits",
-  "compress.providers",
   "compress.nudgeFrequency",
   "compress.minNudgeContextPercent",
   "compress.nudgeGrowthTokens",
@@ -932,7 +931,7 @@ function getConfigKeyPaths(obj, prefix = "") {
   for (const key of Object.keys(obj)) {
     const fullKey = prefix ? `${prefix}.${key}` : key;
     keys.push(fullKey);
-    if (fullKey === "compress.modelMaxLimits" || fullKey === "compress.modelMinLimits" || fullKey === "compress.providers" || fullKey === "messageFilters.filters") {
+    if (fullKey === "compress.modelMaxLimits" || fullKey === "compress.modelMinLimits" || fullKey === "messageFilters.filters") {
       continue;
     }
     if (obj[key] && typeof obj[key] === "object" && !Array.isArray(obj[key])) {
@@ -1312,85 +1311,6 @@ function validateConfigTypes(config) {
       }
       validateModelLimits("compress.modelMaxLimits", compress.modelMaxLimits);
       validateModelLimits("compress.modelMinLimits", compress.modelMinLimits);
-      const validatePercentField = (key, value) => {
-        if (value === void 0) {
-          return;
-        }
-        if (typeof value !== "number" || !Number.isFinite(value) || value < 0 || value > 100) {
-          errors.push({
-            key,
-            expected: "number (0-100)",
-            actual: JSON.stringify(value)
-          });
-        }
-      };
-      const validateModelOverrides = (prefix, overrides) => {
-        if (overrides === void 0) {
-          return;
-        }
-        if (typeof overrides !== "object" || overrides === null || Array.isArray(overrides)) {
-          errors.push({ key: prefix, expected: "CompressModelOverrides", actual: typeof overrides });
-          return;
-        }
-        const model = overrides;
-        for (const field of Object.keys(model)) {
-          if (field !== "minNudgeContextPercent") {
-            errors.push({
-              key: `${prefix}.${field}`,
-              expected: "known override field (minNudgeContextPercent)",
-              actual: "unknown field"
-            });
-          }
-        }
-        validatePercentField(`${prefix}.minNudgeContextPercent`, model.minNudgeContextPercent);
-      };
-      const validateProviderOverrides = (providers) => {
-        if (providers === void 0) {
-          return;
-        }
-        if (typeof providers !== "object" || providers === null || Array.isArray(providers)) {
-          errors.push({
-            key: "compress.providers",
-            expected: "Record<string, ProviderOverrides>",
-            actual: typeof providers
-          });
-          return;
-        }
-        for (const [providerId, providerValue] of Object.entries(providers)) {
-          const prefix = `compress.providers.${providerId}`;
-          if (typeof providerValue !== "object" || providerValue === null || Array.isArray(providerValue)) {
-            errors.push({ key: prefix, expected: "ProviderOverrides", actual: typeof providerValue });
-            continue;
-          }
-          const provider = providerValue;
-          for (const field of Object.keys(provider)) {
-            if (field !== "minNudgeContextPercent" && field !== "models") {
-              errors.push({
-                key: `${prefix}.${field}`,
-                expected: "known override field (minNudgeContextPercent, models)",
-                actual: "unknown field"
-              });
-            }
-          }
-          validatePercentField(`${prefix}.minNudgeContextPercent`, provider.minNudgeContextPercent);
-          const models = provider.models;
-          if (models === void 0) {
-            continue;
-          }
-          if (typeof models !== "object" || models === null || Array.isArray(models)) {
-            errors.push({
-              key: `${prefix}.models`,
-              expected: "Record<string, ModelOverrides>",
-              actual: typeof models
-            });
-            continue;
-          }
-          for (const [modelId, modelValue] of Object.entries(models)) {
-            validateModelOverrides(`${prefix}.models.${modelId}`, modelValue);
-          }
-        }
-      };
-      validateProviderOverrides(compress.providers);
       const validValues = ["ask", "allow", "deny"];
       if (compress.permission !== void 0 && !validValues.includes(compress.permission)) {
         errors.push({
@@ -1691,39 +1611,6 @@ function loadConfigFile(configPath) {
     return { data: null, parseError: error.message || "Failed to parse config" };
   }
 }
-function stripUndefined(value) {
-  const result = {};
-  for (const [key, entry] of Object.entries(value)) {
-    if (entry !== void 0) {
-      result[key] = entry;
-    }
-  }
-  return result;
-}
-function mergeModelOverrides(base, override) {
-  if (base === void 0) return override;
-  if (override === void 0) return base;
-  const merged = { ...base };
-  for (const [modelId, model] of Object.entries(override)) {
-    merged[modelId] = { ...base[modelId], ...stripUndefined(model) };
-  }
-  return merged;
-}
-function mergeProviderOverrides(base, override) {
-  if (base === void 0) return override;
-  if (override === void 0) return base;
-  const merged = { ...base };
-  for (const [providerId, provider] of Object.entries(override)) {
-    const baseProvider = base[providerId];
-    const mergedModels = mergeModelOverrides(baseProvider?.models, provider.models);
-    merged[providerId] = {
-      ...baseProvider,
-      ...stripUndefined(provider),
-      ...mergedModels !== void 0 ? { models: mergedModels } : {}
-    };
-  }
-  return merged;
-}
 function mergeCompress(base, override) {
   if (!override) {
     return base;
@@ -1736,7 +1623,6 @@ function mergeCompress(base, override) {
     minContextLimit: override.minContextLimit ?? base.minContextLimit,
     modelMaxLimits: override.modelMaxLimits ?? base.modelMaxLimits,
     modelMinLimits: override.modelMinLimits ?? base.modelMinLimits,
-    providers: mergeProviderOverrides(base.providers, override.providers),
     nudgeFrequency: override.nudgeFrequency ?? base.nudgeFrequency,
     minNudgeContextPercent: override.minNudgeContextPercent ?? base.minNudgeContextPercent,
     nudgeGrowthTokens: override.nudgeGrowthTokens,
@@ -1787,22 +1673,6 @@ function deepCloneConfig(config) {
       ...config.compress,
       modelMaxLimits: { ...config.compress.modelMaxLimits },
       modelMinLimits: { ...config.compress.modelMinLimits },
-      providers: config.compress.providers ? Object.fromEntries(
-        Object.entries(config.compress.providers).map(([providerId, provider]) => [
-          providerId,
-          {
-            ...provider,
-            ...provider.models ? {
-              models: Object.fromEntries(
-                Object.entries(provider.models).map(([modelId, model]) => [
-                  modelId,
-                  { ...model }
-                ])
-              )
-            } : {}
-          }
-        ])
-      ) : void 0,
       protectedTools: [...config.compress.protectedTools]
     },
     gc: {
@@ -7087,26 +6957,6 @@ function computeShouldNudge2(params) {
   return policy.computeShouldNudge(params);
 }
 var DEFAULT_NUDGE_GROWTH_TOKENS = 5e4;
-var DEFAULT_MIN_NUDGE_CONTEXT_PERCENT = 5;
-function resolveMinNudgeContextPercent(config, providerId, modelId) {
-  const modelOverrides = providerId !== void 0 && modelId !== void 0 ? config.compress?.providers?.[providerId]?.models?.[modelId] : void 0;
-  if (modelOverrides?.minNudgeContextPercent !== void 0) {
-    return modelOverrides.minNudgeContextPercent;
-  }
-  const providerOverrides = providerId !== void 0 ? config.compress?.providers?.[providerId] : void 0;
-  if (providerOverrides?.minNudgeContextPercent !== void 0) {
-    return providerOverrides.minNudgeContextPercent;
-  }
-  return config.compress?.minNudgeContextPercent;
-}
-function resolveMinNudgeFloorTokens(config, modelContextLimit, providerId, modelId) {
-  if (modelContextLimit === void 0) {
-    return void 0;
-  }
-  const percent = resolveMinNudgeContextPercent(config, providerId, modelId) ?? DEFAULT_MIN_NUDGE_CONTEXT_PERCENT;
-  const clamped = Math.min(100, Math.max(0, percent));
-  return Math.round(clamped / 100 * modelContextLimit);
-}
 function addAnchor(anchorMessageIds, anchorMessageId, anchorMessageIndex, messages, interval) {
   if (anchorMessageIndex < 0) {
     return false;
@@ -7789,16 +7639,11 @@ var injectCompressNudges = (state, config, logger, messages, prompts, compressio
     overMinLimit,
     overMaxLimit,
     lastNudgeTokens: growthReference,
-    minNudgeContextPercent: resolveMinNudgeContextPercent(config, providerId, modelId) ?? DEFAULT_MIN_NUDGE_CONTEXT_PERCENT,
+    minNudgeContextPercent: config.compress?.minNudgeContextPercent ?? 5,
     nudgeGrowthTokens: effectiveThreshold
   });
   const growthSinceBaseline = currentTokens !== void 0 && growthReference !== void 0 ? currentTokens - growthReference : void 0;
-  const minNudgeFloorTokens = resolveMinNudgeFloorTokens(
-    config,
-    modelContextLimit,
-    providerId,
-    modelId
-  );
+  const minNudgeFloorTokens = modelContextLimit !== void 0 ? Math.round((config.compress?.minNudgeContextPercent ?? 5) / 100 * modelContextLimit) : void 0;
   const overMinNudgeFloor = minNudgeFloorTokens === void 0 || currentTokens === void 0 || currentTokens >= minNudgeFloorTokens;
   const nudgeAllowed = emergencyOverride || decision.shouldNudge && (overMaxLimit || overMinNudgeFloor) && growthSinceBaseline !== void 0 && growthSinceBaseline >= growthFloor;
   const effectiveTipsVariant = emergencyOverride ? "maxLimit" : decision.tipsVariant;
@@ -9267,7 +9112,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.352.85" : "dev";
+var LOG_VERSION = true ? "1.14.26-pr.353.86" : "dev";
 var LEVEL_RANK = {
   debug: 10,
   info: 20,
@@ -11708,7 +11553,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.352.85" : "dev",
+    version: true ? "1.14.26-pr.353.86" : "dev",
     workspace: ctx.directory,
     logLevel: logger.level,
     debug: config.debug,