codex-multi-auth 2.17.3 → 2.18.0

package/dist/lib/request/error-classification.js

@@ -12,66 +12,55 @@ const CHATGPT_CODEX_UNSUPPORTED_MODEL_PATTERN = /model is not supported when usi
 const NORMALIZED_UNSUPPORTED_MODEL_PATTERN = /the model ['"]([^'"]+)['"] is not currently available for this chatgpt account/i;
 const MODEL_ACCESS_DENIED_PATTERN = /the model [`'"]([^`'"]+)[`'"] does not exist or you do not have access to it/i;
 export const DEFAULT_UNSUPPORTED_CODEX_FALLBACK_CHAIN = {
-    // GPT-6 Astra rolls out org by org, so an account that is not entitled yet
-    // gets a real unsupported-model response for it. This chain only fires when
-    // the user has opted into `fallbackOnUnsupportedCodexModel` (default
-    // `false`), and only on that response, so it never silently swaps the model
-    // out from under a request the account could have served.
+    // GPT-6 models roll out org by org, so an account that is not entitled yet
+    // gets a real unsupported-model response for them. This chain only fires
+    // when the user has opted into `fallbackOnUnsupportedCodexModel` (default
+    // `false`), and only on that response, so it never silently swaps the
+    // model out from under a request the account could have served.
     //
     // This table is walked ONE HOP AT A TIME, not as a per-request candidate
-    // list. index.ts reassigns `model` to whatever came back and passes that as
-    // `requestedModel` on the next unsupported response, so reaching `gpt-5.5`
-    // from Astra requires `gpt-5.6-sol` to carry its own entry below. A second
-    // element here is only ever consulted when the first is already in
-    // `attemptedModels` for that same call.
+    // list. index.ts reassigns `model` to whatever came back and passes that
+    // as `requestedModel` on the next unsupported response, so reaching the
+    // terminal models from a launch model requires every intermediate model
+    // to carry its own entry below. A second element here is only ever
+    // consulted when the first is already in `attemptedModels` for that same
+    // call.
     //
-    // Depth is not free: every hop spends one of the shared per-request outbound
-    // attempts (`tryConsumeOutboundRequestAttempt`). A single-account balanced
-    // session gets a budget of 5, and the aeon walk needs 4 (it needed all 5
-    // until `gpt-5.4` was retired as the floor), leaving one attempt for a retry
-    // or a stream failover. Spend two and the tail hop becomes unreachable,
-    // ending as an attempt-budget-exhausted 503 rather than `gpt-5.5`. Hops are
+    // Depth is not free: every hop spends one of the shared per-request
+    // outbound attempts (`tryConsumeOutboundRequestAttempt`). A single-account
+    // balanced session gets a budget of 5, and the deepest walks — 6.1 Sol and
+    // the retired ids that migrate through Astra — spend all 5, the same shape
+    // the aeon walk had before `gpt-5.4` was retired as the floor. Hops are
     // ordered most-valuable-first so what is lost first matters least. Do not
-    // add a hop to a GPT-6 row without
-    // re-checking that budget; `test/gpt6-astra-models.test.ts` asserts it.
-    "gpt-6-astra": ["gpt-5.6-sol", "gpt-5.5"],
-    // aeon steps to the flagship first: still GPT-6, still Astra, just without
-    // the long-horizon behaviour.
-    "gpt-6-astra-aeon": ["gpt-6-astra", "gpt-5.6-sol"],
-    // Sol and Luna step to the 5.6 tier they replace, never sideways into Astra:
-    // an account without the new tier is far likelier to lack Astra too, and
-    // Astra is the priciest hop available ($10/$50 per 1M against Luna's
-    // $0.10/$0.50). Every hop on these walks still costs more than Luna itself.
+    // add a hop to a GPT-6 row without re-checking that budget;
+    // `test/gpt6-astra-models.test.ts` asserts it.
+    "gpt-6.1-sol": ["gpt-6-sol"],
+    // Astra steps to the workhorse rather than to a smaller tier: an account
+    // without the flagship is still likelier than not to hold the standard
+    // GPT-6 tier, and `gpt-6-sol` keeps the walk inside the generation.
+    "gpt-6-astra": ["gpt-6-sol"],
+    // Sol and Luna step to the 5.6 tier they replace, never sideways into a
+    // pricier model: an account without the new tier is far likelier to lack
+    // Astra too, and Astra is the priciest hop available ($10/$50 per 1M
+    // against Luna's $0.10/$0.50). Every hop on these walks still costs more
+    // than Luna itself.
     "gpt-6-sol": ["gpt-5.6-sol"],
     "gpt-6-luna": ["gpt-5.6-luna"],
-    // The hop that makes the Astra path reach a model every account has. GPT-5.6
-    // shipped without a chain entry, so an unsupported 5.6 response ended the
-    // walk; with Astra above it that would have stranded the fallback one rung
-    // short of the floor it documents.
-    "gpt-5.6-sol": ["gpt-5.5"],
-    // Luna gained its row once `gpt-6-luna` started stepping into it; without
-    // it the Luna walk would stop one rung short of `gpt-5.5`, the same
-    // stranding the Sol row fixed. It also applies to a direct `gpt-5.6-luna`
-    // request, which used to end its walk on an unsupported response and now
-    // retries on the pricier `gpt-5.5`.
-    "gpt-5.6-luna": ["gpt-5.5"],
-    // Terra gained its row once the retired codex minis and `gpt-5-mini` began
-    // stepping into it; without it those walks stopped at Terra instead of the
-    // `gpt-5.5` floor every other retired id reaches.
-    "gpt-5.6-terra": ["gpt-5.5"],
-    "gpt-5": ["gpt-5.5"],
-    "gpt-5-pro": ["gpt-5.5-pro"],
-    "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` and `gpt-5.5-pro` are the floor: they used to step to `gpt-5.4`,
-    // which the Codex backend no longer serves (`retirement_at: 2026-08-31` in
-    // the upstream catalog), so that hop could only ever fail.
-    //
+    // The hop that makes every general walk reach a model almost every account
+    // has: `gpt-6-luna` ships on the most plans of any catalog model, which is
+    // why the quota-probe chain also ends on it.
+    "gpt-5.6-sol": ["gpt-6-luna"],
+    // Luna's own row crosses to Sol rather than stopping: a `gpt-5.6-luna`
+    // request whose tier is absent retries on the same-generation workhorse
+    // instead of ending on an unsupported response.
+    "gpt-5.6-luna": ["gpt-5.6-sol"],
+    "gpt-5.6-terra": ["gpt-5.6-sol"],
+    "gpt-5": ["gpt-5.6-sol"],
+    "gpt-5-pro": ["gpt-6-astra"],
     // A retired id still reaches the backend verbatim through the pass-through
     // rotation proxy, and the backend rejects it as unsupported. One hop to the
-    // replacement OpenAI names for it turns that into a working request.
+    // replacement OpenAI names for it turns that into a working request, and
+    // from there the same staircase above continues toward Luna.
     ...Object.fromEntries(Object.entries(RETIRED_MODEL_REPLACEMENTS).map(([retired, replacement]) => [
         retired,
         [replacement],

package/dist/lib/request/fetch-helpers.js

@@ -252,7 +252,7 @@ function normalizeErrorPayload(errorBody, bodyText, statusText, status, diagnost
             error: {
                 message: `The model '${unsupportedModel}' is not currently available for this ChatGPT account when using Codex OAuth. ` +
                     "This is an account/workspace entitlement gate, not a temporary rate limit. " +
-                    "Try 'gpt-5.6-sol' or 'gpt-5.5', or enable automatic fallback via " +
+                    "Try 'gpt-6.1-sol' or 'gpt-5.6-sol', or enable automatic fallback via " +
                     'unsupportedCodexPolicy: "fallback" (or CODEX_AUTH_UNSUPPORTED_MODEL_POLICY=fallback). ' +
                     "(Legacy: CODEX_AUTH_FALLBACK_UNSUPPORTED_MODEL=1 or fallbackOnUnsupportedCodexModel).",
                 type: "entitlement_error",

package/dist/lib/request/helpers/model-map.d.ts

@@ -40,9 +40,9 @@ export interface ModelProfile {
  * still read naturally.
  */
 export declare const CURRENT_CODEX_MODEL = "gpt-5.6-sol";
-export declare const DEFAULT_MODEL = "gpt-5.5";
+export declare const DEFAULT_MODEL = "gpt-6.1-sol";
 export declare const DEFAULT_PROBE_MODEL = "gpt-5.6-sol";
-export declare const QUOTA_PROBE_MODEL_CHAIN: readonly ["gpt-5.6-sol", "gpt-5.5", "gpt-6-luna"];
+export declare const QUOTA_PROBE_MODEL_CHAIN: readonly ["gpt-5.6-sol", "gpt-6.1-sol", "gpt-6-luna"];
 /**
  * Effective model profiles keyed by canonical model name.
  *

package/dist/lib/request/helpers/model-map.js

@@ -67,20 +67,21 @@ export const CURRENT_CODEX_MODEL = "gpt-5.6-sol";
  * `gpt-5.1-codex-mini`, rather than up to Sol.
  */
 const CODEX_MINI_REPLACEMENT_MODEL = "gpt-5.6-terra";
-export const DEFAULT_MODEL = "gpt-5.5";
+// The default tracks whatever upstream defaults a fresh Codex session to:
+// `gpt-6.1-sol` entered the bundled catalog on 2026-09-29 as priority 1
+// (openai/codex #49318), above Astra. `gpt-5.5`, the previous default here,
+// retires from ChatGPT/Codex on 2026-10-14, so keeping it would have landed
+// every unresolvable request — and the legacy `gpt-5` alias — on a dying id.
+export const DEFAULT_MODEL = "gpt-6.1-sol";
 // Model used for diagnostic live/quota probes (`check`, `report`, `best`).
 // Deliberately distinct from DEFAULT_MODEL: GPT-5.6 is the latest general family
-// (issue #627), so the probe leads with it, while DEFAULT_MODEL stays on 5.5 so
-// actual request routing and the legacy `gpt-5` alias remain opt-in per 2.5.0.
+// (issue #627) with a year of rollout behind it, so the probe leads with it —
+// a probe only needs a response's quota headers, and leading with a fresh
+// launch model (Astra on 2026-09-03, 6.1 Sol on 2026-09-29) spends one failed
+// request per probe on every account not yet entitled and buys nothing. Move
+// DEFAULT_PROBE_MODEL forward once a newer model is broadly available.
 // Bare `gpt-5.6` aliases to Sol; we pin the canonical id so the probe display
 // and report `modelSelection` read `gpt-5.6-sol` without a remap arrow.
-//
-// GPT-6 Astra deliberately does NOT lead the probe as of its 2026-09-03 launch.
-// A probe only needs a response's quota headers, and Astra is still rolling out
-// org by org, so leading with it would spend one failed request per probe for
-// every account without entitlement yet and buy nothing. Move DEFAULT_PROBE_MODEL
-// to `gpt-6-astra` once it is broadly available, and put `gpt-5.6-sol` directly
-// behind it in QUOTA_PROBE_MODEL_CHAIN.
 export const DEFAULT_PROBE_MODEL = "gpt-5.6-sol";
 // Single source of truth for the live/quota probe fallback chain. Both the
 // manager probe (lib/quota-probe.ts) and the runtime probe (lib/runtime/quota-probe.ts)
@@ -126,17 +127,16 @@ const GPT_5_6_LUNA_EFFORTS = [
 /**
  * GPT-6 Astra, OpenAI's 2026-09-03 frontier release.
  *
- * The launch lineup was the flagship plus `aeon`, a long-horizon variant built
- * for runs measured in days; Sol and Luna followed on 2026-09-22 (below).
- * `gpt-6-astra` is the API model name OpenAI published at launch;
- * `gpt-6-astra-aeon` is the second slug that shipped beside it in the Codex
- * model list. "Astra Pro" is a plan tier, not a separate slug we have seen, so
- * it is deliberately not registered as its own canonical model — the GPT-6
- * resolver below claims `gpt-6-astra-pro` and every other unrecognised GPT-6 id
- * for the flagship rather than letting it fall through to GPT-5.5.
+ * Sol and Luna followed on 2026-09-22 (below). `gpt-6-astra` is the API model
+ * name OpenAI published at launch. The long-horizon `gpt-6-astra-aeon` slug
+ * that leaked beside it never appeared in the bundled catalog or the public
+ * model docs and is retired below — its ids now alias the flagship. "Astra
+ * Pro" is a plan tier, not a separate slug we have seen, so it is deliberately
+ * not registered as its own canonical model — the GPT-6 resolver below claims
+ * `gpt-6-astra-pro` and every other unrecognised GPT-6 id for the flagship
+ * rather than letting it fall through to the default.
  */
 const GPT_6_ASTRA_MODEL = "gpt-6-astra";
-const GPT_6_ASTRA_AEON_MODEL = "gpt-6-astra-aeon";
 /** Bare `gpt-6` resolves to the flagship, mirroring bare `gpt-5.6` -> Sol. */
 const GPT_6_FLAGSHIP_ALIAS = "gpt-6";
 /**
@@ -171,6 +171,20 @@ const GPT_6_LUNA_EFFORTS = [
     "xhigh",
     "max",
 ];
+/**
+ * GPT-6.1 Sol, the first 6.1 release: added to the upstream catalog on
+ * 2026-09-29 (openai/codex #49318) as the default model — priority 1, above
+ * Astra — with "near-Astra performance at a lower cost". The same commit
+ * demoted `gpt-6-sol` to "previous generation workhorse". The catalog ships
+ * the full low..ultra ladder with a `low` default (the API model page
+ * documents `medium` for direct-API callers; the Codex catalog this wrapper
+ * mirrors says `low`). Sol is the only 6.1 tier yet, so bare `gpt-6.1` and
+ * any unrecognised 6.1 id resolve to it, matching the bare-alias convention.
+ */
+const GPT_6_1_SOL_MODEL = "gpt-6.1-sol";
+/** Bare `gpt-6.1` resolves to Sol — the only tier OpenAI ships at 6.1. */
+const GPT_6_1_FLAGSHIP_ALIAS = "gpt-6.1";
+const GPT_6_1_SOL_EFFORTS = GPT_6_ASTRA_EFFORTS;
 /**
  * Cyber-specialty models from the upstream Codex catalog
  * (openai/codex `codex-rs/models-manager/models.json`).
@@ -192,47 +206,55 @@ const DAYBREAK_EFFORTS = [
     "max",
     "ultra",
 ];
-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";
 /**
- * Where an unrecognised `gpt-5.<minor>` id lands. Every minor below 5.5 is
- * retired (OpenAI deprecations page, upstream catalog removals), so each maps
- * to the replacement OpenAI names for it rather than to a model that no longer
- * answers: 5.1/5.2 to Sol, 5.4 to GPT-6 Sol/Luna as upstream Codex migrates it,
- * and every `pro` to the one live pro model.
+ * Where an unrecognised `gpt-5.<minor>` id lands. Every known minor is
+ * retired (OpenAI deprecations page, upstream catalog removals, the
+ * 2026-10-14 `gpt-5.5` OAuth shutdown), so each maps to the replacement
+ * OpenAI names for it rather than to a model that no longer answers:
+ * 5.1/5.2 to Sol, 5.4 to GPT-6 Sol/Luna as upstream Codex migrates it,
+ * 5.5 to GPT-6 Sol likewise, and every `pro` to the frontier flagship that
+ * replaced the API-only `gpt-5.5-pro`.
  */
 const GENERAL_GPT5_VERSION_CATALOG = {
     1: {
         base: GPT_5_6_SOL_MODEL,
-        pro: GPT_5_5_PRO_CANONICAL_MODEL,
+        pro: GPT_6_ASTRA_MODEL,
     },
     2: {
         base: GPT_5_6_SOL_MODEL,
-        pro: GPT_5_5_PRO_CANONICAL_MODEL,
+        pro: GPT_6_ASTRA_MODEL,
     },
     4: {
         base: GPT_6_SOL_MODEL,
-        pro: GPT_5_5_PRO_CANONICAL_MODEL,
+        pro: GPT_6_ASTRA_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,
+        base: GPT_6_SOL_MODEL,
+        pro: GPT_6_ASTRA_MODEL,
         mini: GPT_5_6_TERRA_MODEL,
         nano: GPT_5_6_LUNA_MODEL,
     },
 };
-const GENERAL_GPT5_STABLE_VARIANTS = GENERAL_GPT5_VERSION_CATALOG[5];
+/**
+ * Landing spot for a `gpt-5.<minor>` whose minor this catalog does not know
+ * (a `gpt-5.7` or `gpt-5.9` id, say): the newest generation the 5.x line
+ * still serves. Deliberately NOT the migration target `gpt-6-sol` — an id
+ * naming a 5.x minor keeps its generation, the same way every known minor
+ * above lands on a living 5.x or the replacement OpenAI actually named.
+ */
+const GENERAL_GPT5_STABLE_VARIANTS = {
+    base: GPT_5_6_SOL_MODEL,
+    pro: GPT_6_ASTRA_MODEL,
+    mini: GPT_5_6_TERRA_MODEL,
+    nano: GPT_5_6_LUNA_MODEL,
+};
 // `gpt-5-mini`/`gpt-5-nano` point at snapshots OpenAI retires on 2026-12-11;
 // the deprecations page names Terra and Luna as their replacements.
 const GENERAL_GPT5_GENERIC_VARIANTS = {
-    base: DEFAULT_MODEL,
-    pro: GPT_5_5_PRO_CANONICAL_MODEL,
+    base: GPT_5_6_SOL_MODEL,
+    pro: GPT_6_ASTRA_MODEL,
     mini: GPT_5_6_TERRA_MODEL,
     nano: GPT_5_6_LUNA_MODEL,
 };
@@ -258,11 +280,11 @@ export const MODEL_PROFILES = {
         supportedReasoningEfforts: GPT_6_ASTRA_EFFORTS,
         capabilities: TOOL_CAPABILITIES.full,
     },
-    [GPT_6_ASTRA_AEON_MODEL]: {
-        normalizedModel: GPT_6_ASTRA_AEON_MODEL,
+    [GPT_6_1_SOL_MODEL]: {
+        normalizedModel: GPT_6_1_SOL_MODEL,
         promptFamily: "gpt-5.2",
-        defaultReasoningEffort: "medium",
-        supportedReasoningEfforts: GPT_6_ASTRA_EFFORTS,
+        defaultReasoningEffort: "low",
+        supportedReasoningEfforts: GPT_6_1_SOL_EFFORTS,
         capabilities: TOOL_CAPABILITIES.full,
     },
     [GPT_6_SOL_MODEL]: {
@@ -317,26 +339,15 @@ export const MODEL_PROFILES = {
         supportedReasoningEfforts: GPT_5_6_LUNA_EFFORTS,
         capabilities: TOOL_CAPABILITIES.full,
     },
-    [GPT_5_5_CANONICAL_MODEL]: {
-        normalizedModel: GPT_5_5_CANONICAL_MODEL,
-        promptFamily: "gpt-5.2",
-        defaultReasoningEffort: "none",
-        supportedReasoningEfforts: ["none", "low", "medium", "high", "xhigh"],
-        capabilities: TOOL_CAPABILITIES.full,
-    },
-    [GPT_5_5_PRO_CANONICAL_MODEL]: {
-        normalizedModel: GPT_5_5_PRO_CANONICAL_MODEL,
-        promptFamily: "gpt-5.2",
-        defaultReasoningEffort: "high",
-        supportedReasoningEfforts: ["medium", "high", "xhigh"],
-        capabilities: TOOL_CAPABILITIES.computerAndCompact,
-    },
-    // Every model older than 5.5 is retired: `gpt-5.1`, `gpt-5.2` and the whole
-    // 5.4 family left the upstream Codex catalog, the codex models and the
-    // chat-latest snapshots are past their shutdown date on OpenAI's
-    // deprecations page, and `gpt-5-mini`/`gpt-5-nano` shut down 2026-12-11.
-    // Their ids stay accepted as aliases of the named replacement (below) so an
-    // old config keeps working, but no request is sent under a dead name.
+    // 5.5 and older are all retired: `gpt-5.5` leaves ChatGPT/Codex on
+    // 2026-10-14, `gpt-5.5-pro` left the bundled Codex catalog earlier (it is
+    // API-only now, which this OAuth surface cannot serve), `gpt-5.1`,
+    // `gpt-5.2` and the whole 5.4 family left the upstream Codex catalog, the
+    // codex models and the chat-latest snapshots are past their shutdown date
+    // on OpenAI's deprecations page, and `gpt-5-mini`/`gpt-5-nano` shut down
+    // 2026-12-11. Their ids stay accepted as aliases of the named replacement
+    // (below) so an old config keeps working, but no request is sent under a
+    // dead name.
 };
 const MODEL_MAP = {};
 function addAlias(alias, normalizedModel) {
@@ -368,17 +379,21 @@ function addGpt56Aliases() {
 }
 function addGpt6Aliases() {
     addEffortAliases(GPT_6_ASTRA_MODEL, GPT_6_ASTRA_MODEL, GPT_6_ASTRA_EFFORTS);
-    addEffortAliases(GPT_6_ASTRA_AEON_MODEL, GPT_6_ASTRA_AEON_MODEL, GPT_6_ASTRA_EFFORTS);
     addEffortAliases(GPT_6_FLAGSHIP_ALIAS, GPT_6_ASTRA_MODEL, GPT_6_ASTRA_EFFORTS);
     // `astra` on its own is how the model is spoken about everywhere; accept it
-    // rather than letting it fall through to GPT-5.5.
+    // rather than letting it fall through to the default.
     addEffortAliases("astra", GPT_6_ASTRA_MODEL, GPT_6_ASTRA_EFFORTS);
-    addEffortAliases("astra-aeon", GPT_6_ASTRA_AEON_MODEL, GPT_6_ASTRA_EFFORTS);
+    // `astra-aeon` was only ever a leaked slug and is retired now, so the name
+    // resolves to the flagship it was a variant of. Its `gpt-6-astra-aeon`
+    // form comes from the retired table, not from a dedicated registration.
+    addEffortAliases("astra-aeon", GPT_6_ASTRA_MODEL, GPT_6_ASTRA_EFFORTS);
     // No bare `sol`/`luna` aliases: those names already mean the 5.6 tiers to
     // anyone who used them before 2026-09-22, and re-pointing them would swap a
     // user's model generation without asking.
     addEffortAliases(GPT_6_SOL_MODEL, GPT_6_SOL_MODEL, GPT_6_SOL_EFFORTS);
     addEffortAliases(GPT_6_LUNA_MODEL, GPT_6_LUNA_MODEL, GPT_6_LUNA_EFFORTS);
+    addEffortAliases(GPT_6_1_SOL_MODEL, GPT_6_1_SOL_MODEL, GPT_6_1_SOL_EFFORTS);
+    addEffortAliases(GPT_6_1_FLAGSHIP_ALIAS, GPT_6_1_SOL_MODEL, GPT_6_1_SOL_EFFORTS);
 }
 function addDaybreakAliases() {
     addEffortAliases(DAYBREAK_BLUE_MODEL, DAYBREAK_BLUE_MODEL, DAYBREAK_EFFORTS);
@@ -387,14 +402,12 @@ function addDaybreakAliases() {
     addEffortAliases("daybreak-red", DAYBREAK_RED_MODEL, DAYBREAK_EFFORTS);
 }
 function addGeneralAliases() {
-    addReasoningAliases(GPT_5_5_CANONICAL_MODEL, GPT_5_5_CANONICAL_MODEL);
-    addReasoningAliases(GPT_5_5_RELEASE_MODEL, GPT_5_5_CANONICAL_MODEL);
-    addReasoningAliases(GPT_5_5_RELEASE_COMPAT_MODEL, GPT_5_5_CANONICAL_MODEL);
-    addReasoningAliases(GPT_5_5_PRO_CANONICAL_MODEL, GPT_5_5_PRO_CANONICAL_MODEL);
-    addReasoningAliases(GPT_5_5_PRO_RELEASE_MODEL, GPT_5_5_PRO_CANONICAL_MODEL);
-    addReasoningAliases(GPT_5_5_PRO_RELEASE_COMPAT_MODEL, GPT_5_5_PRO_CANONICAL_MODEL);
-    addReasoningAliases("gpt-5-pro", GPT_5_5_PRO_CANONICAL_MODEL);
-    addReasoningAliases("gpt-5", DEFAULT_MODEL);
+    // `gpt-5` and `gpt-5-pro` are the last un-versioned ids upstream published.
+    // With 5.5 retired, "the gpt-5 line" is Sol 5.6 and "the pro tier" is the
+    // Astra flagship that replaced the API-only `gpt-5.5-pro`. The dated and
+    // pro-suffixed forms of 5.5 itself come from the retired table below.
+    addReasoningAliases("gpt-5-pro", GPT_6_ASTRA_MODEL);
+    addReasoningAliases("gpt-5", GPT_5_6_SOL_MODEL);
 }
 /**
  * Retired general ids, each kept as an alias of the replacement OpenAI names
@@ -405,12 +418,27 @@ function addGeneralAliases() {
  * efforts the replacement does not accept are coerced as for any request.
  */
 const RETIRED_GENERAL_MODEL_REPLACEMENTS = {
+    // `gpt-6-astra-aeon` never appeared in the bundled Codex catalog or the
+    // public model docs — it existed only as a Statsig-flag leak — so the id
+    // is dead and goes to the flagship it was a long-horizon variant of.
+    "gpt-6-astra-aeon": GPT_6_ASTRA_MODEL,
+    // `gpt-5.5` leaves ChatGPT/Codex OAuth on 2026-10-14; the bundled catalog
+    // already relabels it "legacy" and names GPT-6 Sol as the migration
+    // target. `gpt-5.5-pro` left the bundled catalog earlier — it is API-only
+    // now, a surface this OAuth wrapper cannot reach — so its ids go to the
+    // frontier flagship. The dated snapshot ids retire with them.
+    "gpt-5.5": GPT_6_SOL_MODEL,
+    "gpt-5.5-2026-04-23": GPT_6_SOL_MODEL,
+    "gpt-5.5-20260423": GPT_6_SOL_MODEL,
+    "gpt-5.5-pro": GPT_6_ASTRA_MODEL,
+    "gpt-5.5-pro-2026-04-23": GPT_6_ASTRA_MODEL,
+    "gpt-5.5-pro-20260423": GPT_6_ASTRA_MODEL,
     "gpt-5.4": GPT_6_SOL_MODEL,
     "gpt-5.4-mini": GPT_6_LUNA_MODEL,
     "gpt-5.4-nano": GPT_6_LUNA_MODEL,
-    "gpt-5.4-pro": GPT_5_5_PRO_CANONICAL_MODEL,
+    "gpt-5.4-pro": GPT_6_ASTRA_MODEL,
     "gpt-5.2": GPT_5_6_SOL_MODEL,
-    "gpt-5.2-pro": GPT_5_5_PRO_CANONICAL_MODEL,
+    "gpt-5.2-pro": GPT_6_ASTRA_MODEL,
     "gpt-5.1": GPT_5_6_SOL_MODEL,
     "gpt-5-mini": GPT_5_6_TERRA_MODEL,
     "gpt-5-nano": GPT_5_6_LUNA_MODEL,
@@ -534,11 +562,17 @@ function resolveGpt6CatalogModel(modelId) {
     // never forms and it used to fall through to GPT-5.5 while still passing
     // capability-policy's catalog gate. Gate and resolver have to agree on the
     // same id or the policy store keys state a request never reads.
-    const isGpt6 = versionToken === "6" || tokens.includes("gpt6");
+    const gpt6Index = tokens.indexOf("gpt6");
+    const isGpt6 = versionToken === "6" || gpt6Index !== -1;
+    // A 6.1 minor shows up as the token after `6` (`gpt-6.1-sol`) or after
+    // `gpt6` (`gpt6.1-sol`); both forms have to land on the 6.1 generation,
+    // not on the 6.0 tier the trailing `sol`/`luna` tokens name.
+    const isGpt61 = (isGpt6 && gptIndex !== -1 && tokens[gptIndex + 2] === "1") ||
+        (gpt6Index !== -1 && tokens[gpt6Index + 1] === "1");
     // A bare `astra` token counts too. OpenAI's own launch material and every
     // picker label say "Astra" without the `gpt-6` prefix, so `Astra Pro` and
     // `astra-fast` reach this resolver with no version tokens at all; without
-    // this clause they miss every branch and land on GPT-5.5.
+    // this clause they miss every branch and land on the default.
     //
     // It is anchored, not a free-floating substring: an id that names a
     // DIFFERENT GPT major version does not get claimed for the frontier model
@@ -551,10 +585,18 @@ function resolveGpt6CatalogModel(modelId) {
     if ((!isGpt6 && !isAstra) || tokens.includes("codex")) {
         return undefined;
     }
+    // `aeon` was the leaked long-horizon Astra variant; retired, its ids run on
+    // the flagship. `astra` keeps its own canonical id because Astra is a
+    // behaviourally different model, not a rename of the Sol workhorse.
     if (tokens.includes("aeon"))
-        return GPT_6_ASTRA_AEON_MODEL;
+        return GPT_6_ASTRA_MODEL;
     if (isAstra)
         return GPT_6_ASTRA_MODEL;
+    // Every unrecognised 6.1 id resolves to the generation's only tier, Sol —
+    // the same in-minor flagship rule the 5.6 resolver applies, kept behind
+    // `astra` so `gpt-6.1-astra` names the frontier model it actually means.
+    if (isGpt61)
+        return GPT_6_1_SOL_MODEL;
     // Before Sol and Luna existed every non-Astra GPT-6 id fell to the line
     // below, so `gpt-6-luna` silently ran Astra at 100x Luna's price. `terra`
     // goes to Sol because there is no GPT-6 Terra and upstream migrates

package/dist/lib/request/request-transformer.d.ts

@@ -19,7 +19,7 @@ export { isHostSystemPrompt, filterHostSystemPromptsWithCachedPrompt, } from "./
  * diagnostics all agree on the same effective model.
  *
  * @param model - Original model name (e.g., "gpt-5-codex-low", "openai/gpt-5.3-codex")
- * @returns Normalized model name (e.g., "gpt-5.3-codex", "gpt-5.5", "gpt-5.4")
+ * @returns Normalized model name (e.g., "gpt-5.6-sol", "gpt-6.1-sol", "gpt-6-astra")
  */
 export declare function normalizeModel(model: string | undefined): string;
 /**

package/dist/lib/request/request-transformer.js

@@ -15,7 +15,7 @@ export { isHostSystemPrompt, filterHostSystemPromptsWithCachedPrompt, } from "./
  * diagnostics all agree on the same effective model.
  *
  * @param model - Original model name (e.g., "gpt-5-codex-low", "openai/gpt-5.3-codex")
- * @returns Normalized model name (e.g., "gpt-5.3-codex", "gpt-5.5", "gpt-5.4")
+ * @returns Normalized model name (e.g., "gpt-5.6-sol", "gpt-6.1-sol", "gpt-6-astra")
  */
 export function normalizeModel(model) {
     return resolveNormalizedModel(model);

package/dist/lib/runtime/model-discovery-status.d.ts

@@ -23,8 +23,8 @@ declare const schema: z.ZodObject<{
                 model: z.ZodString;
                 checkedAt: z.ZodOptional<z.ZodNumber>;
                 probes: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodEnum<{
-                    verified: "verified";
                     unsupported: "unsupported";
+                    verified: "verified";
                     unverified: "unverified";
                     downgraded: "downgraded";
                 }>>>;
@@ -51,8 +51,8 @@ declare const schema: z.ZodObject<{
             model: z.ZodString;
             checkedAt: z.ZodOptional<z.ZodNumber>;
             probes: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodEnum<{
-                verified: "verified";
                 unsupported: "unsupported";
+                verified: "verified";
                 unverified: "unverified";
                 downgraded: "downgraded";
             }>>>;

package/dist/lib/ui/ui-copy.d.ts

@@ -94,7 +94,7 @@ export declare const UI_COPY: {
         readonly experimentalHelpMenu: "Enter Select | 1 Sync | 2 Backup | 3 Guard | 4 Budget | [ - Down | ] + Up | S Save | Q Back";
         readonly experimentalHelpPreview: "Enter Select | A Apply | Q Back";
         readonly experimentalHelpStatus: "Enter Select | Q Back";
-        readonly experimentalSync: "Sync Accounts to oc-chatgpt-multi-auth";
+        readonly experimentalSync: "Sync Accounts to oc-codex-multi-auth";
         readonly experimentalApplySync: "Apply Sync";
         readonly experimentalBackup: "Save Pool Backup";
         readonly experimentalBackupPrompt: "Backup file name (.json): ";

package/dist/lib/ui/ui-copy.js

@@ -95,7 +95,7 @@ export const UI_COPY = {
         experimentalHelpMenu: "Enter Select | 1 Sync | 2 Backup | 3 Guard | 4 Budget | [ - Down | ] + Up | S Save | Q Back",
         experimentalHelpPreview: "Enter Select | A Apply | Q Back",
         experimentalHelpStatus: "Enter Select | Q Back",
-        experimentalSync: "Sync Accounts to oc-chatgpt-multi-auth",
+        experimentalSync: "Sync Accounts to oc-codex-multi-auth",
         experimentalApplySync: "Apply Sync",
         experimentalBackup: "Save Pool Backup",
         experimentalBackupPrompt: "Backup file name (.json): ",

package/dist/lib/usage/pricing.d.ts

@@ -51,7 +51,7 @@ export declare const SHORT_CONTEXT_MAX_INPUT_TOKENS = 272000;
  * `test/usage-pricing-coverage.test.ts` fails if a NEW routable model appears
  * in neither list.
  */
-export declare const UNPRICED_ROUTABLE_MODELS: readonly ["gpt-6-astra-aeon", "gpt-daybreak-blue-latest", "gpt-daybreak-red-latest", "gpt-5.5-pro"];
+export declare const UNPRICED_ROUTABLE_MODELS: readonly ["gpt-daybreak-blue-latest", "gpt-daybreak-red-latest"];
 export declare function getUsageModelPricing(model: string | null | undefined): UsageModelPricing | null;
 export declare function estimateUsageCostUsd(model: string | null | undefined, tokens: UsageTokenCounts): number | null;
 export declare function listUsageModelPricing(): Record<string, UsageModelPricing>;

package/dist/lib/usage/pricing.js

@@ -1,4 +1,4 @@
-import { RETIRED_MODEL_REPLACEMENTS } from "../request/helpers/model-map.js";
+import { getNormalizedModel, 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
@@ -48,6 +48,37 @@ const MODEL_PRICING = {
             },
         },
     },
+    // GPT-6.1 Sol, published with the model on 2026-09-29: same $2 / $10 shape
+    // as 6 Sol but a cheaper cached-input rate ($0.10 vs $0.20) and a separate
+    // cache-write rate this table has no field for — cache writes bill as input
+    // here. Long-context (>272K input) doubles input and cache rates and
+    // multiplies output 1.5x; the Fast tier is the usual 2x.
+    "gpt-6.1-sol": {
+        inputUsdPerMillion: 2,
+        outputUsdPerMillion: 10,
+        cachedInputUsdPerMillion: 0.1,
+        reasoningUsdPerMillion: 10,
+        longContext: {
+            inputUsdPerMillion: 4,
+            outputUsdPerMillion: 15,
+            cachedInputUsdPerMillion: 0.2,
+            reasoningUsdPerMillion: 15,
+        },
+        serviceTiers: {
+            priority: {
+                inputUsdPerMillion: 4,
+                outputUsdPerMillion: 20,
+                cachedInputUsdPerMillion: 0.2,
+                reasoningUsdPerMillion: 20,
+                longContext: {
+                    inputUsdPerMillion: 8,
+                    outputUsdPerMillion: 30,
+                    cachedInputUsdPerMillion: 0.4,
+                    reasoningUsdPerMillion: 30,
+                },
+            },
+        },
+    },
     // 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.
@@ -103,12 +134,6 @@ const MODEL_PRICING = {
             },
         },
     },
-    "gpt-5.5": {
-        inputUsdPerMillion: 2,
-        outputUsdPerMillion: 12,
-        cachedInputUsdPerMillion: 0.2,
-        reasoningUsdPerMillion: 12,
-    },
     "gpt-5.6-sol": {
         inputUsdPerMillion: 5,
         outputUsdPerMillion: 30,
@@ -143,16 +168,10 @@ const MODEL_PRICING = {
  * in neither list.
  */
 export const UNPRICED_ROUTABLE_MODELS = [
-    // OpenAI published a rate for the Astra flagship at launch but not for the
-    // long-horizon `aeon` variant, and the Daybreak cyber models are sold under
-    // a separate controlled-access agreement with no public per-token rate.
-    // Pricing `aeon` off the flagship would be a guess on the model whose whole
-    // purpose is running for days, which is exactly where a wrong rate does the
-    // most damage.
-    "gpt-6-astra-aeon",
+    // The Daybreak cyber models are sold under a separate controlled-access
+    // agreement with no public per-token rate.
     "gpt-daybreak-blue-latest",
     "gpt-daybreak-red-latest",
-    "gpt-5.5-pro",
 ];
 function normalizeModelName(model) {
     const trimmed = model?.trim().toLowerCase();
@@ -179,7 +198,13 @@ export function getUsageModelPricing(model) {
     // the ledger stores `costUsd` when a row is written and never re-prices it.
     const effective = !/^(api|zdr)\//.test(model ?? "") && Object.hasOwn(RETIRED_MODEL_REPLACEMENTS, normalized)
         ? RETIRED_MODEL_REPLACEMENTS[normalized]
-        : normalized;
+        : // Bare aliases (`gpt-6.1`, `gpt-6`, `gpt-5.6`, `astra`) and
+            // effort-suffixed ids (`gpt-6.1-sol-max`) reach the ledger raw too;
+            // `getNormalizedModel` is the exact/alias-only resolver — NOT
+            // `resolveNormalizedModel`, which hands back DEFAULT_MODEL for
+            // anything unrecognized and would price an unknown model at the
+            // default's rate.
+            (getNormalizedModel(normalized) ?? normalized);
     if (!effective || !Object.hasOwn(MODEL_PRICING, effective)) {
         return null;
     }

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "codex-multi-auth",
-	"version": "2.17.3",
+	"version": "2.18.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",