@agentclientprotocol/codex-acp 2.5.1-preview.15 → 2.5.1-preview.16

package/dist/index.js

@@ -41315,6 +41315,7 @@ var AgentMode = class _AgentMode {
 
 // src/CodexAcpClient.ts
 import path10 from "node:path";
+import { isDeepStrictEqual } from "node:util";
 
 // package.json
 var package_default = {
@@ -41322,7 +41323,7 @@ var package_default = {
   publishConfig: {
     access: "public"
   },
-  version: "2.5.1-preview.15",
+  version: "2.5.1-preview.16",
   description: "",
   main: "dist/index.js",
   bin: {
@@ -42204,9 +42205,9 @@ var CodexAcpClient = class _CodexAcpClient {
     if (!URL.canParse(request.baseUrl) || !["http:", "https:"].includes(new URL(request.baseUrl).protocol)) {
       throw RequestError.invalidParams({ baseUrl: request.baseUrl }, "baseUrl must be an http(s) URL");
     }
-    const previous = this.gatewayConfigSource === "acpProviders" ? this.gatewayConfig : null;
+    const previousListing = this.hasProviderRouting(gatewayConfig) ? this.gatewayConfig?.listedModels ?? null : null;
     try {
-      gatewayConfig.listedModels = previous?.listedModels && sameGatewayRouting(previous, gatewayConfig) ? previous.listedModels : await listGatewayModels(gatewayConfig.config.base_url, gatewayConfig.config.http_headers);
+      gatewayConfig.listedModels = previousListing ?? await listGatewayModels(gatewayConfig.config.base_url, gatewayConfig.config.http_headers);
     } catch (error62) {
       if (error62 instanceof GatewayListingError) {
         throw RequestError.internalError(
@@ -42218,6 +42219,10 @@ var CodexAcpClient = class _CodexAcpClient {
     }
     return gatewayConfig;
   }
+  /** Whether `providers/set` already applied the provider config of `gatewayConfig`. */
+  hasProviderRouting(gatewayConfig) {
+    return this.gatewayConfigSource === "acpProviders" && this.gatewayConfig !== null && sameProviderConfig(this.gatewayConfig, gatewayConfig);
+  }
   /** `providers/set`: replaces the routing with a configuration from {@link prepareProvider}. */
   setProvider(gatewayConfig) {
     this.gatewayConfigSource = "acpProviders";
@@ -43144,10 +43149,8 @@ function buildGatewayConfig(params) {
     listedModels: null
   };
 }
-function sameGatewayRouting(left, right) {
-  const leftHeaders = Object.entries(left.config.http_headers);
-  const rightHeaders = right.config.http_headers;
-  return left.config.base_url === right.config.base_url && left.config.wire_api === right.config.wire_api && leftHeaders.length === Object.keys(rightHeaders).length && leftHeaders.every(([name, value]) => rightHeaders[name] === value);
+function sameProviderConfig(left, right) {
+  return left.modelProvider === right.modelProvider && isDeepStrictEqual(left.config, right.config);
 }
 function readMetaAdditionalRoots(meta3) {
   const rawRoots = meta3?.["additionalRoots"];
@@ -50129,6 +50132,8 @@ var CodexAcpServer = class {
   recovery;
   initializeRequest = null;
   providerUpdate = null;
+  /** The last provider update failed, so the app-server may not run the routing of the agent. */
+  providerUpdateFailed = false;
   /**
    * Numbers `providers/set` and `providers/disable` requests in arrival order. A listing finishing after a newer
    * request was applied is dropped; a newer request that failed drops nothing.
@@ -51664,6 +51669,11 @@ You have been logged out. Please try again.`);
       return {};
     }
     this.appliedProviderRequest = request;
+    if (this.codexAcpClient.hasProviderRouting(gatewayConfig) && !this.providerUpdateFailed) {
+      logger.log("providers/set unchanged: the app-server is not restarted");
+      await this.waitForProviderUpdate();
+      return {};
+    }
     this.codexAcpClient.setProvider(gatewayConfig);
     await this.enqueueProviderUpdate((client) => client.setProvider(gatewayConfig));
     return {};
@@ -51761,6 +51771,11 @@ You have been logged out. Please try again.`);
       }
     });
     this.providerUpdate = update;
+    update.then(() => {
+      this.providerUpdateFailed = false;
+    }, () => {
+      this.providerUpdateFailed = true;
+    });
     this.recovery?.settleReplacement(update);
     try {
       await update;

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "2.5.1-preview.15",
+  "version": "2.5.1-preview.16",
   "description": "",
   "main": "dist/index.js",
   "bin": {