codex-multi-auth 1.2.6 → 1.3.0

package/scripts/codex.js

@@ -1,4 +1,4 @@
-#!/usr/bin/env node
+#!/usr/bin/env node
 
 import { spawn } from "node:child_process";
 import {
@@ -18,7 +18,10 @@ import { homedir, tmpdir } from "node:os";
 import { basename, delimiter, dirname, join, resolve as resolvePath } from "node:path";
 import process from "node:process";
 import { fileURLToPath } from "node:url";
-import { resolveRealCodexBin as resolveRealCodexBinFromEnvironment } from "./codex-bin-resolver.js";
+import {
+	resolveRealCodexBin as resolveRealCodexBinFromEnvironment,
+	splitPathEntries,
+} from "./codex-bin-resolver.js";
 import { normalizeAuthAlias, shouldHandleMultiAuthAuth } from "./codex-routing.js";
 
 const RETRYABLE_SHADOW_HOME_CLEANUP_CODES = new Set(["EBUSY", "EPERM", "ENOTEMPTY"]);
@@ -124,11 +127,17 @@ async function autoSyncManagerActiveSelectionIfEnabled() {
 function resolveRealCodexBin() {
 	const override = (process.env.CODEX_MULTI_AUTH_REAL_CODEX_BIN ?? "").trim();
 	if (override.length > 0) {
-		if (existsSync(override)) return override;
-		console.error(
-			`CODEX_MULTI_AUTH_REAL_CODEX_BIN is set but missing: ${override}`,
-		);
-		return null;
+		if (!existsSync(override)) {
+			console.error(
+				`CODEX_MULTI_AUTH_REAL_CODEX_BIN is set but missing: ${override}`,
+			);
+			return null;
+		}
+		return resolveRealCodexBinFromEnvironment({
+			moduleUrl: import.meta.url,
+			env: process.env,
+			existsSyncImpl: existsSync,
+		});
 	}
 
 	return resolveRealCodexBinFromEnvironment({ moduleUrl: import.meta.url });
@@ -145,7 +154,9 @@ function forwardToRealCodex(codexBin, args, env = process.env, cleanup) {
 			resolve(exitCode);
 		};
 
-		const child = spawn(process.execPath, [codexBin, ...args], {
+		const command = codexBin.launchWithNode ? process.execPath : codexBin.path;
+		const commandArgs = codexBin.launchWithNode ? [codexBin.path, ...args] : args;
+		const child = spawn(command, commandArgs, {
 			stdio: "inherit",
 			env,
 		});
@@ -653,201 +664,201 @@ function rewriteConfigTomlReasoningEffort(rawConfig, requestedModel) {
 	return ensureTrailingNewline(nextLines.join(lineEnding));
 }
 
-function resolveOriginalMultiAuthDir(env) {
-	const explicit = (env.CODEX_MULTI_AUTH_DIR ?? "").trim();
-	if (explicit.length > 0) {
-		return explicit;
-	}
-	return undefined;
-}
-
-async function loadRuntimeObservabilityModule() {
-	try {
-		const mod = await import("../dist/lib/runtime/runtime-observability.js");
-		if (
-			typeof mod.loadPersistedRuntimeObservabilitySnapshot !== "function" ||
-			typeof mod.mutateRuntimeObservabilitySnapshot !== "function"
-		) {
-			return null;
-		}
-		return mod;
-	} catch (error) {
-		if (
-			error &&
-			typeof error === "object" &&
-			"code" in error &&
-			error.code === "ERR_MODULE_NOT_FOUND"
-		) {
-			return null;
-		}
-		throw error;
-	}
-}
-
-function isPureHelpOrVersionArgs(rawArgs) {
-	if (!Array.isArray(rawArgs) || rawArgs.length === 0) {
-		return false;
-	}
-	return rawArgs.every((arg) =>
-		typeof arg === "string" && ["--help", "-h", "--version", "-V"].includes(arg),
-	);
-}
-
-function consumesNextArg(arg) {
-	return new Set([
-		"-c",
-		"--config",
-		"--enable",
-		"--disable",
-		"--remote",
-		"--remote-auth-token-env",
-		"-i",
-		"--image",
-		"-m",
-		"--model",
-		"--local-provider",
-		"-p",
-		"--profile",
-		"-s",
-		"--sandbox",
-		"-a",
-		"--ask-for-approval",
-		"-C",
-		"--cd",
-		"--add-dir",
-		"--output-schema",
-		"--color",
-		"-o",
-		"--output-last-message",
-	]).has(arg);
-}
-
-function shouldTrackForwardedRuntimeObservability(rawArgs) {
-	if (!Array.isArray(rawArgs) || rawArgs.length === 0) {
-		return true;
-	}
-	if (isPureHelpOrVersionArgs(rawArgs)) {
-		return false;
-	}
-
-	const requestCommands = new Set(["exec", "review", "resume", "fork"]);
-	const nonRequestCommands = new Set([
-		"help",
-		"completion",
-		"login",
-		"logout",
-		"mcp",
-		"mcp-server",
-		"app-server",
-		"sandbox",
-		"debug",
-		"apply",
-		"cloud",
-		"features",
-		"auth",
-	]);
-
-	for (let i = 0; i < rawArgs.length; i += 1) {
-		const arg = rawArgs[i];
-		if (typeof arg !== "string" || arg.length === 0) continue;
-		if (arg === "--") {
-			return i + 1 < rawArgs.length;
-		}
-		if (arg.startsWith("--config=")) {
-			continue;
-		}
-		if (arg.startsWith("--") || (arg.startsWith("-") && arg !== "-")) {
-			if (consumesNextArg(arg)) {
-				i += 1;
-			}
-			continue;
-		}
-		if (requestCommands.has(arg)) {
-			return true;
-		}
-		if (nonRequestCommands.has(arg)) {
-			return false;
-		}
-		return true;
-	}
-
-	return true;
-}
-
-function createRuntimeSnapshotChangeToken(snapshot) {
-	return JSON.stringify({
-		updatedAt: snapshot?.updatedAt ?? null,
-		responsesRequests: snapshot?.responsesRequests ?? null,
-		authRefreshRequests: snapshot?.authRefreshRequests ?? null,
-		diagnosticProbeRequests: snapshot?.diagnosticProbeRequests ?? null,
-		totalRequests: snapshot?.runtimeMetrics?.totalRequests ?? null,
-		successfulRequests: snapshot?.runtimeMetrics?.successfulRequests ?? null,
-		failedRequests: snapshot?.runtimeMetrics?.failedRequests ?? null,
-		lastRequestAt: snapshot?.runtimeMetrics?.lastRequestAt ?? null,
-	});
-}
-
-async function loadRuntimeSnapshotWithRetry(runtimeObservabilityModule) {
-	let snapshot = null;
-	for (let attempt = 0; attempt < 5; attempt += 1) {
-		snapshot =
-			(await runtimeObservabilityModule.loadPersistedRuntimeObservabilitySnapshot()) ??
-			null;
-		if (snapshot) {
-			return snapshot;
-		}
-		if (attempt < 4) {
-			await new Promise((resolve) => setTimeout(resolve, 20));
-		}
-	}
-	return snapshot;
-}
-
-async function withForwardedRuntimeObservability(rawArgs, runForwardedCommand) {
-	if (!shouldTrackForwardedRuntimeObservability(rawArgs)) {
-		return runForwardedCommand();
-	}
-
-	const runtimeObservabilityModule = await loadRuntimeObservabilityModule();
-	if (!runtimeObservabilityModule) {
-		return runForwardedCommand();
-	}
-
-	const beforeSnapshot = await loadRuntimeSnapshotWithRetry(runtimeObservabilityModule);
-	const beforeToken = createRuntimeSnapshotChangeToken(beforeSnapshot);
-	const startedAt = Date.now();
-	const exitCode = await runForwardedCommand();
-	const afterSnapshot = await loadRuntimeSnapshotWithRetry(runtimeObservabilityModule);
-	const afterToken = createRuntimeSnapshotChangeToken(afterSnapshot);
-	if (afterToken !== beforeToken) {
-		return exitCode;
-	}
-
-	runtimeObservabilityModule.mutateRuntimeObservabilitySnapshot((snapshot) => {
-		snapshot.currentRequestId = null;
-		snapshot.responsesRequests += 1;
-		snapshot.runtimeMetrics.totalRequests += 1;
-		snapshot.runtimeMetrics.responsesRequests += 1;
-		snapshot.runtimeMetrics.cumulativeLatencyMs += Math.max(0, Date.now() - startedAt);
-		snapshot.runtimeMetrics.lastRequestAt = Date.now();
-		if (!snapshot.runtimeMetrics.startedAt) {
-			snapshot.runtimeMetrics.startedAt = startedAt;
-		}
-		if (exitCode === 0) {
-			snapshot.runtimeMetrics.successfulRequests += 1;
-			snapshot.runtimeMetrics.lastError = null;
-		} else {
-			snapshot.runtimeMetrics.failedRequests += 1;
-			snapshot.runtimeMetrics.lastError = `forwarded-codex-exit:${exitCode}`;
-		}
-	});
-	return exitCode;
-}
-
-function createCompatibilityCodexHome(
-	processedArgs,
-	requestedModel,
-	baseEnv = process.env,
+function resolveOriginalMultiAuthDir(env) {
+	const explicit = (env.CODEX_MULTI_AUTH_DIR ?? "").trim();
+	if (explicit.length > 0) {
+		return explicit;
+	}
+	return undefined;
+}
+
+async function loadRuntimeObservabilityModule() {
+	try {
+		const mod = await import("../dist/lib/runtime/runtime-observability.js");
+		if (
+			typeof mod.loadPersistedRuntimeObservabilitySnapshot !== "function" ||
+			typeof mod.mutateRuntimeObservabilitySnapshot !== "function"
+		) {
+			return null;
+		}
+		return mod;
+	} catch (error) {
+		if (
+			error &&
+			typeof error === "object" &&
+			"code" in error &&
+			error.code === "ERR_MODULE_NOT_FOUND"
+		) {
+			return null;
+		}
+		throw error;
+	}
+}
+
+function isPureHelpOrVersionArgs(rawArgs) {
+	if (!Array.isArray(rawArgs) || rawArgs.length === 0) {
+		return false;
+	}
+	return rawArgs.every((arg) =>
+		typeof arg === "string" && ["--help", "-h", "--version", "-V"].includes(arg),
+	);
+}
+
+function consumesNextArg(arg) {
+	return new Set([
+		"-c",
+		"--config",
+		"--enable",
+		"--disable",
+		"--remote",
+		"--remote-auth-token-env",
+		"-i",
+		"--image",
+		"-m",
+		"--model",
+		"--local-provider",
+		"-p",
+		"--profile",
+		"-s",
+		"--sandbox",
+		"-a",
+		"--ask-for-approval",
+		"-C",
+		"--cd",
+		"--add-dir",
+		"--output-schema",
+		"--color",
+		"-o",
+		"--output-last-message",
+	]).has(arg);
+}
+
+function shouldTrackForwardedRuntimeObservability(rawArgs) {
+	if (!Array.isArray(rawArgs) || rawArgs.length === 0) {
+		return true;
+	}
+	if (isPureHelpOrVersionArgs(rawArgs)) {
+		return false;
+	}
+
+	const requestCommands = new Set(["exec", "review", "resume", "fork"]);
+	const nonRequestCommands = new Set([
+		"help",
+		"completion",
+		"login",
+		"logout",
+		"mcp",
+		"mcp-server",
+		"app-server",
+		"sandbox",
+		"debug",
+		"apply",
+		"cloud",
+		"features",
+		"auth",
+	]);
+
+	for (let i = 0; i < rawArgs.length; i += 1) {
+		const arg = rawArgs[i];
+		if (typeof arg !== "string" || arg.length === 0) continue;
+		if (arg === "--") {
+			return i + 1 < rawArgs.length;
+		}
+		if (arg.startsWith("--config=")) {
+			continue;
+		}
+		if (arg.startsWith("--") || (arg.startsWith("-") && arg !== "-")) {
+			if (consumesNextArg(arg)) {
+				i += 1;
+			}
+			continue;
+		}
+		if (requestCommands.has(arg)) {
+			return true;
+		}
+		if (nonRequestCommands.has(arg)) {
+			return false;
+		}
+		return true;
+	}
+
+	return true;
+}
+
+function createRuntimeSnapshotChangeToken(snapshot) {
+	return JSON.stringify({
+		updatedAt: snapshot?.updatedAt ?? null,
+		responsesRequests: snapshot?.responsesRequests ?? null,
+		authRefreshRequests: snapshot?.authRefreshRequests ?? null,
+		diagnosticProbeRequests: snapshot?.diagnosticProbeRequests ?? null,
+		totalRequests: snapshot?.runtimeMetrics?.totalRequests ?? null,
+		successfulRequests: snapshot?.runtimeMetrics?.successfulRequests ?? null,
+		failedRequests: snapshot?.runtimeMetrics?.failedRequests ?? null,
+		lastRequestAt: snapshot?.runtimeMetrics?.lastRequestAt ?? null,
+	});
+}
+
+async function loadRuntimeSnapshotWithRetry(runtimeObservabilityModule) {
+	let snapshot = null;
+	for (let attempt = 0; attempt < 5; attempt += 1) {
+		snapshot =
+			(await runtimeObservabilityModule.loadPersistedRuntimeObservabilitySnapshot()) ??
+			null;
+		if (snapshot) {
+			return snapshot;
+		}
+		if (attempt < 4) {
+			await new Promise((resolve) => setTimeout(resolve, 20));
+		}
+	}
+	return snapshot;
+}
+
+async function withForwardedRuntimeObservability(rawArgs, runForwardedCommand) {
+	if (!shouldTrackForwardedRuntimeObservability(rawArgs)) {
+		return runForwardedCommand();
+	}
+
+	const runtimeObservabilityModule = await loadRuntimeObservabilityModule();
+	if (!runtimeObservabilityModule) {
+		return runForwardedCommand();
+	}
+
+	const beforeSnapshot = await loadRuntimeSnapshotWithRetry(runtimeObservabilityModule);
+	const beforeToken = createRuntimeSnapshotChangeToken(beforeSnapshot);
+	const startedAt = Date.now();
+	const exitCode = await runForwardedCommand();
+	const afterSnapshot = await loadRuntimeSnapshotWithRetry(runtimeObservabilityModule);
+	const afterToken = createRuntimeSnapshotChangeToken(afterSnapshot);
+	if (afterToken !== beforeToken) {
+		return exitCode;
+	}
+
+	runtimeObservabilityModule.mutateRuntimeObservabilitySnapshot((snapshot) => {
+		snapshot.currentRequestId = null;
+		snapshot.responsesRequests += 1;
+		snapshot.runtimeMetrics.totalRequests += 1;
+		snapshot.runtimeMetrics.responsesRequests += 1;
+		snapshot.runtimeMetrics.cumulativeLatencyMs += Math.max(0, Date.now() - startedAt);
+		snapshot.runtimeMetrics.lastRequestAt = Date.now();
+		if (!snapshot.runtimeMetrics.startedAt) {
+			snapshot.runtimeMetrics.startedAt = startedAt;
+		}
+		if (exitCode === 0) {
+			snapshot.runtimeMetrics.successfulRequests += 1;
+			snapshot.runtimeMetrics.lastError = null;
+		} else {
+			snapshot.runtimeMetrics.failedRequests += 1;
+			snapshot.runtimeMetrics.lastError = `forwarded-codex-exit:${exitCode}`;
+		}
+	});
+	return exitCode;
+}
+
+function createCompatibilityCodexHome(
+	processedArgs,
+	requestedModel,
+	baseEnv = process.env,
 ) {
 	if (!requestedModel) {
 		return { args: processedArgs, env: baseEnv, cleanup: undefined };
@@ -993,16 +1004,6 @@ function shouldInstallWindowsBatchShimGuard() {
 	return override !== "0";
 }
 
-function splitPathEntries(pathValue) {
-	if (typeof pathValue !== "string" || pathValue.trim().length === 0) {
-		return [];
-	}
-	return pathValue
-		.split(delimiter)
-		.map((entry) => entry.trim())
-		.filter((entry) => entry.length > 0);
-}
-
 function resolveWindowsShimDirectoryFromInvocation() {
 	const invokedScript = (process.argv[1] ?? "").trim();
 	if (invokedScript.length === 0) return null;
@@ -1138,7 +1139,13 @@ function ensureWindowsShellShim(filePath, desiredContent, options = {}) {
 		}
 		const looksLikeStockOpenAiShim =
 			currentContent.includes("node_modules\\@openai\\codex\\bin\\codex.js") ||
-			currentContent.includes("node_modules/@openai/codex/bin/codex.js");
+			currentContent.includes("node_modules/@openai/codex/bin/codex.js") ||
+			currentContent.includes("@openai\\codex-win32-") ||
+			currentContent.includes("@openai/codex-win32-") ||
+			currentContent.includes("vendor\\x86_64-pc-windows-msvc\\codex\\codex.exe") ||
+			currentContent.includes("vendor\\aarch64-pc-windows-msvc\\codex\\codex.exe") ||
+			currentContent.includes("vendor/x86_64-pc-windows-msvc/codex/codex.exe") ||
+			currentContent.includes("vendor/aarch64-pc-windows-msvc/codex/codex.exe");
 		if (looksLikeStockOpenAiShim) {
 			try {
 				writeFileSync(filePath, desiredContent, { encoding: "utf8", mode: 0o755 });
@@ -1318,9 +1325,9 @@ async function main() {
 	if (!realCodexBin) {
 		console.error(
 			[
-				"Could not locate the official Codex CLI binary (@openai/codex).",
-				"Install it globally: npm install -g @openai/codex",
-				"Or set CODEX_MULTI_AUTH_REAL_CODEX_BIN to a full bin/codex.js path.",
+				"Could not locate the official Codex CLI.",
+				"Install it with npm, Homebrew, or an official native release so `codex` is on PATH.",
+				"Or set CODEX_MULTI_AUTH_REAL_CODEX_BIN to the full path of either codex or @openai/codex/bin/codex.js.",
 			].join("\n"),
 		);
 		return 1;
@@ -1332,15 +1339,15 @@ async function main() {
 		forwardArgs,
 		requestedModel,
 	);
-	return withForwardedRuntimeObservability(rawArgs, () =>
-		forwardToRealCodex(
-			realCodexBin,
-			compatibility.args,
-			compatibility.env,
-			compatibility.cleanup,
-		),
-	);
-}
+	return withForwardedRuntimeObservability(rawArgs, () =>
+		forwardToRealCodex(
+			realCodexBin,
+			compatibility.args,
+			compatibility.env,
+			compatibility.cleanup,
+		),
+	);
+}
 
 const exitCode = await main();
 process.exitCode = normalizeExitCode(exitCode);