From 58cfc330f966a81df6e518ef5a3b6bbf8cdced60 Mon Sep 17 00:00:00 2001
From: SSU-WEI HUANG <stanley.yellow1@gmail.com>
Date: Sat, 11 Jul 2026 10:41:49 +0800
Subject: [PATCH] fix(web): show standard for untouched Codex service tier
 (#1010)

---
 .../components/AssistantChat/HappyComposer.tsx | 10 ++++++----
 .../AssistantChat/codexFastMode.test.ts        | 18 +++++++++++++++++-
 .../components/AssistantChat/codexFastMode.ts  |  9 +++++++++
 3 files changed, 32 insertions(+), 5 deletions(-)

diff --git a/web/src/components/AssistantChat/HappyComposer.tsx b/web/src/components/AssistantChat/HappyComposer.tsx
index e2639d2a..70b1f086 100644
--- a/web/src/components/AssistantChat/HappyComposer.tsx
+++ b/web/src/components/AssistantChat/HappyComposer.tsx
@@ -35,6 +35,7 @@ import { useTranslation } from '@/lib/use-translation'
 import { getModelOptionsForFlavor, getNextModelForFlavor } from './modelOptions'
 import { getClaudeComposerEffortOptions } from './claudeEffortOptions'
 import { getCodexComposerReasoningEffortOptions } from './codexReasoningEffortOptions'
+import { getDisplayedCodexServiceTier } from './codexFastMode'
 import { getPiThinkingLevelOptions, getHighestThinkingLevel, isThinkingLevelSupported } from './piThinkingLevelOptions'
 import { groupModelsByProvider } from './piModelGroups'
 import { PiModelPanel } from './PiModelPanel'
@@ -259,6 +260,7 @@ export function HappyComposer(props: {
     const modelReasoningEffort = rawModelReasoningEffort ?? null
     const effort = rawEffort ?? null
     const serviceTier = rawServiceTier ?? null
+    const displayedServiceTier = getDisplayedCodexServiceTier(serviceTier)
 
     const api = useAssistantApi()
     const { composerEnterBehavior } = useComposerEnterBehavior()
@@ -1159,16 +1161,16 @@ export function HappyComposer(props: {
                                     >
                                         <div
                                             className={`flex h-4 w-4 items-center justify-center rounded-full border-2 ${
-                                                serviceTier === option.value
+                                                displayedServiceTier === option.value
                                                     ? 'border-[var(--app-link)]'
                                                     : 'border-[var(--app-hint)]'
                                             }`}
                                         >
-                                            {serviceTier === option.value && (
+                                            {displayedServiceTier === option.value && (
                                                 <div className="h-2 w-2 rounded-full bg-[var(--app-link)]" />
                                             )}
                                         </div>
-                                        <span className={serviceTier === option.value ? 'text-[var(--app-link)]' : ''}>
+                                        <span className={displayedServiceTier === option.value ? 'text-[var(--app-link)]' : ''}>
                                             {option.label}
                                         </span>
                                     </button>
@@ -1225,7 +1227,7 @@ export function HappyComposer(props: {
         model,
         modelReasoningEffort,
         effort,
-        serviceTier,
+        displayedServiceTier,
         collaborationModeOptions,
         permissionModeOptions,
         handleCollaborationChange,
diff --git a/web/src/components/AssistantChat/codexFastMode.test.ts b/web/src/components/AssistantChat/codexFastMode.test.ts
index 88baf15f..f7f661bf 100644
--- a/web/src/components/AssistantChat/codexFastMode.test.ts
+++ b/web/src/components/AssistantChat/codexFastMode.test.ts
@@ -1,5 +1,9 @@
 import { describe, expect, it } from 'vitest'
-import { codexModelAdvertisesFastTier, isFastServiceTier } from './codexFastMode'
+import {
+    codexModelAdvertisesFastTier,
+    getDisplayedCodexServiceTier,
+    isFastServiceTier
+} from './codexFastMode'
 
 // Mirrors the real Codex catalog: the Fast tier's id is 'priority' and its
 // display name is 'Fast', so the CLI captures both as lowercased tokens
@@ -49,3 +53,15 @@ describe('isFastServiceTier', () => {
         expect(isFastServiceTier('standard')).toBe(false)
     })
 })
+
+describe('getDisplayedCodexServiceTier', () => {
+    it('displays untouched and explicit non-fast tiers as standard', () => {
+        expect(getDisplayedCodexServiceTier(null)).toBe('standard')
+        expect(getDisplayedCodexServiceTier(undefined)).toBe('standard')
+        expect(getDisplayedCodexServiceTier('standard')).toBe('standard')
+    })
+
+    it('preserves the fast selection', () => {
+        expect(getDisplayedCodexServiceTier('fast')).toBe('fast')
+    })
+})
diff --git a/web/src/components/AssistantChat/codexFastMode.ts b/web/src/components/AssistantChat/codexFastMode.ts
index 7d467d69..7b859990 100644
--- a/web/src/components/AssistantChat/codexFastMode.ts
+++ b/web/src/components/AssistantChat/codexFastMode.ts
@@ -49,3 +49,12 @@ export function codexModelAdvertisesFastTier(
 export function isFastServiceTier(serviceTier?: string | null): boolean {
     return serviceTier?.trim().toLowerCase() === 'fast'
 }
+
+/**
+ * The persisted null tier means the user has not chosen an override. The
+ * current two-option control still needs a visible selection, so display that
+ * untouched state as Standard without changing the value sent to the backend.
+ */
+export function getDisplayedCodexServiceTier(serviceTier?: string | null): 'standard' | 'fast' {
+    return isFastServiceTier(serviceTier) ? 'fast' : 'standard'
+}