fix(cliproxy): align codex defaults with gpt-5.4

src/cliproxy/codex-plan-compatibility.ts

@@ -1,5 +1,6 @@
 import { getDefaultAccount } from './account-manager';
 import { getProviderCatalog } from './model-catalog';
+import { normalizeModelIdForProvider } from './model-id-normalizer';
 import { fetchCodexQuota } from './quota-fetcher-codex';
 import { getCachedQuota, setCachedQuota } from './quota-response-cache';
 import type { CodexQuotaResult } from './quota-types';
@@ -7,8 +8,8 @@ import { info, warn } from '../utils/ui';
 
 export type CodexPlanType = CodexQuotaResult['planType'];
 
-const FREE_SAFE_DEFAULT_MODEL = 'gpt-5-codex';
-const FREE_SAFE_FAST_MODEL = 'gpt-5-codex-mini';
+const FREE_SAFE_DEFAULT_MODEL = 'gpt-5.4';
+const FREE_SAFE_FAST_MODEL = 'gpt-5.4-mini';
 const CODEX_EFFORT_SUFFIX_REGEX = /-(xhigh|high|medium)$/i;
 const CODEX_PAREN_SUFFIX_REGEX = /\((xhigh|high|medium)\)$/i;
 const EXTENDED_CONTEXT_SUFFIX_REGEX = /\[1m\]$/i;
@@ -19,7 +20,6 @@ const KNOWN_CODEX_MODELS = new Set(
 const FREE_PLAN_FALLBACKS = new Map<string, string>([
   ['gpt-5.3-codex', FREE_SAFE_DEFAULT_MODEL],
   ['gpt-5.3-codex-spark', FREE_SAFE_FAST_MODEL],
-  ['gpt-5.4', FREE_SAFE_DEFAULT_MODEL],
 ]);
 
 export interface CodexRuntimeFallbackModelMap {
@@ -52,13 +52,13 @@ function isKnownCodexModel(model: string): boolean {
 }
 
 export function normalizeCodexModelId(model: string): string {
-  return model
+  const stripped = model
     .trim()
     .replace(EXTENDED_CONTEXT_SUFFIX_REGEX, '')
     .replace(CODEX_PAREN_SUFFIX_REGEX, '')
     .replace(CODEX_EFFORT_SUFFIX_REGEX, '')
-    .trim()
-    .toLowerCase();
+    .trim();
+  return normalizeModelIdForProvider(stripped, 'codex').trim().toLowerCase();
 }
 
 export function getDefaultCodexModel(): string {

src/cliproxy/model-catalog.ts

@@ -186,56 +186,12 @@ export const MODEL_CATALOG: Partial<Record<CLIProxyProvider, ProviderCatalog>> =
   codex: {
     provider: 'codex',
     displayName: 'Copilot Codex',
-    defaultModel: 'gpt-5-codex',
+    defaultModel: 'gpt-5.4',
     models: [
       {
-        id: 'gpt-5-codex',
-        name: 'GPT-5 Codex',
-        description: 'Cross-plan safe Codex default',
-        thinking: {
-          type: 'levels',
-          levels: ['low', 'medium', 'high'],
-          maxLevel: 'high',
-          dynamicAllowed: false,
-        },
-      },
-      {
-        id: 'gpt-5-codex-mini',
-        name: 'GPT-5 Codex Mini',
-        description: 'Faster and cheaper Codex option',
-        thinking: {
-          type: 'levels',
-          levels: ['low', 'medium', 'high'],
-          maxLevel: 'high',
-          dynamicAllowed: false,
-        },
-      },
-      {
-        id: 'gpt-5-mini',
-        name: 'GPT-5 Mini',
-        description: 'Legacy mini model ID kept for backwards compatibility',
-        thinking: {
-          type: 'levels',
-          levels: ['low', 'medium', 'high'],
-          maxLevel: 'high',
-          dynamicAllowed: false,
-        },
-      },
-      {
-        id: 'gpt-5.1-codex-mini',
-        name: 'GPT-5.1 Codex Mini',
-        description: 'Legacy fast Codex mini model',
-        thinking: {
-          type: 'levels',
-          levels: ['low', 'medium', 'high'],
-          maxLevel: 'high',
-          dynamicAllowed: false,
-        },
-      },
-      {
-        id: 'gpt-5.1-codex-max',
-        name: 'GPT-5.1 Codex Max',
-        description: 'Higher-effort Codex model with xhigh support',
+        id: 'gpt-5.4',
+        name: 'GPT-5.4',
+        description: 'Recommended Codex default for most coding and agentic tasks',
         thinking: {
           type: 'levels',
           levels: ['low', 'medium', 'high', 'xhigh'],
@@ -244,13 +200,13 @@ export const MODEL_CATALOG: Partial<Record<CLIProxyProvider, ProviderCatalog>> =
         },
       },
       {
-        id: 'gpt-5.2-codex',
-        name: 'GPT-5.2 Codex',
-        description: 'Cross-plan Codex model with xhigh support',
+        id: 'gpt-5.4-mini',
+        name: 'GPT-5.4 Mini',
+        description: 'Fast, lower-cost Codex option for lighter tasks and haiku-tier routing',
         thinking: {
           type: 'levels',
-          levels: ['low', 'medium', 'high', 'xhigh'],
-          maxLevel: 'xhigh',
+          levels: ['low', 'medium', 'high'],
+          maxLevel: 'high',
           dynamicAllowed: false,
         },
       },
@@ -258,7 +214,7 @@ export const MODEL_CATALOG: Partial<Record<CLIProxyProvider, ProviderCatalog>> =
         id: 'gpt-5.3-codex',
         name: 'GPT-5.3 Codex',
         tier: 'pro',
-        description: 'Paid Codex plans only',
+        description: 'Previous flagship coding model whose capabilities now power GPT-5.4',
         thinking: {
           type: 'levels',
           levels: ['low', 'medium', 'high', 'xhigh'],
@@ -270,7 +226,8 @@ export const MODEL_CATALOG: Partial<Record<CLIProxyProvider, ProviderCatalog>> =
         id: 'gpt-5.3-codex-spark',
         name: 'GPT-5.3 Codex Spark',
         tier: 'pro',
-        description: 'Paid Codex plans only, ultra-fast coding model',
+        description:
+          'Research preview model for ChatGPT Pro subscribers, optimized for near-instant coding iteration',
         thinking: {
           type: 'levels',
           levels: ['low', 'medium', 'high', 'xhigh'],
@@ -279,10 +236,9 @@ export const MODEL_CATALOG: Partial<Record<CLIProxyProvider, ProviderCatalog>> =
         },
       },
       {
-        id: 'gpt-5.4',
-        name: 'GPT-5.4',
-        tier: 'pro',
-        description: 'Paid Codex plans only, latest GPT-5 family model',
+        id: 'gpt-5.2',
+        name: 'GPT-5.2',
+        description: 'Previous general-purpose Codex model',
         thinking: {
           type: 'levels',
           levels: ['low', 'medium', 'high', 'xhigh'],

src/cliproxy/model-id-normalizer.ts

@@ -27,6 +27,16 @@ const DENIED_ANTIGRAVITY_SONNET_45_REGEX =
   /claude-sonnet-4(?:[.-])5(?:-thinking)?(?=(?:$|[^a-z0-9]))/gi;
 const CANONICAL_ANTIGRAVITY_OPUS_46_MODEL = 'claude-opus-4-6-thinking';
 const CODEX_EFFORT_SUFFIX_REGEX = /-(xhigh|high|medium)$/i;
+const CODEX_LEGACY_MODEL_ALIASES: Readonly<Record<string, string>> = Object.freeze({
+  'gpt-5-codex': 'gpt-5.4',
+  'gpt-5-codex-mini': 'gpt-5.4-mini',
+  'gpt-5-mini': 'gpt-5.4-mini',
+  'gpt-5.1-codex': 'gpt-5.2',
+  'gpt-5.1-codex-mini': 'gpt-5.4-mini',
+  'gpt-5.1-codex-max': 'gpt-5.4',
+  'gpt-5.2-codex': 'gpt-5.2',
+  'gpt-5.2-codex-mini': 'gpt-5.4-mini',
+});
 const IFLOW_LEGACY_MODEL_ALIASES: Readonly<Record<string, string>> = Object.freeze({
   'iflow-default': 'qwen3-coder-plus',
   'kimi-k2.5': 'kimi-k2',
@@ -92,6 +102,17 @@ export function stripCodexEffortSuffix(model: string): string {
   return model.replace(CODEX_EFFORT_SUFFIX_REGEX, '');
 }
 
+/** Normalize legacy Codex aliases to the current public Codex model IDs. */
+export function normalizeCodexLegacyModelAliases(model: string): string {
+  const trimmed = trimModelId(model);
+  const { baseModel, suffix } = splitBaseModelAndSuffix(trimmed);
+  const replacement = CODEX_LEGACY_MODEL_ALIASES[baseModel.trim().toLowerCase()];
+  if (!replacement) {
+    return trimmed;
+  }
+  return `${replacement}${suffix}`;
+}
+
 /**
  * Normalize known legacy iFlow model aliases to current upstream model IDs.
  * Preserves suffixes such as (budget) and [1m].
@@ -186,6 +207,9 @@ export function normalizeModelIdForProvider(model: string, provider: ProviderLik
   if (isIFlowProvider(provider)) {
     return normalizeIFlowLegacyModelAliases(trimmedModel);
   }
+  if (isCodexProvider(provider)) {
+    return normalizeCodexLegacyModelAliases(trimmedModel);
+  }
   if (!isAntigravityProvider(provider)) return trimmedModel;
   const normalizedDottedVersion = normalizeClaudeDottedMajorMinor(trimmedModel);
   return normalizeDeprecatedAntigravityModelAliases(normalizedDottedVersion);