codex-multi-auth 2.15.0 → 2.16.0

package/dist/lib/usage/pricing.js

@@ -1,3 +1,10 @@
+import { RETIRED_MODEL_REPLACEMENTS } from "../request/helpers/model-map.js";
+/**
+ * Largest input still billed at the short-context rate. OpenAI's GPT-6 model
+ * pages say "Prompts with more than 272K input tokens are priced at 2x input
+ * and cache rates", so exactly 272,000 is short and 272,001 is long.
+ */
+export const SHORT_CONTEXT_MAX_INPUT_TOKENS = 272_000;
 const MODEL_PRICING = {
     // GPT-6 Astra, published at the 2026-09-03 launch: $10 / 1M input,
     // $50 / 1M output on the standard service tier, and $20 / $100 on Fast,
@@ -16,48 +23,85 @@ const MODEL_PRICING = {
         outputUsdPerMillion: 50,
         cachedInputUsdPerMillion: 1,
         reasoningUsdPerMillion: 50,
+        // Long-context rows from the same page (read 2026-09-23).
+        longContext: {
+            inputUsdPerMillion: 20,
+            outputUsdPerMillion: 75,
+            cachedInputUsdPerMillion: 2,
+            reasoningUsdPerMillion: 75,
+        },
         serviceTiers: {
             // Published at launch alongside the standard rate: Fast mode is up to
-            // 2.5x the speed at 2x the price, $20 / $100 per 1M. This is the only
-            // tier multiplier OpenAI has published for any model in this table,
-            // which is why it is the only one listed anywhere in this file.
+            // 2.5x the speed at 2x the price, $20 / $100 per 1M. Only the GPT-6
+            // rows list a Fast tier, because only GPT-6 has a published Fast rate.
             priority: {
                 inputUsdPerMillion: 20,
                 outputUsdPerMillion: 100,
                 cachedInputUsdPerMillion: 2,
                 reasoningUsdPerMillion: 100,
+                longContext: {
+                    inputUsdPerMillion: 40,
+                    outputUsdPerMillion: 150,
+                    cachedInputUsdPerMillion: 4,
+                    reasoningUsdPerMillion: 150,
+                },
             },
         },
     },
-    "gpt-5-codex": {
-        inputUsdPerMillion: 1.25,
-        outputUsdPerMillion: 10,
-        cachedInputUsdPerMillion: 0.125,
-        reasoningUsdPerMillion: 10,
-    },
-    "gpt-5.1-codex": {
-        inputUsdPerMillion: 1.25,
-        outputUsdPerMillion: 10,
-        cachedInputUsdPerMillion: 0.125,
-        reasoningUsdPerMillion: 10,
-    },
-    "gpt-5.2": {
-        inputUsdPerMillion: 1.25,
-        outputUsdPerMillion: 10,
-        cachedInputUsdPerMillion: 0.125,
-        reasoningUsdPerMillion: 10,
-    },
-    "gpt-5.3-codex": {
-        inputUsdPerMillion: 1.25,
+    // GPT-6 Sol and Luna, from the OpenAI API pricing page (read 2026-09-23;
+    // short- and long-context rows). Both publish a Fast tier at exactly 2x,
+    // like Astra.
+    "gpt-6-sol": {
+        inputUsdPerMillion: 2,
         outputUsdPerMillion: 10,
-        cachedInputUsdPerMillion: 0.125,
+        cachedInputUsdPerMillion: 0.2,
         reasoningUsdPerMillion: 10,
+        longContext: {
+            inputUsdPerMillion: 4,
+            outputUsdPerMillion: 15,
+            cachedInputUsdPerMillion: 0.4,
+            reasoningUsdPerMillion: 15,
+        },
+        serviceTiers: {
+            priority: {
+                inputUsdPerMillion: 4,
+                outputUsdPerMillion: 20,
+                cachedInputUsdPerMillion: 0.4,
+                reasoningUsdPerMillion: 20,
+                longContext: {
+                    inputUsdPerMillion: 8,
+                    outputUsdPerMillion: 30,
+                    cachedInputUsdPerMillion: 0.8,
+                    reasoningUsdPerMillion: 30,
+                },
+            },
+        },
     },
-    "gpt-5.4": {
-        inputUsdPerMillion: 2,
-        outputUsdPerMillion: 12,
-        cachedInputUsdPerMillion: 0.2,
-        reasoningUsdPerMillion: 12,
+    "gpt-6-luna": {
+        inputUsdPerMillion: 0.1,
+        outputUsdPerMillion: 0.5,
+        cachedInputUsdPerMillion: 0.01,
+        reasoningUsdPerMillion: 0.5,
+        longContext: {
+            inputUsdPerMillion: 0.2,
+            outputUsdPerMillion: 0.75,
+            cachedInputUsdPerMillion: 0.02,
+            reasoningUsdPerMillion: 0.75,
+        },
+        serviceTiers: {
+            priority: {
+                inputUsdPerMillion: 0.2,
+                outputUsdPerMillion: 1,
+                cachedInputUsdPerMillion: 0.02,
+                reasoningUsdPerMillion: 1,
+                longContext: {
+                    inputUsdPerMillion: 0.4,
+                    outputUsdPerMillion: 1.5,
+                    cachedInputUsdPerMillion: 0.04,
+                    reasoningUsdPerMillion: 1.5,
+                },
+            },
+        },
     },
     "gpt-5.5": {
         inputUsdPerMillion: 2,
@@ -108,14 +152,7 @@ export const UNPRICED_ROUTABLE_MODELS = [
     "gpt-6-astra-aeon",
     "gpt-daybreak-blue-latest",
     "gpt-daybreak-red-latest",
-    "gpt-5.1",
-    "gpt-5.2-pro",
-    "gpt-5.4-mini",
-    "gpt-5.4-nano",
-    "gpt-5.4-pro",
     "gpt-5.5-pro",
-    "gpt-5-mini",
-    "gpt-5-nano",
 ];
 function normalizeModelName(model) {
     const trimmed = model?.trim().toLowerCase();
@@ -134,10 +171,19 @@ export function getUsageModelPricing(model) {
     // `NaN` instead of `null`. A NaN cost is worse than an unknown one, because
     // `NaN >= limit` is false, so it silently makes a `maxCostUsd` budget
     // unenforceable rather than failing closed the way an unpriced model does.
-    if (!Object.hasOwn(MODEL_PRICING, normalized)) {
+    //
+    // A retired id is priced as the model it now runs on. The proxy records the
+    // raw client model string, so a new `gpt-5-codex` row is really a
+    // `gpt-5.6-sol` request; pricing it at the retired model's old rate would
+    // under-count a `maxCostUsd` budget. Rows already on disk are unaffected:
+    // the ledger stores `costUsd` when a row is written and never re-prices it.
+    const effective = Object.hasOwn(RETIRED_MODEL_REPLACEMENTS, normalized)
+        ? RETIRED_MODEL_REPLACEMENTS[normalized]
+        : normalized;
+    if (!effective || !Object.hasOwn(MODEL_PRICING, effective)) {
         return null;
     }
-    return MODEL_PRICING[normalized] ?? null;
+    return MODEL_PRICING[effective] ?? null;
 }
 /**
  * Pick the rate that applies to a response's service tier.
@@ -152,6 +198,17 @@ function resolveServiceTierPricing(pricing, serviceTier) {
     }
     return pricing.serviceTiers?.[serviceTier] ?? null;
 }
+function resolveContextLengthPricing(basePricing, tierPricing, inputTokens) {
+    if (inputTokens <= SHORT_CONTEXT_MAX_INPUT_TOKENS) {
+        return tierPricing;
+    }
+    if (tierPricing.longContext) {
+        return tierPricing.longContext;
+    }
+    // The model has long-context rates but not for this tier: unknown, never
+    // the cheaper short-context rate.
+    return basePricing.longContext ? null : tierPricing;
+}
 export function estimateUsageCostUsd(model, tokens) {
     const basePricing = getUsageModelPricing(model);
     if (!basePricing) {
@@ -161,7 +218,11 @@ export function estimateUsageCostUsd(model, tokens) {
     // table has no rate for must report unknown cost, not a standard-tier
     // figure: under-counting is what lets a `maxCostUsd` cap overrun, and
     // `evaluateBudgetGuard` already knows how to fail closed on `null`.
-    const pricing = resolveServiceTierPricing(basePricing, tokens.serviceTier);
+    const tierPricing = resolveServiceTierPricing(basePricing, tokens.serviceTier);
+    if (!tierPricing) {
+        return null;
+    }
+    const pricing = resolveContextLengthPricing(basePricing, tierPricing, tokens.inputTokens);
     if (!pricing) {
         return null;
     }

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "codex-multi-auth",
-	"version": "2.15.0",
+	"version": "2.16.0",
 	"description": "Codex CLI multi-account OAuth manager with account switching, health checks, runtime rotation, diagnostics, and recovery tools for @openai/codex",
 	"main": "./dist/index.js",
 	"types": "./dist/index.d.ts",

package/scripts/codex.js

@@ -686,15 +686,15 @@ function resolveModelFamilyForStatus(model) {
 		return "gpt-5.2";
 	}
 	if (normalized.includes("daybreak")) return "gpt-5.2";
-	// GPT-5.6 general tiers share the gpt-5.2 prompt family (see
-	// lib/request/helpers/model-map.ts MODEL_PROFILES). Check before the generic
-	// gpt-5 catch-all, which would otherwise mis-bucket them as codex.
-	if (normalized.startsWith("gpt-5.6")) return "gpt-5.2";
-	if (normalized.startsWith("gpt-5.2")) return "gpt-5.2";
-	if (normalized.startsWith("gpt-5.1")) return "gpt-5.1";
-	if (normalized.includes("codex-max")) return "codex-max";
-	if (normalized.includes("codex")) return "codex";
-	if (normalized.startsWith("gpt-5")) return "gpt-5-codex";
+	// The proxy keys a /codex/responses request by `getModelFamily(model)`
+	// (lib/runtime-rotation-proxy.ts), i.e. the replacement's prompt family.
+	// Every codex model is retired and runs on `gpt-5.6-sol`/`terra`, and every
+	// live or retired general GPT-5 id runs on a model in the gpt-5.2 family, so
+	// status reads that family. The old `codex`/`codex-max`/`gpt-5.1`/
+	// `gpt-5-codex` answers named keys the proxy does not write for these ids.
+	if (normalized.includes("codex") || normalized.startsWith("gpt-5")) {
+		return "gpt-5.2";
+	}
 	return null;
 }
 
@@ -1368,8 +1368,36 @@ 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";
+// Every codex model is retired; codex ids run on the replacement OpenAI names
+// for them. Mirrors lib/request/helpers/model-map.ts CURRENT_CODEX_MODEL and
+// RETIRED_MODEL_REPLACEMENTS, pinned in parity by test/retired-models.test.ts.
+const CURRENT_CODEX_MODEL = "gpt-5.6-sol";
+const CODEX_MINI_REPLACEMENT_MODEL = "gpt-5.6-terra";
+const RETIRED_MODEL_REPLACEMENTS = {
+	"gpt-5.4": "gpt-6-sol",
+	"gpt-5.4-mini": "gpt-6-luna",
+	"gpt-5.4-nano": "gpt-6-luna",
+	"gpt-5.4-pro": "gpt-5.5-pro",
+	"gpt-5.2": "gpt-5.6-sol",
+	"gpt-5.2-pro": "gpt-5.5-pro",
+	"gpt-5.1": "gpt-5.6-sol",
+	"gpt-5-mini": "gpt-5.6-terra",
+	"gpt-5-nano": "gpt-5.6-luna",
+	"gpt-5-chat-latest": "gpt-5.6-sol",
+	"gpt-5.1-chat-latest": "gpt-5.6-sol",
+	"gpt-5.2-chat-latest": "gpt-5.6-sol",
+	"gpt-5.3-chat-latest": "gpt-5.6-sol",
+	"gpt-5.3-codex": CURRENT_CODEX_MODEL,
+	"gpt-5.3-codex-spark": CURRENT_CODEX_MODEL,
+	"gpt-5.2-codex": CURRENT_CODEX_MODEL,
+	"gpt-5.1-codex": CURRENT_CODEX_MODEL,
+	"gpt-5.1-codex-max": CURRENT_CODEX_MODEL,
+	"gpt-5-codex": CURRENT_CODEX_MODEL,
+	"codex-max": CURRENT_CODEX_MODEL,
+	"gpt-5.1-codex-mini": CODEX_MINI_REPLACEMENT_MODEL,
+	"gpt-5-codex-mini": CODEX_MINI_REPLACEMENT_MODEL,
+	"codex-mini-latest": CODEX_MINI_REPLACEMENT_MODEL,
+};
 // Mirrors the GPT-6 rows of lib/request/error-classification.ts
 // `DEFAULT_UNSUPPORTED_CODEX_FALLBACK_CHAIN`. This table is walked differently
 // from lib's: `resolveUnsupportedModelRetryTarget` keys on the model named in
@@ -1381,25 +1409,25 @@ const LEGACY_CODEX_MODEL = "gpt-5-codex";
 const WRAPPER_UNSUPPORTED_MODEL_FALLBACK_CHAIN = {
 	"gpt-6-astra": ["gpt-5.6-sol", "gpt-5.5"],
 	"gpt-6-astra-aeon": ["gpt-6-astra", "gpt-5.6-sol"],
+	"gpt-6-sol": ["gpt-5.6-sol"],
+	"gpt-6-luna": ["gpt-5.6-luna"],
 	"gpt-5.6-sol": ["gpt-5.5"],
+	"gpt-5.6-luna": ["gpt-5.5"],
+	"gpt-5.6-terra": ["gpt-5.5"],
 	"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],
+	"gpt-5.5-2026-04-23": ["gpt-5.5"],
+	"gpt-5.5-20260423": ["gpt-5.5"],
+	"gpt-5.5-pro-2026-04-23": ["gpt-5.5-pro"],
+	"gpt-5.5-pro-20260423": ["gpt-5.5-pro"],
+	// `gpt-5.5`/`gpt-5.5-pro` are the floor; `gpt-5.4` is retired. A retired id
+	// steps once to its replacement.
+	...Object.fromEntries(
+		Object.entries(RETIRED_MODEL_REPLACEMENTS).map(([retired, replacement]) => [
+			retired,
+			[replacement],
+		]),
+	),
 };
 
 function canonicalizeRequestedModelName(model) {
@@ -2022,9 +2050,10 @@ function hasCliAuthCredentialsStoreOverride(args) {
 // 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-6-astra": ["low", "medium", "high", "xhigh", "max", "ultra"],
 	"gpt-6-astra-aeon": ["low", "medium", "high", "xhigh", "max", "ultra"],
+	"gpt-6-sol": ["low", "medium", "high", "xhigh", "max", "ultra"],
+	"gpt-6-luna": ["low", "medium", "high", "xhigh", "max"],
 	"gpt-daybreak-blue-latest": ["low", "medium", "high", "xhigh", "max", "ultra"],
 	"gpt-daybreak-red-latest": ["low", "medium", "high", "xhigh", "max", "ultra"],
 	"gpt-5.6-sol": ["low", "medium", "high", "xhigh", "max", "ultra"],
@@ -2032,15 +2061,6 @@ const SUPPORTED_REASONING_EFFORTS_BY_MODEL = {
 	"gpt-5.6-luna": ["low", "medium", "high", "xhigh", "max"],
 	"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"],
-	"gpt-5-nano": ["medium"],
 };
 
 const REASONING_FALLBACKS = {
@@ -2086,45 +2106,53 @@ const GPT_5_6_LUNA_MODEL = "gpt-5.6-luna";
 const GPT_5_6_FLAGSHIP_ALIAS = "gpt-5.6";
 const GPT_5_6_SOL_TERRA_EFFORTS = ["low", "medium", "high", "xhigh", "max", "ultra"];
 const GPT_5_6_LUNA_EFFORTS = ["low", "medium", "high", "xhigh", "max"];
-// GPT-6 Astra (2026-09-03). No Sol/Terra/Luna split this generation: the
-// flagship plus `aeon`, a long-horizon variant. Same frontier effort ladder as
-// 5.6 (no `none`/`minimal`, `ultra` at the top). Bare `gpt-6` -> flagship.
+// GPT-6 Astra (2026-09-03): the flagship plus `aeon`, a long-horizon variant.
+// Same frontier effort ladder as 5.6 (no `none`/`minimal`, `ultra` at the
+// top). Bare `gpt-6` -> flagship.
 const GPT_6_ASTRA_MODEL = "gpt-6-astra";
 const GPT_6_ASTRA_AEON_MODEL = "gpt-6-astra-aeon";
 const GPT_6_FLAGSHIP_ALIAS = "gpt-6";
 const GPT_6_ASTRA_EFFORTS = ["low", "medium", "high", "xhigh", "max", "ultra"];
+// GPT-6 Sol and Luna (upstream catalog, 2026-09-22). Sol reaches `ultra`, Luna
+// stops at `max`. No GPT-6 Terra. Mirrors lib/request/helpers/model-map.ts.
+const GPT_6_SOL_MODEL = "gpt-6-sol";
+const GPT_6_LUNA_MODEL = "gpt-6-luna";
+const GPT_6_SOL_EFFORTS = GPT_6_ASTRA_EFFORTS;
+const GPT_6_LUNA_EFFORTS = ["low", "medium", "high", "xhigh", "max"];
 // Daybreak cyber models from the upstream Codex catalog. `red` is the
 // cyber-permissive variant, `blue` the defensive one.
 const DAYBREAK_BLUE_MODEL = "gpt-daybreak-blue-latest";
 const DAYBREAK_RED_MODEL = "gpt-daybreak-red-latest";
 const DAYBREAK_EFFORTS = ["low", "medium", "high", "xhigh", "max", "ultra"];
+// Retired minors map to the replacement OpenAI names for them. Mirrors lib.
 const GENERAL_GPT5_VERSION_CATALOG = {
 	1: {
-		base: "gpt-5.1",
+		base: GPT_5_6_SOL_MODEL,
+		pro: GPT_5_5_PRO_CANONICAL_MODEL,
 	},
 	2: {
-		base: "gpt-5.2",
-		pro: "gpt-5.2-pro",
+		base: GPT_5_6_SOL_MODEL,
+		pro: GPT_5_5_PRO_CANONICAL_MODEL,
 	},
 	4: {
-		base: DEFAULT_GENERAL_GPT5_MODEL,
-		pro: "gpt-5.4-pro",
-		mini: "gpt-5.4-mini",
-		nano: "gpt-5.4-nano",
+		base: GPT_6_SOL_MODEL,
+		pro: GPT_5_5_PRO_CANONICAL_MODEL,
+		mini: GPT_6_LUNA_MODEL,
+		nano: GPT_6_LUNA_MODEL,
 	},
 	5: {
 		base: GPT_5_5_CANONICAL_MODEL,
 		pro: GPT_5_5_PRO_CANONICAL_MODEL,
-		mini: "gpt-5-mini",
-		nano: "gpt-5-nano",
+		mini: GPT_5_6_TERRA_MODEL,
+		nano: GPT_5_6_LUNA_MODEL,
 	},
 };
 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",
+	mini: GPT_5_6_TERRA_MODEL,
+	nano: GPT_5_6_LUNA_MODEL,
 };
 
 function addRequestedModelAlias(alias, normalizedModel) {
@@ -2268,19 +2296,8 @@ function seedRequestedModelAliases() {
 		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.2", "gpt-5.2");
-	addRequestedModelReasoningAliases("gpt-5.1", "gpt-5.1");
 	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);
 	addRequestedModelEffortAliases(
 		GPT_5_6_SOL_MODEL,
 		GPT_5_6_SOL_MODEL,
@@ -2322,6 +2339,13 @@ function seedRequestedModelAliases() {
 		GPT_6_ASTRA_AEON_MODEL,
 		GPT_6_ASTRA_EFFORTS,
 	);
+	// No bare `sol`/`luna` aliases: those already mean the 5.6 tiers.
+	addRequestedModelEffortAliases(GPT_6_SOL_MODEL, GPT_6_SOL_MODEL, GPT_6_SOL_EFFORTS);
+	addRequestedModelEffortAliases(
+		GPT_6_LUNA_MODEL,
+		GPT_6_LUNA_MODEL,
+		GPT_6_LUNA_EFFORTS,
+	);
 	addRequestedModelEffortAliases(
 		DAYBREAK_BLUE_MODEL,
 		DAYBREAK_BLUE_MODEL,
@@ -2342,17 +2366,10 @@ function seedRequestedModelAliases() {
 		DAYBREAK_RED_MODEL,
 		DAYBREAK_EFFORTS,
 	);
-	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);
+	for (const [retired, replacement] of Object.entries(RETIRED_MODEL_REPLACEMENTS)) {
+		addRequestedModelReasoningAliases(retired, replacement);
+	}
 	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();
@@ -2405,39 +2422,13 @@ function resolveStableGeneralGpt5Variant(variant) {
 // between the two, which is exactly what test/codex-model-resolution.test.ts
 // exists to prevent.
 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;
+	// Every codex model is retired: a mini codex id goes to Terra, any other id
+	// carrying `codex` to Sol. Mirrors lib resolveCodexCatalogModel.
+	if (!normalized.includes("codex")) return "";
+	if (/codex[- ]mini(?!mal)/.test(normalized)) {
+		return CODEX_MINI_REPLACEMENT_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.3-codex") ||
-		normalized.includes("gpt 5.3 codex") ||
-		normalized.includes("gpt-5.2-codex") ||
-		normalized.includes("gpt 5.2 codex") ||
-		normalized.includes("gpt-5.1-codex") ||
-		normalized.includes("gpt 5.1 codex") ||
-		normalized.includes("gpt-5-codex") ||
-		normalized.includes("gpt 5 codex") ||
-		normalized.includes("codex")
-	) {
-		return CURRENT_CODEX_MODEL;
-	}
-
-	return "";
+	return CURRENT_CODEX_MODEL;
 }
 
 // Resolve GPT-5.6 identifiers, including ones that are not exact aliases (e.g. a
@@ -2473,6 +2464,11 @@ function resolveGpt6RequestedModel(stripped) {
 		return "";
 	}
 	if (tokens.includes("aeon")) return GPT_6_ASTRA_AEON_MODEL;
+	if (isAstra) return GPT_6_ASTRA_MODEL;
+	// `terra` goes to Sol: there is no GPT-6 Terra, and upstream migrates
+	// `gpt-5.6-terra` users to Sol.
+	if (tokens.includes("luna")) return GPT_6_LUNA_MODEL;
+	if (tokens.includes("sol") || tokens.includes("terra")) return GPT_6_SOL_MODEL;
 	return GPT_6_ASTRA_MODEL;
 }
 
@@ -2546,6 +2542,14 @@ function normalizeRequestedModel(model) {
 	if (exactMatch) {
 		return exactMatch;
 	}
+	// Mirrors lib: retry the alias lookup without a `-max`/`-ultra` suffix.
+	const withoutTopEffort = normalized.replace(/-(max|ultra)$/, "");
+	if (withoutTopEffort !== normalized) {
+		const effortlessMatch = REQUESTED_MODEL_ALIASES.get(withoutTopEffort);
+		if (effortlessMatch) {
+			return effortlessMatch;
+		}
+	}
 
 	const daybreakModel = resolveDaybreakRequestedModel(stripped);
 	if (daybreakModel) {
@@ -6547,6 +6551,7 @@ export {
 	resolveModelFamilyForStatus,
 	canonicalizeRequestedModelName,
 	WRAPPER_UNSUPPORTED_MODEL_FALLBACK_CHAIN,
+	RETIRED_MODEL_REPLACEMENTS,
 };
 
 // Run the wrapper only when actually launched (as the `codex-multi-auth-codex`