From 2114a4b96e1b78e8e4f5a00bd29a866cd147348e Mon Sep 17 00:00:00 2001
From: Tam Nhu Tran <kaitran.ntt@gmail.com>
Date: Wed, 18 Mar 2026 11:56:54 -0400
Subject: [PATCH] fix(ui): sync codex model catalog defaults

---
 ui/src/lib/model-catalogs.ts | 100 +++++++++++++++++++++++++----------
 1 file changed, 71 insertions(+), 29 deletions(-)

diff --git a/ui/src/lib/model-catalogs.ts b/ui/src/lib/model-catalogs.ts
index 9ecabf72..9e711d72 100644
--- a/ui/src/lib/model-catalogs.ts
+++ b/ui/src/lib/model-catalogs.ts
@@ -111,45 +111,56 @@ export const MODEL_CATALOGS: Record<string, ProviderCatalog> = {
   codex: {
     provider: 'codex',
     displayName: 'Codex',
-    defaultModel: 'gpt-5.3-codex',
+    defaultModel: 'gpt-5-codex',
     models: [
       {
-        id: 'gpt-5.3-codex',
-        name: 'GPT-5.3 Codex',
-        description: 'Supports up to xhigh effort',
+        id: 'gpt-5-codex',
+        name: 'GPT-5 Codex',
+        description: 'Cross-plan safe Codex default',
         presetMapping: {
-          default: 'gpt-5.3-codex',
-          opus: 'gpt-5.3-codex',
-          sonnet: 'gpt-5.3-codex',
-          haiku: 'gpt-5.1-codex-mini',
+          default: 'gpt-5-codex',
+          opus: 'gpt-5-codex',
+          sonnet: 'gpt-5-codex',
+          haiku: 'gpt-5-codex-mini',
         },
       },
       {
-        id: 'gpt-5.2-codex',
-        name: 'GPT-5.2 Codex',
-        description: 'Previous stable Codex model',
+        id: 'gpt-5-codex-mini',
+        name: 'GPT-5 Codex Mini',
+        description: 'Faster and cheaper Codex option',
         presetMapping: {
-          default: 'gpt-5.2-codex',
-          opus: 'gpt-5.2-codex',
-          sonnet: 'gpt-5.2-codex',
-          haiku: 'gpt-5.1-codex-mini',
+          default: 'gpt-5-codex-mini',
+          opus: 'gpt-5-codex',
+          sonnet: 'gpt-5-codex',
+          haiku: 'gpt-5-codex-mini',
         },
       },
       {
         id: 'gpt-5-mini',
         name: 'GPT-5 Mini',
-        description: 'Fast, capped at high effort (no xhigh)',
+        description: 'Legacy mini model ID kept for backwards compatibility',
         presetMapping: {
           default: 'gpt-5-mini',
-          opus: 'gpt-5.3-codex',
+          opus: 'gpt-5-codex',
           sonnet: 'gpt-5-mini',
           haiku: 'gpt-5-mini',
         },
       },
+      {
+        id: 'gpt-5.1-codex-mini',
+        name: 'GPT-5.1 Codex Mini',
+        description: 'Legacy fast Codex mini model',
+        presetMapping: {
+          default: 'gpt-5.1-codex-mini',
+          opus: 'gpt-5.1-codex-max',
+          sonnet: 'gpt-5.1-codex-max',
+          haiku: 'gpt-5.1-codex-mini',
+        },
+      },
       {
         id: 'gpt-5.1-codex-max',
-        name: 'Codex Max (5.1)',
-        description: 'Legacy most capable Codex model',
+        name: 'GPT-5.1 Codex Max',
+        description: 'Higher-effort Codex model with xhigh support',
         presetMapping: {
           default: 'gpt-5.1-codex-max',
           opus: 'gpt-5.1-codex-max',
@@ -158,20 +169,51 @@ export const MODEL_CATALOGS: Record<string, ProviderCatalog> = {
         },
       },
       {
-        id: 'gpt-5.2',
-        name: 'GPT 5.2',
-        description: 'Latest GPT model',
+        id: 'gpt-5.2-codex',
+        name: 'GPT-5.2 Codex',
+        description: 'Cross-plan Codex model with xhigh support',
         presetMapping: {
-          default: 'gpt-5.2',
-          opus: 'gpt-5.2',
-          sonnet: 'gpt-5.2',
-          haiku: 'gpt-5.2',
+          default: 'gpt-5.2-codex',
+          opus: 'gpt-5.2-codex',
+          sonnet: 'gpt-5.2-codex',
+          haiku: 'gpt-5-codex-mini',
         },
       },
       {
-        id: 'gpt-5.1-codex-mini',
-        name: 'Codex Mini',
-        description: 'Fast and efficient Codex model',
+        id: 'gpt-5.3-codex',
+        name: 'GPT-5.3 Codex',
+        tier: 'paid',
+        description: 'Paid Codex plans only',
+        presetMapping: {
+          default: 'gpt-5.3-codex',
+          opus: 'gpt-5.3-codex',
+          sonnet: 'gpt-5.3-codex',
+          haiku: 'gpt-5-codex-mini',
+        },
+      },
+      {
+        id: 'gpt-5.3-codex-spark',
+        name: 'GPT-5.3 Codex Spark',
+        tier: 'paid',
+        description: 'Paid Codex plans only, ultra-fast coding model',
+        presetMapping: {
+          default: 'gpt-5.3-codex-spark',
+          opus: 'gpt-5.3-codex',
+          sonnet: 'gpt-5.3-codex',
+          haiku: 'gpt-5-codex-mini',
+        },
+      },
+      {
+        id: 'gpt-5.4',
+        name: 'GPT-5.4',
+        tier: 'paid',
+        description: 'Paid Codex plans only, latest GPT-5 family model',
+        presetMapping: {
+          default: 'gpt-5.4',
+          opus: 'gpt-5.4',
+          sonnet: 'gpt-5.4',
+          haiku: 'gpt-5-codex-mini',
+        },
       },
     ],
   },