Add CodexEnvConfig: auto-configure gateway from env vars

Author: soddygo

package-lock.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.1.7-beta.3",
+  "version": "1.1.7-beta.4",
   "description": "",
   "main": "dist/index.js",
   "bin": {

package.json

@@ -1,4 +1,5 @@
 import {CODEX_API_KEY_ENV_VAR, GatewayAuthMethod, isCodexAuthRequest, OPENAI_API_KEY_ENV_VAR} from "./CodexAuthMethod";
+import {readGatewayConfigFromEnv} from "./CodexEnvConfig";
 import type {EmbeddedResourceResource} from "@agentclientprotocol/sdk";
 import * as acp from "@agentclientprotocol/sdk";
 import {type McpServer, RequestError} from "@agentclientprotocol/sdk";
@@ -80,7 +81,7 @@ export class CodexAcpClient {
         this.codexClient = codexClient;
         this.config = codexConfig ?? {};
         this.modelProvider = modelProvider ?? null;
-        this.gatewayConfig = null;
+        this.gatewayConfig = readGatewayConfigFromEnv();
     }
 
     private readonly defaultClientInfo: ClientInfo = {
@@ -976,7 +977,7 @@ function shouldDeduplicateMcpConflicts(): boolean {
     return !disabledByEnv;
 }
 
-type WireApi = "responses";
+type WireApi = "responses" | "chat";
 
 interface GatewayConfig {
     modelProvider: string;

src/CodexAcpClient.ts

@@ -0,0 +1,121 @@
+/**
+ * Environment-driven auto-configuration for the Nuwax Codex bridge.
+ *
+ * Reads custom env vars (CODEX_BASE_URL, CODEX_WIRE_API, CODEX_MODEL,
+ * CODEX_LOG_DIR) and translates them into Codex gateway config or system
+ * env overrides. All custom logic lives here to keep merge conflicts with
+ * upstream codex-acp to a minimum.
+ */
+import {CODEX_API_KEY_ENV_VAR, OPENAI_API_KEY_ENV_VAR} from "./CodexAuthMethod";
+import {logger} from "./Logger";
+
+// ---------------------------------------------------------------------------
+// Public env var names
+// ---------------------------------------------------------------------------
+
+export const CODEX_BASE_URL_ENV_VAR = "CODEX_BASE_URL";
+export const CODEX_WIRE_API_ENV_VAR = "CODEX_WIRE_API";
+export const CODEX_MODEL_ENV_VAR = "CODEX_MODEL";
+export const CODEX_LOG_DIR_ENV_VAR = "CODEX_LOG_DIR";
+
+// ---------------------------------------------------------------------------
+// Types
+// ---------------------------------------------------------------------------
+
+/** Codex wire-protocol variant. */
+export type EnvWireApi = "responses" | "chat";
+
+/** Well-known provider id used by the auto-configured gateway. */
+export const CUSTOM_GATEWAY_ID = "custom-gateway";
+
+/** Shape of the gateway config stored in CodexAcpClient. */
+export interface EnvGatewayConfig {
+    modelProvider: string;
+    config: {
+        name: string;
+        base_url: string;
+        http_headers: Record<string, string>;
+        wire_api: EnvWireApi;
+    };
+}
+
+// ---------------------------------------------------------------------------
+// Gateway auto-config from env
+// ---------------------------------------------------------------------------
+
+/**
+ * If `CODEX_BASE_URL` is set, build a gateway config from environment
+ * variables. Returns `null` when no env-driven gateway is requested (so
+ * the ACP `authenticate` / `providers/set` flow remains the authority).
+ */
+export function readGatewayConfigFromEnv(): EnvGatewayConfig | null {
+    const baseUrl = process.env[CODEX_BASE_URL_ENV_VAR]?.trim();
+    if (!baseUrl) {
+        return null;
+    }
+
+    const rawWireApi = process.env[CODEX_WIRE_API_ENV_VAR]?.trim();
+    const wireApi: EnvWireApi =
+        rawWireApi === "chat" || rawWireApi === "responses" ? rawWireApi : "responses";
+
+    const providerName =
+        process.env[CODEX_MODEL_ENV_VAR]?.trim() || "Custom Gateway";
+
+    const headers: Record<string, string> = {"X-Client-Feature-ID": "codex"};
+
+    const apiKey = readAnyApiKey();
+    if (apiKey) {
+        headers["Authorization"] = `Bearer ${apiKey}`;
+    }
+
+    logger.log("Auto-configured gateway from env", {
+        baseUrl,
+        wireApi,
+        providerName,
+        hasApiKey: !!apiKey,
+    });
+
+    return {
+        modelProvider: CUSTOM_GATEWAY_ID,
+        config: {
+            name: providerName,
+            base_url: baseUrl,
+            http_headers: headers,
+            wire_api: wireApi,
+        },
+    };
+}
+
+// ---------------------------------------------------------------------------
+// Log directory mapping
+// ---------------------------------------------------------------------------
+
+/**
+ * Map `CODEX_LOG_DIR` → `APP_SERVER_LOGS` if the former is set and the
+ * latter is not. Must be called **before** the Logger singleton is first
+ * accessed (i.e. at the very top of `startAcpServer`).
+ */
+export function applyCodexLogDir(): void {
+    const dir = process.env[CODEX_LOG_DIR_ENV_VAR];
+    if (dir && !process.env["APP_SERVER_LOGS"]) {
+        process.env["APP_SERVER_LOGS"] = dir;
+    }
+}
+
+// ---------------------------------------------------------------------------
+// Helpers
+// ---------------------------------------------------------------------------
+
+/**
+ * Try `CODEX_API_KEY` first, then fall back to `OPENAI_API_KEY`. Returns
+ * `undefined` when neither is set (callers decide whether this is fatal).
+ */
+function readAnyApiKey(): string | undefined {
+    for (const envVar of [CODEX_API_KEY_ENV_VAR, OPENAI_API_KEY_ENV_VAR]) {
+        const value = process.env[envVar]?.trim();
+        if (value) {
+            return value;
+        }
+    }
+    return undefined;
+}

src/CodexEnvConfig.ts

@@ -12,6 +12,7 @@ import packageJson from "../package.json";
 import {logger} from "./Logger";
 import {runLoginCommand} from "./login";
 import {runCodexCli} from "./CodexCli";
+import {applyCodexLogDir} from "./CodexEnvConfig";
 import {
     GOAL_CONTROL_METHOD, LEGACY_SET_SESSION_MODEL_METHOD,
     SESSION_STEERING_METHOD,
@@ -63,6 +64,7 @@ if (process.argv[2] === "login") {
 }
 
 function startAcpServer() {
+    applyCodexLogDir();
     const codexPath = process.env["CODEX_PATH"];
     const configString = process.env["CODEX_CONFIG"];
     const authRequestString = process.env["DEFAULT_AUTH_REQUEST"];