Merge pull request #391 from ndycode/feat/native-codex-cli-support

support native Codex CLI installs

Author: ndycode

README.md

@@ -3,7 +3,7 @@
 [![npm version](https://img.shields.io/npm/v/codex-multi-auth.svg)](https://www.npmjs.com/package/codex-multi-auth)
 [![npm downloads](https://img.shields.io/npm/dw/codex-multi-auth.svg)](https://www.npmjs.com/package/codex-multi-auth)
 
-Codex CLI-first multi-account OAuth manager for the official `@openai/codex` CLI.
+Codex CLI-first multi-account OAuth manager for the official Codex CLI, including the `@openai/codex` npm launcher and native `codex` installs.
 
 <img width="1270" height="729" alt="2026-02-28 12_54_58-prompt txt ‎- Notepads" src="https://github.com/user-attachments/assets/0cecb77e-a6d3-432a-ba48-3577db0c7093" />
 
@@ -72,6 +72,8 @@ codex-multi-auth --version
 codex auth status
 ```
 
+Any official install path is fine as long as `codex` is on `PATH`: `npm i -g @openai/codex`, `brew install --cask codex`, or an official release binary.
+
 </details>
 
 <details>
@@ -106,6 +108,13 @@ npm i -g codex-multi-auth
 codex auth login
 ```
 
+If you already installed the official native CLI via Homebrew or a release binary, you only need:
+
+```bash
+npm i -g codex-multi-auth
+codex auth login
+```
+
 Verify the wrapper and the new account:
 
 ```bash
@@ -274,7 +283,7 @@ codex auth login
 <details>
 <summary><b>Common symptoms</b></summary>
 
-- `codex auth` unrecognized: run `where codex`, then follow `docs/troubleshooting.md` for routing fallback commands
+- `codex auth` unrecognized: run `where codex` or `which codex`, then follow `docs/troubleshooting.md` for routing fallback commands
 - Switch succeeds but wrong account appears active: run `codex auth switch <index>`, then restart session
 - Requests fail fast with a pool cooldown message: wait for the cooldown window or inspect `codex auth status`
 - Requests fail fast after repeated upstream 5xx errors: inspect `codex auth report --json` for runtime traffic and cooldown details

scripts/codex-bin-resolver.js

@@ -1,10 +1,36 @@
 import { spawnSync } from "node:child_process";
-import { existsSync } from "node:fs";
+import { existsSync, realpathSync } from "node:fs";
 import { createRequire } from "node:module";
-import { dirname, join } from "node:path";
+import { basename, delimiter, dirname, extname, join } from "node:path";
 import process from "node:process";
 import { fileURLToPath } from "node:url";
 
+function isJavaScriptEntryPath(candidate) {
+	const extension = extname(candidate).toLowerCase();
+	return extension === ".js" || extension === ".mjs" || extension === ".cjs";
+}
+
+function createResolvedCodexBin(path) {
+	return {
+		path,
+		launchWithNode: isJavaScriptEntryPath(path),
+	};
+}
+
+function normalizeResolvedPath(candidatePath, realpathSyncImpl) {
+	try {
+		return realpathSyncImpl(candidatePath);
+	} catch {
+		return candidatePath;
+	}
+}
+
+function resolveWrapperScriptPath(moduleUrl, realpathSyncImpl) {
+	return normalizeResolvedPath(fileURLToPath(moduleUrl), realpathSyncImpl);
+}
+
+const DEFAULT_WRAPPER_MODULE_URL = new URL("./codex.js", import.meta.url).href;
+
 function defaultResolvePackageBin(moduleUrl) {
 	try {
 		const require = createRequire(moduleUrl);
@@ -26,26 +52,141 @@ function resolveWindowsCmdPath(env) {
 	return "cmd.exe";
 }
 
+export 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 resolvePathExecutableName(platform) {
+	return platform === "win32" ? "codex.exe" : "codex";
+}
+
+function resolveCandidateExecutableNames(platform) {
+	if (platform !== "win32") {
+		return [resolvePathExecutableName(platform)];
+	}
+	return ["codex.exe", "codex"];
+}
+
+function resolveCodexExecutableFromPath(
+	pathEntries,
+	platform,
+	existsSyncImpl,
+	selfScriptPath,
+	realpathSyncImpl,
+) {
+	for (const entry of pathEntries) {
+		for (const executableName of resolveCandidateExecutableNames(platform)) {
+			const candidate = join(entry, executableName);
+			if (!existsSyncImpl(candidate)) {
+				continue;
+			}
+			if (
+				selfScriptPath &&
+				normalizeResolvedPath(candidate, realpathSyncImpl) === selfScriptPath
+			) {
+				continue;
+			}
+			return candidate;
+		}
+	}
+	return null;
+}
+
+function normalizeWhereOutput(stdout) {
+	return stdout
+		.split(/\r?\n/)
+		.map((line) => line.trim())
+		.filter((line) => line.length > 0);
+}
+
+function resolveCodexExecutableFromSystemPath(
+	env,
+	platform,
+	spawnSyncImpl,
+	existsSyncImpl,
+	selfScriptPath,
+	realpathSyncImpl,
+) {
+	const pathEntries = splitPathEntries(env.PATH ?? env.Path ?? "");
+	const fromEnvPath = resolveCodexExecutableFromPath(
+		pathEntries,
+		platform,
+		existsSyncImpl,
+		selfScriptPath,
+		realpathSyncImpl,
+	);
+	if (fromEnvPath) {
+		return fromEnvPath;
+	}
+
+	try {
+		const lookupResult =
+			platform === "win32"
+				? spawnSyncImpl(resolveWindowsCmdPath(env), ["/d", "/s", "/c", "where codex"], {
+						encoding: "utf8",
+						env,
+						stdio: ["ignore", "pipe", "ignore"],
+						timeout: 5000,
+						windowsHide: true,
+					})
+				: spawnSyncImpl("which", ["codex"], {
+						encoding: "utf8",
+						env,
+						stdio: ["ignore", "pipe", "ignore"],
+						timeout: 5000,
+					});
+		if (lookupResult.status !== 0) {
+			return null;
+		}
+		for (const candidate of normalizeWhereOutput(lookupResult.stdout)) {
+			if (!existsSyncImpl(candidate)) {
+				continue;
+			}
+			if (
+				selfScriptPath &&
+				normalizeResolvedPath(candidate, realpathSyncImpl) === selfScriptPath
+			) {
+				continue;
+			}
+			const fileName = basename(candidate).toLowerCase();
+			if (fileName === "codex" || fileName === "codex.exe") {
+				return candidate;
+			}
+		}
+	} catch {
+		// Ignore and fall through.
+	}
+
+	return null;
+}
+
 export function resolveRealCodexBin(options = {}) {
 	const {
 		env = process.env,
 		argv = process.argv,
 		platform = process.platform,
-		moduleUrl = import.meta.url,
+		moduleUrl = DEFAULT_WRAPPER_MODULE_URL,
 		existsSyncImpl = existsSync,
+		realpathSyncImpl = realpathSync,
 		spawnSyncImpl = spawnSync,
 		resolvePackageBin = defaultResolvePackageBin,
 	} = options;
 
 	const override = (env.CODEX_MULTI_AUTH_REAL_CODEX_BIN ?? "").trim();
 	if (override.length > 0) {
-		if (existsSyncImpl(override)) return override;
+		if (existsSyncImpl(override)) return createResolvedCodexBin(override);
 		return null;
 	}
 
 	const resolved = resolvePackageBin(moduleUrl);
 	if (typeof resolved === "string" && resolved.length > 0 && existsSyncImpl(resolved)) {
-		return resolved;
+		return createResolvedCodexBin(resolved);
 	}
 
 	const searchRoots = [];
@@ -65,7 +206,7 @@ export function resolveRealCodexBin(options = {}) {
 
 	for (const root of searchRoots) {
 		const candidate = join(root, "@openai", "codex", "bin", "codex.js");
-		if (existsSyncImpl(candidate)) return candidate;
+		if (existsSyncImpl(candidate)) return createResolvedCodexBin(candidate);
 	}
 
 	try {
@@ -88,12 +229,26 @@ export function resolveRealCodexBin(options = {}) {
 			const globalRoot = rootResult.stdout.trim();
 			if (globalRoot.length > 0) {
 				const globalBin = join(globalRoot, "@openai", "codex", "bin", "codex.js");
-				if (existsSyncImpl(globalBin)) return globalBin;
+				if (existsSyncImpl(globalBin)) return createResolvedCodexBin(globalBin);
 			}
 		}
 	} catch {
 		// Ignore and fall through to null.
 	}
 
+	const selfScriptPath = resolveWrapperScriptPath(moduleUrl, realpathSyncImpl);
+
+	const nativeCodexBin = resolveCodexExecutableFromSystemPath(
+		env,
+		platform,
+		spawnSyncImpl,
+		existsSyncImpl,
+		selfScriptPath,
+		realpathSyncImpl,
+	);
+	if (nativeCodexBin) {
+		return createResolvedCodexBin(nativeCodexBin);
+	}
+
 	return null;
 }

scripts/codex.js

@@ -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,
 		});
@@ -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;