codex-multi-auth 2.1.13-beta.1 → 2.1.13-beta.2

package/scripts/codex-bin-resolver.js

@@ -1,254 +1,254 @@
-import { spawnSync } from "node:child_process";
-import { existsSync, realpathSync } from "node:fs";
-import { createRequire } from "node:module";
-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);
-		return require.resolve("@openai/codex/bin/codex.js");
-	} catch {
-		return null;
-	}
-}
-
-function resolveWindowsCmdPath(env) {
-	const comSpec = (env.ComSpec ?? env.COMSPEC ?? "").trim();
-	if (comSpec.length > 0) return comSpec;
-
-	const systemRoot = (env.SystemRoot ?? env.SYSTEMROOT ?? "").trim();
-	if (systemRoot.length > 0) {
-		return `${systemRoot.replace(/[\\/]+$/, "")}\\System32\\cmd.exe`;
-	}
-
-	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 = 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 createResolvedCodexBin(override);
-		return null;
-	}
-
-	const resolved = resolvePackageBin(moduleUrl);
-	if (typeof resolved === "string" && resolved.length > 0 && existsSyncImpl(resolved)) {
-		return createResolvedCodexBin(resolved);
-	}
-
-	const searchRoots = [];
-	const scriptDir = dirname(fileURLToPath(moduleUrl));
-	searchRoots.push(join(scriptDir, "..", ".."));
-
-	const invokedScript = argv[1];
-	if (typeof invokedScript === "string" && invokedScript.length > 0) {
-		searchRoots.push(join(dirname(invokedScript), "..", ".."));
-	}
-
-	const npmPrefix = (env.npm_config_prefix ?? env.PREFIX ?? "").trim();
-	if (npmPrefix.length > 0) {
-		searchRoots.push(join(npmPrefix, "node_modules"));
-		searchRoots.push(join(npmPrefix, "lib", "node_modules"));
-	}
-
-	for (const root of searchRoots) {
-		const candidate = join(root, "@openai", "codex", "bin", "codex.js");
-		if (existsSyncImpl(candidate)) return createResolvedCodexBin(candidate);
-	}
-
-	try {
-		const rootResult =
-			platform === "win32"
-				? spawnSyncImpl(resolveWindowsCmdPath(env), ["/d", "/s", "/c", "npm root -g"], {
-						encoding: "utf8",
-						env,
-						stdio: ["ignore", "pipe", "ignore"],
-						timeout: 5000,
-						windowsHide: true,
-					})
-				: spawnSyncImpl("npm", ["root", "-g"], {
-						encoding: "utf8",
-						env,
-						stdio: ["ignore", "pipe", "ignore"],
-						timeout: 5000,
-					});
-		if (rootResult.status === 0) {
-			const globalRoot = rootResult.stdout.trim();
-			if (globalRoot.length > 0) {
-				const globalBin = join(globalRoot, "@openai", "codex", "bin", "codex.js");
-				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;
-}
+import { spawnSync } from "node:child_process";
+import { existsSync, realpathSync } from "node:fs";
+import { createRequire } from "node:module";
+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);
+		return require.resolve("@openai/codex/bin/codex.js");
+	} catch {
+		return null;
+	}
+}
+
+function resolveWindowsCmdPath(env) {
+	const comSpec = (env.ComSpec ?? env.COMSPEC ?? "").trim();
+	if (comSpec.length > 0) return comSpec;
+
+	const systemRoot = (env.SystemRoot ?? env.SYSTEMROOT ?? "").trim();
+	if (systemRoot.length > 0) {
+		return `${systemRoot.replace(/[\\/]+$/, "")}\\System32\\cmd.exe`;
+	}
+
+	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 = 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 createResolvedCodexBin(override);
+		return null;
+	}
+
+	const resolved = resolvePackageBin(moduleUrl);
+	if (typeof resolved === "string" && resolved.length > 0 && existsSyncImpl(resolved)) {
+		return createResolvedCodexBin(resolved);
+	}
+
+	const searchRoots = [];
+	const scriptDir = dirname(fileURLToPath(moduleUrl));
+	searchRoots.push(join(scriptDir, "..", ".."));
+
+	const invokedScript = argv[1];
+	if (typeof invokedScript === "string" && invokedScript.length > 0) {
+		searchRoots.push(join(dirname(invokedScript), "..", ".."));
+	}
+
+	const npmPrefix = (env.npm_config_prefix ?? env.PREFIX ?? "").trim();
+	if (npmPrefix.length > 0) {
+		searchRoots.push(join(npmPrefix, "node_modules"));
+		searchRoots.push(join(npmPrefix, "lib", "node_modules"));
+	}
+
+	for (const root of searchRoots) {
+		const candidate = join(root, "@openai", "codex", "bin", "codex.js");
+		if (existsSyncImpl(candidate)) return createResolvedCodexBin(candidate);
+	}
+
+	try {
+		const rootResult =
+			platform === "win32"
+				? spawnSyncImpl(resolveWindowsCmdPath(env), ["/d", "/s", "/c", "npm root -g"], {
+						encoding: "utf8",
+						env,
+						stdio: ["ignore", "pipe", "ignore"],
+						timeout: 5000,
+						windowsHide: true,
+					})
+				: spawnSyncImpl("npm", ["root", "-g"], {
+						encoding: "utf8",
+						env,
+						stdio: ["ignore", "pipe", "ignore"],
+						timeout: 5000,
+					});
+		if (rootResult.status === 0) {
+			const globalRoot = rootResult.stdout.trim();
+			if (globalRoot.length > 0) {
+				const globalBin = join(globalRoot, "@openai", "codex", "bin", "codex.js");
+				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;
+}

package/scripts/codex-multi-auth.js

@@ -1,59 +1,59 @@
-#!/usr/bin/env node
-
-// @ts-check
-
-import { createRequire } from "node:module";
-import { AUTH_SUBCOMMANDS } from "./codex-routing.js";
-
-const versionFlags = new Set(["--version", "-v"]);
-
-function resolveCliVersion() {
-	const require = createRequire(import.meta.url);
-	try {
-		const pkg = require("../package.json");
-		const version = typeof pkg?.version === "string" ? pkg.version.trim() : "";
-		if (version.length > 0) {
-			return version;
-		}
-	} catch {
-		// Best effort only.
-	}
-	return "";
-}
-
-/**
- * @param {string[]} args
- * @returns {string[]}
- */
-function normalizeStandaloneArgs(args) {
-	if (args[0] === "auth") return args;
-	const firstArg = args[0] ?? "";
-	if (AUTH_SUBCOMMANDS.has(firstArg)) {
-		// Keep this exhaustive: generic names here are reserved for auth routing.
-		return ["auth", ...args];
-	}
-	return args;
-}
-
-const args = normalizeStandaloneArgs(process.argv.slice(2));
-const version = resolveCliVersion();
-
-if (version.length > 0) {
-	process.env.CODEX_MULTI_AUTH_CLI_VERSION = version;
-}
-
-const firstArg = args[0] ?? "";
-
-if (args.length === 1 && versionFlags.has(firstArg)) {
-	if (version.length > 0) {
-		process.stdout.write(`${version}\n`);
-		process.exitCode = 0;
-	} else {
-		process.stderr.write("codex-multi-auth version is unavailable.\n");
-		process.exitCode = 1;
-	}
-} else {
-	const { runCodexMultiAuthCli } = await import("../dist/lib/codex-manager.js");
-	const exitCode = await runCodexMultiAuthCli(args);
-	process.exitCode = Number.isInteger(exitCode) ? exitCode : 1;
-}
+#!/usr/bin/env node
+
+// @ts-check
+
+import { createRequire } from "node:module";
+import { AUTH_SUBCOMMANDS } from "./codex-routing.js";
+
+const versionFlags = new Set(["--version", "-v"]);
+
+function resolveCliVersion() {
+	const require = createRequire(import.meta.url);
+	try {
+		const pkg = require("../package.json");
+		const version = typeof pkg?.version === "string" ? pkg.version.trim() : "";
+		if (version.length > 0) {
+			return version;
+		}
+	} catch {
+		// Best effort only.
+	}
+	return "";
+}
+
+/**
+ * @param {string[]} args
+ * @returns {string[]}
+ */
+function normalizeStandaloneArgs(args) {
+	if (args[0] === "auth") return args;
+	const firstArg = args[0] ?? "";
+	if (AUTH_SUBCOMMANDS.has(firstArg)) {
+		// Keep this exhaustive: generic names here are reserved for auth routing.
+		return ["auth", ...args];
+	}
+	return args;
+}
+
+const args = normalizeStandaloneArgs(process.argv.slice(2));
+const version = resolveCliVersion();
+
+if (version.length > 0) {
+	process.env.CODEX_MULTI_AUTH_CLI_VERSION = version;
+}
+
+const firstArg = args[0] ?? "";
+
+if (args.length === 1 && versionFlags.has(firstArg)) {
+	if (version.length > 0) {
+		process.stdout.write(`${version}\n`);
+		process.exitCode = 0;
+	} else {
+		process.stderr.write("codex-multi-auth version is unavailable.\n");
+		process.exitCode = 1;
+	}
+} else {
+	const { runCodexMultiAuthCli } = await import("../dist/lib/codex-manager.js");
+	const exitCode = await runCodexMultiAuthCli(args);
+	process.exitCode = Number.isInteger(exitCode) ? exitCode : 1;
+}