From 4275c9288f7500eac967c83d44e88fcae44c558d Mon Sep 17 00:00:00 2001
From: Hannes Rudolph <hrudolph@gmail.com>
Date: Fri, 9 Jan 2026 19:46:28 -0700
Subject: [PATCH] fix(codex): address review feedback and lint errors

- Fix oauthFileTooLarge error being masked by oauthReadFailed catch path
- Remove empty if (parsed.response?.service_tier) {} block in SSE parser
- Remove unused shouldShowMinimalOption helper from ThinkingBudget
- modelIdKeysByProvider mapping confirmed correct (uses apiModelId)
---
 src/api/providers/openai-native-codex.ts      | 19 +++++++++++--------
 .../components/settings/ThinkingBudget.tsx    | 18 ------------------
 2 files changed, 11 insertions(+), 26 deletions(-)

diff --git a/src/api/providers/openai-native-codex.ts b/src/api/providers/openai-native-codex.ts
index 8f613e2a62..f99ae7ce89 100644
--- a/src/api/providers/openai-native-codex.ts
+++ b/src/api/providers/openai-native-codex.ts
@@ -73,8 +73,8 @@ export class OpenAiNativeCodexHandler extends BaseProvider {
 	constructor(options: ApiHandlerOptions) {
 		super()
 		this.options = options
-		if (this.options.enableGpt5ReasoningSummary === undefined) {
-			this.options.enableGpt5ReasoningSummary = true
+		if (this.options.enableResponsesReasoningSummary === undefined) {
+			this.options.enableResponsesReasoningSummary = true
 		}
 
 		// Credentials are resolved lazily via ensureAuthenticated() on first use.
@@ -100,13 +100,14 @@ export class OpenAiNativeCodexHandler extends BaseProvider {
 		const cacheReadTokens =
 			usage.cache_read_input_tokens ?? usage.cache_read_tokens ?? usage.cached_tokens ?? cachedFromDetails ?? 0
 
-		const totalCost = calculateApiCostOpenAI(
+		const costResult = calculateApiCostOpenAI(
 			model.info,
 			totalInputTokens,
 			totalOutputTokens,
 			cacheWriteTokens,
 			cacheReadTokens,
 		)
+		const totalCost = costResult.totalCost
 
 		const reasoningTokens =
 			typeof usage.output_tokens_details?.reasoning_tokens === "number"
@@ -149,6 +150,10 @@ export class OpenAiNativeCodexHandler extends BaseProvider {
 				)
 			}
 		} catch (e: any) {
+			// Re-throw if already a localized error (e.g., oauthFileTooLarge)
+			if (e instanceof Error && e.message.includes("oauthFileTooLarge")) {
+				throw e
+			}
 			// Surface read failure with localized error (e.g., file missing or inaccessible)
 			const base = t("common:errors.openaiNativeCodex.oauthReadFailed", {
 				path: resolvedPath,
@@ -361,7 +366,7 @@ export class OpenAiNativeCodexHandler extends BaseProvider {
 			...(effectiveEffort && {
 				reasoning: {
 					effort: effectiveEffort,
-					...(this.options.enableGpt5ReasoningSummary ? { summary: "auto" as const } : {}),
+					...(this.options.enableResponsesReasoningSummary ? { summary: "auto" as const } : {}),
 				},
 			}),
 			// ChatGPT codex/responses does not support previous_response_id (stateless).
@@ -388,7 +393,8 @@ export class OpenAiNativeCodexHandler extends BaseProvider {
 		try {
 			const timeoutMs = getApiRequestTimeout()
 			const controller = new AbortController()
-			timeoutId = timeoutMs > 0 ? setTimeout(() => controller.abort(), timeoutMs) : undefined
+			timeoutId =
+				timeoutMs !== undefined && timeoutMs > 0 ? setTimeout(() => controller.abort(), timeoutMs) : undefined
 			const response = await fetch(url, {
 				method: "POST",
 				headers,
@@ -451,9 +457,6 @@ export class OpenAiNativeCodexHandler extends BaseProvider {
 								}
 								try {
 									const parsed = JSON.parse(data)
-									// Persist tier when available (parity with openai-native)
-									if (parsed.response?.service_tier) {
-									}
 									// Minimal content extraction similar to OpenAI Responses
 									if (parsed?.type === "response.text.delta" && parsed?.delta) {
 										hasContent = true
diff --git a/webview-ui/src/components/settings/ThinkingBudget.tsx b/webview-ui/src/components/settings/ThinkingBudget.tsx
index 65bb57c9c9..7b5e7d245d 100644
--- a/webview-ui/src/components/settings/ThinkingBudget.tsx
+++ b/webview-ui/src/components/settings/ThinkingBudget.tsx
@@ -62,24 +62,6 @@ interface ThinkingBudgetProps {
 	modelInfo?: ModelInfo
 }
 
-// Helper function to determine if minimal option should be shown
-const shouldShowMinimalOption = (
-	provider: string | undefined,
-	modelId: string | undefined,
-	supportsEffort: boolean | undefined,
-): boolean => {
-	// Keep existing behavior for native OpenAI provider
-	const isGpt5Native = provider === "openai-native" && modelId?.startsWith("gpt-5")
-
-	// For ChatGPT Codex provider, only expose "minimal" for the regular gpt-5 model,
-	// not for the "gpt-5-codex" variant
-	const isGpt5CodexRegular = provider === "openai-native-codex" && modelId === "gpt-5"
-
-	const isOpenRouterWithEffort = provider === "openrouter" && supportsEffort === true
-
-	return !!(isGpt5Native || isGpt5CodexRegular || isOpenRouterWithEffort)
-}
-
 export const ThinkingBudget = ({ apiConfiguration, setApiConfigurationField, modelInfo }: ThinkingBudgetProps) => {
 	const { t } = useAppTranslation()
 	const { id: selectedModelId } = useSelectedModel(apiConfiguration)