refactor(api): centralize service tier keys

Author: WebMad

packages/types/src/__tests__/provider-settings.test.ts

@@ -1,5 +1,6 @@
 import {
 	getApiProtocol,
+	OPEN_AI_CODEX_SERVICE_TIER_KEY,
 	PROVIDER_SETTINGS_KEYS,
 	providerSettingsSchema,
 	providerSettingsSchemaDiscriminated,
@@ -12,12 +13,12 @@ describe("OpenAI Codex provider settings", () => {
 		const settings = {
 			apiProvider: providerIdentifiers.openaiCodex,
 			apiModelId: "gpt-5.6-sol",
-			openAiCodexServiceTier: OpenAiCodexServiceTier.Priority,
+			[OPEN_AI_CODEX_SERVICE_TIER_KEY]: OpenAiCodexServiceTier.Priority,
 		}
 
 		expect(providerSettingsSchema.parse(settings)).toEqual(settings)
 		expect(providerSettingsSchemaDiscriminated.parse(settings)).toEqual(settings)
-		expect(PROVIDER_SETTINGS_KEYS).toContain("openAiCodexServiceTier")
+		expect(PROVIDER_SETTINGS_KEYS).toContain(OPEN_AI_CODEX_SERVICE_TIER_KEY)
 	})
 
 	it.each([undefined, OpenAiCodexServiceTier.Default])(
@@ -26,7 +27,7 @@ describe("OpenAI Codex provider settings", () => {
 			const standardSettings = {
 				apiProvider: providerIdentifiers.openaiCodex,
 				apiModelId: "gpt-5.6-sol",
-				...(openAiCodexServiceTier ? { openAiCodexServiceTier } : {}),
+				...(openAiCodexServiceTier ? { [OPEN_AI_CODEX_SERVICE_TIER_KEY]: openAiCodexServiceTier } : {}),
 			}
 
 			expect(providerSettingsSchemaDiscriminated.parse(standardSettings)).toEqual(standardSettings)
@@ -38,7 +39,7 @@ describe("OpenAI Codex provider settings", () => {
 			providerSettingsSchemaDiscriminated.safeParse({
 				apiProvider: providerIdentifiers.openaiCodex,
 				apiModelId: "gpt-5.6-sol",
-				openAiCodexServiceTier: OpenAiServiceTier.Flex,
+				[OPEN_AI_CODEX_SERVICE_TIER_KEY]: OpenAiServiceTier.Flex,
 			}).success,
 		).toBe(false)
 	})

packages/types/src/model.ts

@@ -54,6 +54,9 @@ export const verbosityLevelsSchema = z.enum(verbosityLevels)
 
 export type VerbosityLevel = z.infer<typeof verbosityLevelsSchema>
 
+/** Serialized service tier field used in provider request payloads and responses. */
+export const SERVICE_TIER_KEY = "service_tier"
+
 /**
  * Service tiers for the public OpenAI Responses API.
  */

packages/types/src/provider-settings.ts

@@ -42,6 +42,7 @@ import {
  */
 
 export const DEFAULT_CONSECUTIVE_MISTAKE_LIMIT = 3
+export const OPEN_AI_CODEX_SERVICE_TIER_KEY = "openAiCodexServiceTier"
 
 /**
  * DynamicProvider
@@ -284,7 +285,9 @@ const geminiCliSchema = apiModelIdProviderModelSchema.extend({
 
 const openAiCodexSchema = apiModelIdProviderModelSchema.extend({
 	// Codex "Fast" mode maps to the Responses API priority service tier.
-	openAiCodexServiceTier: z.enum([OpenAiCodexServiceTier.Default, OpenAiCodexServiceTier.Priority]).optional(),
+	[OPEN_AI_CODEX_SERVICE_TIER_KEY]: z
+		.enum([OpenAiCodexServiceTier.Default, OpenAiCodexServiceTier.Priority])
+		.optional(),
 })
 
 const openAiNativeSchema = apiModelIdProviderModelSchema.extend({

src/api/providers/__tests__/bedrock.spec.ts

@@ -58,6 +58,7 @@ import {
 	BEDROCK_1M_CONTEXT_MODEL_IDS,
 	BEDROCK_SERVICE_TIER_MODEL_IDS,
 	bedrockModels,
+	SERVICE_TIER_KEY,
 	ApiProviderError,
 } from "@roo-code/types"
 
@@ -1233,10 +1234,10 @@ describe("AwsBedrockHandler", () => {
 				const commandArg = mockConverseStreamCommand.mock.calls[0][0] as any
 
 				// service_tier should be at the top level of the payload
-				expect(commandArg.service_tier).toBe("PRIORITY")
+				expect(commandArg[SERVICE_TIER_KEY]).toBe("PRIORITY")
 				// service_tier should NOT be in additionalModelRequestFields
 				if (commandArg.additionalModelRequestFields) {
-					expect(commandArg.additionalModelRequestFields.service_tier).toBeUndefined()
+					expect(commandArg.additionalModelRequestFields[SERVICE_TIER_KEY]).toBeUndefined()
 				}
 			})
 
@@ -1263,10 +1264,10 @@ describe("AwsBedrockHandler", () => {
 				const commandArg = mockConverseStreamCommand.mock.calls[0][0] as any
 
 				// service_tier should be at the top level of the payload
-				expect(commandArg.service_tier).toBe("FLEX")
+				expect(commandArg[SERVICE_TIER_KEY]).toBe("FLEX")
 				// service_tier should NOT be in additionalModelRequestFields
 				if (commandArg.additionalModelRequestFields) {
-					expect(commandArg.additionalModelRequestFields.service_tier).toBeUndefined()
+					expect(commandArg.additionalModelRequestFields[SERVICE_TIER_KEY]).toBeUndefined()
 				}
 			})
 
@@ -1294,9 +1295,9 @@ describe("AwsBedrockHandler", () => {
 				const commandArg = mockConverseStreamCommand.mock.calls[0][0] as any
 
 				// Service tier should NOT be included for unsupported models (at top level or in additionalModelRequestFields)
-				expect(commandArg.service_tier).toBeUndefined()
+				expect(commandArg[SERVICE_TIER_KEY]).toBeUndefined()
 				if (commandArg.additionalModelRequestFields) {
-					expect(commandArg.additionalModelRequestFields.service_tier).toBeUndefined()
+					expect(commandArg.additionalModelRequestFields[SERVICE_TIER_KEY]).toBeUndefined()
 				}
 			})
 
@@ -1323,9 +1324,9 @@ describe("AwsBedrockHandler", () => {
 				const commandArg = mockConverseStreamCommand.mock.calls[0][0] as any
 
 				// Service tier should NOT be included when not specified (at top level or in additionalModelRequestFields)
-				expect(commandArg.service_tier).toBeUndefined()
+				expect(commandArg[SERVICE_TIER_KEY]).toBeUndefined()
 				if (commandArg.additionalModelRequestFields) {
-					expect(commandArg.additionalModelRequestFields.service_tier).toBeUndefined()
+					expect(commandArg.additionalModelRequestFields[SERVICE_TIER_KEY]).toBeUndefined()
 				}
 			})
 		})

src/api/providers/__tests__/openai-codex.spec.ts

@@ -9,7 +9,7 @@ vitest.mock("@roo-code/telemetry", () => ({
 }))
 
 import { Anthropic } from "@anthropic-ai/sdk"
-import { OpenAiCodexServiceTier } from "@roo-code/types"
+import { OPEN_AI_CODEX_SERVICE_TIER_KEY, OpenAiCodexServiceTier, SERVICE_TIER_KEY } from "@roo-code/types"
 import { OpenAiCodexHandler, transformLunaResponsesLiteBody } from "../openai-codex"
 import { openAiCodexOAuthManager } from "../../../integrations/openai-codex/oauth"
 
@@ -85,7 +85,7 @@ describe("OpenAiCodexHandler.createMessage", () => {
 	it("sends the priority service tier in streaming SDK requests when Fast is selected", async () => {
 		const handler = new OpenAiCodexHandler({
 			apiModelId: "gpt-5.6-sol",
-			openAiCodexServiceTier: OpenAiCodexServiceTier.Priority,
+			[OPEN_AI_CODEX_SERVICE_TIER_KEY]: OpenAiCodexServiceTier.Priority,
 		})
 		vitest.spyOn(openAiCodexOAuthManager, "getAccessToken").mockResolvedValue("test-token")
 		vitest.spyOn(openAiCodexOAuthManager, "getAccountId").mockResolvedValue("acct_test")
@@ -95,14 +95,17 @@ describe("OpenAiCodexHandler.createMessage", () => {
 		await drainStream(handler.createMessage("System prompt", []))
 
 		const [body] = mockCreate.mock.calls[0]
-		expect(body).toMatchObject({ stream: true, service_tier: OpenAiCodexServiceTier.Priority })
+		expect(body).toMatchObject({
+			stream: true,
+			[SERVICE_TIER_KEY]: OpenAiCodexServiceTier.Priority,
+		})
 	})
 
 	it.each([
 		["an absent preference", {}],
 		[
 			"an explicit Standard preference from an older profile",
-			{ openAiCodexServiceTier: OpenAiCodexServiceTier.Default },
+			{ [OPEN_AI_CODEX_SERVICE_TIER_KEY]: OpenAiCodexServiceTier.Default },
 		],
 	])("omits the service tier in streaming SDK requests for %s", async (_description, serviceTierOptions) => {
 		const handler = new OpenAiCodexHandler({
@@ -116,13 +119,13 @@ describe("OpenAiCodexHandler.createMessage", () => {
 
 		await drainStream(handler.createMessage("System prompt", []))
 
-		expect(mockCreate.mock.calls[0][0]).not.toHaveProperty("service_tier")
+		expect(mockCreate.mock.calls[0][0]).not.toHaveProperty(SERVICE_TIER_KEY)
 	})
 
 	it("preserves the priority service tier in the manual streaming fallback", async () => {
 		const handler = new OpenAiCodexHandler({
 			apiModelId: "gpt-5.6-sol",
-			openAiCodexServiceTier: OpenAiCodexServiceTier.Priority,
+			[OPEN_AI_CODEX_SERVICE_TIER_KEY]: OpenAiCodexServiceTier.Priority,
 		})
 		vitest.spyOn(openAiCodexOAuthManager, "getAccessToken").mockResolvedValue("test-token")
 		vitest.spyOn(openAiCodexOAuthManager, "getAccountId").mockResolvedValue("acct_test")
@@ -148,7 +151,7 @@ describe("OpenAiCodexHandler.createMessage", () => {
 
 		expect(JSON.parse(mockFetch.mock.calls[0][1].body)).toMatchObject({
 			stream: true,
-			service_tier: OpenAiCodexServiceTier.Priority,
+			[SERVICE_TIER_KEY]: OpenAiCodexServiceTier.Priority,
 		})
 	})
 
@@ -264,7 +267,7 @@ describe("OpenAiCodexHandler.completePrompt service tier", () => {
 	])("uses the %s preference in non-streaming requests", async (_mode, configuredTier, expectedTier) => {
 		const handler = new OpenAiCodexHandler({
 			apiModelId: "gpt-5.6-sol",
-			...(configuredTier ? { openAiCodexServiceTier: configuredTier } : {}),
+			...(configuredTier ? { [OPEN_AI_CODEX_SERVICE_TIER_KEY]: configuredTier } : {}),
 		})
 		vitest.spyOn(openAiCodexOAuthManager, "getAccessToken").mockResolvedValue("test-token")
 		vitest.spyOn(openAiCodexOAuthManager, "getAccountId").mockResolvedValue("acct_test")
@@ -279,9 +282,9 @@ describe("OpenAiCodexHandler.completePrompt service tier", () => {
 		const body = JSON.parse(mockFetch.mock.calls[0][1].body)
 		expect(body.stream).toBe(false)
 		if (expectedTier) {
-			expect(body.service_tier).toBe(expectedTier)
+			expect(body[SERVICE_TIER_KEY]).toBe(expectedTier)
 		} else {
-			expect(body).not.toHaveProperty("service_tier")
+			expect(body).not.toHaveProperty(SERVICE_TIER_KEY)
 		}
 	})
 })

src/api/providers/__tests__/openai-native.spec.ts

@@ -13,7 +13,7 @@ vitest.mock("@roo-code/telemetry", () => ({
 import { Anthropic } from "@anthropic-ai/sdk"
 import OpenAI from "openai"
 
-import { ApiProviderError, OpenAiServiceTier } from "@roo-code/types"
+import { ApiProviderError, OpenAiServiceTier, SERVICE_TIER_KEY } from "@roo-code/types"
 
 import { OpenAiNativeHandler } from "../openai-native"
 import { ApiHandlerOptions } from "../../../shared/api"
@@ -139,7 +139,7 @@ describe("OpenAiNativeHandler", () => {
 				}
 
 				expect(mockResponsesCreate).toHaveBeenCalledWith(
-					expect.objectContaining({ service_tier: serviceTier }),
+					expect.objectContaining({ [SERVICE_TIER_KEY]: serviceTier }),
 					expect.any(Object),
 				)
 			},
@@ -259,7 +259,7 @@ describe("OpenAiNativeHandler", () => {
 				expect(mockResponsesCreate).toHaveBeenCalledWith(
 					expect.objectContaining({
 						stream: false,
-						service_tier: serviceTier,
+						[SERVICE_TIER_KEY]: serviceTier,
 					}),
 					expect.any(Object),
 				)

src/api/providers/bedrock.ts

@@ -33,6 +33,7 @@ import {
 	BEDROCK_GLOBAL_INFERENCE_MODEL_IDS,
 	BEDROCK_SERVICE_TIER_MODEL_IDS,
 	BEDROCK_SERVICE_TIER_PRICING,
+	SERVICE_TIER_KEY,
 	ApiProviderError,
 } from "@roo-code/types"
 import { TelemetryService } from "@roo-code/telemetry"
@@ -99,7 +100,7 @@ interface BedrockPayload {
 // AWS Bedrock service tiers (STANDARD, FLEX, PRIORITY) are specified at the top level
 // https://docs.aws.amazon.com/bedrock/latest/userguide/service-tiers-inference.html
 type BedrockPayloadWithServiceTier = BedrockPayload & {
-	service_tier?: BedrockServiceTier
+	[SERVICE_TIER_KEY]?: BedrockServiceTier
 }
 
 // Define specific types for content block events to avoid 'as any' usage
@@ -553,7 +554,7 @@ export class AwsBedrockHandler extends BaseProvider implements SingleCompletionH
 			...(thinkingEnabled && { anthropic_version: "bedrock-2023-05-31" }),
 			toolConfig,
 			// Add service_tier as a top-level parameter (not inside additionalModelRequestFields)
-			...(useServiceTier && { service_tier: this.options.awsBedrockServiceTier }),
+			...(useServiceTier && { [SERVICE_TIER_KEY]: this.options.awsBedrockServiceTier }),
 		}
 
 		// Create AbortController with 10 minute timeout

src/api/providers/openai-codex.ts

@@ -5,10 +5,12 @@ import OpenAI from "openai"
 
 import {
 	type ModelInfo,
+	OPEN_AI_CODEX_SERVICE_TIER_KEY,
 	OpenAiCodexServiceTier,
 	openAiCodexDefaultModelId,
 	OpenAiCodexModelId,
 	openAiCodexModels,
+	SERVICE_TIER_KEY,
 	type ReasoningEffort,
 	type ReasoningEffortExtended,
 	ApiProviderError,
@@ -41,7 +43,9 @@ const LUNA_MODEL_ID = "gpt-5.6-luna"
 const LUNA_CODEX_VERSION = "0.144.0"
 
 const getOpenAiCodexServiceTier = (options: ApiHandlerOptions): OpenAiCodexRequestServiceTier | undefined =>
-	options.openAiCodexServiceTier === OpenAiCodexServiceTier.Priority ? OpenAiCodexServiceTier.Priority : undefined
+	options[OPEN_AI_CODEX_SERVICE_TIER_KEY] === OpenAiCodexServiceTier.Priority
+		? OpenAiCodexServiceTier.Priority
+		: undefined
 
 function stripInputImageDetail(value: any): any {
 	if (Array.isArray(value)) {
@@ -371,7 +375,7 @@ export class OpenAiCodexHandler extends BaseProvider implements SingleCompletion
 			model: string
 			input: Array<{ role: "user" | "assistant"; content: any[] } | { type: string; content: string }>
 			stream: boolean
-			service_tier?: OpenAiCodexRequestServiceTier
+			[SERVICE_TIER_KEY]?: OpenAiCodexRequestServiceTier
 			reasoning?: { effort?: ReasoningEffortExtended; summary?: "auto" }
 			temperature?: number
 			store?: boolean
@@ -397,7 +401,7 @@ export class OpenAiCodexHandler extends BaseProvider implements SingleCompletion
 			stream: true,
 			store: false,
 			instructions: systemPrompt,
-			...(serviceTier ? { service_tier: serviceTier } : {}),
+			...(serviceTier ? { [SERVICE_TIER_KEY]: serviceTier } : {}),
 			// Only include encrypted reasoning content when reasoning effort is set
 			...(reasoningEffort ? { include: ["reasoning.encrypted_content"] } : {}),
 			...(reasoningEffort
@@ -1282,7 +1286,7 @@ export class OpenAiCodexHandler extends BaseProvider implements SingleCompletion
 				],
 				stream: false,
 				store: false,
-				...(serviceTier ? { service_tier: serviceTier } : {}),
+				...(serviceTier ? { [SERVICE_TIER_KEY]: serviceTier } : {}),
 				...(reasoningEffort ? { include: ["reasoning.encrypted_content"] } : {}),
 			}
 

src/api/providers/openai-native.ts

@@ -14,6 +14,7 @@ import {
 	type VerbosityLevel,
 	type ReasoningEffortExtended,
 	OpenAiServiceTier,
+	SERVICE_TIER_KEY,
 	type ServiceTier,
 	ApiProviderError,
 } from "@roo-code/types"
@@ -319,7 +320,7 @@ export class OpenAiNativeHandler extends BaseProvider implements SingleCompletio
 			max_output_tokens?: number
 			store?: boolean
 			instructions?: string
-			service_tier?: ServiceTier
+			[SERVICE_TIER_KEY]?: ServiceTier
 			include?: string[]
 			/** Prompt cache retention policy: "in_memory" (default) or "24h" for extended caching */
 			prompt_cache_retention?: "in_memory" | "24h"
@@ -371,7 +372,7 @@ export class OpenAiNativeHandler extends BaseProvider implements SingleCompletio
 			// Include tier when selected and supported by the model, or when explicitly "default"
 			...(requestedTier &&
 				(requestedTier === OpenAiServiceTier.Default || allowedTierNames.has(requestedTier)) && {
-					service_tier: requestedTier,
+					[SERVICE_TIER_KEY]: requestedTier,
 				}),
 			// Enable extended prompt cache retention for models that support it.
 			// This uses the OpenAI Responses API `prompt_cache_retention` parameter.
@@ -706,8 +707,8 @@ export class OpenAiNativeHandler extends BaseProvider implements SingleCompletio
 							const parsed = JSON.parse(data)
 
 							// Capture resolved service tier if present
-							if (parsed.response?.service_tier) {
-								this.lastServiceTier = parsed.response.service_tier as ServiceTier
+							if (parsed.response?.[SERVICE_TIER_KEY]) {
+								this.lastServiceTier = parsed.response[SERVICE_TIER_KEY] as ServiceTier
 							}
 							// Capture complete output array (includes reasoning items with encrypted_content)
 							if (parsed.response?.output && Array.isArray(parsed.response.output)) {
@@ -1017,8 +1018,8 @@ export class OpenAiNativeHandler extends BaseProvider implements SingleCompletio
 								}
 							} else if (parsed.type === "response.completed" || parsed.type === "response.done") {
 								// Capture resolved service tier if present
-								if (parsed.response?.service_tier) {
-									this.lastServiceTier = parsed.response.service_tier as ServiceTier
+								if (parsed.response?.[SERVICE_TIER_KEY]) {
+									this.lastServiceTier = parsed.response[SERVICE_TIER_KEY] as ServiceTier
 								}
 								// Capture top-level response id
 								if (parsed.response?.id) {
@@ -1147,8 +1148,8 @@ export class OpenAiNativeHandler extends BaseProvider implements SingleCompletio
 	 */
 	private async *processEvent(event: any, model: OpenAiNativeModel): ApiStream {
 		// Capture resolved service tier when available
-		if (event?.response?.service_tier) {
-			this.lastServiceTier = event.response.service_tier as ServiceTier
+		if (event?.response?.[SERVICE_TIER_KEY]) {
+			this.lastServiceTier = event.response[SERVICE_TIER_KEY] as ServiceTier
 		}
 		// Capture complete output array (includes reasoning items with encrypted_content)
 		if (event?.response?.output && Array.isArray(event.response.output)) {
@@ -1514,7 +1515,7 @@ export class OpenAiNativeHandler extends BaseProvider implements SingleCompletio
 			const requestedTier = (this.options.openAiNativeServiceTier as ServiceTier | undefined) || undefined
 			const allowedTierNames = new Set(model.info.tiers?.map((t) => t.name).filter(Boolean) || [])
 			if (requestedTier && (requestedTier === OpenAiServiceTier.Default || allowedTierNames.has(requestedTier))) {
-				requestBody.service_tier = requestedTier
+				requestBody[SERVICE_TIER_KEY] = requestedTier
 			}
 
 			// Add reasoning if supported