codex-multi-auth 2.0.1 → 2.1.0

package/scripts/codex.js

@@ -440,76 +440,76 @@ const NORMALIZED_UNSUPPORTED_MODEL_PATTERN =
 	/model ['"]([^'"]+)['"] is not currently available for this chatgpt account when using codex oauth/i;
 const MODEL_ACCESS_DENIED_PATTERN =
 	/the model [`'"]([^`'"]+)[`'"] does not exist or you do not have access to it/i;
-const DIRECT_UNSUPPORTED_MODEL_PATTERN =
-	/['"]([^'"]+)['"]\s+model is not supported when using codex with a chatgpt account/i;
-const CURRENT_CODEX_MODEL = "gpt-5.3-codex";
-const LEGACY_CODEX_MODEL = "gpt-5-codex";
-const WRAPPER_UNSUPPORTED_MODEL_FALLBACK_CHAIN = {
-	"gpt-5": ["gpt-5.5"],
-	"gpt-5-pro": ["gpt-5.5-pro"],
-	"gpt-5-chat-latest": ["gpt-5.5"],
-	"gpt-5.5": ["gpt-5.4"],
-	"gpt-5.5-pro": ["gpt-5.4"],
-	"gpt-5.5-2026-04-23": ["gpt-5.4"],
-	"gpt-5.5-pro-2026-04-23": ["gpt-5.4"],
-	"gpt-5.5-20260423": ["gpt-5.4"],
-	"gpt-5.5-pro-20260423": ["gpt-5.4"],
-	"gpt-5.3-codex-spark": [CURRENT_CODEX_MODEL],
-	"codex-max": [CURRENT_CODEX_MODEL],
-	"gpt-5.1-codex-max": [CURRENT_CODEX_MODEL],
-	"codex-mini-latest": [CURRENT_CODEX_MODEL],
-	"gpt-5-codex-mini": [CURRENT_CODEX_MODEL],
-	"gpt-5.1-codex-mini": [CURRENT_CODEX_MODEL],
-	[LEGACY_CODEX_MODEL]: [CURRENT_CODEX_MODEL],
-	"gpt-5.2-codex": [CURRENT_CODEX_MODEL],
-	"gpt-5.1-codex": [CURRENT_CODEX_MODEL],
-};
-
-function canonicalizeRequestedModelName(model) {
-	if (typeof model !== "string") return "";
-	const normalizedModel = normalizeRequestedModel(model);
-	if (normalizedModel) {
-		return normalizedModel;
+const DIRECT_UNSUPPORTED_MODEL_PATTERN =
+	/['"]([^'"]+)['"]\s+model is not supported when using codex with a chatgpt account/i;
+const CURRENT_CODEX_MODEL = "gpt-5.3-codex";
+const LEGACY_CODEX_MODEL = "gpt-5-codex";
+const WRAPPER_UNSUPPORTED_MODEL_FALLBACK_CHAIN = {
+	"gpt-5": ["gpt-5.5"],
+	"gpt-5-pro": ["gpt-5.5-pro"],
+	"gpt-5-chat-latest": ["gpt-5.5"],
+	"gpt-5.5": ["gpt-5.4"],
+	"gpt-5.5-pro": ["gpt-5.4"],
+	"gpt-5.5-2026-04-23": ["gpt-5.4"],
+	"gpt-5.5-pro-2026-04-23": ["gpt-5.4"],
+	"gpt-5.5-20260423": ["gpt-5.4"],
+	"gpt-5.5-pro-20260423": ["gpt-5.4"],
+	"gpt-5.3-codex-spark": [CURRENT_CODEX_MODEL],
+	"codex-max": [CURRENT_CODEX_MODEL],
+	"gpt-5.1-codex-max": [CURRENT_CODEX_MODEL],
+	"codex-mini-latest": [CURRENT_CODEX_MODEL],
+	"gpt-5-codex-mini": [CURRENT_CODEX_MODEL],
+	"gpt-5.1-codex-mini": [CURRENT_CODEX_MODEL],
+	[LEGACY_CODEX_MODEL]: [CURRENT_CODEX_MODEL],
+	"gpt-5.2-codex": [CURRENT_CODEX_MODEL],
+	"gpt-5.1-codex": [CURRENT_CODEX_MODEL],
+};
+
+function canonicalizeRequestedModelName(model) {
+	if (typeof model !== "string") return "";
+	const normalizedModel = normalizeRequestedModel(model);
+	if (normalizedModel) {
+		return normalizedModel;
 	}
 
 	const stripped = stripProviderPrefix(model).trim().toLowerCase();
 	if (!stripped) {
 		return "";
 	}
-
-	return stripped.replace(/-(none|minimal|low|medium|high|xhigh)$/i, "");
-}
-
-function canonicalizeUnsupportedModelKey(model) {
-	if (typeof model !== "string") return "";
-	const stripped = stripProviderPrefix(model).trim().toLowerCase();
-	if (!stripped) {
-		return "";
-	}
-	return stripped.replace(/-(none|minimal|low|medium|high|xhigh)$/i, "");
-}
-
-function extractUnsupportedModelFromOutput(output) {
-	if (typeof output !== "string" || output.length === 0) {
-		return undefined;
-	}
-
-	const directMatch = output.match(DIRECT_UNSUPPORTED_MODEL_PATTERN);
-	if (directMatch?.[1]) {
-		return canonicalizeUnsupportedModelKey(directMatch[1]);
-	}
-
-	const normalizedMatch = output.match(NORMALIZED_UNSUPPORTED_MODEL_PATTERN);
-	if (normalizedMatch?.[1]) {
-		return canonicalizeUnsupportedModelKey(normalizedMatch[1]);
-	}
-	const accessDeniedMatch = output.match(MODEL_ACCESS_DENIED_PATTERN);
-	if (accessDeniedMatch?.[1]) {
-		return canonicalizeUnsupportedModelKey(accessDeniedMatch[1]);
-	}
-
-	return undefined;
-}
+
+	return stripped.replace(/-(none|minimal|low|medium|high|xhigh)$/i, "");
+}
+
+function canonicalizeUnsupportedModelKey(model) {
+	if (typeof model !== "string") return "";
+	const stripped = stripProviderPrefix(model).trim().toLowerCase();
+	if (!stripped) {
+		return "";
+	}
+	return stripped.replace(/-(none|minimal|low|medium|high|xhigh)$/i, "");
+}
+
+function extractUnsupportedModelFromOutput(output) {
+	if (typeof output !== "string" || output.length === 0) {
+		return undefined;
+	}
+
+	const directMatch = output.match(DIRECT_UNSUPPORTED_MODEL_PATTERN);
+	if (directMatch?.[1]) {
+		return canonicalizeUnsupportedModelKey(directMatch[1]);
+	}
+
+	const normalizedMatch = output.match(NORMALIZED_UNSUPPORTED_MODEL_PATTERN);
+	if (normalizedMatch?.[1]) {
+		return canonicalizeUnsupportedModelKey(normalizedMatch[1]);
+	}
+	const accessDeniedMatch = output.match(MODEL_ACCESS_DENIED_PATTERN);
+	if (accessDeniedMatch?.[1]) {
+		return canonicalizeUnsupportedModelKey(accessDeniedMatch[1]);
+	}
+
+	return undefined;
+}
 
 function resolveUnsupportedModelRetryTarget(
 	requestedModel,
@@ -526,14 +526,14 @@ function resolveUnsupportedModelRetryTarget(
 		return undefined;
 	}
 
-	const attempted = new Set(
-		attemptedModels
-			.map((model) => canonicalizeUnsupportedModelKey(model))
-			.filter(Boolean),
-	);
-	const normalizedRequestedModel = canonicalizeUnsupportedModelKey(requestedModel);
-	const blockedModel =
-		extractUnsupportedModelFromOutput(output) ?? normalizedRequestedModel;
+	const attempted = new Set(
+		attemptedModels
+			.map((model) => canonicalizeUnsupportedModelKey(model))
+			.filter(Boolean),
+	);
+	const normalizedRequestedModel = canonicalizeUnsupportedModelKey(requestedModel);
+	const blockedModel =
+		extractUnsupportedModelFromOutput(output) ?? normalizedRequestedModel;
 	const fallbackChain =
 		WRAPPER_UNSUPPORTED_MODEL_FALLBACK_CHAIN[blockedModel] ??
 		(normalizedRequestedModel
@@ -557,11 +557,11 @@ function replaceRequestedModel(args, nextModel) {
 
 	const nextArgs = [...args];
 	for (let i = 0; i < nextArgs.length; i += 1) {
-		const arg = nextArgs[i];
-		if ((arg === "--model" || arg === "-m") && typeof nextArgs[i + 1] === "string") {
-			nextArgs[i + 1] = nextModel;
-			return nextArgs;
-		}
+		const arg = nextArgs[i];
+		if ((arg === "--model" || arg === "-m") && typeof nextArgs[i + 1] === "string") {
+			nextArgs[i + 1] = nextModel;
+			return nextArgs;
+		}
 		if (typeof arg === "string" && arg.startsWith("--model=")) {
 			nextArgs[i] = `--model=${nextModel}`;
 			return nextArgs;
@@ -1001,15 +1001,15 @@ function hasCliAuthCredentialsStoreOverride(args) {
 // `lib/request/helpers/model-map.ts` `MODEL_PROFILES`
 // and its GPT-5 normalization helpers.
 // This wrapper runs before the TypeScript build, so it cannot import that source.
-const SUPPORTED_REASONING_EFFORTS_BY_MODEL = {
-	[CURRENT_CODEX_MODEL]: ["low", "medium", "high", "xhigh"],
-	"gpt-5.5": ["none", "low", "medium", "high", "xhigh"],
-	"gpt-5.5-pro": ["medium", "high", "xhigh"],
-	"gpt-5.4": ["none", "low", "medium", "high", "xhigh"],
-	"gpt-5.4-pro": ["medium", "high", "xhigh"],
-	"gpt-5.4-mini": ["medium"],
-	"gpt-5.4-nano": ["medium"],
-	"gpt-5.2-pro": ["medium", "high", "xhigh"],
+const SUPPORTED_REASONING_EFFORTS_BY_MODEL = {
+	[CURRENT_CODEX_MODEL]: ["low", "medium", "high", "xhigh"],
+	"gpt-5.5": ["none", "low", "medium", "high", "xhigh"],
+	"gpt-5.5-pro": ["medium", "high", "xhigh"],
+	"gpt-5.4": ["none", "low", "medium", "high", "xhigh"],
+	"gpt-5.4-pro": ["medium", "high", "xhigh"],
+	"gpt-5.4-mini": ["medium"],
+	"gpt-5.4-nano": ["medium"],
+	"gpt-5.2-pro": ["medium", "high", "xhigh"],
 	"gpt-5.2": ["none", "low", "medium", "high", "xhigh"],
 	"gpt-5.1": ["none", "low", "medium", "high"],
 	"gpt-5-mini": ["medium"],
@@ -1027,13 +1027,13 @@ const REASONING_FALLBACKS = {
 
 const KNOWN_REASONING_EFFORTS = new Set(Object.keys(REASONING_FALLBACKS));
 const REQUESTED_MODEL_ALIASES = new Map();
-const DEFAULT_GENERAL_GPT5_MODEL = "gpt-5.5";
-const GPT_5_5_CANONICAL_MODEL = "gpt-5.5";
-const GPT_5_5_PRO_CANONICAL_MODEL = "gpt-5.5-pro";
-const GPT_5_5_RELEASE_MODEL = "gpt-5.5-2026-04-23";
-const GPT_5_5_PRO_RELEASE_MODEL = "gpt-5.5-pro-2026-04-23";
-const GPT_5_5_RELEASE_COMPAT_MODEL = "gpt-5.5-20260423";
-const GPT_5_5_PRO_RELEASE_COMPAT_MODEL = "gpt-5.5-pro-20260423";
+const DEFAULT_GENERAL_GPT5_MODEL = "gpt-5.5";
+const GPT_5_5_CANONICAL_MODEL = "gpt-5.5";
+const GPT_5_5_PRO_CANONICAL_MODEL = "gpt-5.5-pro";
+const GPT_5_5_RELEASE_MODEL = "gpt-5.5-2026-04-23";
+const GPT_5_5_PRO_RELEASE_MODEL = "gpt-5.5-pro-2026-04-23";
+const GPT_5_5_RELEASE_COMPAT_MODEL = "gpt-5.5-20260423";
+const GPT_5_5_PRO_RELEASE_COMPAT_MODEL = "gpt-5.5-pro-20260423";
 const GENERAL_GPT5_VERSION_CATALOG = {
 	1: {
 		base: "gpt-5.1",
@@ -1042,12 +1042,12 @@ const GENERAL_GPT5_VERSION_CATALOG = {
 		base: "gpt-5.2",
 		pro: "gpt-5.2-pro",
 	},
-	4: {
-		base: DEFAULT_GENERAL_GPT5_MODEL,
-		pro: "gpt-5.4-pro",
-		mini: "gpt-5.4-mini",
-		nano: "gpt-5.4-nano",
-	},
+	4: {
+		base: DEFAULT_GENERAL_GPT5_MODEL,
+		pro: "gpt-5.4-pro",
+		mini: "gpt-5.4-mini",
+		nano: "gpt-5.4-nano",
+	},
 	5: {
 		base: GPT_5_5_CANONICAL_MODEL,
 		pro: GPT_5_5_PRO_CANONICAL_MODEL,
@@ -1055,13 +1055,13 @@ const GENERAL_GPT5_VERSION_CATALOG = {
 		nano: "gpt-5-nano",
 	},
 };
-const GENERAL_GPT5_STABLE_VARIANTS = GENERAL_GPT5_VERSION_CATALOG[5];
-const GENERAL_GPT5_GENERIC_VARIANTS = {
-	base: DEFAULT_GENERAL_GPT5_MODEL,
-	pro: GPT_5_5_PRO_CANONICAL_MODEL,
-	mini: "gpt-5-mini",
-	nano: "gpt-5-nano",
-};
+const GENERAL_GPT5_STABLE_VARIANTS = GENERAL_GPT5_VERSION_CATALOG[5];
+const GENERAL_GPT5_GENERIC_VARIANTS = {
+	base: DEFAULT_GENERAL_GPT5_MODEL,
+	pro: GPT_5_5_PRO_CANONICAL_MODEL,
+	mini: "gpt-5-mini",
+	nano: "gpt-5-nano",
+};
 
 function addRequestedModelAlias(alias, normalizedModel) {
 	REQUESTED_MODEL_ALIASES.set(alias, normalizedModel);
@@ -1174,50 +1174,50 @@ function seedRequestedModelAliases() {
 		GPT_5_5_CANONICAL_MODEL,
 		GPT_5_5_CANONICAL_MODEL,
 	);
-	addRequestedModelReasoningAliases(
-		GPT_5_5_RELEASE_MODEL,
-		GPT_5_5_CANONICAL_MODEL,
-	);
-	addRequestedModelReasoningAliases(
-		GPT_5_5_RELEASE_COMPAT_MODEL,
-		GPT_5_5_CANONICAL_MODEL,
-	);
 	addRequestedModelReasoningAliases(
+		GPT_5_5_RELEASE_MODEL,
+		GPT_5_5_CANONICAL_MODEL,
+	);
+	addRequestedModelReasoningAliases(
+		GPT_5_5_RELEASE_COMPAT_MODEL,
+		GPT_5_5_CANONICAL_MODEL,
+	);
+	addRequestedModelReasoningAliases(
+		GPT_5_5_PRO_CANONICAL_MODEL,
 		GPT_5_5_PRO_CANONICAL_MODEL,
+	);
+	addRequestedModelReasoningAliases(
+		GPT_5_5_PRO_RELEASE_MODEL,
 		GPT_5_5_PRO_CANONICAL_MODEL,
 	);
-	addRequestedModelReasoningAliases(
-		GPT_5_5_PRO_RELEASE_MODEL,
-		GPT_5_5_PRO_CANONICAL_MODEL,
-	);
-	addRequestedModelReasoningAliases(
-		GPT_5_5_PRO_RELEASE_COMPAT_MODEL,
-		GPT_5_5_PRO_CANONICAL_MODEL,
-	);
-	addRequestedModelReasoningAliases("gpt-5.4", "gpt-5.4");
-	addRequestedModelReasoningAliases("gpt-5.4-pro", "gpt-5.4-pro");
-	addRequestedModelReasoningAliases("gpt-5.4-mini", "gpt-5.4-mini");
-	addRequestedModelReasoningAliases("gpt-5.4-nano", "gpt-5.4-nano");
+	addRequestedModelReasoningAliases(
+		GPT_5_5_PRO_RELEASE_COMPAT_MODEL,
+		GPT_5_5_PRO_CANONICAL_MODEL,
+	);
+	addRequestedModelReasoningAliases("gpt-5.4", "gpt-5.4");
+	addRequestedModelReasoningAliases("gpt-5.4-pro", "gpt-5.4-pro");
+	addRequestedModelReasoningAliases("gpt-5.4-mini", "gpt-5.4-mini");
+	addRequestedModelReasoningAliases("gpt-5.4-nano", "gpt-5.4-nano");
 	addRequestedModelReasoningAliases("gpt-5.2-pro", "gpt-5.2-pro");
-	addRequestedModelReasoningAliases("gpt-5-pro", GPT_5_5_PRO_CANONICAL_MODEL);
+	addRequestedModelReasoningAliases("gpt-5-pro", GPT_5_5_PRO_CANONICAL_MODEL);
 	addRequestedModelReasoningAliases("gpt-5.2", "gpt-5.2");
 	addRequestedModelReasoningAliases("gpt-5.1", "gpt-5.1");
-	addRequestedModelReasoningAliases("gpt-5", DEFAULT_GENERAL_GPT5_MODEL);
+	addRequestedModelReasoningAliases("gpt-5", DEFAULT_GENERAL_GPT5_MODEL);
 	addRequestedModelReasoningAliases("gpt-5-mini", "gpt-5-mini");
 	addRequestedModelReasoningAliases("gpt-5-nano", "gpt-5-nano");
 	addRequestedModelReasoningAliases("gpt-5.1-chat-latest", "gpt-5.1");
-	addRequestedModelReasoningAliases("gpt-5-chat-latest", DEFAULT_GENERAL_GPT5_MODEL);
-	addRequestedModelReasoningAliases(CURRENT_CODEX_MODEL, CURRENT_CODEX_MODEL);
-	addRequestedModelReasoningAliases("gpt-5.3-codex-spark", CURRENT_CODEX_MODEL);
-	addRequestedModelReasoningAliases(LEGACY_CODEX_MODEL, CURRENT_CODEX_MODEL);
-	addRequestedModelReasoningAliases("gpt-5.2-codex", CURRENT_CODEX_MODEL);
-	addRequestedModelReasoningAliases("gpt-5.1-codex", CURRENT_CODEX_MODEL);
-	addRequestedModelAlias("gpt_5_codex", CURRENT_CODEX_MODEL);
-	addRequestedModelReasoningAliases("codex-max", CURRENT_CODEX_MODEL);
-	addRequestedModelReasoningAliases("gpt-5.1-codex-max", CURRENT_CODEX_MODEL);
-	addRequestedModelAlias("codex-mini-latest", CURRENT_CODEX_MODEL);
-	addRequestedModelReasoningAliases("gpt-5-codex-mini", CURRENT_CODEX_MODEL);
-	addRequestedModelReasoningAliases("gpt-5.1-codex-mini", CURRENT_CODEX_MODEL);
+	addRequestedModelReasoningAliases("gpt-5-chat-latest", DEFAULT_GENERAL_GPT5_MODEL);
+	addRequestedModelReasoningAliases(CURRENT_CODEX_MODEL, CURRENT_CODEX_MODEL);
+	addRequestedModelReasoningAliases("gpt-5.3-codex-spark", CURRENT_CODEX_MODEL);
+	addRequestedModelReasoningAliases(LEGACY_CODEX_MODEL, CURRENT_CODEX_MODEL);
+	addRequestedModelReasoningAliases("gpt-5.2-codex", CURRENT_CODEX_MODEL);
+	addRequestedModelReasoningAliases("gpt-5.1-codex", CURRENT_CODEX_MODEL);
+	addRequestedModelAlias("gpt_5_codex", CURRENT_CODEX_MODEL);
+	addRequestedModelReasoningAliases("codex-max", CURRENT_CODEX_MODEL);
+	addRequestedModelReasoningAliases("gpt-5.1-codex-max", CURRENT_CODEX_MODEL);
+	addRequestedModelAlias("codex-mini-latest", CURRENT_CODEX_MODEL);
+	addRequestedModelReasoningAliases("gpt-5-codex-mini", CURRENT_CODEX_MODEL);
+	addRequestedModelReasoningAliases("gpt-5.1-codex-mini", CURRENT_CODEX_MODEL);
 }
 
 seedRequestedModelAliases();
@@ -1264,24 +1264,24 @@ function resolveStableGeneralGpt5Variant(variant) {
 
 function resolveCodexRequestedModel(normalized) {
 	if (
-		normalized.includes("gpt-5.1-codex-max") ||
-		normalized.includes("gpt 5.1 codex max") ||
-		normalized.includes("codex-max")
-	) {
-		return CURRENT_CODEX_MODEL;
-	}
+		normalized.includes("gpt-5.1-codex-max") ||
+		normalized.includes("gpt 5.1 codex max") ||
+		normalized.includes("codex-max")
+	) {
+		return CURRENT_CODEX_MODEL;
+	}
 	if (
 		normalized.includes("gpt-5.1-codex-mini") ||
 		normalized.includes("gpt 5.1 codex mini") ||
 		normalized.includes("gpt-5-codex-mini") ||
-		normalized.includes("gpt 5 codex mini") ||
-		normalized.includes("codex-mini-latest")
-	) {
-		return CURRENT_CODEX_MODEL;
-	}
-	if (
-		normalized.includes("gpt-5.3-codex-spark") ||
-		normalized.includes("gpt 5.3 codex spark") ||
+		normalized.includes("gpt 5 codex mini") ||
+		normalized.includes("codex-mini-latest")
+	) {
+		return CURRENT_CODEX_MODEL;
+	}
+	if (
+		normalized.includes("gpt-5.3-codex-spark") ||
+		normalized.includes("gpt 5.3 codex spark") ||
 		normalized.includes("gpt-5.3-codex") ||
 		normalized.includes("gpt 5.3 codex") ||
 		normalized.includes("gpt-5.2-codex") ||
@@ -1289,11 +1289,11 @@ function resolveCodexRequestedModel(normalized) {
 		normalized.includes("gpt-5.1-codex") ||
 		normalized.includes("gpt 5.1 codex") ||
 		normalized.includes("gpt-5-codex") ||
-		normalized.includes("gpt 5 codex") ||
-		normalized === "codex"
-	) {
-		return CURRENT_CODEX_MODEL;
-	}
+		normalized.includes("gpt 5 codex") ||
+		normalized === "codex"
+	) {
+		return CURRENT_CODEX_MODEL;
+	}
 
 	return "";
 }
@@ -1379,12 +1379,12 @@ function coerceReasoningEffortForModel(model, effort) {
 }
 
 function extractRequestedModel(args) {
-	for (let i = 0; i < args.length; i += 1) {
-		const arg = args[i];
-		if (arg === "--model" || arg === "-m") {
-			const next = args[i + 1];
-			if (typeof next === "string" && next.trim().length > 0) {
-				return next.trim();
+	for (let i = 0; i < args.length; i += 1) {
+		const arg = args[i];
+		if (arg === "--model" || arg === "-m") {
+			const next = args[i + 1];
+			if (typeof next === "string" && next.trim().length > 0) {
+				return next.trim();
 			}
 			continue;
 		}