From f36c9abb4a3f5381d8d86eb135d9868de255c19f Mon Sep 17 00:00:00 2001
From: gubin-dev <alecmei.gubin@yandex.ru>
Date: Fri, 28 Aug 2026 12:32:43 +0300
Subject: [PATCH 01/13] refactor(eslint): move provider identifier rule to
 shared config

---
 .../config-eslint/provider-identifiers.js                      | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
 rename src/eslint-rules/no-raw-provider-identifiers.mjs => packages/config-eslint/provider-identifiers.js (96%)

diff --git a/src/eslint-rules/no-raw-provider-identifiers.mjs b/packages/config-eslint/provider-identifiers.js
similarity index 96%
rename from src/eslint-rules/no-raw-provider-identifiers.mjs
rename to packages/config-eslint/provider-identifiers.js
index 7520cc6414..2078769b6a 100644
--- a/src/eslint-rules/no-raw-provider-identifiers.mjs
+++ b/packages/config-eslint/provider-identifiers.js
@@ -65,8 +65,7 @@ export const noRawProviderIdentifiers = {
 		docs: { description: "Require canonical provider identifiers in provider-like contexts" },
 		schema: [],
 		messages: {
-			useCanonical:
-				'Use {{replacement}} instead of the raw provider identifier "{{value}}".',
+			useCanonical: 'Use {{replacement}} instead of the raw provider identifier "{{value}}".',
 		},
 	},
 	create(context) {

From 7f7287062a643ee1b82254cef332385e3a166da4 Mon Sep 17 00:00:00 2001
From: gubin-dev <alecmei.gubin@yandex.ru>
Date: Fri, 28 Aug 2026 12:33:05 +0300
Subject: [PATCH 02/13] refactor(eslint): share provider identifier config
 across packages

---
 packages/config-eslint/package.json           |   6 +-
 .../config-eslint/provider-identifiers.js     | 197 +++++++++++-------
 .../provider-identifiers.test.js              |  42 ++++
 packages/types/eslint.config.mjs              |   3 +
 src/eslint.config.mjs                         |  21 +-
 webview-ui/eslint.config.mjs                  |   3 +
 6 files changed, 181 insertions(+), 91 deletions(-)
 create mode 100644 packages/config-eslint/provider-identifiers.test.js

diff --git a/packages/config-eslint/package.json b/packages/config-eslint/package.json
index 8c01525543..92f67536d9 100644
--- a/packages/config-eslint/package.json
+++ b/packages/config-eslint/package.json
@@ -5,7 +5,11 @@
 	"exports": {
 		"./base": "./base.js",
 		"./react": "./react.js",
-		"./next-js": "./next.js"
+		"./next-js": "./next.js",
+		"./provider-identifiers": "./provider-identifiers.js"
+	},
+	"scripts": {
+		"test": "node --test provider-identifiers.test.js"
 	},
 	"devDependencies": {
 		"@eslint/js": "9.39.4",
diff --git a/packages/config-eslint/provider-identifiers.js b/packages/config-eslint/provider-identifiers.js
index 2078769b6a..6f22941cdd 100644
--- a/packages/config-eslint/provider-identifiers.js
+++ b/packages/config-eslint/provider-identifiers.js
@@ -1,12 +1,3 @@
-import { providerIdentifiers, retiredProviderIdentifiers } from "@roo-code/types/provider-identifiers"
-
-const providerReplacementsByValue = new Map([
-	...Object.entries(providerIdentifiers).map(([member, value]) => [value, `providerIdentifiers.${member}`]),
-	...Object.entries(retiredProviderIdentifiers).map(([member, value]) => [
-		value,
-		`retiredProviderIdentifiers.${member}`,
-	]),
-])
 const typescriptExpressionWrappers = new Set([
 	"TSAsExpression",
 	"TSNonNullExpression",
@@ -40,82 +31,144 @@ function isProviderLike(node) {
 	return getStaticName(node)?.toLowerCase().includes("provider") ?? false
 }
 
-function getRawProvider(node) {
-	while (typescriptExpressionWrappers.has(node?.type)) {
-		node = node.expression
-	}
+function isCanonicalProviderRegistry(node) {
+	const name = getStaticName(node)
+	return name === "providerIdentifiers" || name === "retiredProviderIdentifiers"
+}
 
-	if (node?.type === "Literal" && typeof node.value === "string") {
-		const replacement = providerReplacementsByValue.get(node.value)
-		return replacement ? { replacement, value: node.value } : undefined
-	}
+export function createProviderIdentifierConfig({ providerIdentifiers, retiredProviderIdentifiers }) {
+	const providerReplacementsByValue = new Map([
+		...Object.entries(providerIdentifiers).map(([member, value]) => [value, `providerIdentifiers.${member}`]),
+		...Object.entries(retiredProviderIdentifiers).map(([member, value]) => [
+			value,
+			`retiredProviderIdentifiers.${member}`,
+		]),
+	])
 
-	if (node?.type === "TemplateLiteral" && node.expressions.length === 0) {
-		const value = node.quasis[0]?.value.cooked
-		const replacement = value ? providerReplacementsByValue.get(value) : undefined
-		return replacement ? { replacement, value } : undefined
-	}
+	function getRawProvider(node) {
+		while (typescriptExpressionWrappers.has(node?.type)) {
+			node = node.expression
+		}
 
-	return undefined
-}
+		if (node?.type === "Literal" && typeof node.value === "string") {
+			const replacement = providerReplacementsByValue.get(node.value)
+			return replacement ? { replacement, value: node.value } : undefined
+		}
 
-export const noRawProviderIdentifiers = {
-	meta: {
-		type: "problem",
-		docs: { description: "Require canonical provider identifiers in provider-like contexts" },
-		schema: [],
-		messages: {
-			useCanonical: 'Use {{replacement}} instead of the raw provider identifier "{{value}}".',
-		},
-	},
-	create(context) {
-		function reportIfRawProvider(node) {
-			const provider = getRawProvider(node)
-			if (provider) {
-				context.report({ node, messageId: "useCanonical", data: provider })
-			}
+		if (node?.type === "TemplateLiteral" && node.expressions.length === 0) {
+			const value = node.quasis[0]?.value.cooked
+			const replacement = value ? providerReplacementsByValue.get(value) : undefined
+			return replacement ? { replacement, value } : undefined
 		}
 
-		return {
-			Property(node) {
-				if (isProviderLike(node.key)) {
-					reportIfRawProvider(node.value)
-				}
-			},
-			PropertyDefinition(node) {
-				if (isProviderLike(node.key)) {
-					reportIfRawProvider(node.value)
-				}
-			},
-			VariableDeclarator(node) {
-				if (isProviderLike(node.id)) {
-					reportIfRawProvider(node.init)
-				}
+		return undefined
+	}
+
+	function getProviderMapDeclarator(objectExpression) {
+		let expression = objectExpression
+		while (typescriptExpressionWrappers.has(expression.parent?.type)) {
+			expression = expression.parent
+		}
+
+		const declarator = expression.parent
+		return declarator?.type === "VariableDeclarator" && declarator.init === expression ? declarator : undefined
+	}
+
+	const noRawProviderIdentifiers = {
+		meta: {
+			type: "problem",
+			docs: { description: "Require canonical provider identifiers in provider-like contexts" },
+			schema: [],
+			messages: {
+				useCanonical: 'Use {{replacement}} instead of the raw provider identifier "{{value}}".',
 			},
-			AssignmentExpression(node) {
-				if (isProviderLike(node.left)) {
-					reportIfRawProvider(node.right)
+		},
+		create(context) {
+			function reportIfRawProvider(node) {
+				const provider = getRawProvider(node)
+				if (provider) {
+					context.report({ node, messageId: "useCanonical", data: provider })
 				}
-			},
-			BinaryExpression(node) {
-				if (!["===", "!==", "==", "!="].includes(node.operator)) {
+			}
+
+			function reportIfRawProviderMapKey(node) {
+				if (node.computed || node.parent?.type !== "ObjectExpression") {
 					return
 				}
 
-				if (isProviderLike(node.left)) {
-					reportIfRawProvider(node.right)
+				const declarator = getProviderMapDeclarator(node.parent)
+				if (!declarator || !isProviderLike(declarator.id) || isCanonicalProviderRegistry(declarator.id)) {
+					return
 				}
-				if (isProviderLike(node.right)) {
-					reportIfRawProvider(node.left)
+
+				const value = getStaticName(node.key)
+				const replacement = value ? providerReplacementsByValue.get(value) : undefined
+				if (replacement) {
+					context.report({
+						node: node.key,
+						messageId: "useCanonical",
+						data: { replacement, value },
+					})
 				}
-			},
-			SwitchStatement(node) {
-				if (isProviderLike(node.discriminant)) {
-					for (const switchCase of node.cases) {
-						reportIfRawProvider(switchCase.test)
+			}
+
+			return {
+				Property(node) {
+					reportIfRawProviderMapKey(node)
+					if (isProviderLike(node.key)) {
+						reportIfRawProvider(node.value)
 					}
-				}
+				},
+				PropertyDefinition(node) {
+					if (isProviderLike(node.key)) {
+						reportIfRawProvider(node.value)
+					}
+				},
+				VariableDeclarator(node) {
+					if (isProviderLike(node.id)) {
+						reportIfRawProvider(node.init)
+					}
+				},
+				AssignmentExpression(node) {
+					if (isProviderLike(node.left)) {
+						reportIfRawProvider(node.right)
+					}
+				},
+				BinaryExpression(node) {
+					if (!["===", "!==", "==", "!="].includes(node.operator)) {
+						return
+					}
+
+					if (isProviderLike(node.left)) {
+						reportIfRawProvider(node.right)
+					}
+					if (isProviderLike(node.right)) {
+						reportIfRawProvider(node.left)
+					}
+				},
+				SwitchStatement(node) {
+					if (isProviderLike(node.discriminant)) {
+						for (const switchCase of node.cases) {
+							reportIfRawProvider(switchCase.test)
+						}
+					}
+				},
+			}
+		},
+	}
+
+	return {
+		files: ["**/*.ts", "**/*.tsx"],
+		ignores: ["**/fixtures/**"],
+		plugins: {
+			zoo: {
+				rules: {
+					"no-raw-provider-identifiers": noRawProviderIdentifiers,
+				},
 			},
-		}
-	},
+		},
+		rules: {
+			"zoo/no-raw-provider-identifiers": "error",
+		},
+	}
 }
diff --git a/packages/config-eslint/provider-identifiers.test.js b/packages/config-eslint/provider-identifiers.test.js
new file mode 100644
index 0000000000..7b59ec0d5a
--- /dev/null
+++ b/packages/config-eslint/provider-identifiers.test.js
@@ -0,0 +1,42 @@
+import { RuleTester } from "eslint"
+
+import { createProviderIdentifierConfig } from "./provider-identifiers.js"
+
+const config = createProviderIdentifierConfig({
+	providerIdentifiers: {
+		openrouter: "openrouter",
+		vercelAiGateway: "vercel-ai-gateway",
+	},
+	retiredProviderIdentifiers: {},
+})
+const rule = config.plugins.zoo.rules["no-raw-provider-identifiers"]
+
+const ruleTester = new RuleTester({
+	languageOptions: {
+		ecmaVersion: 2022,
+		sourceType: "module",
+	},
+})
+
+ruleTester.run("no-raw-provider-identifiers provider map keys", rule, {
+	valid: [
+		"const dynamicProviderExtras = { [providerIdentifiers.openrouter]: {} }",
+		"const response = { openrouter: externalPayload }",
+		'const providerIdentifiers = { openrouter: "openrouter", vercelAiGateway: "vercel-ai-gateway" }',
+	],
+	invalid: [
+		{
+			code: 'const dynamicProviderExtras = { openrouter: {}, "vercel-ai-gateway": {} }',
+			errors: [
+				{
+					messageId: "useCanonical",
+					data: { replacement: "providerIdentifiers.openrouter", value: "openrouter" },
+				},
+				{
+					messageId: "useCanonical",
+					data: { replacement: "providerIdentifiers.vercelAiGateway", value: "vercel-ai-gateway" },
+				},
+			],
+		},
+	],
+})
diff --git a/packages/types/eslint.config.mjs b/packages/types/eslint.config.mjs
index c603a68f12..dd57625dfa 100644
--- a/packages/types/eslint.config.mjs
+++ b/packages/types/eslint.config.mjs
@@ -1,9 +1,12 @@
 import { config } from "@roo-code/config-eslint/base"
+import { createProviderIdentifierConfig } from "@roo-code/config-eslint/provider-identifiers"
+import { providerIdentifiers, retiredProviderIdentifiers } from "./src/provider-identifiers.ts"
 import globals from "globals"
 
 /** @type {import("eslint").Linter.Config} */
 export default [
 	...config,
+	createProviderIdentifierConfig({ providerIdentifiers, retiredProviderIdentifiers }),
 	{
 		files: ["**/*.cjs"],
 		languageOptions: {
diff --git a/src/eslint.config.mjs b/src/eslint.config.mjs
index 36a56c5df2..0dbf5c7f79 100644
--- a/src/eslint.config.mjs
+++ b/src/eslint.config.mjs
@@ -1,10 +1,11 @@
 import { config } from "@roo-code/config-eslint/base"
-
-import { noRawProviderIdentifiers } from "./eslint-rules/no-raw-provider-identifiers.mjs"
+import { createProviderIdentifierConfig } from "@roo-code/config-eslint/provider-identifiers"
+import { providerIdentifiers, retiredProviderIdentifiers } from "@roo-code/types/provider-identifiers"
 
 /** @type {import("eslint").Linter.Config} */
 export default [
 	...config,
+	createProviderIdentifierConfig({ providerIdentifiers, retiredProviderIdentifiers }),
 	{
 		rules: {
 			"prefer-const": ["error", { destructuring: "all" }],
@@ -33,22 +34,6 @@ export default [
 			"no-undef": "off",
 		},
 	},
-	{
-		files: ["**/*.ts", "**/*.tsx"],
-		ignores: [
-			"**/fixtures/**",
-		],
-		plugins: {
-			zoo: {
-				rules: {
-					"no-raw-provider-identifiers": noRawProviderIdentifiers,
-				},
-			},
-		},
-		rules: {
-			"zoo/no-raw-provider-identifiers": "error",
-		},
-	},
 	{
 		// Ratchet: enforce no-floating-promises directory by directory. Each
 		// directory is added here once its floating promises are resolved.
diff --git a/webview-ui/eslint.config.mjs b/webview-ui/eslint.config.mjs
index db76f49211..11a49e9b41 100644
--- a/webview-ui/eslint.config.mjs
+++ b/webview-ui/eslint.config.mjs
@@ -1,8 +1,11 @@
 import { reactConfig } from "@roo-code/config-eslint/react"
+import { createProviderIdentifierConfig } from "@roo-code/config-eslint/provider-identifiers"
+import { providerIdentifiers, retiredProviderIdentifiers } from "@roo-code/types/provider-identifiers"
 
 /** @type {import("eslint").Linter.Config} */
 export default [
 	...reactConfig,
+	createProviderIdentifierConfig({ providerIdentifiers, retiredProviderIdentifiers }),
 	{
 		rules: {
 			"@typescript-eslint/no-unused-vars": [

From 3255a2812a36c441e7e928c4a13d44583dbfd4c9 Mon Sep 17 00:00:00 2001
From: gubin-dev <alecmei.gubin@yandex.ru>
Date: Fri, 28 Aug 2026 12:42:10 +0300
Subject: [PATCH 03/13] fix(eslint): migrate provider literals and shared rule
 tests

---
 .../provider-identifiers.test.js              |  64 +++++++-
 .../types/src/__tests__/kimi-code.test.ts     |   7 +-
 .../src/__tests__/provider-model-id.test.ts   |   3 +-
 .../types/src/__tests__/telemetry.test.ts     |   3 +-
 packages/types/src/image-generation.ts        |  30 +++-
 pnpm-lock.yaml                                |   4 +-
 .../no-raw-provider-identifiers.spec.mjs      | 137 ------------------
 .../no-raw-provider-identifiers.test.mjs      |  39 -----
 src/package.json                              |   1 -
 src/shared/api.ts                             |  31 ++--
 .../__tests__/ContextWindowProgress.spec.tsx  |   3 +-
 .../src/components/chat/CodeIndexPopover.tsx  |  45 +++---
 .../chat/__tests__/ApiConfigSelector.spec.tsx |   3 +-
 .../ChatTextArea.lockApiConfig.spec.tsx       |   3 +-
 .../chat/__tests__/ChatTextArea.spec.tsx      |  25 ++--
 .../CodeIndexPopover.auto-populate.spec.tsx   |  17 ++-
 .../chat/__tests__/TaskHeader.spec.tsx        |   5 +-
 .../settings/ImageGenerationSettings.tsx      |   5 +-
 .../ApiOptions.provider-filtering.spec.tsx    |   5 +-
 .../settings/__tests__/ApiOptions.spec.tsx    |  37 ++---
 .../__tests__/ModelPicker.deprecated.spec.tsx |  11 +-
 .../SettingsView.change-detection.spec.tsx    |  27 ++--
 .../SettingsView.unsaved-changes.spec.tsx     |  15 +-
 .../__tests__/ThinkingBudget.spec.tsx         |  11 +-
 .../providers/__tests__/Friendli.spec.tsx     |   9 +-
 .../OpenAICompatible.visual.fixture.tsx       |   3 +-
 .../providers/__tests__/OpenCodeGo.spec.tsx   |  11 +-
 .../providers/__tests__/ZooGateway.spec.tsx   |  11 +-
 .../__tests__/providerModelConfig.spec.ts     |  18 +--
 .../welcome/WelcomeViewProvider.tsx           |   4 +-
 .../__tests__/WelcomeViewProvider.spec.tsx    |   9 +-
 .../src/context/ExtensionStateContext.tsx     |   3 +-
 .../__tests__/ExtensionStateContext.spec.tsx  |  13 +-
 .../src/utils/__tests__/validate.spec.ts      |  56 +++----
 34 files changed, 303 insertions(+), 365 deletions(-)
 delete mode 100644 src/__tests__/no-raw-provider-identifiers.spec.mjs
 delete mode 100644 src/eslint-rules/no-raw-provider-identifiers.test.mjs

diff --git a/packages/config-eslint/provider-identifiers.test.js b/packages/config-eslint/provider-identifiers.test.js
index 7b59ec0d5a..ecd1713be1 100644
--- a/packages/config-eslint/provider-identifiers.test.js
+++ b/packages/config-eslint/provider-identifiers.test.js
@@ -4,10 +4,16 @@ import { createProviderIdentifierConfig } from "./provider-identifiers.js"
 
 const config = createProviderIdentifierConfig({
 	providerIdentifiers: {
+		anthropic: "anthropic",
+		openaiNative: "openai-native",
 		openrouter: "openrouter",
+		poe: "poe",
 		vercelAiGateway: "vercel-ai-gateway",
 	},
-	retiredProviderIdentifiers: {},
+	retiredProviderIdentifiers: {
+		groq: "groq",
+		roo: "roo",
+	},
 })
 const rule = config.plugins.zoo.rules["no-raw-provider-identifiers"]
 
@@ -40,3 +46,59 @@ ruleTester.run("no-raw-provider-identifiers provider map keys", rule, {
 		},
 	],
 })
+
+ruleTester.run("no-raw-provider-identifiers provider-like values", rule, {
+	valid: [
+		"const apiProvider = retiredProviderIdentifiers.roo",
+		"const provider = retiredProviderIdentifiers.groq",
+		'const config = { apiProvider: "external-provider" }',
+		"const config = { apiProvider: providerIdentifiers.poe }",
+		'const response = { protocol: "anthropic", format: "openrouter" }',
+	],
+	invalid: [
+		{
+			code: 'const apiProvider = "roo"',
+			errors: [
+				{
+					messageId: "useCanonical",
+					data: { replacement: "retiredProviderIdentifiers.roo", value: "roo" },
+					type: "Literal",
+				},
+			],
+		},
+		{
+			code: "const persistedProvider = `groq`",
+			errors: [
+				{
+					messageId: "useCanonical",
+					data: { replacement: "retiredProviderIdentifiers.groq", value: "groq" },
+					type: "TemplateLiteral",
+				},
+			],
+		},
+		{
+			code: 'const config = { apiProvider: "poe", imageProvider: `openrouter` }',
+			errors: [
+				{ messageId: "useCanonical", data: { replacement: "providerIdentifiers.poe", value: "poe" } },
+				{
+					messageId: "useCanonical",
+					data: { replacement: "providerIdentifiers.openrouter", value: "openrouter" },
+				},
+			],
+		},
+		{
+			code: 'config["apiProvider"] = "poe"; if (imageProvider === "openrouter") {}',
+			errors: [
+				{ messageId: "useCanonical", data: { replacement: "providerIdentifiers.poe", value: "poe" } },
+				{
+					messageId: "useCanonical",
+					data: { replacement: "providerIdentifiers.openrouter", value: "openrouter" },
+				},
+			],
+		},
+		{
+			code: 'switch (config.apiProvider) { case "poe": break; case providerIdentifiers.openrouter: break }',
+			errors: [{ messageId: "useCanonical", data: { replacement: "providerIdentifiers.poe", value: "poe" } }],
+		},
+	],
+})
diff --git a/packages/types/src/__tests__/kimi-code.test.ts b/packages/types/src/__tests__/kimi-code.test.ts
index 3d8b9ac549..1a59ed3e12 100644
--- a/packages/types/src/__tests__/kimi-code.test.ts
+++ b/packages/types/src/__tests__/kimi-code.test.ts
@@ -1,3 +1,4 @@
+import { providerIdentifiers } from "../provider-identifiers.js"
 import {
 	SECRET_STATE_KEYS,
 	dynamicProviders,
@@ -16,13 +17,15 @@ describe("Kimi Code provider types", () => {
 	it("parses OAuth and API-key settings independently from Moonshot", () => {
 		expect(
 			providerSettingsSchemaDiscriminated.parse({
-				apiProvider: "kimi-code",
+				apiProvider: providerIdentifiers.kimiCode,
 				kimiCodeAuthMethod: "api-key",
 				kimiCodeApiKey: "kimi-key",
 				apiModelId: kimiCodeDefaultModelId,
 			}),
 		).toMatchObject({ kimiCodeApiKey: "kimi-key" })
-		expect(providerSettingsSchema.parse({ apiProvider: "kimi-code", kimiCodeAuthMethod: "oauth" })).toMatchObject({
+		expect(
+			providerSettingsSchema.parse({ apiProvider: providerIdentifiers.kimiCode, kimiCodeAuthMethod: "oauth" }),
+		).toMatchObject({
 			kimiCodeAuthMethod: "oauth",
 		})
 	})
diff --git a/packages/types/src/__tests__/provider-model-id.test.ts b/packages/types/src/__tests__/provider-model-id.test.ts
index 7c404c1cd4..a623b24b27 100644
--- a/packages/types/src/__tests__/provider-model-id.test.ts
+++ b/packages/types/src/__tests__/provider-model-id.test.ts
@@ -1,3 +1,4 @@
+import { retiredProviderIdentifiers } from "../provider-identifiers.js"
 import { getModelId, modelIdKeys, providerIdentifiers, type ProviderSettings } from "../index.js"
 
 const expectedModelIdKeys = [
@@ -75,7 +76,7 @@ describe("getModelId", () => {
 
 	it("preserves legacy model ID precedence for retired providers", () => {
 		const settings: ProviderSettings = {
-			apiProvider: "groq",
+			apiProvider: retiredProviderIdentifiers.groq,
 			lmStudioDraftModelId: "draft-model",
 			requestyModelId: "requesty-model",
 		}
diff --git a/packages/types/src/__tests__/telemetry.test.ts b/packages/types/src/__tests__/telemetry.test.ts
index 29e6207794..6b8a9fc30c 100644
--- a/packages/types/src/__tests__/telemetry.test.ts
+++ b/packages/types/src/__tests__/telemetry.test.ts
@@ -1,3 +1,4 @@
+import { providerIdentifiers } from "../provider-identifiers.js"
 // pnpm --filter @roo-code/types test src/__tests__/telemetry.test.ts
 
 import {
@@ -536,7 +537,7 @@ describe("telemetry error utilities", () => {
 				consecutiveMistakeCount: 5,
 				consecutiveMistakeLimit: 3,
 				reason: "no_tools_used",
-				provider: "anthropic",
+				provider: providerIdentifiers.anthropic,
 				modelId: "claude-3-sonnet-20240229",
 			})
 		})
diff --git a/packages/types/src/image-generation.ts b/packages/types/src/image-generation.ts
index 76bfca2552..c7d946de7f 100644
--- a/packages/types/src/image-generation.ts
+++ b/packages/types/src/image-generation.ts
@@ -1,3 +1,5 @@
+import { providerIdentifiers } from "./provider-identifiers.js"
+
 /**
  * Image generation model constants
  */
@@ -16,12 +18,28 @@ export interface ImageGenerationModel {
 
 export const IMAGE_GENERATION_MODELS: ImageGenerationModel[] = [
 	// OpenRouter models
-	{ value: "google/gemini-2.5-flash-image", label: "Gemini 2.5 Flash Image", provider: "openrouter" },
-	{ value: "google/gemini-3-pro-image-preview", label: "Gemini 3 Pro Image Preview", provider: "openrouter" },
-	{ value: "openai/gpt-5-image", label: "GPT-5 Image", provider: "openrouter" },
-	{ value: "openai/gpt-5-image-mini", label: "GPT-5 Image Mini", provider: "openrouter" },
-	{ value: "black-forest-labs/flux.2-flex", label: "Black Forest Labs FLUX.2 Flex", provider: "openrouter" },
-	{ value: "black-forest-labs/flux.2-pro", label: "Black Forest Labs FLUX.2 Pro", provider: "openrouter" },
+	{
+		value: "google/gemini-2.5-flash-image",
+		label: "Gemini 2.5 Flash Image",
+		provider: providerIdentifiers.openrouter,
+	},
+	{
+		value: "google/gemini-3-pro-image-preview",
+		label: "Gemini 3 Pro Image Preview",
+		provider: providerIdentifiers.openrouter,
+	},
+	{ value: "openai/gpt-5-image", label: "GPT-5 Image", provider: providerIdentifiers.openrouter },
+	{ value: "openai/gpt-5-image-mini", label: "GPT-5 Image Mini", provider: providerIdentifiers.openrouter },
+	{
+		value: "black-forest-labs/flux.2-flex",
+		label: "Black Forest Labs FLUX.2 Flex",
+		provider: providerIdentifiers.openrouter,
+	},
+	{
+		value: "black-forest-labs/flux.2-pro",
+		label: "Black Forest Labs FLUX.2 Pro",
+		provider: providerIdentifiers.openrouter,
+	},
 ]
 
 /**
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index a666502f4e..cee51dd474 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -671,9 +671,6 @@ importers:
       '@types/vscode':
         specifier: 1.100.0
         version: 1.100.0
-      '@typescript-eslint/parser':
-        specifier: 8.32.1
-        version: 8.32.1(eslint@9.39.4(jiti@2.7.0))(typescript@5.9.3)
       '@vitest/coverage-v8':
         specifier: 4.1.9
         version: 4.1.9(vitest@4.1.9)
@@ -3479,6 +3476,7 @@ packages:
   '@xmldom/xmldom@0.8.13':
     resolution: {integrity: sha512-KRYzxepc14G/CEpEGc3Yn+JKaAeT63smlDr+vjB8jRfgTBBI9wRj/nkQEO+ucV8p8I9bfKLWp37uHgFrbntPvw==}
     engines: {node: '>=10.0.0'}
+    deprecated: this version has critical issues, please update to the latest version
 
   '@xobotyi/scrollbar-width@1.9.5':
     resolution: {integrity: sha512-N8tkAACJx2ww8vFMneJmaAgmjAG1tnVBZJRLRcx061tmsLRZHSEZSLuGWnwPtunsSLvSqXQ2wfp7Mgqg1I+2dQ==}
diff --git a/src/__tests__/no-raw-provider-identifiers.spec.mjs b/src/__tests__/no-raw-provider-identifiers.spec.mjs
deleted file mode 100644
index 46d981b791..0000000000
--- a/src/__tests__/no-raw-provider-identifiers.spec.mjs
+++ /dev/null
@@ -1,137 +0,0 @@
-import { Linter } from "eslint"
-import typescriptParser from "@typescript-eslint/parser"
-import { describe, expect, it } from "vitest"
-
-import { noRawProviderIdentifiers } from "../eslint-rules/no-raw-provider-identifiers.mjs"
-
-const linter = new Linter({ configType: "eslintrc" })
-
-linter.defineRule("zoo/no-raw-provider-identifiers", noRawProviderIdentifiers)
-linter.defineParser("@typescript-eslint/parser", typescriptParser)
-
-function lint(code) {
-	return linter.verify(code, {
-		parserOptions: { ecmaVersion: 2022, sourceType: "module" },
-		rules: { "zoo/no-raw-provider-identifiers": "error" },
-	})
-}
-
-function lintTypeScript(code) {
-	return linter.verify(code, {
-		parser: "@typescript-eslint/parser",
-		parserOptions: {
-			ecmaVersion: 2022,
-			sourceType: "module",
-			warnOnUnsupportedTypeScriptVersion: false,
-		},
-		rules: { "zoo/no-raw-provider-identifiers": "error" },
-	})
-}
-
-describe("no-raw-provider-identifiers", () => {
-	it("rejects a canonical provider literal in an apiProvider property", () => {
-		const messages = lint('const config = { apiProvider: "poe" }')
-
-		expect(messages).toHaveLength(1)
-		expect(messages[0]).toMatchObject({
-			ruleId: "zoo/no-raw-provider-identifiers",
-			message: 'Use providerIdentifiers.poe instead of the raw provider identifier "poe".',
-		})
-	})
-
-	it("allows a non-canonical literal and a canonical registry member", () => {
-		expect(lint('const config = { apiProvider: "external-provider" }')).toHaveLength(0)
-		expect(lint("const config = { apiProvider: providerIdentifiers.poe }")).toHaveLength(0)
-	})
-
-	it("matches provider-like property names and static template literals", () => {
-		const messages = lint('const config = { provider: "poe", imageProvider: `openrouter` }')
-
-		expect(messages).toHaveLength(2)
-	})
-
-	it("allows an empty static template in a provider-like context", () => {
-		expect(lint("const config = { apiProvider: `` }")).toHaveLength(0)
-	})
-
-	it("rejects canonical literals in provider-like variable declarations", () => {
-		const messages = lint(`
-			const apiProvider = "poe"
-			let fallbackProvider = \`openrouter\`
-			const label = "poe"
-		`)
-
-		expect(messages.map(({ message }) => message)).toEqual([
-			'Use providerIdentifiers.poe instead of the raw provider identifier "poe".',
-			'Use providerIdentifiers.openrouter instead of the raw provider identifier "openrouter".',
-		])
-	})
-
-	it("rejects canonical provider literals wrapped in TypeScript expressions", () => {
-		const messages = lintTypeScript(`
-			const apiProvider = "poe" as ApiProvider
-			const fallbackProvider = "openrouter" satisfies ApiProvider
-			const imageProvider = <ApiProvider>"openai-native"
-			const nestedProvider = ("anthropic" as ApiProvider)!
-		`)
-
-		expect(messages.map(({ message }) => message)).toEqual([
-			'Use providerIdentifiers.poe instead of the raw provider identifier "poe".',
-			'Use providerIdentifiers.openrouter instead of the raw provider identifier "openrouter".',
-			'Use providerIdentifiers.openaiNative instead of the raw provider identifier "openai-native".',
-			'Use providerIdentifiers.anthropic instead of the raw provider identifier "anthropic".',
-		])
-	})
-
-	it("rejects canonical literals in provider-like class fields", () => {
-		const messages = lintTypeScript(`
-			class Settings {
-				apiProvider = "poe"
-				label = "openrouter"
-			}
-		`)
-
-		expect(messages.map(({ message }) => message)).toEqual([
-			'Use providerIdentifiers.poe instead of the raw provider identifier "poe".',
-		])
-	})
-
-	it("rejects canonical literals in provider-like assignments and comparisons", () => {
-		const messages = lint(`
-			config["apiProvider"] = "poe"
-			if (imageProvider === "openrouter") {}
-			if ("openai-native" !== config.fallbackProvider) {}
-		`)
-
-		expect(messages.map(({ message }) => message)).toEqual([
-			'Use providerIdentifiers.poe instead of the raw provider identifier "poe".',
-			'Use providerIdentifiers.openrouter instead of the raw provider identifier "openrouter".',
-			'Use providerIdentifiers.openaiNative instead of the raw provider identifier "openai-native".',
-		])
-	})
-
-	it("rejects canonical literals in provider-like switch cases", () => {
-		const messages = lint(`
-			switch (config.apiProvider) {
-				case "poe": break
-				case providerIdentifiers.openrouter: break
-			}
-		`)
-
-		expect(messages).toHaveLength(1)
-		expect(messages[0].message).toContain("providerIdentifiers.poe")
-	})
-
-	it("does not report canonical values outside provider-like contexts", () => {
-		const messages = lint(`
-			const label = "poe"
-			const config = { protocol: "anthropic", format: "openai" }
-			config[dynamicKey] = "poe"
-			if (apiProtocol === "anthropic") {}
-			if (provider > "poe") {}
-			switch (format) { case "openai": break }
-		`)
-
-		expect(messages).toHaveLength(0)
-	})
-})
diff --git a/src/eslint-rules/no-raw-provider-identifiers.test.mjs b/src/eslint-rules/no-raw-provider-identifiers.test.mjs
deleted file mode 100644
index c4efaf90ff..0000000000
--- a/src/eslint-rules/no-raw-provider-identifiers.test.mjs
+++ /dev/null
@@ -1,39 +0,0 @@
-import { RuleTester } from "eslint"
-
-import { noRawProviderIdentifiers } from "./no-raw-provider-identifiers.mjs"
-
-const ruleTester = new RuleTester({
-	languageOptions: {
-		ecmaVersion: 2022,
-		sourceType: "module",
-	},
-})
-
-ruleTester.run("no-raw-provider-identifiers", noRawProviderIdentifiers, {
-	valid: [
-		"const apiProvider = retiredProviderIdentifiers.roo",
-		"const provider = retiredProviderIdentifiers.groq",
-	],
-	invalid: [
-		{
-			code: 'const apiProvider = "roo"',
-			errors: [
-				{
-					message:
-						'Use retiredProviderIdentifiers.roo instead of the raw provider identifier "roo".',
-					type: "Literal",
-				},
-			],
-		},
-		{
-			code: "const persistedProvider = `groq`",
-			errors: [
-				{
-					message:
-						'Use retiredProviderIdentifiers.groq instead of the raw provider identifier "groq".',
-					type: "TemplateLiteral",
-				},
-			],
-		},
-	],
-})
diff --git a/src/package.json b/src/package.json
index 094d7aed93..28c4184da5 100644
--- a/src/package.json
+++ b/src/package.json
@@ -529,7 +529,6 @@
 	},
 	"devDependencies": {
 		"@ai-sdk/openai-compatible": "2.0.56",
-		"@typescript-eslint/parser": "8.32.1",
 		"@roo-code/build": "workspace:^",
 		"@roo-code/config-eslint": "workspace:^",
 		"@roo-code/config-typescript": "workspace:^",
diff --git a/src/shared/api.ts b/src/shared/api.ts
index 1787e15e88..d1cc21cad0 100644
--- a/src/shared/api.ts
+++ b/src/shared/api.ts
@@ -6,6 +6,7 @@ import {
 	ANTHROPIC_DEFAULT_MAX_TOKENS,
 	isDynamicProvider,
 	isLocalProvider,
+	providerIdentifiers,
 } from "@roo-code/types"
 
 // ApiHandlerOptions
@@ -176,21 +177,21 @@ type CommonFetchParams = {
 // If a new dynamic provider is added in packages/types, this will fail to compile
 // until a corresponding entry is added here.
 const dynamicProviderExtras = {
-	openrouter: {} as {}, // eslint-disable-line @typescript-eslint/no-empty-object-type
-	"vercel-ai-gateway": {} as {}, // eslint-disable-line @typescript-eslint/no-empty-object-type
-	"zoo-gateway": {} as { apiKey?: string; baseUrl?: string },
-	litellm: {} as { apiKey?: string; baseUrl: string },
-	requesty: {} as { apiKey?: string; baseUrl?: string },
-	unbound: {} as { apiKey?: string },
-	ollama: {} as {}, // eslint-disable-line @typescript-eslint/no-empty-object-type
-	lmstudio: {} as {}, // eslint-disable-line @typescript-eslint/no-empty-object-type
-	poe: {} as { apiKey?: string; baseUrl?: string },
-	deepseek: {} as { apiKey?: string; baseUrl?: string },
-	moonshot: {} as { apiKey?: string; baseUrl?: string },
-	"opencode-go": {} as { apiKey?: string },
-	kenari: {} as { apiKey?: string },
-	nanogpt: {} as { apiKey?: string },
-	"kimi-code": {} as { apiKey?: string },
+	[providerIdentifiers.openrouter]: {} as {}, // eslint-disable-line @typescript-eslint/no-empty-object-type
+	[providerIdentifiers.vercelAiGateway]: {} as {}, // eslint-disable-line @typescript-eslint/no-empty-object-type
+	[providerIdentifiers.zooGateway]: {} as { apiKey?: string; baseUrl?: string },
+	[providerIdentifiers.litellm]: {} as { apiKey?: string; baseUrl: string },
+	[providerIdentifiers.requesty]: {} as { apiKey?: string; baseUrl?: string },
+	[providerIdentifiers.unbound]: {} as { apiKey?: string },
+	[providerIdentifiers.ollama]: {} as {}, // eslint-disable-line @typescript-eslint/no-empty-object-type
+	[providerIdentifiers.lmstudio]: {} as {}, // eslint-disable-line @typescript-eslint/no-empty-object-type
+	[providerIdentifiers.poe]: {} as { apiKey?: string; baseUrl?: string },
+	[providerIdentifiers.deepseek]: {} as { apiKey?: string; baseUrl?: string },
+	[providerIdentifiers.moonshot]: {} as { apiKey?: string; baseUrl?: string },
+	[providerIdentifiers.opencodeGo]: {} as { apiKey?: string },
+	[providerIdentifiers.kenari]: {} as { apiKey?: string },
+	[providerIdentifiers.nanogpt]: {} as { apiKey?: string },
+	[providerIdentifiers.kimiCode]: {} as { apiKey?: string },
 } as const satisfies Record<RouterName, object>
 
 // Build the dynamic options union from the map, intersected with CommonFetchParams
diff --git a/webview-ui/src/__tests__/ContextWindowProgress.spec.tsx b/webview-ui/src/__tests__/ContextWindowProgress.spec.tsx
index 3236510911..f5c2ba1062 100644
--- a/webview-ui/src/__tests__/ContextWindowProgress.spec.tsx
+++ b/webview-ui/src/__tests__/ContextWindowProgress.spec.tsx
@@ -1,6 +1,7 @@
 // npm run test ContextWindowProgress.spec.tsx
 
 import { render, screen, fireEvent } from "@/utils/test-utils"
+import { providerIdentifiers } from "@roo-code/types"
 
 import TaskHeader from "@src/components/chat/TaskHeader"
 
@@ -17,7 +18,7 @@ vi.mock("@vscode/webview-ui-toolkit/react", () => ({
 // Mock ExtensionStateContext since we use useExtensionState
 vi.mock("@src/context/ExtensionStateContext", () => ({
 	useExtensionState: vi.fn(() => ({
-		apiConfiguration: { apiProvider: "openai" },
+		apiConfiguration: { apiProvider: providerIdentifiers.openai },
 		currentTaskItem: { id: "test-id", number: 1, size: 1024 },
 	})),
 }))
diff --git a/webview-ui/src/components/chat/CodeIndexPopover.tsx b/webview-ui/src/components/chat/CodeIndexPopover.tsx
index 5742be032c..732280532f 100644
--- a/webview-ui/src/components/chat/CodeIndexPopover.tsx
+++ b/webview-ui/src/components/chat/CodeIndexPopover.tsx
@@ -12,7 +12,12 @@ import {
 import * as ProgressPrimitive from "@radix-ui/react-progress"
 import { TriangleAlert } from "lucide-react"
 
-import { type IndexingStatus, type EmbedderProvider, CODEBASE_INDEX_DEFAULTS } from "@roo-code/types"
+import {
+	type IndexingStatus,
+	type EmbedderProvider,
+	CODEBASE_INDEX_DEFAULTS,
+	providerIdentifiers,
+} from "@roo-code/types"
 
 import { vscode } from "@src/utils/vscode"
 import { useExtensionState } from "@src/context/ExtensionStateContext"
@@ -95,7 +100,7 @@ const createValidationSchema = (provider: EmbedderProvider, t: any) => {
 	})
 
 	switch (provider) {
-		case "openai":
+		case providerIdentifiers.openai:
 			return baseSchema.extend({
 				codeIndexOpenAiKey: z.string().min(1, t("settings:codeIndex.validation.openaiApiKeyRequired")),
 				codebaseIndexEmbedderModelId: z
@@ -103,7 +108,7 @@ const createValidationSchema = (provider: EmbedderProvider, t: any) => {
 					.min(1, t("settings:codeIndex.validation.modelSelectionRequired")),
 			})
 
-		case "ollama":
+		case providerIdentifiers.ollama:
 			return baseSchema.extend({
 				codebaseIndexEmbedderBaseUrl: z
 					.string()
@@ -131,7 +136,7 @@ const createValidationSchema = (provider: EmbedderProvider, t: any) => {
 					.min(1, t("settings:codeIndex.validation.modelDimensionRequired")),
 			})
 
-		case "gemini":
+		case providerIdentifiers.gemini:
 			return baseSchema.extend({
 				codebaseIndexGeminiApiKey: z.string().min(1, t("settings:codeIndex.validation.geminiApiKeyRequired")),
 				codebaseIndexEmbedderModelId: z
@@ -139,7 +144,7 @@ const createValidationSchema = (provider: EmbedderProvider, t: any) => {
 					.min(1, t("settings:codeIndex.validation.modelSelectionRequired")),
 			})
 
-		case "mistral":
+		case providerIdentifiers.mistral:
 			return baseSchema.extend({
 				codebaseIndexMistralApiKey: z.string().min(1, t("settings:codeIndex.validation.mistralApiKeyRequired")),
 				codebaseIndexEmbedderModelId: z
@@ -147,7 +152,7 @@ const createValidationSchema = (provider: EmbedderProvider, t: any) => {
 					.min(1, t("settings:codeIndex.validation.modelSelectionRequired")),
 			})
 
-		case "vercel-ai-gateway":
+		case providerIdentifiers.vercelAiGateway:
 			return baseSchema.extend({
 				codebaseIndexVercelAiGatewayApiKey: z
 					.string()
@@ -157,7 +162,7 @@ const createValidationSchema = (provider: EmbedderProvider, t: any) => {
 					.min(1, t("settings:codeIndex.validation.modelSelectionRequired")),
 			})
 
-		case "bedrock":
+		case providerIdentifiers.bedrock:
 			return baseSchema.extend({
 				codebaseIndexBedrockRegion: z.string().min(1, t("settings:codeIndex.validation.bedrockRegionRequired")),
 				codebaseIndexBedrockProfile: z.string().optional(),
@@ -166,7 +171,7 @@ const createValidationSchema = (provider: EmbedderProvider, t: any) => {
 					.min(1, t("settings:codeIndex.validation.modelSelectionRequired")),
 			})
 
-		case "openrouter":
+		case providerIdentifiers.openrouter:
 			return baseSchema.extend({
 				codebaseIndexOpenRouterApiKey: z
 					.string()
@@ -218,7 +223,7 @@ export const CodeIndexPopover: React.FC<CodeIndexPopoverProps> = ({
 	const getDefaultSettings = (): LocalCodeIndexSettings => ({
 		codebaseIndexEnabled: true,
 		codebaseIndexQdrantUrl: "",
-		codebaseIndexEmbedderProvider: "openai",
+		codebaseIndexEmbedderProvider: providerIdentifiers.openai,
 		codebaseIndexEmbedderBaseUrl: "",
 		codebaseIndexEmbedderModelId: "",
 		codebaseIndexEmbedderModelDimension: undefined,
@@ -593,13 +598,13 @@ export const CodeIndexPopover: React.FC<CodeIndexPopoverProps> = ({
 
 	// Fetch OpenRouter model providers for embedding model
 	const { data: openRouterEmbeddingProviders } = useOpenRouterModelProviders(
-		currentSettings.codebaseIndexEmbedderProvider === "openrouter"
+		currentSettings.codebaseIndexEmbedderProvider === providerIdentifiers.openrouter
 			? currentSettings.codebaseIndexEmbedderModelId
 			: undefined,
 		undefined,
 		{
 			enabled:
-				currentSettings.codebaseIndexEmbedderProvider === "openrouter" &&
+				currentSettings.codebaseIndexEmbedderProvider === providerIdentifiers.openrouter &&
 				!!currentSettings.codebaseIndexEmbedderModelId,
 		},
 	)
@@ -720,7 +725,7 @@ export const CodeIndexPopover: React.FC<CodeIndexPopoverProps> = ({
 												// if the main API provider is also configured for Bedrock
 												if (
 													value === "bedrock" &&
-													apiConfiguration?.apiProvider === "bedrock"
+													apiConfiguration?.apiProvider === providerIdentifiers.bedrock
 												) {
 													// Only populate if currently empty
 													if (
@@ -781,7 +786,7 @@ export const CodeIndexPopover: React.FC<CodeIndexPopoverProps> = ({
 									</div>
 
 									{/* Provider-specific settings */}
-									{currentSettings.codebaseIndexEmbedderProvider === "openai" && (
+									{currentSettings.codebaseIndexEmbedderProvider === providerIdentifiers.openai && (
 										<>
 											<div className="space-y-2">
 												<label className="text-sm font-medium">
@@ -846,7 +851,7 @@ export const CodeIndexPopover: React.FC<CodeIndexPopoverProps> = ({
 										</>
 									)}
 
-									{currentSettings.codebaseIndexEmbedderProvider === "ollama" && (
+									{currentSettings.codebaseIndexEmbedderProvider === providerIdentifiers.ollama && (
 										<>
 											<div className="space-y-2">
 												<label className="text-sm font-medium">
@@ -1038,7 +1043,7 @@ export const CodeIndexPopover: React.FC<CodeIndexPopoverProps> = ({
 										</>
 									)}
 
-									{currentSettings.codebaseIndexEmbedderProvider === "gemini" && (
+									{currentSettings.codebaseIndexEmbedderProvider === providerIdentifiers.gemini && (
 										<>
 											<div className="space-y-2">
 												<label className="text-sm font-medium">
@@ -1103,7 +1108,7 @@ export const CodeIndexPopover: React.FC<CodeIndexPopoverProps> = ({
 										</>
 									)}
 
-									{currentSettings.codebaseIndexEmbedderProvider === "mistral" && (
+									{currentSettings.codebaseIndexEmbedderProvider === providerIdentifiers.mistral && (
 										<>
 											<div className="space-y-2">
 												<label className="text-sm font-medium">
@@ -1168,7 +1173,8 @@ export const CodeIndexPopover: React.FC<CodeIndexPopoverProps> = ({
 										</>
 									)}
 
-									{currentSettings.codebaseIndexEmbedderProvider === "vercel-ai-gateway" && (
+									{currentSettings.codebaseIndexEmbedderProvider ===
+										providerIdentifiers.vercelAiGateway && (
 										<>
 											<div className="space-y-2">
 												<label className="text-sm font-medium">
@@ -1238,7 +1244,7 @@ export const CodeIndexPopover: React.FC<CodeIndexPopoverProps> = ({
 										</>
 									)}
 
-									{currentSettings.codebaseIndexEmbedderProvider === "bedrock" && (
+									{currentSettings.codebaseIndexEmbedderProvider === providerIdentifiers.bedrock && (
 										<>
 											<div className="space-y-2">
 												<label className="text-sm font-medium">
@@ -1331,7 +1337,8 @@ export const CodeIndexPopover: React.FC<CodeIndexPopoverProps> = ({
 										</>
 									)}
 
-									{currentSettings.codebaseIndexEmbedderProvider === "openrouter" && (
+									{currentSettings.codebaseIndexEmbedderProvider ===
+										providerIdentifiers.openrouter && (
 										<>
 											<div className="space-y-2">
 												<label className="text-sm font-medium">
diff --git a/webview-ui/src/components/chat/__tests__/ApiConfigSelector.spec.tsx b/webview-ui/src/components/chat/__tests__/ApiConfigSelector.spec.tsx
index a71216d96f..420249b365 100644
--- a/webview-ui/src/components/chat/__tests__/ApiConfigSelector.spec.tsx
+++ b/webview-ui/src/components/chat/__tests__/ApiConfigSelector.spec.tsx
@@ -1,5 +1,6 @@
 import { render, screen, fireEvent, waitFor } from "@/utils/test-utils"
 import { vscode } from "@/utils/vscode"
+import { providerIdentifiers } from "@roo-code/types"
 
 import { ApiConfigSelector } from "../ApiConfigSelector"
 
@@ -24,7 +25,7 @@ vi.mock("@/components/ui/hooks/useRooPortal", () => ({
 vi.mock("@/context/ExtensionStateContext", () => ({
 	useExtensionState: () => ({
 		apiConfiguration: {
-			apiProvider: "anthropic",
+			apiProvider: providerIdentifiers.anthropic,
 			apiModelId: "claude-3-opus-20240229",
 		},
 	}),
diff --git a/webview-ui/src/components/chat/__tests__/ChatTextArea.lockApiConfig.spec.tsx b/webview-ui/src/components/chat/__tests__/ChatTextArea.lockApiConfig.spec.tsx
index d3fb2b6890..4f6e45825d 100644
--- a/webview-ui/src/components/chat/__tests__/ChatTextArea.lockApiConfig.spec.tsx
+++ b/webview-ui/src/components/chat/__tests__/ChatTextArea.lockApiConfig.spec.tsx
@@ -1,3 +1,4 @@
+import { providerIdentifiers } from "@roo-code/types"
 import { defaultModeSlug } from "@roo/modes"
 
 import { render, fireEvent, screen } from "@src/utils/test-utils"
@@ -44,7 +45,7 @@ describe("ChatTextArea - lockApiConfigAcrossModes toggle", () => {
 	const defaultState = {
 		filePaths: [],
 		openedTabs: [],
-		apiConfiguration: { apiProvider: "anthropic" },
+		apiConfiguration: { apiProvider: providerIdentifiers.anthropic },
 		taskHistory: [],
 		cwd: "/test/workspace",
 		listApiConfigMeta: [{ id: "default", name: "Default", modelId: "claude-3" }],
diff --git a/webview-ui/src/components/chat/__tests__/ChatTextArea.spec.tsx b/webview-ui/src/components/chat/__tests__/ChatTextArea.spec.tsx
index 90df0755c7..a3a5558748 100644
--- a/webview-ui/src/components/chat/__tests__/ChatTextArea.spec.tsx
+++ b/webview-ui/src/components/chat/__tests__/ChatTextArea.spec.tsx
@@ -1,3 +1,4 @@
+import { providerIdentifiers } from "@roo-code/types"
 import { defaultModeSlug } from "@roo/modes"
 
 import { render, fireEvent, screen } from "@src/utils/test-utils"
@@ -68,7 +69,7 @@ describe("ChatTextArea", () => {
 			filePaths: [],
 			openedTabs: [],
 			apiConfiguration: {
-				apiProvider: "anthropic",
+				apiProvider: providerIdentifiers.anthropic,
 			},
 			taskHistory: [],
 			cwd: "/test/workspace",
@@ -92,7 +93,7 @@ describe("ChatTextArea", () => {
 	describe("handleEnhancePrompt", () => {
 		it("should send message with correct configuration when clicked", () => {
 			const apiConfiguration = {
-				apiProvider: "openrouter",
+				apiProvider: providerIdentifiers.openrouter,
 				apiKey: "test-key",
 			}
 
@@ -120,7 +121,7 @@ describe("ChatTextArea", () => {
 				filePaths: [],
 				openedTabs: [],
 				apiConfiguration: {
-					apiProvider: "openrouter",
+					apiProvider: providerIdentifiers.openrouter,
 				},
 				taskHistory: [],
 				cwd: "/test/workspace",
@@ -142,7 +143,7 @@ describe("ChatTextArea", () => {
 				filePaths: [],
 				openedTabs: [],
 				apiConfiguration: {
-					apiProvider: "openrouter",
+					apiProvider: providerIdentifiers.openrouter,
 				},
 				taskHistory: [],
 				cwd: "/test/workspace",
@@ -168,7 +169,7 @@ describe("ChatTextArea", () => {
 				filePaths: [],
 				openedTabs: [],
 				apiConfiguration: {
-					apiProvider: "openrouter",
+					apiProvider: providerIdentifiers.openrouter,
 					newSetting: "test",
 				},
 				taskHistory: [],
@@ -500,7 +501,7 @@ describe("ChatTextArea", () => {
 					filePaths: [],
 					openedTabs: [],
 					apiConfiguration: {
-						apiProvider: "anthropic",
+						apiProvider: providerIdentifiers.anthropic,
 					},
 					taskHistory: [],
 					clineMessages: mockClineMessages,
@@ -653,7 +654,7 @@ describe("ChatTextArea", () => {
 					filePaths: [],
 					openedTabs: [],
 					apiConfiguration: {
-						apiProvider: "anthropic",
+						apiProvider: providerIdentifiers.anthropic,
 					},
 					taskHistory: [],
 					clineMessages: mixedClineMessages,
@@ -681,7 +682,7 @@ describe("ChatTextArea", () => {
 					filePaths: [],
 					openedTabs: [],
 					apiConfiguration: {
-						apiProvider: "anthropic",
+						apiProvider: providerIdentifiers.anthropic,
 					},
 					taskHistory: [],
 					clineMessages: [],
@@ -712,7 +713,7 @@ describe("ChatTextArea", () => {
 					filePaths: [],
 					openedTabs: [],
 					apiConfiguration: {
-						apiProvider: "anthropic",
+						apiProvider: providerIdentifiers.anthropic,
 					},
 					taskHistory: [],
 					clineMessages: clineMessagesWithEmpty,
@@ -746,7 +747,7 @@ describe("ChatTextArea", () => {
 					filePaths: [],
 					openedTabs: [],
 					apiConfiguration: {
-						apiProvider: "anthropic",
+						apiProvider: providerIdentifiers.anthropic,
 					},
 					taskHistory: mockTaskHistory,
 					clineMessages: [], // No conversation messages
@@ -780,7 +781,7 @@ describe("ChatTextArea", () => {
 					filePaths: [],
 					openedTabs: [],
 					apiConfiguration: {
-						apiProvider: "anthropic",
+						apiProvider: providerIdentifiers.anthropic,
 					},
 					taskHistory: [
 						{ task: "Task 1", workspace: "/test/workspace" },
@@ -803,7 +804,7 @@ describe("ChatTextArea", () => {
 					filePaths: [],
 					openedTabs: [],
 					apiConfiguration: {
-						apiProvider: "anthropic",
+						apiProvider: providerIdentifiers.anthropic,
 					},
 					taskHistory: [],
 					clineMessages: [
diff --git a/webview-ui/src/components/chat/__tests__/CodeIndexPopover.auto-populate.spec.tsx b/webview-ui/src/components/chat/__tests__/CodeIndexPopover.auto-populate.spec.tsx
index 818a771281..0e89e4ac1c 100644
--- a/webview-ui/src/components/chat/__tests__/CodeIndexPopover.auto-populate.spec.tsx
+++ b/webview-ui/src/components/chat/__tests__/CodeIndexPopover.auto-populate.spec.tsx
@@ -1,3 +1,4 @@
+import { providerIdentifiers } from "@roo-code/types"
 /**
  * Tests for the auto-population feature in CodeIndexPopover
  *
@@ -34,7 +35,7 @@ describe("CodeIndexPopover - Auto-population Feature Logic", () => {
 			codebaseIndexBedrockProfile: "",
 		}
 		const apiConfiguration = {
-			apiProvider: "bedrock",
+			apiProvider: providerIdentifiers.bedrock,
 			awsRegion: "us-west-2",
 			awsProfile: "my-profile",
 		}
@@ -75,7 +76,7 @@ describe("CodeIndexPopover - Auto-population Feature Logic", () => {
 			codebaseIndexBedrockProfile: "",
 		}
 		const apiConfiguration: TestApiConfiguration = {
-			apiProvider: "openai",
+			apiProvider: providerIdentifiers.openai,
 			apiKey: "test-key",
 		}
 
@@ -114,7 +115,7 @@ describe("CodeIndexPopover - Auto-population Feature Logic", () => {
 			codebaseIndexBedrockProfile: "",
 		}
 		const apiConfiguration = {
-			apiProvider: "bedrock",
+			apiProvider: providerIdentifiers.bedrock,
 			awsRegion: "us-west-2",
 			awsProfile: "default",
 		}
@@ -154,7 +155,7 @@ describe("CodeIndexPopover - Auto-population Feature Logic", () => {
 			codebaseIndexBedrockProfile: "",
 		}
 		const apiConfiguration: TestApiConfiguration = {
-			apiProvider: "bedrock",
+			apiProvider: providerIdentifiers.bedrock,
 			awsRegion: "ap-southeast-1",
 			// No awsProfile configured
 		}
@@ -193,7 +194,7 @@ describe("CodeIndexPopover - Auto-population Feature Logic", () => {
 			codebaseIndexBedrockProfile: "",
 		}
 		const apiConfiguration: TestApiConfiguration = {
-			apiProvider: "bedrock",
+			apiProvider: providerIdentifiers.bedrock,
 			// No awsRegion or awsProfile configured
 		}
 
@@ -229,7 +230,7 @@ describe("CodeIndexPopover - Auto-population Feature Logic", () => {
 			codebaseIndexBedrockProfile: "",
 		}
 		const apiConfiguration = {
-			apiProvider: "bedrock",
+			apiProvider: providerIdentifiers.bedrock,
 			awsRegion: "us-east-1",
 			awsProfile: undefined, // Explicitly undefined
 		}
@@ -266,7 +267,7 @@ describe("CodeIndexPopover - Auto-population Feature Logic", () => {
 			codebaseIndexBedrockProfile: "",
 		}
 		const apiConfiguration = {
-			apiProvider: "bedrock",
+			apiProvider: providerIdentifiers.bedrock,
 			awsRegion: "us-west-2",
 			awsProfile: "my-profile",
 		}
@@ -304,7 +305,7 @@ describe("CodeIndexPopover - Auto-population Feature Logic", () => {
 			codebaseIndexBedrockProfile: "production",
 		}
 		const apiConfiguration = {
-			apiProvider: "bedrock",
+			apiProvider: providerIdentifiers.bedrock,
 			awsRegion: "us-west-2",
 			awsProfile: "default",
 		}
diff --git a/webview-ui/src/components/chat/__tests__/TaskHeader.spec.tsx b/webview-ui/src/components/chat/__tests__/TaskHeader.spec.tsx
index 2a302e6b18..022186f40e 100644
--- a/webview-ui/src/components/chat/__tests__/TaskHeader.spec.tsx
+++ b/webview-ui/src/components/chat/__tests__/TaskHeader.spec.tsx
@@ -1,3 +1,4 @@
+import { providerIdentifiers } from "@roo-code/types"
 // npx vitest src/components/chat/__tests__/TaskHeader.spec.tsx
 
 import React from "react"
@@ -42,7 +43,7 @@ const mockExtensionState: {
 	taskHistory: any[]
 } = {
 	apiConfiguration: {
-		apiProvider: "anthropic",
+		apiProvider: providerIdentifiers.anthropic,
 		apiKey: "test-api-key",
 		apiModelId: "claude-3-opus-20240229",
 	} as ProviderSettings,
@@ -75,7 +76,7 @@ let mockModelInfo: { contextWindow: number; maxTokens: number } | undefined = un
 // Mock useSelectedModel hook
 vi.mock("@/components/ui/hooks/useSelectedModel", () => ({
 	useSelectedModel: () => ({
-		provider: "anthropic",
+		provider: providerIdentifiers.anthropic,
 		id: "test-model",
 		info: mockModelInfo,
 		isLoading: false,
diff --git a/webview-ui/src/components/settings/ImageGenerationSettings.tsx b/webview-ui/src/components/settings/ImageGenerationSettings.tsx
index fca4547672..f322436a17 100644
--- a/webview-ui/src/components/settings/ImageGenerationSettings.tsx
+++ b/webview-ui/src/components/settings/ImageGenerationSettings.tsx
@@ -1,3 +1,4 @@
+import { providerIdentifiers } from "@roo-code/types"
 import React, { useMemo } from "react"
 import { VSCodeCheckbox, VSCodeTextField, VSCodeDropdown, VSCodeOption } from "@vscode/webview-ui-toolkit/react"
 import { IMAGE_GENERATION_MODELS, type ImageGenerationProvider, getImageGenerationProvider } from "@roo-code/types"
@@ -87,7 +88,7 @@ export const ImageGenerationSettings = ({
 		setImageGenerationSelectedModel(value)
 	}
 
-	const requiresApiKey = currentProvider === "openrouter"
+	const requiresApiKey = currentProvider === providerIdentifiers.openrouter
 	const isConfigured = !requiresApiKey || (requiresApiKey && openRouterImageApiKey)
 
 	return (
@@ -124,7 +125,7 @@ export const ImageGenerationSettings = ({
 					</div>
 
 					{/* API Key Configuration (only for OpenRouter) */}
-					{currentProvider === "openrouter" && (
+					{currentProvider === providerIdentifiers.openrouter && (
 						<div>
 							<label className="block font-medium mb-1">
 								{t("settings:experimental.IMAGE_GENERATION.openRouterApiKeyLabel")}
diff --git a/webview-ui/src/components/settings/__tests__/ApiOptions.provider-filtering.spec.tsx b/webview-ui/src/components/settings/__tests__/ApiOptions.provider-filtering.spec.tsx
index c9fb64272b..afe66e8d46 100644
--- a/webview-ui/src/components/settings/__tests__/ApiOptions.provider-filtering.spec.tsx
+++ b/webview-ui/src/components/settings/__tests__/ApiOptions.provider-filtering.spec.tsx
@@ -1,3 +1,4 @@
+import { providerIdentifiers } from "@roo-code/types"
 import { screen } from "@testing-library/react"
 
 import { renderWithExtensionState } from "@/utils/test-utils"
@@ -44,7 +45,7 @@ vi.mock("@src/components/ui/hooks/useRouterModels", () => ({
 // Mock the selected model hook
 vi.mock("@src/components/ui/hooks/useSelectedModel", () => ({
 	useSelectedModel: vi.fn(() => ({
-		provider: "anthropic",
+		provider: providerIdentifiers.anthropic,
 		id: "claude-3-5-sonnet-20241022",
 		info: null,
 	})),
@@ -99,7 +100,7 @@ describe("ApiOptions Provider Filtering", () => {
 	const defaultProps = {
 		uriScheme: "vscode",
 		apiConfiguration: {
-			apiProvider: "anthropic",
+			apiProvider: providerIdentifiers.anthropic,
 			apiKey: "test-key",
 		} as ProviderSettings,
 		setApiConfigurationField: vi.fn(),
diff --git a/webview-ui/src/components/settings/__tests__/ApiOptions.spec.tsx b/webview-ui/src/components/settings/__tests__/ApiOptions.spec.tsx
index c625650845..e5e666960b 100644
--- a/webview-ui/src/components/settings/__tests__/ApiOptions.spec.tsx
+++ b/webview-ui/src/components/settings/__tests__/ApiOptions.spec.tsx
@@ -1,3 +1,4 @@
+import { retiredProviderIdentifiers, providerIdentifiers } from "@roo-code/types"
 // npx vitest src/components/settings/__tests__/ApiOptions.spec.tsx
 
 import { renderWithExtensionState, screen, fireEvent, within } from "@/utils/test-utils"
@@ -292,7 +293,7 @@ describe("ApiOptions", () => {
 
 		renderApiOptions({
 			apiConfiguration: {
-				apiProvider: "anthropic",
+				apiProvider: providerIdentifiers.anthropic,
 				// Simulate a previously-selected model ID from another provider.
 				// When switching to OpenAI - ChatGPT Plus/Pro, this is invalid and should be reset.
 				apiModelId: "claude-3-5-sonnet-20241022",
@@ -320,7 +321,7 @@ describe("ApiOptions", () => {
 
 		renderApiOptions({
 			apiConfiguration: {
-				apiProvider: "anthropic",
+				apiProvider: providerIdentifiers.anthropic,
 				// No prior zooGatewayModelId.
 			},
 			setApiConfigurationField: mockSetApiConfigurationField,
@@ -337,7 +338,7 @@ describe("ApiOptions", () => {
 	it("renders the Friendli provider form when friendli is selected", () => {
 		renderApiOptions({
 			apiConfiguration: {
-				apiProvider: "friendli" as const,
+				apiProvider: providerIdentifiers.friendli,
 				friendliApiKey: "k",
 			},
 		})
@@ -364,7 +365,7 @@ describe("ApiOptions", () => {
 		it("should show ThinkingBudget for Anthropic models that support thinking", () => {
 			renderApiOptions({
 				apiConfiguration: {
-					apiProvider: "anthropic",
+					apiProvider: providerIdentifiers.anthropic,
 					apiModelId: "claude-3-7-sonnet-20250219:thinking",
 				},
 			})
@@ -375,7 +376,7 @@ describe("ApiOptions", () => {
 		it("should show ThinkingBudget for Vertex models that support thinking", () => {
 			renderApiOptions({
 				apiConfiguration: {
-					apiProvider: "vertex",
+					apiProvider: providerIdentifiers.vertex,
 					apiModelId: "claude-3-7-sonnet@20250219:thinking",
 				},
 			})
@@ -386,7 +387,7 @@ describe("ApiOptions", () => {
 		it("should not show ThinkingBudget for models that don't support thinking", () => {
 			renderApiOptions({
 				apiConfiguration: {
-					apiProvider: "anthropic",
+					apiProvider: providerIdentifiers.anthropic,
 					apiModelId: "claude-3-opus-20240229",
 				},
 			})
@@ -430,7 +431,7 @@ describe("ApiOptions", () => {
 		it("removes reasoningEffort from openAiCustomModelInfo when unchecked", () => {
 			const mockSetApiConfigurationField = vi.fn()
 			const initialConfig = {
-				apiProvider: "openai" as const,
+				apiProvider: providerIdentifiers.openai,
 				enableReasoningEffort: true,
 				openAiCustomModelInfo: {
 					...openAiModelInfoSaneDefaults, // Start with defaults
@@ -473,7 +474,7 @@ describe("ApiOptions", () => {
 		it("does not render ReasoningEffort component when initially disabled", () => {
 			const mockSetApiConfigurationField = vi.fn()
 			const initialConfig = {
-				apiProvider: "openai" as const,
+				apiProvider: providerIdentifiers.openai,
 				enableReasoningEffort: false, // Initially disabled
 				openAiCustomModelInfo: {
 					...openAiModelInfoSaneDefaults,
@@ -492,7 +493,7 @@ describe("ApiOptions", () => {
 		it("renders ReasoningEffort component and sets flag when checkbox is checked", () => {
 			const mockSetApiConfigurationField = vi.fn()
 			const initialConfig = {
-				apiProvider: "openai" as const,
+				apiProvider: providerIdentifiers.openai,
 				enableReasoningEffort: false, // Initially disabled
 				openAiCustomModelInfo: {
 					...openAiModelInfoSaneDefaults,
@@ -520,7 +521,7 @@ describe("ApiOptions", () => {
 		it("updates reasoningEffort in openAiCustomModelInfo when select value changes", () => {
 			const mockSetApiConfigurationField = vi.fn()
 			const initialConfig = {
-				apiProvider: "openai" as const,
+				apiProvider: providerIdentifiers.openai,
 				enableReasoningEffort: true, // Initially enabled
 				openAiCustomModelInfo: {
 					...openAiModelInfoSaneDefaults,
@@ -568,7 +569,7 @@ describe("ApiOptions", () => {
 		it("renders LiteLLM component when provider is selected", () => {
 			renderApiOptions({
 				apiConfiguration: {
-					apiProvider: "litellm",
+					apiProvider: providerIdentifiers.litellm,
 					litellmBaseUrl: "http://localhost:4000",
 					litellmApiKey: "test-key",
 				},
@@ -583,7 +584,7 @@ describe("ApiOptions", () => {
 			const mockSetApiConfigurationField = vi.fn()
 			renderApiOptions({
 				apiConfiguration: {
-					apiProvider: "litellm",
+					apiProvider: providerIdentifiers.litellm,
 				},
 				setApiConfigurationField: mockSetApiConfigurationField,
 			})
@@ -601,7 +602,7 @@ describe("ApiOptions", () => {
 		it("shows refresh models button for LiteLLM", () => {
 			renderApiOptions({
 				apiConfiguration: {
-					apiProvider: "litellm",
+					apiProvider: providerIdentifiers.litellm,
 					litellmBaseUrl: "http://localhost:4000",
 					litellmApiKey: "test-key",
 				},
@@ -613,7 +614,7 @@ describe("ApiOptions", () => {
 		it("does not render LiteLLM component when other provider is selected", () => {
 			renderApiOptions({
 				apiConfiguration: {
-					apiProvider: "anthropic",
+					apiProvider: providerIdentifiers.anthropic,
 				},
 			})
 
@@ -625,7 +626,7 @@ describe("ApiOptions", () => {
 		it("renders Kenari component when provider is selected", () => {
 			renderApiOptions({
 				apiConfiguration: {
-					apiProvider: "kenari",
+					apiProvider: providerIdentifiers.kenari,
 					kenariApiKey: "kn-test-key",
 				},
 			})
@@ -637,7 +638,7 @@ describe("ApiOptions", () => {
 		it("does not render Kenari component when other provider is selected", () => {
 			renderApiOptions({
 				apiConfiguration: {
-					apiProvider: "anthropic",
+					apiProvider: providerIdentifiers.anthropic,
 				},
 			})
 
@@ -648,7 +649,7 @@ describe("ApiOptions", () => {
 	it("renders retired provider message and hides provider-specific forms", () => {
 		renderApiOptions({
 			apiConfiguration: {
-				apiProvider: "groq",
+				apiProvider: retiredProviderIdentifiers.groq,
 			},
 		})
 
@@ -661,7 +662,7 @@ describe("ApiOptions", () => {
 	it("does not reintroduce retired providers into active provider options", () => {
 		renderApiOptions({
 			apiConfiguration: {
-				apiProvider: "groq",
+				apiProvider: retiredProviderIdentifiers.groq,
 			},
 		})
 
diff --git a/webview-ui/src/components/settings/__tests__/ModelPicker.deprecated.spec.tsx b/webview-ui/src/components/settings/__tests__/ModelPicker.deprecated.spec.tsx
index ebc3239792..154f1cc1de 100644
--- a/webview-ui/src/components/settings/__tests__/ModelPicker.deprecated.spec.tsx
+++ b/webview-ui/src/components/settings/__tests__/ModelPicker.deprecated.spec.tsx
@@ -1,3 +1,4 @@
+import { providerIdentifiers } from "@roo-code/types"
 // npx vitest src/components/settings/__tests__/ModelPicker.deprecated.spec.tsx
 
 import { screen } from "@testing-library/react"
@@ -49,7 +50,7 @@ vi.mock("@/components/ui/hooks/useSelectedModel", () => ({
 		return {
 			id: modelId,
 			info: models[modelId],
-			provider: "openrouter",
+			provider: providerIdentifiers.openrouter,
 			isLoading: false,
 			isError: false,
 		}
@@ -97,7 +98,7 @@ describe("ModelPicker - Deprecated Models", () => {
 				modelIdKey="openRouterModelId"
 				serviceName="Test Service"
 				serviceUrl="https://test.com"
-				apiConfiguration={{ apiProvider: "openrouter" }}
+				apiConfiguration={{ apiProvider: providerIdentifiers.openrouter }}
 				setApiConfigurationField={mockSetApiConfigurationField}
 				organizationAllowList={{ allowAll: true, providers: {} }}
 			/>,
@@ -125,7 +126,7 @@ describe("ModelPicker - Deprecated Models", () => {
 				serviceName="Test Service"
 				serviceUrl="https://test.com"
 				apiConfiguration={{
-					apiProvider: "openrouter",
+					apiProvider: providerIdentifiers.openrouter,
 					openRouterModelId: "deprecated-model",
 				}}
 				setApiConfigurationField={mockSetApiConfigurationField}
@@ -150,7 +151,7 @@ describe("ModelPicker - Deprecated Models", () => {
 				modelIdKey="openRouterModelId"
 				serviceName="Test Service"
 				serviceUrl="https://test.com"
-				apiConfiguration={{ apiProvider: "openrouter" }}
+				apiConfiguration={{ apiProvider: providerIdentifiers.openrouter }}
 				setApiConfigurationField={mockSetApiConfigurationField}
 				organizationAllowList={{ allowAll: true, providers: {} }}
 			/>,
@@ -178,7 +179,7 @@ describe("ModelPicker - Deprecated Models", () => {
 				serviceName="Test Service"
 				serviceUrl="https://test.com"
 				apiConfiguration={{
-					apiProvider: "openrouter",
+					apiProvider: providerIdentifiers.openrouter,
 					openRouterModelId: "deprecated-model",
 				}}
 				setApiConfigurationField={mockSetApiConfigurationField}
diff --git a/webview-ui/src/components/settings/__tests__/SettingsView.change-detection.spec.tsx b/webview-ui/src/components/settings/__tests__/SettingsView.change-detection.spec.tsx
index 385b4320f1..034038e27e 100644
--- a/webview-ui/src/components/settings/__tests__/SettingsView.change-detection.spec.tsx
+++ b/webview-ui/src/components/settings/__tests__/SettingsView.change-detection.spec.tsx
@@ -1,3 +1,4 @@
+import { providerIdentifiers, type ProviderSettings } from "@roo-code/types"
 import { act, screen, fireEvent, waitFor, configure } from "@testing-library/react"
 
 import { renderWithExtensionState } from "@/utils/test-utils"
@@ -385,9 +386,9 @@ describe("SettingsView - Change Detection Fix", () => {
 		uriScheme: "vscode",
 		settingsImportedAt: undefined,
 		apiConfiguration: {
-			apiProvider: "openai",
+			apiProvider: providerIdentifiers.openai,
 			apiModelId: "", // Empty string initially
-		},
+		} as ProviderSettings,
 		alwaysAllowReadOnly: false,
 		alwaysAllowReadOnlyOutsideWorkspace: false,
 		allowedCommands: [],
@@ -516,7 +517,7 @@ describe("SettingsView - Change Detection Fix", () => {
 		let extensionState = createExtensionState({
 			settingsImportedAt: 123,
 			apiConfiguration: {
-				apiProvider: "openai",
+				apiProvider: providerIdentifiers.openai,
 				apiModelId: "gpt-4.1",
 			},
 		})
@@ -539,7 +540,7 @@ describe("SettingsView - Change Detection Fix", () => {
 			type: "upsertApiConfiguration",
 			text: "default",
 			apiConfiguration: expect.objectContaining({
-				apiProvider: "baseten",
+				apiProvider: providerIdentifiers.baseten,
 				basetenApiKey: "test-baseten-key",
 			}),
 		})
@@ -552,7 +553,7 @@ describe("SettingsView - Change Detection Fix", () => {
 				settingsImportedAt: 123,
 				soundEnabled: true,
 				apiConfiguration: {
-					apiProvider: "baseten",
+					apiProvider: providerIdentifiers.baseten,
 					apiModelId: "zai-org/GLM-4.6",
 					basetenApiKey: "test-baseten-key",
 				},
@@ -577,7 +578,7 @@ describe("SettingsView - Change Detection Fix", () => {
 			type: "upsertApiConfiguration",
 			text: "default",
 			apiConfiguration: expect.objectContaining({
-				apiProvider: "deepseek",
+				apiProvider: providerIdentifiers.deepseek,
 			}),
 		})
 	}, 10000)
@@ -587,7 +588,7 @@ describe("SettingsView - Change Detection Fix", () => {
 		let extensionState = createExtensionState({
 			settingsImportedAt: 100,
 			apiConfiguration: {
-				apiProvider: "openai",
+				apiProvider: providerIdentifiers.openai,
 				apiModelId: "gpt-4.1",
 			},
 		})
@@ -607,7 +608,7 @@ describe("SettingsView - Change Detection Fix", () => {
 			extensionState = createExtensionState({
 				settingsImportedAt: 101,
 				apiConfiguration: {
-					apiProvider: "baseten",
+					apiProvider: providerIdentifiers.baseten,
 					apiModelId: "zai-org/GLM-4.6",
 					basetenApiKey: "imported-baseten-key",
 				},
@@ -632,7 +633,7 @@ describe("SettingsView - Change Detection Fix", () => {
 			let extensionState = createExtensionState({
 				mode: "code",
 				apiConfiguration: {
-					apiProvider: "openai",
+					apiProvider: providerIdentifiers.openai,
 					apiModelId: "gpt-4.1",
 				},
 			})
@@ -659,7 +660,7 @@ describe("SettingsView - Change Detection Fix", () => {
 			await act(async () => {
 				extensionState.mode = "ask"
 				extensionState.apiConfiguration = {
-					apiProvider: "openrouter",
+					apiProvider: providerIdentifiers.openrouter,
 					apiModelId: "claude-3.5-sonnet",
 				}
 
@@ -693,7 +694,7 @@ describe("SettingsView - Change Detection Fix", () => {
 				extensionState = createExtensionState({
 					mode: "ask",
 					apiConfiguration: {
-						apiProvider: "friendli",
+						apiProvider: providerIdentifiers.friendli,
 						apiModelId: "friendli-model",
 					},
 				})
@@ -715,7 +716,7 @@ describe("SettingsView - Change Detection Fix", () => {
 			let extensionState = createExtensionState({
 				mode: "code",
 				apiConfiguration: {
-					apiProvider: "openai",
+					apiProvider: providerIdentifiers.openai,
 					apiModelId: "gpt-4.1",
 				},
 			})
@@ -739,7 +740,7 @@ describe("SettingsView - Change Detection Fix", () => {
 				extensionState = createExtensionState({
 					mode: "code",
 					apiConfiguration: {
-						apiProvider: "openai",
+						apiProvider: providerIdentifiers.openai,
 						apiModelId: "gpt-4.1",
 					},
 				})
diff --git a/webview-ui/src/components/settings/__tests__/SettingsView.unsaved-changes.spec.tsx b/webview-ui/src/components/settings/__tests__/SettingsView.unsaved-changes.spec.tsx
index 11b7de066d..439b859d30 100644
--- a/webview-ui/src/components/settings/__tests__/SettingsView.unsaved-changes.spec.tsx
+++ b/webview-ui/src/components/settings/__tests__/SettingsView.unsaved-changes.spec.tsx
@@ -1,3 +1,4 @@
+import { providerIdentifiers } from "@roo-code/types"
 import { screen, fireEvent, waitFor } from "@testing-library/react"
 
 import { renderWithExtensionState } from "@/utils/test-utils"
@@ -258,7 +259,7 @@ describe("SettingsView - Unsaved Changes Detection", () => {
 		uriScheme: "vscode",
 		settingsImportedAt: undefined,
 		apiConfiguration: {
-			apiProvider: "openai",
+			apiProvider: providerIdentifiers.openai,
 			apiModelId: "", // Empty string initially
 		},
 		alwaysAllowReadOnly: false,
@@ -457,7 +458,7 @@ describe("SettingsView - Unsaved Changes Detection", () => {
 		const stateWithUndefined = {
 			...defaultExtensionState,
 			apiConfiguration: {
-				apiProvider: "openai",
+				apiProvider: providerIdentifiers.openai,
 				apiModelId: undefined,
 			},
 		}
@@ -496,7 +497,7 @@ describe("SettingsView - Unsaved Changes Detection", () => {
 		const stateWithNull = {
 			...defaultExtensionState,
 			apiConfiguration: {
-				apiProvider: "openai",
+				apiProvider: providerIdentifiers.openai,
 				apiModelId: null,
 			},
 		}
@@ -606,7 +607,7 @@ describe("SettingsView - Unsaved Changes Detection", () => {
 
 	it("buffers and saves the complete NanoGPT provider configuration from cached state", async () => {
 		const liveApiConfiguration = {
-			apiProvider: "nanogpt" as const,
+			apiProvider: providerIdentifiers.nanogpt,
 			nanoGptApiKey: "original-key",
 			nanoGptModelId: "openai/original",
 			nanoGptRoutingPreference: "auto" as const,
@@ -660,7 +661,7 @@ describe("SettingsView - Unsaved Changes Detection", () => {
 		fireEvent.change(screen.getByTestId("cached-nanogpt-routing"), { target: { value: "tools" } })
 
 		expect(liveApiConfiguration).toEqual({
-			apiProvider: "nanogpt",
+			apiProvider: providerIdentifiers.nanogpt,
 			nanoGptApiKey: "original-key",
 			nanoGptModelId: "openai/original",
 			nanoGptRoutingPreference: "auto",
@@ -673,7 +674,7 @@ describe("SettingsView - Unsaved Changes Detection", () => {
 			type: "upsertApiConfiguration",
 			text: "default",
 			apiConfiguration: {
-				apiProvider: "nanogpt",
+				apiProvider: providerIdentifiers.nanogpt,
 				nanoGptApiKey: "unsaved-key",
 				nanoGptModelId: "openai/next",
 				nanoGptRoutingPreference: "tools",
@@ -686,7 +687,7 @@ describe("SettingsView - Unsaved Changes Detection", () => {
 		;(useExtensionState as ReturnType<typeof vi.fn>).mockReturnValue({
 			...defaultExtensionState,
 			apiConfiguration: {
-				apiProvider: "nanogpt",
+				apiProvider: providerIdentifiers.nanogpt,
 				nanoGptApiKey: "saved-key",
 				nanoGptModelId: "openai/saved",
 				nanoGptRoutingPreference: "cheap",
diff --git a/webview-ui/src/components/settings/__tests__/ThinkingBudget.spec.tsx b/webview-ui/src/components/settings/__tests__/ThinkingBudget.spec.tsx
index 3c97ee20e9..536903dc53 100644
--- a/webview-ui/src/components/settings/__tests__/ThinkingBudget.spec.tsx
+++ b/webview-ui/src/components/settings/__tests__/ThinkingBudget.spec.tsx
@@ -1,3 +1,4 @@
+import { providerIdentifiers } from "@roo-code/types"
 // npx vitest src/components/settings/__tests__/ThinkingBudget.spec.tsx
 
 import React from "react"
@@ -46,7 +47,7 @@ vi.mock("@/components/ui/hooks/useSelectedModel", () => ({
 		if (apiConfiguration?.apiProvider === "gemini") {
 			return {
 				id: apiConfiguration?.apiModelId || "gemini-2.0-flash-exp",
-				provider: "gemini",
+				provider: providerIdentifiers.gemini,
 				info: undefined,
 			}
 		}
@@ -176,7 +177,7 @@ describe("ThinkingBudget", () => {
 				{...defaultProps}
 				apiConfiguration={{
 					modelMaxTokens: 10000,
-					apiProvider: "gemini",
+					apiProvider: providerIdentifiers.gemini,
 					apiModelId: "gemini-2.5-pro-002",
 				}}
 			/>,
@@ -192,7 +193,7 @@ describe("ThinkingBudget", () => {
 				{...defaultProps}
 				apiConfiguration={{
 					modelMaxTokens: 10000,
-					apiProvider: "gemini",
+					apiProvider: providerIdentifiers.gemini,
 					apiModelId: "gemini-2.5-pro-002",
 				}}
 			/>,
@@ -208,7 +209,7 @@ describe("ThinkingBudget", () => {
 				{...defaultProps}
 				apiConfiguration={{
 					modelMaxTokens: 10000,
-					apiProvider: "anthropic",
+					apiProvider: providerIdentifiers.anthropic,
 					apiModelId: "claude-3-5-sonnet-20241022",
 				}}
 			/>,
@@ -419,7 +420,7 @@ describe("ThinkingBudget", () => {
 			supportsPromptCache: true,
 		}
 
-		const glmApiConfiguration = { apiProvider: "zai", apiModelId: "glm-5.1" } as const
+		const glmApiConfiguration = { apiProvider: providerIdentifiers.zai, apiModelId: "glm-5.1" } as const
 
 		it("should render the max output tokens slider alongside the reasoning effort dropdown", () => {
 			render(<ThinkingBudget {...defaultProps} apiConfiguration={glmApiConfiguration} modelInfo={glmModelInfo} />)
diff --git a/webview-ui/src/components/settings/providers/__tests__/Friendli.spec.tsx b/webview-ui/src/components/settings/providers/__tests__/Friendli.spec.tsx
index 20ad73075b..5ccab1c7bb 100644
--- a/webview-ui/src/components/settings/providers/__tests__/Friendli.spec.tsx
+++ b/webview-ui/src/components/settings/providers/__tests__/Friendli.spec.tsx
@@ -1,3 +1,4 @@
+import { providerIdentifiers } from "@roo-code/types"
 import React from "react"
 import { render, screen, fireEvent } from "@/utils/test-utils"
 import type { ProviderSettings } from "@roo-code/types"
@@ -31,7 +32,7 @@ describe("Friendli provider settings", () => {
 	it("renders the 'Get Friendli API Key' link when no key is set", () => {
 		render(
 			<Friendli
-				apiConfiguration={{ apiProvider: "friendli" } as ProviderSettings}
+				apiConfiguration={{ apiProvider: providerIdentifiers.friendli } as ProviderSettings}
 				setApiConfigurationField={vi.fn()}
 			/>,
 		)
@@ -41,7 +42,9 @@ describe("Friendli provider settings", () => {
 	it("hides the 'Get Friendli API Key' link once a key is set", () => {
 		render(
 			<Friendli
-				apiConfiguration={{ apiProvider: "friendli", friendliApiKey: "stored-key" } as ProviderSettings}
+				apiConfiguration={
+					{ apiProvider: providerIdentifiers.friendli, friendliApiKey: "stored-key" } as ProviderSettings
+				}
 				setApiConfigurationField={vi.fn()}
 			/>,
 		)
@@ -53,7 +56,7 @@ describe("Friendli provider settings", () => {
 		const mockSetApiConfigurationField = vi.fn()
 		render(
 			<Friendli
-				apiConfiguration={{ apiProvider: "friendli" } as ProviderSettings}
+				apiConfiguration={{ apiProvider: providerIdentifiers.friendli } as ProviderSettings}
 				setApiConfigurationField={mockSetApiConfigurationField}
 			/>,
 		)
diff --git a/webview-ui/src/components/settings/providers/__tests__/OpenAICompatible.visual.fixture.tsx b/webview-ui/src/components/settings/providers/__tests__/OpenAICompatible.visual.fixture.tsx
index 0586ea9000..d9e918ab97 100644
--- a/webview-ui/src/components/settings/providers/__tests__/OpenAICompatible.visual.fixture.tsx
+++ b/webview-ui/src/components/settings/providers/__tests__/OpenAICompatible.visual.fixture.tsx
@@ -1,3 +1,4 @@
+import { providerIdentifiers } from "@roo-code/types"
 /* v8 ignore file -- Playwright component fixture is covered by the visual test. */
 import React, { useState } from "react"
 import { QueryClient, QueryClientProvider } from "@tanstack/react-query"
@@ -26,7 +27,7 @@ function flattenTranslations(obj: Record<string, unknown>, prefix = "settings:")
 const translations = flattenTranslations(enSettings as Record<string, unknown>)
 
 const apiConfiguration: ProviderSettings = {
-	apiProvider: "openai",
+	apiProvider: providerIdentifiers.openai,
 	openAiBaseUrl: "",
 	openAiModelId: "my-gpt4o-deployment",
 	openAiUseAzure: true,
diff --git a/webview-ui/src/components/settings/providers/__tests__/OpenCodeGo.spec.tsx b/webview-ui/src/components/settings/providers/__tests__/OpenCodeGo.spec.tsx
index aa92547647..9fcfd2f102 100644
--- a/webview-ui/src/components/settings/providers/__tests__/OpenCodeGo.spec.tsx
+++ b/webview-ui/src/components/settings/providers/__tests__/OpenCodeGo.spec.tsx
@@ -1,3 +1,4 @@
+import { providerIdentifiers } from "@roo-code/types"
 import { render, screen, fireEvent, act } from "@testing-library/react"
 
 import type { ProviderSettings, OrganizationAllowList } from "@roo-code/types"
@@ -129,7 +130,7 @@ describe("OpenCodeGo", () => {
 
 			expect(postMessageMock).toHaveBeenCalledWith({
 				type: "requestRouterModels",
-				values: { provider: "opencode-go", refresh: true, opencodeGoApiKey: "my-key" },
+				values: { provider: providerIdentifiers.opencodeGo, refresh: true, opencodeGoApiKey: "my-key" },
 			})
 		})
 
@@ -160,7 +161,7 @@ describe("OpenCodeGo", () => {
 			dispatchMessage({
 				type: "singleRouterModelFetchResponse",
 				success: false,
-				values: { provider: "opencode-go" },
+				values: { provider: providerIdentifiers.opencodeGo },
 				error: "Invalid API key",
 			})
 
@@ -174,7 +175,7 @@ describe("OpenCodeGo", () => {
 			dispatchMessage({
 				type: "singleRouterModelFetchResponse",
 				success: false,
-				values: { provider: "opencode-go" },
+				values: { provider: providerIdentifiers.opencodeGo },
 			})
 
 			expect(screen.getByText("settings:providers.refreshModels.error")).toBeInTheDocument()
@@ -187,7 +188,7 @@ describe("OpenCodeGo", () => {
 			dispatchMessage({
 				type: "singleRouterModelFetchResponse",
 				success: false,
-				values: { provider: "openrouter" },
+				values: { provider: providerIdentifiers.openrouter },
 				error: "should not show",
 			})
 
@@ -208,7 +209,7 @@ describe("OpenCodeGo", () => {
 						data: {
 							type: "singleRouterModelFetchResponse",
 							success: false,
-							values: { provider: "opencode-go" },
+							values: { provider: providerIdentifiers.opencodeGo },
 							error: "boom",
 						},
 					}),
diff --git a/webview-ui/src/components/settings/providers/__tests__/ZooGateway.spec.tsx b/webview-ui/src/components/settings/providers/__tests__/ZooGateway.spec.tsx
index 9bdda1f433..4f063b57ba 100644
--- a/webview-ui/src/components/settings/providers/__tests__/ZooGateway.spec.tsx
+++ b/webview-ui/src/components/settings/providers/__tests__/ZooGateway.spec.tsx
@@ -1,3 +1,4 @@
+import { providerIdentifiers } from "@roo-code/types"
 import React from "react"
 import { render, screen, waitFor } from "@/utils/test-utils"
 import type { ModelInfo, ProviderSettings, RouterModels } from "@roo-code/types"
@@ -94,7 +95,7 @@ describe("ZooGateway component", () => {
 		const setApiConfigurationField = vi.fn()
 		render(
 			<ZooGateway
-				apiConfiguration={{ apiProvider: "zoo-gateway" } as ProviderSettings}
+				apiConfiguration={{ apiProvider: providerIdentifiers.zooGateway } as ProviderSettings}
 				setApiConfigurationField={setApiConfigurationField}
 				routerModels={buildRouterModels(["anthropic/claude-sonnet-4", "anthropic/claude-sonnet-4.5"])}
 				organizationAllowList={baseProps.organizationAllowList}
@@ -112,7 +113,7 @@ describe("ZooGateway component", () => {
 			<ZooGateway
 				apiConfiguration={
 					{
-						apiProvider: "zoo-gateway",
+						apiProvider: providerIdentifiers.zooGateway,
 						zooGatewayModelId: "anthropic/claude-sonnet-4",
 					} as ProviderSettings
 				}
@@ -139,7 +140,7 @@ describe("ZooGateway component", () => {
 			<ZooGateway
 				apiConfiguration={
 					{
-						apiProvider: "zoo-gateway",
+						apiProvider: providerIdentifiers.zooGateway,
 						zooGatewayModelId: "anthropic/claude-sonnet-4.5",
 					} as ProviderSettings
 				}
@@ -158,7 +159,7 @@ describe("ZooGateway component", () => {
 		const setApiConfigurationField = vi.fn()
 		render(
 			<ZooGateway
-				apiConfiguration={{ apiProvider: "zoo-gateway" } as ProviderSettings}
+				apiConfiguration={{ apiProvider: providerIdentifiers.zooGateway } as ProviderSettings}
 				setApiConfigurationField={setApiConfigurationField}
 				routerModels={undefined}
 				organizationAllowList={baseProps.organizationAllowList}
@@ -174,7 +175,7 @@ describe("ZooGateway component", () => {
 		try {
 			render(
 				<ZooGateway
-					apiConfiguration={{ apiProvider: "zoo-gateway" } as ProviderSettings}
+					apiConfiguration={{ apiProvider: providerIdentifiers.zooGateway } as ProviderSettings}
 					setApiConfigurationField={vi.fn()}
 					routerModels={buildRouterModels(["anthropic/claude-sonnet-4"])}
 					organizationAllowList={baseProps.organizationAllowList}
diff --git a/webview-ui/src/components/settings/utils/__tests__/providerModelConfig.spec.ts b/webview-ui/src/components/settings/utils/__tests__/providerModelConfig.spec.ts
index 6916de8479..294f6f0bf9 100644
--- a/webview-ui/src/components/settings/utils/__tests__/providerModelConfig.spec.ts
+++ b/webview-ui/src/components/settings/utils/__tests__/providerModelConfig.spec.ts
@@ -107,7 +107,7 @@ describe("providerModelConfig", () => {
 
 		it("returns mainland default for Z.ai with china_coding entrypoint", () => {
 			const defaultId = getDefaultModelIdForProvider("zai", {
-				apiProvider: "zai",
+				apiProvider: providerIdentifiers.zai,
 				zaiApiLine: "china_coding",
 			})
 			expect(defaultId).toBeDefined()
@@ -119,7 +119,7 @@ describe("providerModelConfig", () => {
 		it("returns mainland default for Z.ai with china_api entrypoint", () => {
 			expect(
 				getDefaultModelIdForProvider("zai", {
-					apiProvider: "zai",
+					apiProvider: providerIdentifiers.zai,
 					zaiApiLine: "china_api",
 				}),
 			).toBe(mainlandZAiDefaultModelId)
@@ -127,7 +127,7 @@ describe("providerModelConfig", () => {
 
 		it("returns international default for Z.ai with international_coding entrypoint", () => {
 			const defaultId = getDefaultModelIdForProvider("zai", {
-				apiProvider: "zai",
+				apiProvider: providerIdentifiers.zai,
 				zaiApiLine: "international_coding",
 			})
 			expect(defaultId).toBeDefined()
@@ -138,11 +138,11 @@ describe("providerModelConfig", () => {
 		it("uses mainland or international defaults based on zaiApiLine setting", () => {
 			// Verify the function correctly routes to appropriate defaults
 			const chinaDefault = getDefaultModelIdForProvider("zai", {
-				apiProvider: "zai",
+				apiProvider: providerIdentifiers.zai,
 				zaiApiLine: "china_coding",
 			})
 			const internationalDefault = getDefaultModelIdForProvider("zai", {
-				apiProvider: "zai",
+				apiProvider: providerIdentifiers.zai,
 				zaiApiLine: "international_coding",
 			})
 			// Both should return valid model IDs (they may or may not be the same)
@@ -208,19 +208,19 @@ describe("providerModelConfig", () => {
 
 		it("shows GLM-5.3 models for international Z.ai API and Coding Plan entrypoints", () => {
 			const internationalCoding = getStaticModelsForProvider("zai", undefined, {
-				apiProvider: "zai",
+				apiProvider: providerIdentifiers.zai,
 				zaiApiLine: "international_coding",
 			})
 			const chinaCoding = getStaticModelsForProvider("zai", undefined, {
-				apiProvider: "zai",
+				apiProvider: providerIdentifiers.zai,
 				zaiApiLine: "china_coding",
 			})
 			const internationalApi = getStaticModelsForProvider("zai", undefined, {
-				apiProvider: "zai",
+				apiProvider: providerIdentifiers.zai,
 				zaiApiLine: "international_api",
 			})
 			const chinaApi = getStaticModelsForProvider("zai", undefined, {
-				apiProvider: "zai",
+				apiProvider: providerIdentifiers.zai,
 				zaiApiLine: "china_api",
 			})
 
diff --git a/webview-ui/src/components/welcome/WelcomeViewProvider.tsx b/webview-ui/src/components/welcome/WelcomeViewProvider.tsx
index 5a77a6c111..3a36b3634e 100644
--- a/webview-ui/src/components/welcome/WelcomeViewProvider.tsx
+++ b/webview-ui/src/components/welcome/WelcomeViewProvider.tsx
@@ -2,7 +2,7 @@ import { useCallback, useState } from "react"
 import { Trans } from "react-i18next"
 import { ArrowLeft, Brain } from "lucide-react"
 
-import { openRouterDefaultModelId, type ProviderSettings } from "@roo-code/types"
+import { openRouterDefaultModelId, providerIdentifiers, type ProviderSettings } from "@roo-code/types"
 
 import { useExtensionState } from "@src/context/ExtensionStateContext"
 import { validateApiConfiguration } from "@src/utils/validate"
@@ -16,7 +16,7 @@ import { Tab, TabContent } from "../common/Tab"
 import { WelcomeLanding } from "./WelcomeLanding"
 
 const DEFAULT_WELCOME_API_CONFIGURATION: ProviderSettings = {
-	apiProvider: "openrouter",
+	apiProvider: providerIdentifiers.openrouter,
 	openRouterModelId: openRouterDefaultModelId,
 }
 
diff --git a/webview-ui/src/components/welcome/__tests__/WelcomeViewProvider.spec.tsx b/webview-ui/src/components/welcome/__tests__/WelcomeViewProvider.spec.tsx
index e172886c77..c15c0608ec 100644
--- a/webview-ui/src/components/welcome/__tests__/WelcomeViewProvider.spec.tsx
+++ b/webview-ui/src/components/welcome/__tests__/WelcomeViewProvider.spec.tsx
@@ -1,3 +1,4 @@
+import { providerIdentifiers } from "@roo-code/types"
 // npx vitest src/components/welcome/__tests__/WelcomeViewProvider.spec.tsx
 
 import React from "react"
@@ -134,7 +135,7 @@ describe("WelcomeViewProvider", () => {
 		expect(screen.getByTestId("api-options")).toHaveAttribute("data-provider", "openrouter")
 		expect(screen.getByTestId("api-options")).toHaveAttribute("data-model", openRouterDefaultModelId)
 		expect(setApiConfiguration).toHaveBeenCalledWith({
-			apiProvider: "openrouter",
+			apiProvider: providerIdentifiers.openrouter,
 			openRouterModelId: openRouterDefaultModelId,
 		})
 		expect(screen.getByTestId("trans-welcome:providerSignup.chooseProvider")).toBeInTheDocument()
@@ -154,7 +155,7 @@ describe("WelcomeViewProvider", () => {
 	it("treats the built-in Anthropic default as empty onboarding config", () => {
 		const { setApiConfiguration } = renderWelcomeViewProvider({
 			apiConfiguration: {
-				apiProvider: "anthropic",
+				apiProvider: providerIdentifiers.anthropic,
 				apiModelId: "claude-sonnet-4-5",
 			},
 		})
@@ -164,7 +165,7 @@ describe("WelcomeViewProvider", () => {
 		expect(screen.getByTestId("api-options")).toHaveAttribute("data-provider", "openrouter")
 		expect(screen.getByTestId("api-options")).toHaveAttribute("data-model", openRouterDefaultModelId)
 		expect(setApiConfiguration).toHaveBeenCalledWith({
-			apiProvider: "openrouter",
+			apiProvider: providerIdentifiers.openrouter,
 			openRouterModelId: openRouterDefaultModelId,
 		})
 	})
@@ -233,7 +234,7 @@ describe("WelcomeViewProvider", () => {
 
 	it("saves the configured provider from setup", () => {
 		const apiConfiguration = {
-			apiProvider: "openrouter" as const,
+			apiProvider: providerIdentifiers.openrouter,
 			openRouterApiKey: "test-key",
 			openRouterModelId: openRouterDefaultModelId,
 		}
diff --git a/webview-ui/src/context/ExtensionStateContext.tsx b/webview-ui/src/context/ExtensionStateContext.tsx
index 377c8eb721..177372f310 100644
--- a/webview-ui/src/context/ExtensionStateContext.tsx
+++ b/webview-ui/src/context/ExtensionStateContext.tsx
@@ -1,3 +1,4 @@
+import { providerIdentifiers } from "@roo-code/types"
 import React, { createContext, useCallback, useEffect, useState } from "react"
 
 import {
@@ -259,7 +260,7 @@ const createInitialExtensionState = (): ExtensionState => ({
 	codebaseIndexConfig: {
 		codebaseIndexEnabled: true,
 		codebaseIndexQdrantUrl: "http://localhost:6333",
-		codebaseIndexEmbedderProvider: "openai",
+		codebaseIndexEmbedderProvider: providerIdentifiers.openai,
 		codebaseIndexEmbedderBaseUrl: "",
 		codebaseIndexEmbedderModelId: "",
 		codebaseIndexSearchMaxResults: undefined,
diff --git a/webview-ui/src/context/__tests__/ExtensionStateContext.spec.tsx b/webview-ui/src/context/__tests__/ExtensionStateContext.spec.tsx
index 23ac911585..4c2e2a092c 100644
--- a/webview-ui/src/context/__tests__/ExtensionStateContext.spec.tsx
+++ b/webview-ui/src/context/__tests__/ExtensionStateContext.spec.tsx
@@ -1,3 +1,4 @@
+import { providerIdentifiers } from "@roo-code/types"
 import { render, screen, act } from "@/utils/test-utils"
 import React from "react"
 
@@ -64,7 +65,9 @@ const ApiConfigTestComponent = () => {
 			<div data-testid="api-configuration">{JSON.stringify(apiConfiguration)}</div>
 			<button
 				data-testid="update-api-config-button"
-				onClick={() => setApiConfiguration({ apiModelId: "new-model", apiProvider: "anthropic" })}>
+				onClick={() =>
+					setApiConfiguration({ apiModelId: "new-model", apiProvider: providerIdentifiers.anthropic })
+				}>
 				Update API Config
 			</button>
 			<button data-testid="partial-update-button" onClick={() => setApiConfiguration({ modelTemperature: 0.7 })}>
@@ -353,7 +356,7 @@ describe("ExtensionStateContext", () => {
 		expect(updatedConfig).toEqual(
 			expect.objectContaining({
 				apiModelId: "new-model",
-				apiProvider: "anthropic",
+				apiProvider: providerIdentifiers.anthropic,
 			}),
 		)
 	})
@@ -376,7 +379,7 @@ describe("ExtensionStateContext", () => {
 		expect(initialConfig).toEqual(
 			expect.objectContaining({
 				apiModelId: "new-model",
-				apiProvider: "anthropic",
+				apiProvider: providerIdentifiers.anthropic,
 			}),
 		)
 
@@ -391,7 +394,7 @@ describe("ExtensionStateContext", () => {
 		expect(updatedConfig).toEqual(
 			expect.objectContaining({
 				apiModelId: "new-model", // Should retain this from previous update
-				apiProvider: "anthropic", // Should retain this from previous update
+				apiProvider: providerIdentifiers.anthropic, // Should retain this from previous update
 				modelTemperature: 0.7, // Should add this from partial update
 			}),
 		)
@@ -413,7 +416,7 @@ describe("mergeExtensionState", () => {
 			customModes: [],
 			maxOpenTabsContext: 20,
 			maxWorkspaceFiles: 100,
-			apiConfiguration: { providerId: "openrouter" } as ProviderSettings,
+			apiConfiguration: { providerId: providerIdentifiers.openrouter } as ProviderSettings,
 			telemetrySetting: "unset",
 			showRooIgnoredFiles: true,
 			enableSubfolderRules: false,
diff --git a/webview-ui/src/utils/__tests__/validate.spec.ts b/webview-ui/src/utils/__tests__/validate.spec.ts
index 6535e3ba61..3238536e3f 100644
--- a/webview-ui/src/utils/__tests__/validate.spec.ts
+++ b/webview-ui/src/utils/__tests__/validate.spec.ts
@@ -82,7 +82,7 @@ describe("Model Validation Functions", () => {
 	describe("getModelValidationError", () => {
 		it("returns undefined for valid OpenRouter model", () => {
 			const config: ProviderSettings = {
-				apiProvider: "openrouter",
+				apiProvider: providerIdentifiers.openrouter,
 				openRouterModelId: "valid-model",
 			}
 
@@ -92,7 +92,7 @@ describe("Model Validation Functions", () => {
 
 		it("returns error for invalid OpenRouter model", () => {
 			const config: ProviderSettings = {
-				apiProvider: "openrouter",
+				apiProvider: providerIdentifiers.openrouter,
 				openRouterModelId: "invalid-model",
 			}
 
@@ -102,7 +102,7 @@ describe("Model Validation Functions", () => {
 
 		it("returns error for model not allowed by organization", () => {
 			const config: ProviderSettings = {
-				apiProvider: "openrouter",
+				apiProvider: providerIdentifiers.openrouter,
 				openRouterModelId: "another-valid-model",
 			}
 
@@ -112,7 +112,7 @@ describe("Model Validation Functions", () => {
 
 		it("returns undefined for OpenAI models when no router models provided", () => {
 			const config: ProviderSettings = {
-				apiProvider: "openai",
+				apiProvider: providerIdentifiers.openai,
 				openAiModelId: "gpt-4",
 			}
 
@@ -158,7 +158,7 @@ describe("Model Validation Functions", () => {
 
 		it("handles empty model IDs gracefully", () => {
 			const config: ProviderSettings = {
-				apiProvider: "openrouter",
+				apiProvider: providerIdentifiers.openrouter,
 				openRouterModelId: "",
 			}
 
@@ -168,7 +168,7 @@ describe("Model Validation Functions", () => {
 
 		it("handles undefined model IDs gracefully", () => {
 			const config: ProviderSettings = {
-				apiProvider: "openrouter",
+				apiProvider: providerIdentifiers.openrouter,
 				// openRouterModelId is undefined
 			}
 
@@ -180,7 +180,7 @@ describe("Model Validation Functions", () => {
 	describe("validateApiConfigurationExcludingModelErrors", () => {
 		it("returns undefined when configuration is valid", () => {
 			const config: ProviderSettings = {
-				apiProvider: "openrouter",
+				apiProvider: providerIdentifiers.openrouter,
 				openRouterApiKey: "valid-key",
 				openRouterModelId: "valid-model",
 			}
@@ -191,7 +191,7 @@ describe("Model Validation Functions", () => {
 
 		it("returns error for missing API key", () => {
 			const config: ProviderSettings = {
-				apiProvider: "openrouter",
+				apiProvider: providerIdentifiers.openrouter,
 				openRouterModelId: "valid-model",
 				// Missing openRouterApiKey
 			}
@@ -202,7 +202,7 @@ describe("Model Validation Functions", () => {
 
 		it("excludes model-specific errors", () => {
 			const config: ProviderSettings = {
-				apiProvider: "openrouter",
+				apiProvider: providerIdentifiers.openrouter,
 				openRouterApiKey: "valid-key",
 				openRouterModelId: "invalid-model", // This should be ignored
 			}
@@ -213,7 +213,7 @@ describe("Model Validation Functions", () => {
 
 		it("excludes model-specific organization errors", () => {
 			const config: ProviderSettings = {
-				apiProvider: "openrouter",
+				apiProvider: providerIdentifiers.openrouter,
 				openRouterApiKey: "valid-key",
 				openRouterModelId: "another-valid-model", // Not allowed by restrictive org
 			}
@@ -230,7 +230,7 @@ describe("Model Validation Functions", () => {
 	describe("Opencode Go validation", () => {
 		it("returns an apiKey error when the Opencode Go API key is missing", () => {
 			const config: ProviderSettings = {
-				apiProvider: "opencode-go",
+				apiProvider: providerIdentifiers.opencodeGo,
 				opencodeGoModelId: "glm-5.1",
 				// Missing opencodeGoApiKey
 			}
@@ -241,7 +241,7 @@ describe("Model Validation Functions", () => {
 
 		it("returns undefined for a valid Opencode Go configuration", () => {
 			const config: ProviderSettings = {
-				apiProvider: "opencode-go",
+				apiProvider: providerIdentifiers.opencodeGo,
 				opencodeGoApiKey: "valid-key",
 				opencodeGoModelId: "glm-5.1",
 			}
@@ -252,7 +252,7 @@ describe("Model Validation Functions", () => {
 
 		it("returns a modelId error when no Opencode Go model id is set", () => {
 			const config: ProviderSettings = {
-				apiProvider: "opencode-go",
+				apiProvider: providerIdentifiers.opencodeGo,
 				opencodeGoApiKey: "valid-key",
 				// Missing opencodeGoModelId
 			}
@@ -264,7 +264,7 @@ describe("Model Validation Functions", () => {
 	describe("Kenari validation", () => {
 		it("returns an apiKey error when the Kenari API key is missing", () => {
 			const config: ProviderSettings = {
-				apiProvider: "kenari",
+				apiProvider: providerIdentifiers.kenari,
 				kenariModelId: "glm-5.1",
 				// Missing kenariApiKey
 			}
@@ -275,7 +275,7 @@ describe("Model Validation Functions", () => {
 
 		it("returns undefined for a valid Kenari configuration", () => {
 			const config: ProviderSettings = {
-				apiProvider: "kenari",
+				apiProvider: providerIdentifiers.kenari,
 				kenariApiKey: "valid-key",
 				kenariModelId: "glm-5.1",
 			}
@@ -286,7 +286,7 @@ describe("Model Validation Functions", () => {
 
 		it("returns a modelId error when no Kenari model id is set", () => {
 			const config: ProviderSettings = {
-				apiProvider: "kenari",
+				apiProvider: providerIdentifiers.kenari,
 				kenariApiKey: "valid-key",
 				// Missing kenariModelId
 			}
@@ -329,7 +329,7 @@ describe("Model Validation Functions", () => {
 	describe("Friendli validation", () => {
 		it("returns an apiKey error when the Friendli API key is missing", () => {
 			const config: ProviderSettings = {
-				apiProvider: "friendli",
+				apiProvider: providerIdentifiers.friendli,
 				apiModelId: "zai-org/GLM-5.2",
 				// Missing friendliApiKey
 			}
@@ -340,7 +340,7 @@ describe("Model Validation Functions", () => {
 
 		it("returns undefined for a valid Friendli configuration", () => {
 			const config: ProviderSettings = {
-				apiProvider: "friendli",
+				apiProvider: providerIdentifiers.friendli,
 				friendliApiKey: "valid-key",
 				apiModelId: "zai-org/GLM-5.2",
 			}
@@ -354,7 +354,7 @@ describe("Model Validation Functions", () => {
 		describe("validateApiConfiguration (welcome-view entry point)", () => {
 			it("returns a sign-in error when neither profile token nor Zoo auth is present", () => {
 				const config: ProviderSettings = {
-					apiProvider: "zoo-gateway",
+					apiProvider: providerIdentifiers.zooGateway,
 					zooGatewayModelId: "anthropic/claude-sonnet-4",
 				}
 
@@ -364,7 +364,7 @@ describe("Model Validation Functions", () => {
 
 			it("returns undefined when Zoo Code auth is active without a profile token", () => {
 				const config: ProviderSettings = {
-					apiProvider: "zoo-gateway",
+					apiProvider: providerIdentifiers.zooGateway,
 					zooGatewayModelId: "anthropic/claude-sonnet-4",
 				}
 
@@ -374,7 +374,7 @@ describe("Model Validation Functions", () => {
 
 			it("returns undefined when a profile session token is set", () => {
 				const config: ProviderSettings = {
-					apiProvider: "zoo-gateway",
+					apiProvider: providerIdentifiers.zooGateway,
 					zooGatewayModelId: "anthropic/claude-sonnet-4",
 					zooSessionToken: "zoo_ext_test_token",
 				}
@@ -390,7 +390,7 @@ describe("Model Validation Functions", () => {
 			// surface a zoo-gateway-specific error regardless of auth state.
 			it("returns undefined for zoo-gateway when unauthenticated and no token", () => {
 				const config: ProviderSettings = {
-					apiProvider: "zoo-gateway",
+					apiProvider: providerIdentifiers.zooGateway,
 					zooGatewayModelId: "anthropic/claude-sonnet-4",
 				}
 
@@ -404,7 +404,7 @@ describe("Model Validation Functions", () => {
 
 			it("returns undefined for zoo-gateway when a profile token is set", () => {
 				const config: ProviderSettings = {
-					apiProvider: "zoo-gateway",
+					apiProvider: providerIdentifiers.zooGateway,
 					zooGatewayModelId: "anthropic/claude-sonnet-4",
 					zooSessionToken: "zoo_ext_test_token",
 				}
@@ -426,7 +426,7 @@ describe("Model Validation Functions", () => {
 				}
 
 				const config: ProviderSettings = {
-					apiProvider: "zoo-gateway",
+					apiProvider: providerIdentifiers.zooGateway,
 					zooGatewayModelId: "anthropic/claude-sonnet-4",
 				}
 
@@ -443,7 +443,7 @@ describe("Model Validation Functions", () => {
 	describe("Kimi Code validation", () => {
 		it("returns undefined when using OAuth auth method", () => {
 			const config: ProviderSettings = {
-				apiProvider: "kimi-code",
+				apiProvider: providerIdentifiers.kimiCode,
 				kimiCodeAuthMethod: "oauth",
 			}
 
@@ -453,7 +453,7 @@ describe("Model Validation Functions", () => {
 
 		it("returns undefined when auth method is not specified (defaults to OAuth)", () => {
 			const config: ProviderSettings = {
-				apiProvider: "kimi-code",
+				apiProvider: providerIdentifiers.kimiCode,
 			}
 
 			const result = validateApiConfigurationExcludingModelErrors(config, mockRouterModels, allowAllOrganization)
@@ -462,7 +462,7 @@ describe("Model Validation Functions", () => {
 
 		it("returns apiKey error when using api-key auth method without key", () => {
 			const config: ProviderSettings = {
-				apiProvider: "kimi-code",
+				apiProvider: providerIdentifiers.kimiCode,
 				kimiCodeAuthMethod: "api-key",
 			}
 
@@ -472,7 +472,7 @@ describe("Model Validation Functions", () => {
 
 		it("returns undefined when using api-key auth method with key", () => {
 			const config: ProviderSettings = {
-				apiProvider: "kimi-code",
+				apiProvider: providerIdentifiers.kimiCode,
 				kimiCodeAuthMethod: "api-key",
 				kimiCodeApiKey: "valid-key",
 			}

From 4534b79d4e7a2436c1c4c697430b6811fd2c21bb Mon Sep 17 00:00:00 2001
From: gubin-dev <alecmei.gubin@yandex.ru>
Date: Fri, 28 Aug 2026 13:05:12 +0300
Subject: [PATCH 04/13] fix(webview): expose provider identifiers to visual
 tests

---
 webview-ui/playwright/roo-code-types.ts | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/webview-ui/playwright/roo-code-types.ts b/webview-ui/playwright/roo-code-types.ts
index d07b4aaddc..5d0c0bbf15 100644
--- a/webview-ui/playwright/roo-code-types.ts
+++ b/webview-ui/playwright/roo-code-types.ts
@@ -15,6 +15,8 @@ export const CODEBASE_INDEX_DEFAULTS = {
 	SEARCH_SCORE_STEP: 0.05,
 } as const
 
+export { providerIdentifiers } from "../../packages/types/src/provider-identifiers"
+
 export const TelemetryEventName = {
 	MODE_SWITCH: "Mode Switched",
 	MODE_SELECTOR_OPENED: "Mode Selector Opened",

From 4f4522ef29930717870b6f3127e4753bbae3ff23 Mon Sep 17 00:00:00 2001
From: gubin-dev <alecmei.gubin@yandex.ru>
Date: Fri, 28 Aug 2026 13:19:51 +0300
Subject: [PATCH 05/13] refactor(eslint): cover remaining provider identifiers

---
 apps/cli/eslint.config.mjs                    |  7 +++-
 .../agent/__tests__/extension-host.test.ts    |  5 ++-
 .../lib/storage/__tests__/settings.test.ts    | 15 +++----
 apps/cli/src/types/__tests__/types.test.ts    |  4 +-
 apps/cli/src/ui/__tests__/store.test.ts       |  3 +-
 apps/vscode-e2e/eslint.config.mjs             |  3 ++
 .../src/suite/anthropic-opus-4-7.test.ts      |  5 ++-
 apps/vscode-e2e/src/suite/index.ts            |  3 +-
 .../src/suite/providers/bedrock.test.ts       | 11 ++---
 .../src/suite/providers/deepseek-v4.test.ts   |  5 ++-
 .../src/suite/providers/gemini.test.ts        |  5 ++-
 .../src/suite/providers/openrouter.test.ts    |  3 +-
 .../src/suite/providers/xai.test.ts           |  7 ++--
 .../src/suite/providers/zai.test.ts           |  5 ++-
 apps/vscode-e2e/src/suite/subtasks.test.ts    |  3 +-
 .../src/suite/tools/apply-diff.test.ts        |  5 ++-
 .../src/suite/tools/execute-command.test.ts   |  5 ++-
 .../src/suite/tools/terminal-profile.test.ts  |  5 ++-
 .../src/suite/tools/write-to-file.test.ts     |  5 ++-
 packages/cloud/eslint.config.mjs              |  3 ++
 .../CloudSettingsService.parsing.test.ts      |  3 +-
 .../config-eslint/provider-identifiers.js     | 16 +++++++
 .../provider-identifiers.test.js              | 21 ++++++++++
 packages/types/src/image-generation.ts        |  4 +-
 src/services/code-index/config-manager.ts     |  2 +-
 webview-ui/playwright/AppProviders.tsx        |  3 +-
 .../playwright/ExtensionStateContext.tsx      |  3 +-
 .../__tests__/providerModelConfig.spec.ts     | 42 +++++++++----------
 28 files changed, 134 insertions(+), 67 deletions(-)

diff --git a/apps/cli/eslint.config.mjs b/apps/cli/eslint.config.mjs
index 694bf73664..483b531cb8 100644
--- a/apps/cli/eslint.config.mjs
+++ b/apps/cli/eslint.config.mjs
@@ -1,4 +1,9 @@
 import { config } from "@roo-code/config-eslint/base"
+import { createProviderIdentifierConfig } from "@roo-code/config-eslint/provider-identifiers"
+import { providerIdentifiers, retiredProviderIdentifiers } from "@roo-code/types/provider-identifiers"
 
 /** @type {import("eslint").Linter.Config} */
-export default [...config]
+export default [
+	...config,
+	createProviderIdentifierConfig({ providerIdentifiers, retiredProviderIdentifiers }),
+]
diff --git a/apps/cli/src/agent/__tests__/extension-host.test.ts b/apps/cli/src/agent/__tests__/extension-host.test.ts
index 0c42c88d5b..5e848e5a7e 100644
--- a/apps/cli/src/agent/__tests__/extension-host.test.ts
+++ b/apps/cli/src/agent/__tests__/extension-host.test.ts
@@ -1,3 +1,4 @@
+import { providerIdentifiers } from "@roo-code/types"
 // pnpm --filter @roo-code/cli test src/agent/__tests__/extension-host.test.ts
 
 import { EventEmitter } from "events"
@@ -28,7 +29,7 @@ vi.mock("@/lib/storage/index.js", () => ({
  */
 function createTestHost({
 	mode = "code",
-	provider = "openrouter",
+	provider = providerIdentifiers.openrouter,
 	model = "test-model",
 	...options
 }: Partial<ExtensionHostOptions> = {}): ExtensionHost {
@@ -113,7 +114,7 @@ describe("ExtensionHost", () => {
 				extensionPath: "/my/extension",
 				user: null,
 				apiKey: "test-key",
-				provider: "openrouter",
+				provider: providerIdentifiers.openrouter,
 				model: "test-model",
 				ephemeral: false,
 				debug: false,
diff --git a/apps/cli/src/lib/storage/__tests__/settings.test.ts b/apps/cli/src/lib/storage/__tests__/settings.test.ts
index b2a3b18cb4..59b323ca60 100644
--- a/apps/cli/src/lib/storage/__tests__/settings.test.ts
+++ b/apps/cli/src/lib/storage/__tests__/settings.test.ts
@@ -1,3 +1,4 @@
+import { providerIdentifiers } from "@roo-code/types"
 import fs from "fs/promises"
 import path from "path"
 
@@ -58,7 +59,7 @@ describe("Settings Storage", () => {
 			const settingsData = {
 				onboardingProviderChoice: OnboardingProviderChoice.Byok,
 				mode: "architect",
-				provider: "anthropic" as const,
+				provider: providerIdentifiers.anthropic,
 				model: "claude-sonnet-4-20250514",
 				reasoningEffort: "high" as const,
 			}
@@ -95,7 +96,7 @@ describe("Settings Storage", () => {
 
 		it("should merge settings with existing ones", async () => {
 			await saveSettings({ mode: "code" })
-			await saveSettings({ provider: "openrouter" as const })
+			await saveSettings({ provider: providerIdentifiers.openrouter })
 
 			const savedData = await fs.readFile(expectedSettingsFile, "utf-8")
 			const settings = JSON.parse(savedData)
@@ -107,7 +108,7 @@ describe("Settings Storage", () => {
 		it("should save all default settings fields", async () => {
 			await saveSettings({
 				mode: "architect",
-				provider: "anthropic" as const,
+				provider: providerIdentifiers.anthropic,
 				model: "claude-opus-4.6",
 				reasoningEffort: "medium" as const,
 				consecutiveMistakeLimit: 5,
@@ -155,7 +156,7 @@ describe("Settings Storage", () => {
 			await saveSettings({
 				onboardingProviderChoice: OnboardingProviderChoice.Byok,
 				mode: "architect",
-				provider: "gemini" as const,
+				provider: providerIdentifiers.gemini,
 			})
 
 			await resetOnboarding()
@@ -172,7 +173,7 @@ describe("Settings Storage", () => {
 			// Test that all the settings that can be used as defaults are properly saved and loaded
 			const defaultSettings = {
 				mode: "debug",
-				provider: "openai-native" as const,
+				provider: providerIdentifiers.openaiNative,
 				model: "gpt-4o",
 				reasoningEffort: "low" as const,
 				consecutiveMistakeLimit: 7,
@@ -205,7 +206,7 @@ describe("Settings Storage", () => {
 		it("should support all settings together including requireApproval", async () => {
 			const allSettings = {
 				mode: "architect",
-				provider: "anthropic" as const,
+				provider: providerIdentifiers.anthropic,
 				model: "claude-sonnet-4-20250514",
 				reasoningEffort: "high" as const,
 				requireApproval: true,
@@ -231,7 +232,7 @@ describe("Settings Storage", () => {
 		it("should support all settings together including oneshot", async () => {
 			const allSettings = {
 				mode: "architect",
-				provider: "anthropic" as const,
+				provider: providerIdentifiers.anthropic,
 				model: "claude-sonnet-4-20250514",
 				reasoningEffort: "high" as const,
 				consecutiveMistakeLimit: 9,
diff --git a/apps/cli/src/types/__tests__/types.test.ts b/apps/cli/src/types/__tests__/types.test.ts
index 5ed0c84016..538dbec72e 100644
--- a/apps/cli/src/types/__tests__/types.test.ts
+++ b/apps/cli/src/types/__tests__/types.test.ts
@@ -1,4 +1,4 @@
-import { providerIdentifiers } from "@roo-code/types"
+import { providerIdentifiers, retiredProviderIdentifiers } from "@roo-code/types"
 
 import { isSupportedProvider, supportedProviders } from "../types.js"
 
@@ -20,7 +20,7 @@ describe("isSupportedProvider", () => {
 	})
 
 	it("returns false for 'roo' (retired provider)", () => {
-		expect(isSupportedProvider("roo")).toBe(false)
+		expect(isSupportedProvider(retiredProviderIdentifiers.roo)).toBe(false)
 	})
 
 	it("returns false for unknown provider", () => {
diff --git a/apps/cli/src/ui/__tests__/store.test.ts b/apps/cli/src/ui/__tests__/store.test.ts
index 5b8b4fbf77..970d52aa0a 100644
--- a/apps/cli/src/ui/__tests__/store.test.ts
+++ b/apps/cli/src/ui/__tests__/store.test.ts
@@ -1,3 +1,4 @@
+import { providerIdentifiers } from "@roo-code/types"
 import { RooCodeSettings } from "@roo-code/types"
 
 import { useCLIStore } from "../store.js"
@@ -168,7 +169,7 @@ describe("useCLIStore", () => {
 		})
 
 		it("should PRESERVE apiConfiguration", () => {
-			const config: RooCodeSettings = { apiProvider: "openai", apiModelId: "gpt-4" }
+			const config: RooCodeSettings = { apiProvider: providerIdentifiers.openai, apiModelId: "gpt-4" }
 
 			useCLIStore
 				.getState()
diff --git a/apps/vscode-e2e/eslint.config.mjs b/apps/vscode-e2e/eslint.config.mjs
index 222e2069b0..19145e60a9 100644
--- a/apps/vscode-e2e/eslint.config.mjs
+++ b/apps/vscode-e2e/eslint.config.mjs
@@ -1,4 +1,6 @@
 import { config } from "@roo-code/config-eslint/base"
+import { createProviderIdentifierConfig } from "@roo-code/config-eslint/provider-identifiers"
+import { providerIdentifiers, retiredProviderIdentifiers } from "@roo-code/types/provider-identifiers"
 
 /** @type {import("eslint").Linter.Config} */
 export default [
@@ -15,4 +17,5 @@ export default [
 			"@typescript-eslint/no-floating-promises": "error",
 		},
 	},
+	createProviderIdentifierConfig({ providerIdentifiers, retiredProviderIdentifiers }),
 ]
diff --git a/apps/vscode-e2e/src/suite/anthropic-opus-4-7.test.ts b/apps/vscode-e2e/src/suite/anthropic-opus-4-7.test.ts
index ac7e5e4f5f..24897db274 100644
--- a/apps/vscode-e2e/src/suite/anthropic-opus-4-7.test.ts
+++ b/apps/vscode-e2e/src/suite/anthropic-opus-4-7.test.ts
@@ -1,3 +1,4 @@
+import { providerIdentifiers } from "@roo-code/types"
 import * as assert from "assert"
 import { createServer, type IncomingMessage, type ServerResponse } from "http"
 
@@ -177,7 +178,7 @@ suite("Claude Opus 4.7 (Anthropic)", function () {
 		const aimockUrl = process.env.AIMOCK_URL
 		const isRecord = process.env.AIMOCK_RECORD === "true"
 		await globalThis.api.setConfiguration({
-			apiProvider: "openrouter" as const,
+			apiProvider: providerIdentifiers.openrouter,
 			openRouterApiKey: aimockUrl && !isRecord ? "mock-key" : process.env.OPENROUTER_API_KEY!,
 			openRouterModelId: "openai/gpt-4.1",
 			...(aimockUrl && { openRouterBaseUrl: `${aimockUrl}/v1` }),
@@ -203,7 +204,7 @@ suite("Claude Opus 4.7 (Anthropic)", function () {
 				// aimock handles /v1/messages natively and serves Anthropic-format SSE responses.
 				// In record mode the real x-api-key is forwarded so aimock can proxy to api.anthropic.com.
 				await api.setConfiguration({
-					apiProvider: "anthropic" as const,
+					apiProvider: providerIdentifiers.anthropic,
 					apiKey: aimockUrl && !isRecord ? "mock-key" : process.env.ANTHROPIC_API_KEY!,
 					apiModelId: "claude-opus-4-7",
 					enableReasoningEffort: reasoningEnabled,
diff --git a/apps/vscode-e2e/src/suite/index.ts b/apps/vscode-e2e/src/suite/index.ts
index a81c622ad6..0d53d65b2b 100644
--- a/apps/vscode-e2e/src/suite/index.ts
+++ b/apps/vscode-e2e/src/suite/index.ts
@@ -1,3 +1,4 @@
+import { providerIdentifiers } from "@roo-code/types"
 import * as path from "path"
 import Mocha from "mocha"
 import { glob } from "glob"
@@ -20,7 +21,7 @@ export async function run() {
 	const isRecord = process.env.AIMOCK_RECORD === "true"
 
 	await api.setConfiguration({
-		apiProvider: "openrouter" as const,
+		apiProvider: providerIdentifiers.openrouter,
 		// In record mode, forward the real key so aimock can proxy it to OpenRouter.
 		// In replay mode, "mock-key" is sufficient — aimock never contacts the real API.
 		openRouterApiKey: aimockUrl && !isRecord ? "mock-key" : process.env.OPENROUTER_API_KEY!,
diff --git a/apps/vscode-e2e/src/suite/providers/bedrock.test.ts b/apps/vscode-e2e/src/suite/providers/bedrock.test.ts
index 6a0c4907f7..882988306e 100644
--- a/apps/vscode-e2e/src/suite/providers/bedrock.test.ts
+++ b/apps/vscode-e2e/src/suite/providers/bedrock.test.ts
@@ -1,3 +1,4 @@
+import { providerIdentifiers } from "@roo-code/types"
 import * as assert from "assert"
 
 import { startBedrockMockServer, type BedrockMockServer } from "../../bedrock-mock-server"
@@ -26,7 +27,7 @@ suite("Bedrock provider", function () {
 		if (!aimockUrl && BEDROCK_LIVE_E2E && AWS_BEARER_TOKEN_BEDROCK) {
 			// Live mode — explicitly opted into real AWS credentials, no aimock intercepting traffic.
 			await globalThis.api.setConfiguration({
-				apiProvider: "bedrock" as const,
+				apiProvider: providerIdentifiers.bedrock,
 				awsUseApiKey: true,
 				awsApiKey: AWS_BEARER_TOKEN_BEDROCK,
 				awsRegion: BEDROCK_REGION,
@@ -38,7 +39,7 @@ suite("Bedrock provider", function () {
 			// deserializer to drop the delta field (take() reads top-level only).
 			mockServer = await startBedrockMockServer()
 			await globalThis.api.setConfiguration({
-				apiProvider: "bedrock" as const,
+				apiProvider: providerIdentifiers.bedrock,
 				awsUseApiKey: true,
 				awsApiKey: "mock-key",
 				awsRegion: BEDROCK_REGION,
@@ -56,7 +57,7 @@ suite("Bedrock provider", function () {
 		const aimockUrl = process.env.AIMOCK_URL
 		const isRecord = process.env.AIMOCK_RECORD === "true"
 		await globalThis.api.setConfiguration({
-			apiProvider: "openrouter" as const,
+			apiProvider: providerIdentifiers.openrouter,
 			openRouterApiKey: aimockUrl && !isRecord ? "mock-key" : process.env.OPENROUTER_API_KEY!,
 			openRouterModelId: "openai/gpt-4.1",
 			...(aimockUrl && { openRouterBaseUrl: `${aimockUrl}/v1` }),
@@ -108,7 +109,7 @@ suite("Bedrock provider", function () {
 		// formation end-to-end.
 		if (!process.env.AIMOCK_URL && BEDROCK_LIVE_E2E && AWS_BEARER_TOKEN_BEDROCK) {
 			await api.setConfiguration({
-				apiProvider: "bedrock" as const,
+				apiProvider: providerIdentifiers.bedrock,
 				awsUseApiKey: true,
 				awsApiKey: AWS_BEARER_TOKEN_BEDROCK,
 				awsRegion: BEDROCK_REGION,
@@ -116,7 +117,7 @@ suite("Bedrock provider", function () {
 			})
 		} else {
 			await api.setConfiguration({
-				apiProvider: "bedrock" as const,
+				apiProvider: providerIdentifiers.bedrock,
 				awsUseApiKey: true,
 				awsApiKey: "mock-key",
 				awsRegion: BEDROCK_REGION,
diff --git a/apps/vscode-e2e/src/suite/providers/deepseek-v4.test.ts b/apps/vscode-e2e/src/suite/providers/deepseek-v4.test.ts
index 6391c79873..d5be2eba2f 100644
--- a/apps/vscode-e2e/src/suite/providers/deepseek-v4.test.ts
+++ b/apps/vscode-e2e/src/suite/providers/deepseek-v4.test.ts
@@ -1,3 +1,4 @@
+import { providerIdentifiers } from "@roo-code/types"
 import * as assert from "assert"
 import * as fs from "fs/promises"
 import * as path from "path"
@@ -211,7 +212,7 @@ async function runDeepSeekToolProbe(
 
 	try {
 		await api.setConfiguration({
-			apiProvider: "deepseek" as const,
+			apiProvider: providerIdentifiers.deepseek,
 			deepSeekApiKey: aimockUrl && !isRecord ? "mock-key" : DEEPSEEK_API_KEY!,
 			...(aimockUrl && { deepSeekBaseUrl: `${aimockUrl}/v1` }),
 			apiModelId: modelId,
@@ -336,7 +337,7 @@ suite("DeepSeek V4 provider", function () {
 		const aimockUrl = process.env.AIMOCK_URL
 		const isRecord = process.env.AIMOCK_RECORD === "true"
 		await globalThis.api.setConfiguration({
-			apiProvider: "openrouter" as const,
+			apiProvider: providerIdentifiers.openrouter,
 			openRouterApiKey: aimockUrl
 				? isRecord
 					? (process.env.OPENROUTER_API_KEY ?? "mock-key")
diff --git a/apps/vscode-e2e/src/suite/providers/gemini.test.ts b/apps/vscode-e2e/src/suite/providers/gemini.test.ts
index 7355c1cefd..269fd68328 100644
--- a/apps/vscode-e2e/src/suite/providers/gemini.test.ts
+++ b/apps/vscode-e2e/src/suite/providers/gemini.test.ts
@@ -1,3 +1,4 @@
+import { providerIdentifiers } from "@roo-code/types"
 import * as assert from "assert"
 
 import { RooCodeEventName, type ClineMessage } from "@roo-code/types"
@@ -190,7 +191,7 @@ suite("Gemini provider", function () {
 		const aimockUrl = process.env.AIMOCK_URL
 		const isRecord = process.env.AIMOCK_RECORD === "true"
 		await globalThis.api.setConfiguration({
-			apiProvider: "openrouter" as const,
+			apiProvider: providerIdentifiers.openrouter,
 			openRouterApiKey: aimockUrl && !isRecord ? "mock-key" : process.env.OPENROUTER_API_KEY!,
 			openRouterModelId: "openai/gpt-4.1",
 			...(aimockUrl && { openRouterBaseUrl: `${aimockUrl}/v1` }),
@@ -207,7 +208,7 @@ suite("Gemini provider", function () {
 			const promptTag = `gemini-e2e:reasoning-${reasoningEffort}`
 
 			await api.setConfiguration({
-				apiProvider: "gemini" as const,
+				apiProvider: providerIdentifiers.gemini,
 				geminiApiKey: aimockUrl && !isRecord ? "mock-key" : GEMINI_API_KEY!,
 				apiModelId: GEMINI_MODEL_ID,
 				enableReasoningEffort: reasoningEffort !== "disable",
diff --git a/apps/vscode-e2e/src/suite/providers/openrouter.test.ts b/apps/vscode-e2e/src/suite/providers/openrouter.test.ts
index 8b7e3d788f..0a31452067 100644
--- a/apps/vscode-e2e/src/suite/providers/openrouter.test.ts
+++ b/apps/vscode-e2e/src/suite/providers/openrouter.test.ts
@@ -1,3 +1,4 @@
+import { providerIdentifiers } from "@roo-code/types"
 import * as assert from "assert"
 
 import { setDefaultSuiteTimeout } from "../test-utils"
@@ -93,7 +94,7 @@ suite("OpenRouter provider", function () {
 		restoreFetch = installOpenRouterRequestCapture(requests, baseUrl)
 
 		await globalThis.api.setConfiguration({
-			apiProvider: "openrouter" as const,
+			apiProvider: providerIdentifiers.openrouter,
 			openRouterApiKey: aimockUrl && !isRecord ? "mock-key" : OPENROUTER_API_KEY!,
 			openRouterModelId: "anthropic/claude-haiku-4-5",
 			...(aimockUrl && { openRouterBaseUrl: `${aimockUrl}/v1` }),
diff --git a/apps/vscode-e2e/src/suite/providers/xai.test.ts b/apps/vscode-e2e/src/suite/providers/xai.test.ts
index 7403d71279..0cae6e5377 100644
--- a/apps/vscode-e2e/src/suite/providers/xai.test.ts
+++ b/apps/vscode-e2e/src/suite/providers/xai.test.ts
@@ -1,3 +1,4 @@
+import { providerIdentifiers } from "@roo-code/types"
 import * as assert from "assert"
 import * as fs from "fs/promises"
 import * as path from "path"
@@ -336,7 +337,7 @@ async function runXAIToolProbe(
 
 	try {
 		await api.setConfiguration({
-			apiProvider: "xai" as const,
+			apiProvider: providerIdentifiers.xai,
 			xaiApiKey: XAI_API_KEY ?? "mock-key",
 			apiModelId: modelId,
 		})
@@ -549,7 +550,7 @@ suite("xAI provider", function () {
 		)
 
 		await globalThis.api.setConfiguration({
-			apiProvider: "xai" as const,
+			apiProvider: providerIdentifiers.xai,
 			xaiApiKey: XAI_API_KEY ?? "mock-key",
 			apiModelId: XAI_MODEL_ID,
 		})
@@ -569,7 +570,7 @@ suite("xAI provider", function () {
 		const aimockUrl = process.env.AIMOCK_URL
 		const isRecord = process.env.AIMOCK_RECORD === "true"
 		await globalThis.api.setConfiguration({
-			apiProvider: "openrouter" as const,
+			apiProvider: providerIdentifiers.openrouter,
 			openRouterApiKey: aimockUrl && !isRecord ? "mock-key" : process.env.OPENROUTER_API_KEY!,
 			openRouterModelId: "openai/gpt-4.1",
 			...(aimockUrl && { openRouterBaseUrl: `${aimockUrl}/v1` }),
diff --git a/apps/vscode-e2e/src/suite/providers/zai.test.ts b/apps/vscode-e2e/src/suite/providers/zai.test.ts
index d3603c370c..25a342e423 100644
--- a/apps/vscode-e2e/src/suite/providers/zai.test.ts
+++ b/apps/vscode-e2e/src/suite/providers/zai.test.ts
@@ -1,3 +1,4 @@
+import { providerIdentifiers } from "@roo-code/types"
 import * as assert from "assert"
 
 import { RooCodeEventName, type ClineMessage } from "@roo-code/types"
@@ -21,7 +22,7 @@ type ZAiRequestCapture = { maxTokens?: number }
 
 function getBaseZAiConfiguration() {
 	return {
-		apiProvider: "zai" as const,
+		apiProvider: providerIdentifiers.zai,
 		zaiApiKey: ZAI_API_KEY ?? "mock-key",
 		zaiApiLine: "international_api" as const,
 		modelMaxTokens: undefined,
@@ -197,7 +198,7 @@ suite("Z.ai GLM provider", function () {
 		await globalThis.api.upsertProfile(
 			"default",
 			{
-				apiProvider: "openrouter" as const,
+				apiProvider: providerIdentifiers.openrouter,
 				openRouterApiKey: aimockUrl && !isRecord ? "mock-key" : process.env.OPENROUTER_API_KEY!,
 				openRouterModelId: "openai/gpt-4.1",
 				...(aimockUrl && { openRouterBaseUrl: `${aimockUrl}/v1` }),
diff --git a/apps/vscode-e2e/src/suite/subtasks.test.ts b/apps/vscode-e2e/src/suite/subtasks.test.ts
index 9da2cec28f..857c8accc5 100644
--- a/apps/vscode-e2e/src/suite/subtasks.test.ts
+++ b/apps/vscode-e2e/src/suite/subtasks.test.ts
@@ -1,3 +1,4 @@
+import { providerIdentifiers } from "@roo-code/types"
 import * as assert from "assert"
 
 import { RooCodeEventName, type ClineMessage } from "@roo-code/types"
@@ -735,7 +736,7 @@ suite("Roo Code Subtasks", function () {
 
 		const aimockUrl = process.env.AIMOCK_URL
 		const parentProfile = {
-			apiProvider: "openrouter" as const,
+			apiProvider: providerIdentifiers.openrouter,
 			openRouterApiKey: "mock-key",
 			openRouterModelId: "openai/gpt-4.1",
 			rateLimitSeconds: 0,
diff --git a/apps/vscode-e2e/src/suite/tools/apply-diff.test.ts b/apps/vscode-e2e/src/suite/tools/apply-diff.test.ts
index 36bd847416..622b998fac 100644
--- a/apps/vscode-e2e/src/suite/tools/apply-diff.test.ts
+++ b/apps/vscode-e2e/src/suite/tools/apply-diff.test.ts
@@ -1,3 +1,4 @@
+import { providerIdentifiers } from "@roo-code/types"
 import * as assert from "assert"
 import * as fs from "fs/promises"
 import * as path from "path"
@@ -110,7 +111,7 @@ suite("Roo Code apply_diff Tool", function () {
 		const isRecord = process.env.AIMOCK_RECORD === "true"
 
 		await globalThis.api.setConfiguration({
-			apiProvider: "openrouter" as const,
+			apiProvider: providerIdentifiers.openrouter,
 			openRouterApiKey: aimockUrl && !isRecord ? "mock-key" : process.env.OPENROUTER_API_KEY!,
 			openRouterModelId: "anthropic/claude-sonnet-4.5",
 			...(aimockUrl && { openRouterBaseUrl: `${aimockUrl}/v1` }),
@@ -136,7 +137,7 @@ suite("Roo Code apply_diff Tool", function () {
 		const aimockUrl = process.env.AIMOCK_URL
 		const isRecord = process.env.AIMOCK_RECORD === "true"
 		await globalThis.api.setConfiguration({
-			apiProvider: "openrouter" as const,
+			apiProvider: providerIdentifiers.openrouter,
 			openRouterApiKey: aimockUrl && !isRecord ? "mock-key" : process.env.OPENROUTER_API_KEY!,
 			openRouterModelId: "openai/gpt-4.1",
 			...(aimockUrl && { openRouterBaseUrl: `${aimockUrl}/v1` }),
diff --git a/apps/vscode-e2e/src/suite/tools/execute-command.test.ts b/apps/vscode-e2e/src/suite/tools/execute-command.test.ts
index db09fba264..8b45c22d9f 100644
--- a/apps/vscode-e2e/src/suite/tools/execute-command.test.ts
+++ b/apps/vscode-e2e/src/suite/tools/execute-command.test.ts
@@ -1,3 +1,4 @@
+import { providerIdentifiers } from "@roo-code/types"
 import * as assert from "assert"
 import * as fs from "fs/promises"
 import * as path from "path"
@@ -25,7 +26,7 @@ suite("Roo Code execute_command Tool", function () {
 		const isRecord = process.env.AIMOCK_RECORD === "true"
 
 		await globalThis.api.setConfiguration({
-			apiProvider: "openrouter" as const,
+			apiProvider: providerIdentifiers.openrouter,
 			openRouterApiKey: aimockUrl && !isRecord ? "mock-key" : process.env.OPENROUTER_API_KEY!,
 			openRouterModelId: "anthropic/claude-sonnet-4.5",
 			...(aimockUrl && { openRouterBaseUrl: `${aimockUrl}/v1` }),
@@ -51,7 +52,7 @@ suite("Roo Code execute_command Tool", function () {
 		const aimockUrl = process.env.AIMOCK_URL
 		const isRecord = process.env.AIMOCK_RECORD === "true"
 		await globalThis.api.setConfiguration({
-			apiProvider: "openrouter" as const,
+			apiProvider: providerIdentifiers.openrouter,
 			openRouterApiKey: aimockUrl && !isRecord ? "mock-key" : process.env.OPENROUTER_API_KEY!,
 			openRouterModelId: "openai/gpt-4.1",
 			...(aimockUrl && { openRouterBaseUrl: `${aimockUrl}/v1` }),
diff --git a/apps/vscode-e2e/src/suite/tools/terminal-profile.test.ts b/apps/vscode-e2e/src/suite/tools/terminal-profile.test.ts
index a23bd8163c..63b26e7bfb 100644
--- a/apps/vscode-e2e/src/suite/tools/terminal-profile.test.ts
+++ b/apps/vscode-e2e/src/suite/tools/terminal-profile.test.ts
@@ -1,3 +1,4 @@
+import { providerIdentifiers } from "@roo-code/types"
 /**
  * Linux-only e2e smoke test for the VS Code terminal profile override.
  *
@@ -41,7 +42,7 @@ suite("Terminal Profile", function () {
 		const isRecord = process.env.AIMOCK_RECORD === "true"
 
 		await globalThis.api.setConfiguration({
-			apiProvider: "openrouter" as const,
+			apiProvider: providerIdentifiers.openrouter,
 			openRouterApiKey: aimockUrl && !isRecord ? "mock-key" : process.env.OPENROUTER_API_KEY!,
 			openRouterModelId: "anthropic/claude-sonnet-4.5",
 			...(aimockUrl && { openRouterBaseUrl: `${aimockUrl}/v1` }),
@@ -97,7 +98,7 @@ suite("Terminal Profile", function () {
 		const aimockUrl = process.env.AIMOCK_URL
 		const isRecord = process.env.AIMOCK_RECORD === "true"
 		await globalThis.api.setConfiguration({
-			apiProvider: "openrouter" as const,
+			apiProvider: providerIdentifiers.openrouter,
 			openRouterApiKey: aimockUrl && !isRecord ? "mock-key" : process.env.OPENROUTER_API_KEY!,
 			openRouterModelId: "openai/gpt-4.1",
 			...(aimockUrl && { openRouterBaseUrl: `${aimockUrl}/v1` }),
diff --git a/apps/vscode-e2e/src/suite/tools/write-to-file.test.ts b/apps/vscode-e2e/src/suite/tools/write-to-file.test.ts
index 55cf80a483..695276c9e2 100644
--- a/apps/vscode-e2e/src/suite/tools/write-to-file.test.ts
+++ b/apps/vscode-e2e/src/suite/tools/write-to-file.test.ts
@@ -1,3 +1,4 @@
+import { providerIdentifiers } from "@roo-code/types"
 import * as assert from "assert"
 import * as fs from "fs/promises"
 import * as path from "path"
@@ -25,7 +26,7 @@ suite("Roo Code write_to_file Tool", function () {
 		const isRecord = process.env.AIMOCK_RECORD === "true"
 
 		await globalThis.api.setConfiguration({
-			apiProvider: "openrouter" as const,
+			apiProvider: providerIdentifiers.openrouter,
 			openRouterApiKey: aimockUrl && !isRecord ? "mock-key" : process.env.OPENROUTER_API_KEY!,
 			openRouterModelId: "anthropic/claude-sonnet-4.5",
 			...(aimockUrl && { openRouterBaseUrl: `${aimockUrl}/v1` }),
@@ -51,7 +52,7 @@ suite("Roo Code write_to_file Tool", function () {
 		const aimockUrl = process.env.AIMOCK_URL
 		const isRecord = process.env.AIMOCK_RECORD === "true"
 		await globalThis.api.setConfiguration({
-			apiProvider: "openrouter" as const,
+			apiProvider: providerIdentifiers.openrouter,
 			openRouterApiKey: aimockUrl && !isRecord ? "mock-key" : process.env.OPENROUTER_API_KEY!,
 			openRouterModelId: "openai/gpt-4.1",
 			...(aimockUrl && { openRouterBaseUrl: `${aimockUrl}/v1` }),
diff --git a/packages/cloud/eslint.config.mjs b/packages/cloud/eslint.config.mjs
index c603a68f12..7c0d5b2903 100644
--- a/packages/cloud/eslint.config.mjs
+++ b/packages/cloud/eslint.config.mjs
@@ -1,9 +1,12 @@
 import { config } from "@roo-code/config-eslint/base"
+import { createProviderIdentifierConfig } from "@roo-code/config-eslint/provider-identifiers"
+import { providerIdentifiers, retiredProviderIdentifiers } from "@roo-code/types/provider-identifiers"
 import globals from "globals"
 
 /** @type {import("eslint").Linter.Config} */
 export default [
 	...config,
+	createProviderIdentifierConfig({ providerIdentifiers, retiredProviderIdentifiers }),
 	{
 		files: ["**/*.cjs"],
 		languageOptions: {
diff --git a/packages/cloud/src/__tests__/CloudSettingsService.parsing.test.ts b/packages/cloud/src/__tests__/CloudSettingsService.parsing.test.ts
index b0486b971c..6d8e0035dd 100644
--- a/packages/cloud/src/__tests__/CloudSettingsService.parsing.test.ts
+++ b/packages/cloud/src/__tests__/CloudSettingsService.parsing.test.ts
@@ -1,3 +1,4 @@
+import { providerIdentifiers } from "@roo-code/types"
 // pnpm test src/__tests__/CloudSettingsService.parsing.test.ts
 
 import type { ExtensionContext } from "vscode"
@@ -97,7 +98,7 @@ describe("CloudSettingsService - Response Parsing", () => {
 				providerProfiles: {
 					default: {
 						id: "default",
-						apiProvider: "anthropic",
+						apiProvider: providerIdentifiers.anthropic,
 						apiModelId: "claude-3-opus-20240229",
 						apiKey: "test-key",
 						modelTemperature: 0.7,
diff --git a/packages/config-eslint/provider-identifiers.js b/packages/config-eslint/provider-identifiers.js
index 6f22941cdd..2444c91d97 100644
--- a/packages/config-eslint/provider-identifiers.js
+++ b/packages/config-eslint/provider-identifiers.js
@@ -6,6 +6,10 @@ const typescriptExpressionWrappers = new Set([
 ])
 
 function getStaticName(node) {
+	while (typescriptExpressionWrappers.has(node?.type)) {
+		node = node.expression
+	}
+
 	if (node?.type === "Identifier") {
 		return node.name
 	}
@@ -129,6 +133,11 @@ export function createProviderIdentifierConfig({ providerIdentifiers, retiredPro
 						reportIfRawProvider(node.init)
 					}
 				},
+				AssignmentPattern(node) {
+					if (isProviderLike(node.left)) {
+						reportIfRawProvider(node.right)
+					}
+				},
 				AssignmentExpression(node) {
 					if (isProviderLike(node.left)) {
 						reportIfRawProvider(node.right)
@@ -153,6 +162,13 @@ export function createProviderIdentifierConfig({ providerIdentifiers, retiredPro
 						}
 					}
 				},
+				CallExpression(node) {
+					if (isProviderLike(node.callee)) {
+						for (const argument of node.arguments) {
+							reportIfRawProvider(argument)
+						}
+					}
+				},
 			}
 		},
 	}
diff --git a/packages/config-eslint/provider-identifiers.test.js b/packages/config-eslint/provider-identifiers.test.js
index ecd1713be1..113b47b909 100644
--- a/packages/config-eslint/provider-identifiers.test.js
+++ b/packages/config-eslint/provider-identifiers.test.js
@@ -5,6 +5,7 @@ import { createProviderIdentifierConfig } from "./provider-identifiers.js"
 const config = createProviderIdentifierConfig({
 	providerIdentifiers: {
 		anthropic: "anthropic",
+		gemini: "gemini",
 		openaiNative: "openai-native",
 		openrouter: "openrouter",
 		poe: "poe",
@@ -53,6 +54,8 @@ ruleTester.run("no-raw-provider-identifiers provider-like values", rule, {
 		"const provider = retiredProviderIdentifiers.groq",
 		'const config = { apiProvider: "external-provider" }',
 		"const config = { apiProvider: providerIdentifiers.poe }",
+		"const provider = providerIdentifiers.openrouter",
+		"getProviderServiceConfig(providerIdentifiers.gemini)",
 		'const response = { protocol: "anthropic", format: "openrouter" }',
 	],
 	invalid: [
@@ -100,5 +103,23 @@ ruleTester.run("no-raw-provider-identifiers provider-like values", rule, {
 			code: 'switch (config.apiProvider) { case "poe": break; case providerIdentifiers.openrouter: break }',
 			errors: [{ messageId: "useCanonical", data: { replacement: "providerIdentifiers.poe", value: "poe" } }],
 		},
+		{
+			code: 'function select(provider = "openrouter") { return provider }',
+			errors: [
+				{
+					messageId: "useCanonical",
+					data: { replacement: "providerIdentifiers.openrouter", value: "openrouter" },
+				},
+			],
+		},
+		{
+			code: 'getProviderServiceConfig("gemini")',
+			errors: [
+				{
+					messageId: "useCanonical",
+					data: { replacement: "providerIdentifiers.gemini", value: "gemini" },
+				},
+			],
+		},
 	],
 })
diff --git a/packages/types/src/image-generation.ts b/packages/types/src/image-generation.ts
index c7d946de7f..a40d28073b 100644
--- a/packages/types/src/image-generation.ts
+++ b/packages/types/src/image-generation.ts
@@ -50,7 +50,7 @@ export const IMAGE_GENERATION_MODEL_IDS = IMAGE_GENERATION_MODELS.map((m) => m.v
 /**
  * Image generation provider type
  */
-export type ImageGenerationProvider = "openrouter"
+export type ImageGenerationProvider = typeof providerIdentifiers.openrouter
 
 /**
  * Get the image generation provider with backwards compatibility
@@ -62,5 +62,5 @@ export function getImageGenerationProvider(
 	explicitProvider: ImageGenerationProvider | undefined,
 	_hasExistingModel: boolean,
 ): ImageGenerationProvider {
-	return explicitProvider !== undefined ? explicitProvider : "openrouter"
+	return explicitProvider !== undefined ? explicitProvider : providerIdentifiers.openrouter
 }
diff --git a/src/services/code-index/config-manager.ts b/src/services/code-index/config-manager.ts
index dc6f72d34a..62b191a44c 100644
--- a/src/services/code-index/config-manager.ts
+++ b/src/services/code-index/config-manager.ts
@@ -117,7 +117,7 @@ export class CodeIndexConfigManager {
 			this.embedderProvider = providerIdentifiers.mistral
 		} else if (codebaseIndexEmbedderProvider === providerIdentifiers.vercelAiGateway) {
 			this.embedderProvider = providerIdentifiers.vercelAiGateway
-		} else if ((codebaseIndexEmbedderProvider as string) === "bedrock") {
+		} else if ((codebaseIndexEmbedderProvider as string) === providerIdentifiers.bedrock) {
 			this.embedderProvider = providerIdentifiers.bedrock
 		} else if (codebaseIndexEmbedderProvider === providerIdentifiers.openrouter) {
 			this.embedderProvider = providerIdentifiers.openrouter
diff --git a/webview-ui/playwright/AppProviders.tsx b/webview-ui/playwright/AppProviders.tsx
index a11b1e3977..f8a274cd9f 100644
--- a/webview-ui/playwright/AppProviders.tsx
+++ b/webview-ui/playwright/AppProviders.tsx
@@ -1,6 +1,7 @@
 import React, { useState } from "react"
 import { QueryClient, QueryClientProvider } from "@tanstack/react-query"
 import { I18nextProvider } from "react-i18next"
+import { providerIdentifiers } from "@roo-code/types"
 
 import { ExtensionStateContextProvider } from "@/context/ExtensionStateContext"
 import { TranslationProvider } from "@/i18n/TranslationContext"
@@ -23,7 +24,7 @@ const defaultInitialState: InitialState = {
 	taskHistory: [],
 	shouldShowAnnouncement: false,
 	telemetrySetting: "enabled",
-	apiConfiguration: { apiProvider: "anthropic" },
+	apiConfiguration: { apiProvider: providerIdentifiers.anthropic },
 	currentApiConfigName: "Default",
 	listApiConfigMeta: [{ id: "default", name: "Default", modelId: "claude-sonnet" }],
 	pinnedApiConfigs: {},
diff --git a/webview-ui/playwright/ExtensionStateContext.tsx b/webview-ui/playwright/ExtensionStateContext.tsx
index 3aadd4bd8d..597c28cac5 100644
--- a/webview-ui/playwright/ExtensionStateContext.tsx
+++ b/webview-ui/playwright/ExtensionStateContext.tsx
@@ -1,4 +1,5 @@
 import React, { createContext, useContext } from "react"
+import { providerIdentifiers } from "@roo-code/types"
 
 const noop = () => undefined
 
@@ -14,7 +15,7 @@ const defaultState = {
 	currentApiConfigName: "Default",
 	listApiConfigMeta: [{ id: "default", name: "Default", modelId: "claude-sonnet" }],
 	pinnedApiConfigs: {},
-	apiConfiguration: { apiProvider: "anthropic" },
+	apiConfiguration: { apiProvider: providerIdentifiers.anthropic },
 	enterBehavior: "send",
 	lockApiConfigAcrossModes: false,
 	telemetrySetting: "enabled",
diff --git a/webview-ui/src/components/settings/utils/__tests__/providerModelConfig.spec.ts b/webview-ui/src/components/settings/utils/__tests__/providerModelConfig.spec.ts
index 294f6f0bf9..b695b3529e 100644
--- a/webview-ui/src/components/settings/utils/__tests__/providerModelConfig.spec.ts
+++ b/webview-ui/src/components/settings/utils/__tests__/providerModelConfig.spec.ts
@@ -64,7 +64,7 @@ describe("providerModelConfig", () => {
 
 	describe("getProviderServiceConfig", () => {
 		it("returns correct config for known provider", () => {
-			const config = getProviderServiceConfig("gemini")
+			const config = getProviderServiceConfig(providerIdentifiers.gemini)
 			expect(config.serviceName).toBe("Google Gemini")
 			expect(config.serviceUrl).toBe("https://ai.google.dev")
 		})
@@ -87,7 +87,7 @@ describe("providerModelConfig", () => {
 
 	describe("getDefaultModelIdForProvider", () => {
 		it("returns default model ID for known provider", () => {
-			const defaultId = getDefaultModelIdForProvider("anthropic")
+			const defaultId = getDefaultModelIdForProvider(providerIdentifiers.anthropic)
 			expect(defaultId).toBeDefined()
 			expect(typeof defaultId).toBe("string")
 			expect(defaultId.length).toBeGreaterThan(0)
@@ -99,14 +99,14 @@ describe("providerModelConfig", () => {
 		})
 
 		it("returns international default for Z.ai without apiConfiguration", () => {
-			const defaultId = getDefaultModelIdForProvider("zai")
+			const defaultId = getDefaultModelIdForProvider(providerIdentifiers.zai)
 			expect(defaultId).toBeDefined()
 			expect(typeof defaultId).toBe("string")
 			expect(defaultId.length).toBeGreaterThan(0)
 		})
 
 		it("returns mainland default for Z.ai with china_coding entrypoint", () => {
-			const defaultId = getDefaultModelIdForProvider("zai", {
+			const defaultId = getDefaultModelIdForProvider(providerIdentifiers.zai, {
 				apiProvider: providerIdentifiers.zai,
 				zaiApiLine: "china_coding",
 			})
@@ -118,7 +118,7 @@ describe("providerModelConfig", () => {
 
 		it("returns mainland default for Z.ai with china_api entrypoint", () => {
 			expect(
-				getDefaultModelIdForProvider("zai", {
+				getDefaultModelIdForProvider(providerIdentifiers.zai, {
 					apiProvider: providerIdentifiers.zai,
 					zaiApiLine: "china_api",
 				}),
@@ -126,7 +126,7 @@ describe("providerModelConfig", () => {
 		})
 
 		it("returns international default for Z.ai with international_coding entrypoint", () => {
-			const defaultId = getDefaultModelIdForProvider("zai", {
+			const defaultId = getDefaultModelIdForProvider(providerIdentifiers.zai, {
 				apiProvider: providerIdentifiers.zai,
 				zaiApiLine: "international_coding",
 			})
@@ -137,11 +137,11 @@ describe("providerModelConfig", () => {
 
 		it("uses mainland or international defaults based on zaiApiLine setting", () => {
 			// Verify the function correctly routes to appropriate defaults
-			const chinaDefault = getDefaultModelIdForProvider("zai", {
+			const chinaDefault = getDefaultModelIdForProvider(providerIdentifiers.zai, {
 				apiProvider: providerIdentifiers.zai,
 				zaiApiLine: "china_coding",
 			})
-			const internationalDefault = getDefaultModelIdForProvider("zai", {
+			const internationalDefault = getDefaultModelIdForProvider(providerIdentifiers.zai, {
 				apiProvider: providerIdentifiers.zai,
 				zaiApiLine: "international_coding",
 			})
@@ -191,35 +191,35 @@ describe("providerModelConfig", () => {
 
 	describe("getStaticModelsForProvider", () => {
 		it("returns models for anthropic provider", () => {
-			const models = getStaticModelsForProvider("anthropic")
+			const models = getStaticModelsForProvider(providerIdentifiers.anthropic)
 			expect(Object.keys(models).length).toBeGreaterThan(0)
 		})
 
 		it("adds custom-arn option for bedrock provider", () => {
-			const models = getStaticModelsForProvider("bedrock", "Use Custom ARN")
+			const models = getStaticModelsForProvider(providerIdentifiers.bedrock, "Use Custom ARN")
 			expect(models["custom-arn"]).toBeDefined()
 			expect(models["custom-arn"].description).toBe("Use Custom ARN")
 		})
 
 		it("returns empty object for providers without static models", () => {
-			const models = getStaticModelsForProvider("openrouter")
+			const models = getStaticModelsForProvider(providerIdentifiers.openrouter)
 			expect(Object.keys(models).length).toBe(0)
 		})
 
 		it("shows GLM-5.3 models for international Z.ai API and Coding Plan entrypoints", () => {
-			const internationalCoding = getStaticModelsForProvider("zai", undefined, {
+			const internationalCoding = getStaticModelsForProvider(providerIdentifiers.zai, undefined, {
 				apiProvider: providerIdentifiers.zai,
 				zaiApiLine: "international_coding",
 			})
-			const chinaCoding = getStaticModelsForProvider("zai", undefined, {
+			const chinaCoding = getStaticModelsForProvider(providerIdentifiers.zai, undefined, {
 				apiProvider: providerIdentifiers.zai,
 				zaiApiLine: "china_coding",
 			})
-			const internationalApi = getStaticModelsForProvider("zai", undefined, {
+			const internationalApi = getStaticModelsForProvider(providerIdentifiers.zai, undefined, {
 				apiProvider: providerIdentifiers.zai,
 				zaiApiLine: "international_api",
 			})
-			const chinaApi = getStaticModelsForProvider("zai", undefined, {
+			const chinaApi = getStaticModelsForProvider(providerIdentifiers.zai, undefined, {
 				apiProvider: providerIdentifiers.zai,
 				zaiApiLine: "china_api",
 			})
@@ -237,16 +237,16 @@ describe("providerModelConfig", () => {
 
 	describe("isStaticModelProvider", () => {
 		it("returns true for providers with static models", () => {
-			expect(isStaticModelProvider("anthropic")).toBe(true)
-			expect(isStaticModelProvider("bedrock")).toBe(true)
-			expect(isStaticModelProvider("gemini")).toBe(true)
+			expect(isStaticModelProvider(providerIdentifiers.anthropic)).toBe(true)
+			expect(isStaticModelProvider(providerIdentifiers.bedrock)).toBe(true)
+			expect(isStaticModelProvider(providerIdentifiers.gemini)).toBe(true)
 			expect(isStaticModelProvider(providerIdentifiers.openaiNative)).toBe(true)
 		})
 
 		it("returns false for providers without static models", () => {
-			expect(isStaticModelProvider("openrouter")).toBe(false)
-			expect(isStaticModelProvider("ollama")).toBe(false)
-			expect(isStaticModelProvider("lmstudio")).toBe(false)
+			expect(isStaticModelProvider(providerIdentifiers.openrouter)).toBe(false)
+			expect(isStaticModelProvider(providerIdentifiers.ollama)).toBe(false)
+			expect(isStaticModelProvider(providerIdentifiers.lmstudio)).toBe(false)
 		})
 	})
 

From 5288aec18dc808112e8da6d936d48e58aee9cd03 Mon Sep 17 00:00:00 2001
From: gubin-dev <alecmei.gubin@yandex.ru>
Date: Sun, 30 Aug 2026 16:29:55 +0300
Subject: [PATCH 06/13] fix(eslint): unwrap provider expression wrappers

---
 .../config-eslint/provider-identifiers.js     |  2 ++
 .../provider-identifiers.test.js              | 21 +++++++++++++++++++
 2 files changed, 23 insertions(+)

diff --git a/packages/config-eslint/provider-identifiers.js b/packages/config-eslint/provider-identifiers.js
index 2444c91d97..6677508b72 100644
--- a/packages/config-eslint/provider-identifiers.js
+++ b/packages/config-eslint/provider-identifiers.js
@@ -1,5 +1,7 @@
 const typescriptExpressionWrappers = new Set([
+	"ChainExpression",
 	"TSAsExpression",
+	"TSInstantiationExpression",
 	"TSNonNullExpression",
 	"TSSatisfiesExpression",
 	"TSTypeAssertion",
diff --git a/packages/config-eslint/provider-identifiers.test.js b/packages/config-eslint/provider-identifiers.test.js
index 113b47b909..07cfceb03f 100644
--- a/packages/config-eslint/provider-identifiers.test.js
+++ b/packages/config-eslint/provider-identifiers.test.js
@@ -1,4 +1,5 @@
 import { RuleTester } from "eslint"
+import typescriptEslint from "typescript-eslint"
 
 import { createProviderIdentifierConfig } from "./provider-identifiers.js"
 
@@ -22,6 +23,7 @@ const ruleTester = new RuleTester({
 	languageOptions: {
 		ecmaVersion: 2022,
 		sourceType: "module",
+		parser: typescriptEslint.parser,
 	},
 })
 
@@ -56,6 +58,7 @@ ruleTester.run("no-raw-provider-identifiers provider-like values", rule, {
 		"const config = { apiProvider: providerIdentifiers.poe }",
 		"const provider = providerIdentifiers.openrouter",
 		"getProviderServiceConfig(providerIdentifiers.gemini)",
+		'if (config?.protocol === "gemini") {}',
 		'const response = { protocol: "anthropic", format: "openrouter" }',
 	],
 	invalid: [
@@ -121,5 +124,23 @@ ruleTester.run("no-raw-provider-identifiers provider-like values", rule, {
 				},
 			],
 		},
+		{
+			code: '(getProviderServiceConfig<string>)("gemini")',
+			errors: [
+				{
+					messageId: "useCanonical",
+					data: { replacement: "providerIdentifiers.gemini", value: "gemini" },
+				},
+			],
+		},
+		{
+			code: 'if (config?.apiProvider === "gemini") {}',
+			errors: [
+				{
+					messageId: "useCanonical",
+					data: { replacement: "providerIdentifiers.gemini", value: "gemini" },
+				},
+			],
+		},
 	],
 })

From 397c0fec24920821bcade548cff80fd2fa5bdef6 Mon Sep 17 00:00:00 2001
From: gubin-dev <alecmei.gubin@yandex.ru>
Date: Sun, 30 Aug 2026 17:21:51 +0300
Subject: [PATCH 07/13] test(types): reuse Kimi Code auth method schema

---
 packages/types/src/__tests__/kimi-code.test.ts | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/packages/types/src/__tests__/kimi-code.test.ts b/packages/types/src/__tests__/kimi-code.test.ts
index 1a59ed3e12..5b2696fab3 100644
--- a/packages/types/src/__tests__/kimi-code.test.ts
+++ b/packages/types/src/__tests__/kimi-code.test.ts
@@ -2,11 +2,14 @@ import { providerIdentifiers } from "../provider-identifiers.js"
 import {
 	SECRET_STATE_KEYS,
 	dynamicProviders,
+	kimiCodeAuthMethodSchema,
 	kimiCodeDefaultModelId,
 	providerSettingsSchema,
 	providerSettingsSchemaDiscriminated,
 } from "../index.js"
 
+const [kimiCodeOAuthAuthMethod] = kimiCodeAuthMethodSchema.options
+
 describe("Kimi Code provider types", () => {
 	it("registers Kimi Code as a dynamic provider with a distinct secret", () => {
 		expect(dynamicProviders).toContain("kimi-code")
@@ -24,9 +27,12 @@ describe("Kimi Code provider types", () => {
 			}),
 		).toMatchObject({ kimiCodeApiKey: "kimi-key" })
 		expect(
-			providerSettingsSchema.parse({ apiProvider: providerIdentifiers.kimiCode, kimiCodeAuthMethod: "oauth" }),
+			providerSettingsSchema.parse({
+				apiProvider: providerIdentifiers.kimiCode,
+				kimiCodeAuthMethod: kimiCodeOAuthAuthMethod,
+			}),
 		).toMatchObject({
-			kimiCodeAuthMethod: "oauth",
+			kimiCodeAuthMethod: kimiCodeOAuthAuthMethod,
 		})
 	})
 })

From 5c0901bcc4c5789f26b988b4b6e2cbe075f835f6 Mon Sep 17 00:00:00 2001
From: gubin-dev <alecmei.gubin@yandex.ru>
Date: Sun, 30 Aug 2026 17:22:47 +0300
Subject: [PATCH 08/13] refactor(eslint): simplify provider identifier helpers

---
 .../config-eslint/provider-identifiers.js     | 49 +++++++++++--------
 1 file changed, 29 insertions(+), 20 deletions(-)

diff --git a/packages/config-eslint/provider-identifiers.js b/packages/config-eslint/provider-identifiers.js
index 6677508b72..173f334489 100644
--- a/packages/config-eslint/provider-identifiers.js
+++ b/packages/config-eslint/provider-identifiers.js
@@ -7,32 +7,43 @@ const typescriptExpressionWrappers = new Set([
 	"TSTypeAssertion",
 ])
 
-function getStaticName(node) {
+const useCanonicalMessageId = "useCanonical"
+
+function unwrapExpression(node) {
 	while (typescriptExpressionWrappers.has(node?.type)) {
 		node = node.expression
 	}
 
-	if (node?.type === "Identifier") {
-		return node.name
-	}
-
-	if (node?.type === "MemberExpression") {
-		if (!node.computed && node.property.type === "Identifier") {
-			return node.property.name
-		}
+	return node
+}
 
-		if (node.computed && node.property.type === "Literal" && typeof node.property.value === "string") {
-			return node.property.value
-		}
+function getMemberExpressionStaticName(node) {
+	if (!node.computed && node.property.type === "Identifier") {
+		return node.property.name
 	}
 
-	if (node?.type === "Literal" && typeof node.value === "string") {
-		return node.value
+	if (node.computed && node.property.type === "Literal" && typeof node.property.value === "string") {
+		return node.property.value
 	}
 
 	return undefined
 }
 
+function getStaticName(node) {
+	node = unwrapExpression(node)
+
+	switch (node?.type) {
+		case "Identifier":
+			return node.name
+		case "MemberExpression":
+			return getMemberExpressionStaticName(node)
+		case "Literal":
+			return typeof node.value === "string" ? node.value : undefined
+		default:
+			return undefined
+	}
+}
+
 function isProviderLike(node) {
 	return getStaticName(node)?.toLowerCase().includes("provider") ?? false
 }
@@ -52,9 +63,7 @@ export function createProviderIdentifierConfig({ providerIdentifiers, retiredPro
 	])
 
 	function getRawProvider(node) {
-		while (typescriptExpressionWrappers.has(node?.type)) {
-			node = node.expression
-		}
+		node = unwrapExpression(node)
 
 		if (node?.type === "Literal" && typeof node.value === "string") {
 			const replacement = providerReplacementsByValue.get(node.value)
@@ -86,14 +95,14 @@ export function createProviderIdentifierConfig({ providerIdentifiers, retiredPro
 			docs: { description: "Require canonical provider identifiers in provider-like contexts" },
 			schema: [],
 			messages: {
-				useCanonical: 'Use {{replacement}} instead of the raw provider identifier "{{value}}".',
+				[useCanonicalMessageId]: 'Use {{replacement}} instead of the raw provider identifier "{{value}}".',
 			},
 		},
 		create(context) {
 			function reportIfRawProvider(node) {
 				const provider = getRawProvider(node)
 				if (provider) {
-					context.report({ node, messageId: "useCanonical", data: provider })
+					context.report({ node, messageId: useCanonicalMessageId, data: provider })
 				}
 			}
 
@@ -112,7 +121,7 @@ export function createProviderIdentifierConfig({ providerIdentifiers, retiredPro
 				if (replacement) {
 					context.report({
 						node: node.key,
-						messageId: "useCanonical",
+						messageId: useCanonicalMessageId,
 						data: { replacement, value },
 					})
 				}

From f9e59d19fa7abf8f356bcf4552fe6cdb0f0178e9 Mon Sep 17 00:00:00 2001
From: gubin-dev <alecmei.gubin@yandex.ru>
Date: Sun, 30 Aug 2026 17:50:56 +0300
Subject: [PATCH 09/13] test(code-index): cover embedder provider branches

---
 .../__tests__/config-manager.spec.ts          |  20 +++
 .../src/components/chat/CodeIndexPopover.tsx  |   2 +-
 .../chat/__tests__/CodeIndexPopover.test.tsx  | 132 ++++++++++++++++++
 3 files changed, 153 insertions(+), 1 deletion(-)
 create mode 100644 webview-ui/src/components/chat/__tests__/CodeIndexPopover.test.tsx

diff --git a/src/services/code-index/__tests__/config-manager.spec.ts b/src/services/code-index/__tests__/config-manager.spec.ts
index 6a496b6809..49a004bb27 100644
--- a/src/services/code-index/__tests__/config-manager.spec.ts
+++ b/src/services/code-index/__tests__/config-manager.spec.ts
@@ -59,6 +59,26 @@ describe("CodeIndexConfigManager", () => {
 			expect(configManager.isFeatureEnabled).toBe(false)
 			expect(configManager.currentEmbedderProvider).toBe("openai")
 		})
+
+		it("loads Bedrock as the embedder provider with its optional profile", () => {
+			mockContextProxy.getGlobalState.mockReturnValue({
+				codebaseIndexEnabled: true,
+				codebaseIndexEmbedderProvider: providerIdentifiers.bedrock,
+				codebaseIndexEmbedderModelId: "amazon.titan-embed-text-v2:0",
+				codebaseIndexBedrockRegion: "eu-west-1",
+				codebaseIndexBedrockProfile: "development",
+				codebaseIndexQdrantUrl: "http://localhost:6333",
+			})
+
+			configManager = new CodeIndexConfigManager(mockContextProxy)
+
+			expect(configManager.getConfig()).toMatchObject({
+				embedderProvider: providerIdentifiers.bedrock,
+				modelId: "amazon.titan-embed-text-v2:0",
+				bedrockOptions: { region: "eu-west-1", profile: "development" },
+				isConfigured: true,
+			})
+		})
 	})
 
 	describe("isFeatureEnabled", () => {
diff --git a/webview-ui/src/components/chat/CodeIndexPopover.tsx b/webview-ui/src/components/chat/CodeIndexPopover.tsx
index 732280532f..3a278111a3 100644
--- a/webview-ui/src/components/chat/CodeIndexPopover.tsx
+++ b/webview-ui/src/components/chat/CodeIndexPopover.tsx
@@ -89,7 +89,7 @@ interface LocalCodeIndexSettings {
 }
 
 // Validation schema for codebase index settings
-const createValidationSchema = (provider: EmbedderProvider, t: any) => {
+export const createValidationSchema = (provider: EmbedderProvider, t: any) => {
 	const baseSchema = z.object({
 		codebaseIndexEnabled: z.boolean(),
 		codebaseIndexQdrantUrl: z
diff --git a/webview-ui/src/components/chat/__tests__/CodeIndexPopover.test.tsx b/webview-ui/src/components/chat/__tests__/CodeIndexPopover.test.tsx
new file mode 100644
index 0000000000..a8b80d23fa
--- /dev/null
+++ b/webview-ui/src/components/chat/__tests__/CodeIndexPopover.test.tsx
@@ -0,0 +1,132 @@
+import type { ExtensionState } from "@roo-code/types"
+import { providerIdentifiers } from "@roo-code/types"
+
+import { renderWithExtensionState } from "@/utils/test-utils"
+import { useOpenRouterModelProviders } from "@src/components/ui/hooks/useOpenRouterModelProviders"
+
+import { CodeIndexPopover, createValidationSchema } from "../CodeIndexPopover"
+
+vi.mock("@src/components/ui/hooks/useOpenRouterModelProviders", () => ({
+	OPENROUTER_DEFAULT_PROVIDER_NAME: "Auto",
+	useOpenRouterModelProviders: vi.fn(() => ({ data: undefined })),
+}))
+
+const indexingStatus = {
+	systemStatus: "Standby" as const,
+	message: "",
+	processedItems: 0,
+	totalItems: 0,
+	currentItemUnit: "items",
+}
+
+const baseSettings = {
+	codebaseIndexEnabled: true,
+	codebaseIndexQdrantUrl: "http://localhost:6333",
+	codebaseIndexEmbedderModelId: "embedding-model",
+}
+
+const translate = (key: string) => key
+
+describe("CodeIndexPopover validation", () => {
+	it.each([
+		{
+			provider: providerIdentifiers.openai,
+			requiredField: "codeIndexOpenAiKey",
+			settings: { codeIndexOpenAiKey: "openai-key" },
+		},
+		{
+			provider: providerIdentifiers.ollama,
+			requiredField: "codebaseIndexEmbedderBaseUrl",
+			settings: { codebaseIndexEmbedderBaseUrl: "http://localhost:11434" },
+		},
+		{
+			provider: providerIdentifiers.gemini,
+			requiredField: "codebaseIndexGeminiApiKey",
+			settings: { codebaseIndexGeminiApiKey: "gemini-key" },
+		},
+		{
+			provider: providerIdentifiers.mistral,
+			requiredField: "codebaseIndexMistralApiKey",
+			settings: { codebaseIndexMistralApiKey: "mistral-key" },
+		},
+		{
+			provider: providerIdentifiers.vercelAiGateway,
+			requiredField: "codebaseIndexVercelAiGatewayApiKey",
+			settings: { codebaseIndexVercelAiGatewayApiKey: "gateway-key" },
+		},
+		{
+			provider: providerIdentifiers.bedrock,
+			requiredField: "codebaseIndexBedrockRegion",
+			settings: { codebaseIndexBedrockRegion: "us-east-1" },
+		},
+		{
+			provider: providerIdentifiers.openrouter,
+			requiredField: "codebaseIndexOpenRouterApiKey",
+			settings: { codebaseIndexOpenRouterApiKey: "openrouter-key" },
+		},
+	])("requires provider-specific configuration for $provider", ({ provider, requiredField, settings }) => {
+		const schema = createValidationSchema(provider, translate)
+		const validSettings = { ...baseSettings, ...settings }
+
+		expect(schema.safeParse(validSettings).success).toBe(true)
+
+		const invalidSettings = { ...validSettings, [requiredField]: "" }
+		const result = schema.safeParse(invalidSettings)
+		expect(result.success).toBe(false)
+		if (!result.success) {
+			expect(result.error.issues).toEqual(
+				expect.arrayContaining([expect.objectContaining({ path: [requiredField] })]),
+			)
+		}
+	})
+})
+
+describe("CodeIndexPopover OpenRouter provider lookup", () => {
+	const mockedUseOpenRouterModelProviders = vi.mocked(useOpenRouterModelProviders)
+
+	const renderPopover = (
+		provider: typeof providerIdentifiers.openai | typeof providerIdentifiers.openrouter,
+		modelId: string,
+	) =>
+		renderWithExtensionState(
+			<CodeIndexPopover indexingStatus={indexingStatus}>
+				<button>Open code index settings</button>
+			</CodeIndexPopover>,
+			{
+				state: {
+					codebaseIndexConfig: {
+						...baseSettings,
+						codebaseIndexEmbedderProvider: provider,
+						codebaseIndexEmbedderModelId: modelId,
+					},
+					codebaseIndexModels: {},
+					platform: "darwin",
+					arch: "arm64",
+				} as Partial<ExtensionState>,
+			},
+		)
+
+	beforeEach(() => {
+		mockedUseOpenRouterModelProviders.mockClear()
+	})
+
+	it("disables provider lookup for a non-OpenRouter embedder", () => {
+		renderPopover(providerIdentifiers.openai, "text-embedding-3-small")
+
+		expect(mockedUseOpenRouterModelProviders).toHaveBeenLastCalledWith(undefined, undefined, { enabled: false })
+	})
+
+	it("waits for an OpenRouter model selection before enabling lookup", () => {
+		renderPopover(providerIdentifiers.openrouter, "")
+
+		expect(mockedUseOpenRouterModelProviders).toHaveBeenLastCalledWith("", undefined, { enabled: false })
+	})
+
+	it("loads providers for the selected OpenRouter embedding model", () => {
+		renderPopover(providerIdentifiers.openrouter, "openai/text-embedding-3-small")
+
+		expect(mockedUseOpenRouterModelProviders).toHaveBeenLastCalledWith("openai/text-embedding-3-small", undefined, {
+			enabled: true,
+		})
+	})
+})

From ffb3b84aa07b8971b7ab568b6f450febf79775d1 Mon Sep 17 00:00:00 2001
From: gubin-dev <alecmei.gubin@yandex.ru>
Date: Sun, 30 Aug 2026 18:01:32 +0300
Subject: [PATCH 10/13] fix(lint): use canonical provider identifiers

---
 apps/vscode-e2e/src/visual/sceneController.ts    | 10 ++++++++--
 .../CodeIndexPopover.auto-populate.spec.tsx      | 16 ++++++++--------
 .../settings/__tests__/ThinkingBudget.spec.tsx   |  2 +-
 3 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/apps/vscode-e2e/src/visual/sceneController.ts b/apps/vscode-e2e/src/visual/sceneController.ts
index 66da706045..a4372c95ae 100644
--- a/apps/vscode-e2e/src/visual/sceneController.ts
+++ b/apps/vscode-e2e/src/visual/sceneController.ts
@@ -2,7 +2,13 @@ import fs from "fs/promises"
 
 import * as vscode from "vscode"
 
-import { RooCodeEventName, type ClineMessage, type RooCodeTestAPI, type WebviewThemeFixture } from "@roo-code/types"
+import {
+	providerIdentifiers,
+	RooCodeEventName,
+	type ClineMessage,
+	type RooCodeTestAPI,
+	type WebviewThemeFixture,
+} from "@roo-code/types"
 
 import { isCompletedAsk } from "../suite/utils"
 
@@ -89,7 +95,7 @@ export async function run(): Promise<void> {
 		if (!prompt || !result) throw new Error("Chat prompt and result are required for the populated chat scene")
 
 		await api.setConfiguration({
-			apiProvider: "openrouter",
+			apiProvider: providerIdentifiers.openrouter,
 			lastShownAnnouncementId: api.getLatestAnnouncementId(),
 			openRouterApiKey: "mock-key",
 			openRouterModelId: "openai/gpt-4.1",
diff --git a/webview-ui/src/components/chat/__tests__/CodeIndexPopover.auto-populate.spec.tsx b/webview-ui/src/components/chat/__tests__/CodeIndexPopover.auto-populate.spec.tsx
index 0e89e4ac1c..a6d6df0bf9 100644
--- a/webview-ui/src/components/chat/__tests__/CodeIndexPopover.auto-populate.spec.tsx
+++ b/webview-ui/src/components/chat/__tests__/CodeIndexPopover.auto-populate.spec.tsx
@@ -47,7 +47,7 @@ describe("CodeIndexPopover - Auto-population Feature Logic", () => {
 		mockUpdateSetting("codebaseIndexEmbedderModelId", "")
 
 		// Auto-populate Region and Profile when switching to Bedrock
-		if (value === "bedrock" && apiConfiguration?.apiProvider === "bedrock") {
+		if (value === "bedrock" && apiConfiguration?.apiProvider === providerIdentifiers.bedrock) {
 			if (!currentSettings.codebaseIndexBedrockRegion && apiConfiguration.awsRegion) {
 				mockUpdateSetting("codebaseIndexBedrockRegion", apiConfiguration.awsRegion)
 			}
@@ -85,7 +85,7 @@ describe("CodeIndexPopover - Auto-population Feature Logic", () => {
 
 		mockUpdateSetting("codebaseIndexEmbedderModelId", "")
 
-		if (value === "bedrock" && apiConfiguration?.apiProvider === "bedrock") {
+		if (value === "bedrock" && apiConfiguration?.apiProvider === providerIdentifiers.bedrock) {
 			if (!currentSettings.codebaseIndexBedrockRegion && apiConfiguration.awsRegion) {
 				mockUpdateSetting("codebaseIndexBedrockRegion", apiConfiguration.awsRegion)
 			}
@@ -125,7 +125,7 @@ describe("CodeIndexPopover - Auto-population Feature Logic", () => {
 
 		mockUpdateSetting("codebaseIndexEmbedderModelId", "")
 
-		if (value === "bedrock" && apiConfiguration?.apiProvider === "bedrock") {
+		if (value === "bedrock" && apiConfiguration?.apiProvider === providerIdentifiers.bedrock) {
 			if (!currentSettings.codebaseIndexBedrockRegion && apiConfiguration.awsRegion) {
 				mockUpdateSetting("codebaseIndexBedrockRegion", apiConfiguration.awsRegion)
 			}
@@ -165,7 +165,7 @@ describe("CodeIndexPopover - Auto-population Feature Logic", () => {
 
 		mockUpdateSetting("codebaseIndexEmbedderModelId", "")
 
-		if (value === "bedrock" && apiConfiguration?.apiProvider === "bedrock") {
+		if (value === "bedrock" && apiConfiguration?.apiProvider === providerIdentifiers.bedrock) {
 			if (!currentSettings.codebaseIndexBedrockRegion && apiConfiguration.awsRegion) {
 				mockUpdateSetting("codebaseIndexBedrockRegion", apiConfiguration.awsRegion)
 			}
@@ -203,7 +203,7 @@ describe("CodeIndexPopover - Auto-population Feature Logic", () => {
 
 		mockUpdateSetting("codebaseIndexEmbedderModelId", "")
 
-		if (value === "bedrock" && apiConfiguration?.apiProvider === "bedrock") {
+		if (value === "bedrock" && apiConfiguration?.apiProvider === providerIdentifiers.bedrock) {
 			if (!currentSettings.codebaseIndexBedrockRegion && apiConfiguration.awsRegion) {
 				mockUpdateSetting("codebaseIndexBedrockRegion", apiConfiguration.awsRegion)
 			}
@@ -240,7 +240,7 @@ describe("CodeIndexPopover - Auto-population Feature Logic", () => {
 
 		mockUpdateSetting("codebaseIndexEmbedderModelId", "")
 
-		if (value === "bedrock" && apiConfiguration?.apiProvider === "bedrock") {
+		if (value === "bedrock" && apiConfiguration?.apiProvider === providerIdentifiers.bedrock) {
 			if (!currentSettings.codebaseIndexBedrockRegion && apiConfiguration.awsRegion) {
 				mockUpdateSetting("codebaseIndexBedrockRegion", apiConfiguration.awsRegion)
 			}
@@ -278,7 +278,7 @@ describe("CodeIndexPopover - Auto-population Feature Logic", () => {
 		mockUpdateSetting("codebaseIndexEmbedderModelId", "")
 
 		// The condition intentionally won't match since value is "openai"
-		if (value === "bedrock" && apiConfiguration?.apiProvider === "bedrock") {
+		if (value === "bedrock" && apiConfiguration?.apiProvider === providerIdentifiers.bedrock) {
 			if (!currentSettings.codebaseIndexBedrockRegion && apiConfiguration.awsRegion) {
 				mockUpdateSetting("codebaseIndexBedrockRegion", apiConfiguration.awsRegion)
 			}
@@ -315,7 +315,7 @@ describe("CodeIndexPopover - Auto-population Feature Logic", () => {
 
 		mockUpdateSetting("codebaseIndexEmbedderModelId", "")
 
-		if (value === "bedrock" && apiConfiguration?.apiProvider === "bedrock") {
+		if (value === "bedrock" && apiConfiguration?.apiProvider === providerIdentifiers.bedrock) {
 			if (!currentSettings.codebaseIndexBedrockRegion && apiConfiguration.awsRegion) {
 				mockUpdateSetting("codebaseIndexBedrockRegion", apiConfiguration.awsRegion)
 			}
diff --git a/webview-ui/src/components/settings/__tests__/ThinkingBudget.spec.tsx b/webview-ui/src/components/settings/__tests__/ThinkingBudget.spec.tsx
index 536903dc53..98c1e6d8c5 100644
--- a/webview-ui/src/components/settings/__tests__/ThinkingBudget.spec.tsx
+++ b/webview-ui/src/components/settings/__tests__/ThinkingBudget.spec.tsx
@@ -44,7 +44,7 @@ vi.mock("@/components/ui/hooks/useSelectedModel", () => ({
 	useSelectedModel: (apiConfiguration: any) => {
 		// Return the model ID based on apiConfiguration for testing
 		// For Gemini tests, check if apiProvider is gemini and use apiModelId
-		if (apiConfiguration?.apiProvider === "gemini") {
+		if (apiConfiguration?.apiProvider === providerIdentifiers.gemini) {
 			return {
 				id: apiConfiguration?.apiModelId || "gemini-2.0-flash-exp",
 				provider: providerIdentifiers.gemini,

From fa52af838762e0e5272b3bde180c6de831c422fb Mon Sep 17 00:00:00 2001
From: gubin-dev <alecmei.gubin@yandex.ru>
Date: Sun, 30 Aug 2026 18:04:57 +0300
Subject: [PATCH 11/13] fix(lint): canonicalize provider manager test cases

---
 src/core/config/__tests__/ProviderSettingsManager.spec.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/core/config/__tests__/ProviderSettingsManager.spec.ts b/src/core/config/__tests__/ProviderSettingsManager.spec.ts
index b7a0a9595c..ff408b3188 100644
--- a/src/core/config/__tests__/ProviderSettingsManager.spec.ts
+++ b/src/core/config/__tests__/ProviderSettingsManager.spec.ts
@@ -25,9 +25,9 @@ vi.mock("../../../api", async () => {
 	const modelInfoFor = (config: { apiProvider?: string; apiModelId?: string }) => {
 		const id = config?.apiModelId ?? ""
 		switch (config?.apiProvider) {
-			case "zai":
+			case types.providerIdentifiers.zai:
 				return zaiModels[id] ?? {}
-			case "anthropic":
+			case types.providerIdentifiers.anthropic:
 				return anthropicModels[id] ?? {}
 			default:
 				return {}

From cea8e8b1f04e5e6526748a2c050f57cf00ea15e4 Mon Sep 17 00:00:00 2001
From: gubin-dev <alecmei.gubin@yandex.ru>
Date: Sun, 30 Aug 2026 18:24:01 +0300
Subject: [PATCH 12/13] test(code-index): cover provider-specific rendering

---
 .../chat/__tests__/CodeIndexPopover.test.tsx  | 37 ++++++++++++++++---
 1 file changed, 31 insertions(+), 6 deletions(-)

diff --git a/webview-ui/src/components/chat/__tests__/CodeIndexPopover.test.tsx b/webview-ui/src/components/chat/__tests__/CodeIndexPopover.test.tsx
index a8b80d23fa..b79b73d76e 100644
--- a/webview-ui/src/components/chat/__tests__/CodeIndexPopover.test.tsx
+++ b/webview-ui/src/components/chat/__tests__/CodeIndexPopover.test.tsx
@@ -1,7 +1,9 @@
-import type { ExtensionState } from "@roo-code/types"
+import React from "react"
+
+import type { EmbedderProvider, ExtensionState } from "@roo-code/types"
 import { providerIdentifiers } from "@roo-code/types"
 
-import { renderWithExtensionState } from "@/utils/test-utils"
+import { renderWithExtensionState, screen } from "@/utils/test-utils"
 import { useOpenRouterModelProviders } from "@src/components/ui/hooks/useOpenRouterModelProviders"
 
 import { CodeIndexPopover, createValidationSchema } from "../CodeIndexPopover"
@@ -11,6 +13,18 @@ vi.mock("@src/components/ui/hooks/useOpenRouterModelProviders", () => ({
 	useOpenRouterModelProviders: vi.fn(() => ({ data: undefined })),
 }))
 
+vi.mock("@src/components/ui", async (importOriginal) => {
+	const actual = await importOriginal<typeof import("@src/components/ui")>()
+	return {
+		...actual,
+		Popover: ({ children, onOpenChange }: React.PropsWithChildren<{ onOpenChange?: (open: boolean) => void }>) => {
+			React.useEffect(() => onOpenChange?.(true), [onOpenChange])
+			return <>{children}</>
+		},
+		PopoverContent: ({ children }: React.PropsWithChildren) => <div>{children}</div>,
+	}
+})
+
 const indexingStatus = {
 	systemStatus: "Standby" as const,
 	message: "",
@@ -84,10 +98,7 @@ describe("CodeIndexPopover validation", () => {
 describe("CodeIndexPopover OpenRouter provider lookup", () => {
 	const mockedUseOpenRouterModelProviders = vi.mocked(useOpenRouterModelProviders)
 
-	const renderPopover = (
-		provider: typeof providerIdentifiers.openai | typeof providerIdentifiers.openrouter,
-		modelId: string,
-	) =>
+	const renderPopover = (provider: EmbedderProvider, modelId: string) =>
 		renderWithExtensionState(
 			<CodeIndexPopover indexingStatus={indexingStatus}>
 				<button>Open code index settings</button>
@@ -129,4 +140,18 @@ describe("CodeIndexPopover OpenRouter provider lookup", () => {
 			enabled: true,
 		})
 	})
+
+	it.each([
+		providerIdentifiers.openai,
+		providerIdentifiers.ollama,
+		providerIdentifiers.gemini,
+		providerIdentifiers.mistral,
+		providerIdentifiers.vercelAiGateway,
+		providerIdentifiers.bedrock,
+		providerIdentifiers.openrouter,
+	] as const)("renders the %s provider settings when the popover opens", (provider) => {
+		renderPopover(provider, "embedding-model")
+
+		expect(screen.getByText("settings:codeIndex.title")).toBeInTheDocument()
+	})
 })

From 2c90de17ca524c7ccab468c68e0d30219afc2b00 Mon Sep 17 00:00:00 2001
From: gubin-dev <alecmei.gubin@yandex.ru>
Date: Sun, 30 Aug 2026 18:42:16 +0300
Subject: [PATCH 13/13] test(code-index): exercise provider settings branches

---
 .../chat/__tests__/CodeIndexPopover.test.tsx  | 24 +++++++++++--------
 1 file changed, 14 insertions(+), 10 deletions(-)

diff --git a/webview-ui/src/components/chat/__tests__/CodeIndexPopover.test.tsx b/webview-ui/src/components/chat/__tests__/CodeIndexPopover.test.tsx
index b79b73d76e..be04dec71b 100644
--- a/webview-ui/src/components/chat/__tests__/CodeIndexPopover.test.tsx
+++ b/webview-ui/src/components/chat/__tests__/CodeIndexPopover.test.tsx
@@ -3,7 +3,7 @@ import React from "react"
 import type { EmbedderProvider, ExtensionState } from "@roo-code/types"
 import { providerIdentifiers } from "@roo-code/types"
 
-import { renderWithExtensionState, screen } from "@/utils/test-utils"
+import { fireEvent, renderWithExtensionState, screen } from "@/utils/test-utils"
 import { useOpenRouterModelProviders } from "@src/components/ui/hooks/useOpenRouterModelProviders"
 
 import { CodeIndexPopover, createValidationSchema } from "../CodeIndexPopover"
@@ -142,16 +142,20 @@ describe("CodeIndexPopover OpenRouter provider lookup", () => {
 	})
 
 	it.each([
-		providerIdentifiers.openai,
-		providerIdentifiers.ollama,
-		providerIdentifiers.gemini,
-		providerIdentifiers.mistral,
-		providerIdentifiers.vercelAiGateway,
-		providerIdentifiers.bedrock,
-		providerIdentifiers.openrouter,
-	] as const)("renders the %s provider settings when the popover opens", (provider) => {
+		{ provider: providerIdentifiers.openai, label: "settings:codeIndex.openAiKeyLabel" },
+		{ provider: providerIdentifiers.ollama, label: "settings:codeIndex.ollamaBaseUrlLabel" },
+		{ provider: providerIdentifiers.gemini, label: "settings:codeIndex.geminiApiKeyLabel" },
+		{ provider: providerIdentifiers.mistral, label: "settings:codeIndex.mistralApiKeyLabel" },
+		{
+			provider: providerIdentifiers.vercelAiGateway,
+			label: "settings:codeIndex.vercelAiGatewayApiKeyLabel",
+		},
+		{ provider: providerIdentifiers.bedrock, label: "settings:codeIndex.bedrockRegionLabel" },
+		{ provider: providerIdentifiers.openrouter, label: "settings:codeIndex.openRouterApiKeyLabel" },
+	] as const)("renders the $provider provider settings when the setup section opens", ({ provider, label }) => {
 		renderPopover(provider, "embedding-model")
+		fireEvent.click(screen.getByText("settings:codeIndex.setupConfigLabel"))
 
-		expect(screen.getByText("settings:codeIndex.title")).toBeInTheDocument()
+		expect(screen.getByText(label)).toBeInTheDocument()
 	})
 })