ai-sdk-provider-codex-cli 2.1.1 → 2.1.2

package/dist/index.d.ts

@@ -900,7 +900,21 @@ declare class ExecLanguageModel implements LanguageModelV4 {
     private mergeSettings;
     private getItemType;
     private buildArgs;
+    /**
+     * Apply MCP server settings as `-c` config overrides.
+     *
+     * Returns environment variables that must be set on the spawned codex
+     * process. Inline HTTP `bearerToken` secrets are routed through the child
+     * environment (via `bearer_token_env_var`) instead of argv, because command
+     * lines are readable by any local process (`ps`, /proc/<pid>/cmdline).
+     */
     private applyMcpSettings;
+    /**
+     * Pick a child-env variable name to carry an inline MCP bearer token,
+     * avoiding collisions between server names that normalize identically
+     * (e.g. 'foo-bar' and 'foo_bar').
+     */
+    private allocateBearerTokenEnvVar;
     private addConfigOverride;
     /**
      * Serialize a config override value into a CLI-safe string.

package/dist/index.js

@@ -1443,7 +1443,7 @@ var ExecLanguageModel = class {
     if (settings.webSearch) {
       args.push("-c", "tools.web_search=true");
     }
-    this.applyMcpSettings(args, settings);
+    const mcpSecretEnv = this.applyMcpSettings(args, settings);
     if (settings.color) {
       args.push("--color", settings.color);
     }
@@ -1491,6 +1491,7 @@ var ExecLanguageModel = class {
     const env = {
       ...process.env,
       ...settings.env || {},
+      ...mcpSecretEnv,
       RUST_LOG: process.env.RUST_LOG || "error"
     };
     let lastMessagePath = settings.outputLastMessageFile;
@@ -1516,11 +1517,20 @@ var ExecLanguageModel = class {
       tempImagePaths: tempImagePaths.length > 0 ? tempImagePaths : void 0
     };
   }
+  /**
+   * Apply MCP server settings as `-c` config overrides.
+   *
+   * Returns environment variables that must be set on the spawned codex
+   * process. Inline HTTP `bearerToken` secrets are routed through the child
+   * environment (via `bearer_token_env_var`) instead of argv, because command
+   * lines are readable by any local process (`ps`, /proc/<pid>/cmdline).
+   */
   applyMcpSettings(args, settings) {
     if (settings.rmcpClient) {
       this.addConfigOverride(args, "features.rmcp_client", true);
     }
-    if (!settings.mcpServers) return;
+    if (!settings.mcpServers) return void 0;
+    const secretEnv = {};
     for (const [rawName, server] of Object.entries(settings.mcpServers)) {
       const name = assertValidMcpServerName(rawName);
       const prefix = `mcp_servers.${name}`;
@@ -1546,15 +1556,43 @@ var ExecLanguageModel = class {
         if (server.cwd) this.addConfigOverride(args, `${prefix}.cwd`, server.cwd);
       } else {
         this.addConfigOverride(args, `${prefix}.url`, server.url);
-        if (server.bearerTokenEnvVar)
+        const hasExplicitAuthorizationHeader = Object.keys(server.httpHeaders ?? {}).some(
+          (key) => key.toLowerCase() === "authorization"
+        );
+        if (server.bearerTokenEnvVar) {
           this.addConfigOverride(args, `${prefix}.bearer_token_env_var`, server.bearerTokenEnvVar);
-        const httpHeaders = mcpHttpHeadersWithBearerToken(server);
-        if (httpHeaders !== void 0)
-          this.addConfigOverride(args, `${prefix}.http_headers`, httpHeaders);
+          if (server.bearerToken !== void 0) {
+            this.logger.warn(
+              `[codex-cli] MCP server '${name}': both bearerToken and bearerTokenEnvVar are set; using bearerTokenEnvVar and ignoring the inline token.`
+            );
+          }
+        } else if (server.bearerToken !== void 0 && !hasExplicitAuthorizationHeader) {
+          const envVarName = this.allocateBearerTokenEnvVar(name, secretEnv);
+          secretEnv[envVarName] = server.bearerToken;
+          this.addConfigOverride(args, `${prefix}.bearer_token_env_var`, envVarName);
+        }
+        if (server.httpHeaders !== void 0)
+          this.addConfigOverride(args, `${prefix}.http_headers`, server.httpHeaders);
         if (server.envHttpHeaders !== void 0)
           this.addConfigOverride(args, `${prefix}.env_http_headers`, server.envHttpHeaders);
       }
     }
+    return Object.keys(secretEnv).length > 0 ? secretEnv : void 0;
+  }
+  /**
+   * Pick a child-env variable name to carry an inline MCP bearer token,
+   * avoiding collisions between server names that normalize identically
+   * (e.g. 'foo-bar' and 'foo_bar').
+   */
+  allocateBearerTokenEnvVar(serverName, secretEnv) {
+    const base = `CODEX_MCP_${serverName.toUpperCase().replace(/-/g, "_")}_BEARER_TOKEN`;
+    let candidate = base;
+    let suffix = 2;
+    while (candidate in secretEnv) {
+      candidate = `${base}_${suffix}`;
+      suffix += 1;
+    }
+    return candidate;
   }
   addConfigOverride(args, key, value) {
     assertValidConfigOverrideKey(key);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ai-sdk-provider-codex-cli",
-  "version": "2.1.1",
+  "version": "2.1.2",
   "description": "AI SDK v7 provider for OpenAI Codex CLI (use ChatGPT Plus/Pro subscription)",
   "keywords": [
     "ai-sdk",