@agentclientprotocol/codex-acp 2.5.1-preview.19 → 2.5.1-preview.20

package/dist/index.js

@@ -40747,6 +40747,9 @@ function isCodexAuthRequest(request) {
   return request.methodId === "api-key" || request.methodId === "chat-gpt" || request.methodId === "chat-gpt-device-code" || request.methodId === "gateway";
 }
 
+// src/CodexAcpServer.ts
+import { isDeepStrictEqual as isDeepStrictEqual2 } from "node:util";
+
 // src/mcp/McpServerSignIn.ts
 import { randomUUID as randomUUID2 } from "node:crypto";
 function createMcpServerSignIn(connection, codexAcpClient, clientCapabilities) {
@@ -41948,7 +41951,7 @@ var package_default = {
   publishConfig: {
     access: "public"
   },
-  version: "2.5.1-preview.19",
+  version: "2.5.1-preview.20",
   description: "",
   main: "dist/index.js",
   bin: {
@@ -42521,6 +42524,19 @@ function narrowToListedModels(models, listed) {
   return narrowed.map((model, index) => model.isDefault === (index === defaultIndex) ? model : { ...model, isDefault: index === defaultIndex });
 }
 
+// src/CodexConfigOverride.ts
+function configOverride(key, value) {
+  return ["-c", `${key}=${toToml(value)}`];
+}
+function toToml(value) {
+  if (Array.isArray(value)) return `[${value.map(toToml).join(", ")}]`;
+  if (value !== null && typeof value === "object") {
+    return `{ ${Object.entries(value).map(([key, item]) => `${JSON.stringify(key)} = ${toToml(item)}`).join(", ")} }`;
+  }
+  return JSON.stringify(value);
+}
+var NO_PROVIDER_STARTUP_CONFIG = { args: [], env: {} };
+
 // src/UnsupportedSkills.ts
 var UNSUPPORTED_SKILL_NAMES = /* @__PURE__ */ new Set(["visualize:visualize"]);
 function disableUnsupportedSkills(config2) {
@@ -43456,6 +43472,10 @@ var CodexAcpClient = class _CodexAcpClient {
   getModelProvider() {
     return this.gatewayConfig?.modelProvider ?? this.modelProvider;
   }
+  /** The provider routing that the app-server of this client must start with, see {@link providerStartupConfig}. */
+  providerStartupConfig() {
+    return providerStartupConfig(this.modelProvider, this.config, this.gatewayConfig);
+  }
   async getResumeModelProvider() {
     return await this.getCurrentModelProvider() ?? "openai";
   }
@@ -43909,6 +43929,28 @@ function mergeGatewayConfig(config2, gatewayConfig) {
     return config2;
   }
 }
+function providerStartupConfig(modelProvider, config2, gatewayConfig) {
+  const configuredProvider = typeof config2["model_provider"] === "string" ? config2["model_provider"] : null;
+  const effectiveProvider = gatewayConfig?.modelProvider ?? modelProvider ?? configuredProvider;
+  if (effectiveProvider === null) return NO_PROVIDER_STARTUP_CONFIG;
+  const args = configOverride("model_provider", effectiveProvider);
+  const providers = mergeGatewayConfig(config2, gatewayConfig)["model_providers"];
+  const providerDefinition = isJsonObject3(providers) ? providers[effectiveProvider] : void 0;
+  if (!isJsonObject3(providerDefinition)) return { args, env: {} };
+  const { http_headers: headers, ...provider } = providerDefinition;
+  const env = {};
+  const envHeaders = isJsonObject3(provider["env_http_headers"]) ? { ...provider["env_http_headers"] } : {};
+  if (isJsonObject3(headers)) {
+    for (const [name, value] of Object.entries(headers)) {
+      if (typeof value !== "string") continue;
+      const variable = `CODEX_ACP_PROVIDER_HEADER_${Object.keys(env).length}`;
+      env[variable] = value;
+      envHeaders[name] = variable;
+    }
+  }
+  if (Object.keys(envHeaders).length > 0) provider["env_http_headers"] = envHeaders;
+  return { args: [...args, ...configOverride(`model_providers.${effectiveProvider}`, provider)], env };
+}
 async function* noItems() {
 }
 async function* oneItemPage(items) {
@@ -46083,6 +46125,10 @@ function isConnectionDeathError(error62) {
 }
 
 // src/app-server-recovery/CodexAppServerSupervisor.ts
+function appServerStartup(state) {
+  const providerStartupConfig2 = state.providerStartupConfig ?? NO_PROVIDER_STARTUP_CONFIG;
+  return { args: [...state.appServerStartupArgs ?? ["app-server"], ...providerStartupConfig2.args], env: providerStartupConfig2.env };
+}
 var DEFAULT_TIMINGS = {
   closeGraceMs: 1e3,
   drainMs: 50,
@@ -46092,7 +46138,7 @@ var DEFAULT_TIMINGS = {
 };
 var KEPT_EXITS = 16;
 var CodexAppServerSupervisor = class {
-  constructor(state, spawnConnection = (codexPath, appServerStartupArgs) => startCodexConnection(codexPath, void 0, appServerStartupArgs, { disposeOnExit: false }), timings = {}, now = Date.now) {
+  constructor(state, spawnConnection = (codexPath, appServerStartupArgs, env) => startCodexConnection(codexPath, { ...process.env, ...env }, appServerStartupArgs, { disposeOnExit: false }), timings = {}, now = Date.now) {
     this.state = state;
     this.spawnConnection = spawnConnection;
     this.now = now;
@@ -46157,7 +46203,8 @@ var CodexAppServerSupervisor = class {
     if (this.isShuttingDown) throw new Error("The agent is shutting down");
     if (this.child.exit === null) throw new Error("The Codex app-server is still running or draining");
     this.state.stderr = "";
-    const connection = this.spawnConnection(this.state.codexPath, this.state.appServerStartupArgs);
+    const { args, env } = appServerStartup(this.state);
+    const connection = this.spawnConnection(this.state.codexPath, args, env);
     this.state.connection = connection;
     this.child = this.watch(connection);
     logger.log("[APP-SERVER START]", { generation: this.child.generation, pid: connection.process.pid ?? null });
@@ -46193,6 +46240,7 @@ var CodexAppServerSupervisor = class {
       generation,
       connection,
       startedAt: this.now(),
+      providerStartupConfig: this.state.providerStartupConfig ?? NO_PROVIDER_STARTUP_CONFIG,
       exit: null,
       dead: false,
       intentional: false,
@@ -52285,6 +52333,10 @@ You have been logged out. Please try again.`);
         logger.log("Authenticate request failed");
         throw RequestError.authRequired({ methodId: _params.methodId }, "Sign-in did not complete");
       }
+      if (this.providerStartupConfigChanged()) {
+        await withRequestCancellation(this.enqueueProviderUpdate(() => {
+        }), signal);
+      }
       await withRequestCancellation(this.refreshAuthState(this.getAuthProviderForAuthenticateRequest(_params)), signal);
       logger.log("Authenticate request completed");
       return {};
@@ -52374,7 +52426,7 @@ You have been logged out. Please try again.`);
   async enqueueProviderUpdate(apply2) {
     const previous = this.providerUpdate?.catch(() => void 0) ?? Promise.resolve();
     const update = previous.then(async () => {
-      if (this.sessions.size === 0) {
+      if (this.sessions.size === 0 && !this.providerStartupConfigChanged()) {
         return;
       }
       const activePrompts = [...this.activePrompts.values()].map((prompt) => prompt.completion);
@@ -52484,11 +52536,20 @@ You have been logged out. Please try again.`);
     });
   }
   async restartCodexClient() {
-    if (this.recovery === null) {
+    if (this.recovery === null || this.codexProcessState === null) {
       throw new Error("Codex process state is unavailable");
     }
+    this.codexProcessState.providerStartupConfig = this.codexAcpClient.providerStartupConfig();
     return await this.recovery.beginReplacement();
   }
+  /**
+   * Whether the app-server runs with other provider routing than the agent has now. Codex 0.166 refuses input for a
+   * thread whose provider is not the one that its app-server started with, so the app-server has to restart.
+   */
+  providerStartupConfigChanged() {
+    const supervisor = this.codexProcessState?.supervisor;
+    return supervisor !== void 0 && !isDeepStrictEqual2(supervisor.current.providerStartupConfig, this.codexAcpClient.providerStartupConfig());
+  }
   /**
    * Waits for the provider update in flight. When its app-server died, the request goes on: the failure belongs to
    * the `providers/set` request, and the request restarts the app-server itself. Any other failure fails it, as before.
@@ -55463,14 +55524,7 @@ function spawnCodexCli(codexPath, args) {
 function prepareCodexHookConfig(config2) {
   if (config2?.["hooks"] === void 0) return { sessionConfig: config2, appServerStartupArgs: ["app-server"] };
   const { hooks, ...sessionConfig } = config2;
-  return { sessionConfig, appServerStartupArgs: ["app-server", "-c", `hooks=${toToml(hooks)}`] };
-}
-function toToml(value) {
-  if (Array.isArray(value)) return `[${value.map(toToml).join(", ")}]`;
-  if (value !== null && typeof value === "object") {
-    return `{ ${Object.entries(value).map(([key, item]) => `${JSON.stringify(key)} = ${toToml(item)}`).join(", ")} }`;
-  }
-  return JSON.stringify(value);
+  return { sessionConfig, appServerStartupArgs: ["app-server", ...configOverride("hooks", hooks)] };
 }
 
 // src/AcpResponseDelivery.ts
@@ -55711,12 +55765,17 @@ function startAcpServer() {
     authRequest: authRequestString ?? null,
     defaultAuthRequest: defaultAuthRequest ?? null
   });
+  const startupState = {
+    appServerStartupArgs: hookConfig.appServerStartupArgs,
+    providerStartupConfig: providerStartupConfig(modelProvider ?? null, hookConfig.sessionConfig ?? {}, null)
+  };
+  const startup = appServerStartup(startupState);
   const codexProcessState = {
     // The supervisor disposes the connection itself, after the last output of the process was read.
-    connection: startCodexConnection(codexPath, void 0, hookConfig.appServerStartupArgs, { disposeOnExit: false }),
+    connection: startCodexConnection(codexPath, { ...process.env, ...startup.env }, startup.args, { disposeOnExit: false }),
     codexPath,
     config: hookConfig.sessionConfig,
-    appServerStartupArgs: hookConfig.appServerStartupArgs,
+    ...startupState,
     modelProvider,
     stderr: ""
   };

package/package.json

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