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

package/dist/index.js

@@ -4243,16 +4243,16 @@ var SessionStateRegistry = class {
   // 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;
+  // The in-flight promise (not a boolean) lets concurrent callers await the
+  // same hydration instead of skipping it.
+  lazyHydration;
   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);
-    }
+    this.lazyHydration ??= this.catalog.hydrateFromClient(client);
+    await this.lazyHydration;
     return this.catalog.resolve(providerId, modelId);
   }
   get(sessionId) {
@@ -9159,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.349.71" : "dev";
+var LOG_VERSION = true ? "1.14.25-pr.349.75" : "dev";
 var LEVEL_RANK = {
   debug: 10,
   info: 20,
@@ -9984,6 +9984,7 @@ var KEEP_PREFIX_CHARS = 2e3;
 var KEEP_SUFFIX_CHARS = 2e3;
 var PROTECT_RECENT_MESSAGES = 3;
 var OUTPUT_RESERVE_TOKENS = 16384;
+var overheadErrorLogged = /* @__PURE__ */ new Set();
 function parseGcThreshold(threshold, modelContextLimit) {
   if (typeof threshold === "number") return threshold;
   const str = threshold ?? "100%";
@@ -10000,12 +10001,16 @@ function truncateLargeToolOutputs(state, config, logger, messages) {
   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
-    });
+    const sessionKey = state.sessionId ?? "unknown";
+    if (!overheadErrorLogged.has(sessionKey)) {
+      overheadErrorLogged.add(sessionKey);
+      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;
@@ -11084,10 +11089,14 @@ function createSystemPromptHandler(registry4, logger, config, prompts) {
       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;
+      const changed = state.modelContextLimit !== limit || providerID !== void 0 && state.modelProviderID !== providerID || modelID !== void 0 && state.modelID !== modelID;
       state.modelContextLimit = limit;
-      state.modelProviderID = providerID;
-      state.modelID = modelID;
+      if (providerID !== void 0) {
+        state.modelProviderID = providerID;
+      }
+      if (modelID !== void 0) {
+        state.modelID = modelID;
+      }
       if (changed) {
         saveSessionState(state, logger).catch(() => {
         });
@@ -11650,7 +11659,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.349.71" : "dev",
+    version: true ? "1.14.25-pr.349.75" : "dev",
     workspace: ctx.directory,
     logLevel: logger.level,
     debug: config.debug,