opencode-acp 1.14.19-pr.314.26 → 1.14.19-pr.315.27

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAA;AA2BjD,QAAA,MAAM,MAAM,EAAE,MAwHK,CAAA;AAEnB,eAAe,MAAM,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAA;AA2BjD,QAAA,MAAM,MAAM,EAAE,MA6IK,CAAA;AAEnB,eAAe,MAAM,CAAA"}

package/dist/index.js

@@ -2418,7 +2418,9 @@ async function saveSessionState(sessionState, logger, sessionName) {
       nextRef: sessionState.messageIds.nextRef
     },
     lastCompaction: sessionState.lastCompaction,
-    modelContextLimit: sessionState.modelContextLimit
+    modelContextLimit: sessionState.modelContextLimit,
+    modelProviderID: sessionState.modelProviderID,
+    modelID: sessionState.modelID
   };
   await writePersistedSessionState(sessionState.sessionId, state, logger);
 }
@@ -2949,6 +2951,51 @@ function applyPendingCompressionDurations(state) {
   return updates;
 }
 
+// lib/state/model-limits.ts
+function createModelLimitCatalog() {
+  const modelLimits = /* @__PURE__ */ new Map();
+  return {
+    record(providerId, modelId, limit) {
+      if (!providerId || !modelId || typeof limit !== "number" || limit <= 0) return;
+      modelLimits.set(`${providerId}/${modelId}`, limit);
+    },
+    resolve(providerId, modelId) {
+      if (!providerId || !modelId) return void 0;
+      return modelLimits.get(`${providerId}/${modelId}`);
+    },
+    /**
+     * Best-effort one-time seed from the host's provider catalog
+     * (`client.config.providers()` → GET /config/providers). Never throws;
+     * returns the number of model-limit entries recorded.
+     */
+    async hydrateFromClient(client) {
+      try {
+        const config = client;
+        const result = await config.config?.providers?.();
+        const payload = result;
+        const providers = payload?.data?.providers;
+        if (!Array.isArray(providers)) return 0;
+        let recorded = 0;
+        for (const provider of providers) {
+          const { id, models } = provider ?? {};
+          if (typeof id !== "string" || !models) continue;
+          for (const [modelId, model] of Object.entries(models)) {
+            const limit = model?.limit;
+            const context = limit?.context;
+            if (typeof context === "number" && context > 0) {
+              modelLimits.set(`${id}/${modelId}`, context);
+              recorded++;
+            }
+          }
+        }
+        return recorded;
+      } catch {
+        return 0;
+      }
+    }
+  };
+}
+
 // lib/compress/search.ts
 import { tool } from "@opencode-ai/plugin";
 async function fetchSessionMessages(client, sessionId) {
@@ -4140,56 +4187,25 @@ var SessionStateRegistry = class {
     startsByCallId: /* @__PURE__ */ new Map(),
     pendingByCallId: /* @__PURE__ */ new Map()
   };
-  // [FIX #312] Catalog of per-model context limits, keyed `${providerID}/${modelID}`.
-  // Within one LLM request the host fires experimental.chat.messages.transform
-  // BEFORE experimental.chat.system.transform (sst/opencode: session/prompt.ts
-  // triggers messages.transform, then llm/request.ts triggers system.transform
-  // during handle.process). state.modelContextLimit is written only by the
-  // system hook, so on the first request after a model switch every percentage
-  // threshold (emergencyThresholdPercent, min/maxContextLimit "%", adaptive
-  // nudge growth, GC tiers) is still computed against the PREVIOUS model's
-  // limit. This catalog lets the messages hook reconcile against the model
-  // named on the request's user message instead of waiting one turn.
-  // Entries are recorded live by the system hook every request and seeded once
-  // at plugin init from the host's /config/providers catalog.
-  modelLimits = /* @__PURE__ */ new Map();
+  // [FIX #312] Model-limit catalog (full rationale in ./model-limits.ts):
+  // lets the messages hook reconcile state.modelContextLimit against the
+  // model named on the request's user message instead of waiting one turn
+  // for the system hook. Shared implementation — the test registry stub
+  // composes the same factory.
+  catalog = createModelLimitCatalog();
   recordModelLimit(providerId, modelId, limit) {
-    if (!providerId || !modelId || typeof limit !== "number" || limit <= 0) return;
-    this.modelLimits.set(`${providerId}/${modelId}`, limit);
+    this.catalog.record(providerId, modelId, limit);
   }
   resolveModelLimit(providerId, modelId) {
-    if (!providerId || !modelId) return void 0;
-    return this.modelLimits.get(`${providerId}/${modelId}`);
+    return this.catalog.resolve(providerId, modelId);
   }
   /**
    * Best-effort one-time seed from the host's provider catalog
    * (`client.config.providers()` → GET /config/providers). Never throws;
    * returns the number of model-limit entries recorded.
    */
-  async hydrateModelLimitsFromClient(client) {
-    try {
-      const config = client;
-      const result = await config.config?.providers?.();
-      const payload = result;
-      const providers = payload?.data?.providers;
-      if (!Array.isArray(providers)) return 0;
-      let recorded = 0;
-      for (const provider of providers) {
-        const { id, models } = provider ?? {};
-        if (typeof id !== "string" || !models) continue;
-        for (const [modelId, model] of Object.entries(models)) {
-          const limit = model?.limit;
-          const context = limit?.context;
-          if (typeof context === "number" && context > 0) {
-            this.modelLimits.set(`${id}/${modelId}`, context);
-            recorded++;
-          }
-        }
-      }
-      return recorded;
-    } catch {
-      return 0;
-    }
+  hydrateModelLimitsFromClient(client) {
+    return this.catalog.hydrateFromClient(client);
   }
   get(sessionId) {
     return this.states.get(sessionId);
@@ -4279,6 +4295,8 @@ function createSessionState() {
     lastCompaction: 0,
     currentTurn: 0,
     modelContextLimit: void 0,
+    modelProviderID: void 0,
+    modelID: void 0,
     systemPromptTokens: void 0,
     qualityGateRetryPending: false
   };
@@ -4318,6 +4336,8 @@ function resetSessionState(state) {
   state.lastCompaction = 0;
   state.currentTurn = 0;
   state.modelContextLimit = void 0;
+  state.modelProviderID = void 0;
+  state.modelID = void 0;
   state.systemPromptTokens = void 0;
   state.qualityGateRetryPending = false;
 }
@@ -4392,6 +4412,8 @@ async function ensureSessionInitialized(client, state, sessionId, logger, messag
   }
   if (typeof persisted.modelContextLimit === "number" && persisted.modelContextLimit > 0) {
     state.modelContextLimit = persisted.modelContextLimit;
+    state.modelProviderID = persisted.modelProviderID;
+    state.modelID = persisted.modelID;
   }
   const applied = applyPendingCompressionDurations(state);
   if (applied > 0) {
@@ -9000,7 +9022,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.19-pr.314.26" : "dev";
+var LOG_VERSION = true ? "1.14.19-pr.315.27" : "dev";
 var Logger = class {
   logDir;
   enabled;
@@ -10575,6 +10597,8 @@ function createSystemPromptHandler(registry4, logger, config, prompts) {
     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;
@@ -10634,6 +10658,22 @@ function createChatMessageTransformHandler(client, registry4, logger, config, pr
       );
       if (requestModelLimit !== void 0) {
         state.modelContextLimit = requestModelLimit;
+        state.modelProviderID = requestModel?.providerID;
+        state.modelID = requestModel?.modelID;
+      } else if (
+        // [FIX #312 fallback] Catalog miss: we cannot CORRECT the
+        // limit, but we can tell when it belongs to a DIFFERENT model.
+        // Invalidate instead of letting every percentage threshold
+        // below run against the wrong window (#312's false positive).
+        // States persisted before this identity pair existed carry no
+        // identity and are treated as stale for the same reason.
+        // Consumers already tolerate undefined — fresh sessions run
+        // with it until the first system.transform sets the pair.
+        requestModel?.providerID && requestModel?.modelID && state.modelContextLimit !== void 0 && (state.modelProviderID !== requestModel.providerID || state.modelID !== requestModel.modelID)
+      ) {
+        state.modelContextLimit = void 0;
+        state.modelProviderID = requestModel.providerID;
+        state.modelID = requestModel.modelID;
       }
       await updatePerTurnState(state, logger, messages);
     }
@@ -11020,8 +11060,25 @@ var server = (async (ctx) => {
   if (isSecureMode()) {
     configureClientAuth(ctx.client);
   }
-  registry4.hydrateModelLimitsFromClient(ctx.client).catch(() => {
-  });
+  registry4.hydrateModelLimitsFromClient(ctx.client).then(
+    (recorded) => {
+      if (recorded > 0) {
+        logger.info("Model limit catalog seeded from provider config", {
+          models: recorded
+        });
+      } else {
+        logger.warn(
+          "Model limit catalog seeding recorded no entries \u2014 falling back to per-request refresh (system.transform)"
+        );
+      }
+    },
+    (error) => {
+      logger.warn(
+        "Model limit catalog seeding failed \u2014 falling back to per-request refresh (system.transform)",
+        { error: error instanceof Error ? error.message : String(error) }
+      );
+    }
+  );
   logger.info("DCP initialized");
   startAutoUpdate(ctx, config.autoUpdate);
   const compressToolContext = {