fix(eslint): reject raw retired provider identifiers

Author: WebMad

src/core/config/__tests__/ContextProxy.spec.ts

@@ -8,7 +8,7 @@ import { clearAllMocks } from "../../../test-utils/reset"
 import { makeExtensionContext, makeUri } from "../../../test-utils/vscode"
 
 import { ContextProxy } from "../ContextProxy"
-import { providerIdentifiers } from "@roo-code/types/provider-identifiers"
+import { providerIdentifiers, retiredProviderIdentifiers } from "@roo-code/types/provider-identifiers"
 
 vi.mock("vscode", () => ({
 	Uri: {
@@ -566,7 +566,7 @@ describe("ContextProxy", () => {
 
 		it("should preserve retired apiProvider and provider fields", async () => {
 			await proxy.setValues({
-				apiProvider: "groq",
+				apiProvider: retiredProviderIdentifiers.groq,
 				apiModelId: "llama3-70b",
 				openAiBaseUrl: "https://api.retired-provider.example/v1",
 				apiKey: "retired-provider-key",

src/core/config/__tests__/ProviderSettingsManager.spec.ts

@@ -4,6 +4,7 @@ import {
 	OPEN_AI_CODEX_SERVICE_TIER_KEY,
 	OpenAiCodexServiceTier,
 	providerIdentifiers,
+	retiredProviderIdentifiers,
 	type ProviderSettings,
 } from "@roo-code/types"
 
@@ -266,15 +267,15 @@ describe("ProviderSettingsManager", () => {
 						default: {
 							config: {},
 							id: "default",
-							apiProvider: "roo",
+							apiProvider: retiredProviderIdentifiers.roo,
 							apiModelId: "roo/code-supernova", // Old model ID
 						},
 						test: {
-							apiProvider: "roo",
+							apiProvider: retiredProviderIdentifiers.roo,
 							apiModelId: "roo/code-supernova", // Old model ID
 						},
 						existing: {
-							apiProvider: "roo",
+							apiProvider: retiredProviderIdentifiers.roo,
 							apiModelId: "roo/code-supernova-1-million", // Already migrated
 						},
 						otherProvider: {
@@ -329,7 +330,7 @@ describe("ProviderSettingsManager", () => {
 
 			await providerSettingsManager.saveConfig("router-profile", {
 				id: "router-id",
-				apiProvider: "roo",
+				apiProvider: retiredProviderIdentifiers.roo,
 				apiModelId: "roo/code-supernova",
 				rooApiKey: "router-key",
 			} as any)
@@ -614,7 +615,7 @@ describe("ProviderSettingsManager", () => {
 			// Include a legacy provider-specific field (groqApiKey) that is no
 			// longer in the schema — passthrough() must keep it.
 			const retiredConfig = {
-				apiProvider: "groq",
+				apiProvider: retiredProviderIdentifiers.groq,
 				apiKey: "legacy-key",
 				apiModelId: "legacy-model",
 				openAiBaseUrl: "https://legacy.example/v1",
@@ -822,7 +823,7 @@ describe("ProviderSettingsManager", () => {
 				apiConfigs: {
 					retiredProvider: {
 						id: "retired-id",
-						apiProvider: "groq",
+						apiProvider: retiredProviderIdentifiers.groq,
 						apiKey: "legacy-key",
 						apiModelId: "legacy-model",
 						openAiBaseUrl: "https://legacy.example/v1",
@@ -916,7 +917,7 @@ describe("ProviderSettingsManager", () => {
 				apiConfigs: {
 					retired: {
 						id: "retired-id",
-						apiProvider: "groq",
+						apiProvider: retiredProviderIdentifiers.groq,
 						apiKey: "legacy-key",
 						apiModelId: "legacy-model",
 						openAiBaseUrl: "https://legacy.example/v1",

src/core/config/__tests__/importExport.spec.ts

@@ -18,7 +18,7 @@ import { CustomModesManager } from "../CustomModesManager"
 import { safeWriteJson } from "../../../utils/safeWriteJson"
 
 import type { Mock } from "vitest"
-import { providerIdentifiers } from "@roo-code/types/provider-identifiers"
+import { providerIdentifiers, retiredProviderIdentifiers } from "@roo-code/types/provider-identifiers"
 
 vi.mock("vscode", () => ({
 	workspace: {
@@ -932,7 +932,7 @@ describe("importExport", () => {
 						currentApiConfigName: "router-profile",
 						apiConfigs: {
 							"router-profile": {
-								apiProvider: "roo",
+								apiProvider: retiredProviderIdentifiers.roo,
 								apiModelId: "roo/code-supernova",
 								rooApiKey: "router-key",
 								id: "router-id",
@@ -1155,7 +1155,7 @@ describe("importExport", () => {
 						},
 					},
 					globalSettings: {
-						imageGenerationProvider: "roo",
+						imageGenerationProvider: retiredProviderIdentifiers.roo,
 						openRouterImageGenerationSelectedModel: "openrouter/model-1",
 						customInstructions: "Keep this setting",
 					},

src/core/webview/__tests__/webviewMessageHandler.routerModels.spec.ts

@@ -1,6 +1,11 @@
 import { describe, it, expect, vi, beforeEach } from "vitest"
 
-import { kimiCodeAuthMethodSchema, providerIdentifiers, RouterModelsMessageType } from "@roo-code/types"
+import {
+	kimiCodeAuthMethodSchema,
+	providerIdentifiers,
+	retiredProviderIdentifiers,
+	RouterModelsMessageType,
+} from "@roo-code/types"
 
 import { webviewMessageHandler } from "../webviewMessageHandler"
 import type { ClineProvider } from "../ClineProvider"
@@ -104,7 +109,7 @@ describe("webviewMessageHandler - requestRouterModels provider filter", () => {
 			type: RouterModelsMessageType.singleRouterModelFetchResponse,
 			success: false,
 			error: "Roo Code Router has been removed. Please select and configure a different provider.",
-			values: { provider: "roo" },
+			values: { provider: retiredProviderIdentifiers.roo },
 		})
 	})
 

src/core/webview/__tests__/webviewMessageHandler.spec.ts

@@ -197,7 +197,7 @@ vi.mock("../../mentions/resolveImageMentions", () => ({
 import { resolveImageMentions } from "../../mentions/resolveImageMentions"
 import { Terminal } from "../../../integrations/terminal/Terminal"
 import { TerminalRegistry } from "../../../integrations/terminal/TerminalRegistry"
-import { providerIdentifiers } from "@roo-code/types/provider-identifiers"
+import { providerIdentifiers, retiredProviderIdentifiers } from "@roo-code/types/provider-identifiers"
 
 describe("webviewMessageHandler - requestLmStudioModels", () => {
 	beforeEach(() => {
@@ -894,7 +894,7 @@ describe("webviewMessageHandler - requestRouterModels", () => {
 			type: "singleRouterModelFetchResponse",
 			success: false,
 			error: "Roo Code Router has been removed. Please select and configure a different provider.",
-			values: { provider: "roo" },
+			values: { provider: retiredProviderIdentifiers.roo },
 		})
 	})
 

src/core/webview/webviewMessageHandler.ts

@@ -23,6 +23,7 @@ import {
 	checkoutRestorePayloadSchema,
 	getCompletionCheckpoint,
 	providerIdentifiers,
+	retiredProviderIdentifiers,
 	LmStudioModelsMessageType,
 	OllamaModelsMessageType,
 	OpenAiModelsMessageType,
@@ -1412,7 +1413,7 @@ export const webviewMessageHandler = async (
 				type: RouterModelsMessageType.singleRouterModelFetchResponse,
 				success: false,
 				error: getRouterRemovalMessage(),
-				values: { provider: "roo" },
+				values: { provider: retiredProviderIdentifiers.roo },
 			})
 			break
 		}

src/eslint-rules/no-raw-provider-identifiers.mjs

@@ -1,6 +1,12 @@
-import { providerIdentifiers } from "@roo-code/types/provider-identifiers"
+import { providerIdentifiers, retiredProviderIdentifiers } from "@roo-code/types/provider-identifiers"
 
-const providerMembersByValue = new Map(Object.entries(providerIdentifiers).map(([member, value]) => [value, member]))
+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,14 +46,14 @@ function getRawProvider(node) {
 	}
 
 	if (node?.type === "Literal" && typeof node.value === "string") {
-		const member = providerMembersByValue.get(node.value)
-		return member ? { member, value: node.value } : undefined
+		const replacement = providerReplacementsByValue.get(node.value)
+		return replacement ? { replacement, value: node.value } : undefined
 	}
 
 	if (node?.type === "TemplateLiteral" && node.expressions.length === 0) {
 		const value = node.quasis[0]?.value.cooked
-		const member = value ? providerMembersByValue.get(value) : undefined
-		return member ? { member, value } : undefined
+		const replacement = value ? providerReplacementsByValue.get(value) : undefined
+		return replacement ? { replacement, value } : undefined
 	}
 
 	return undefined
@@ -60,7 +66,7 @@ export const noRawProviderIdentifiers = {
 		schema: [],
 		messages: {
 			useCanonical:
-				'Use providerIdentifiers.{{member}} instead of the raw provider identifier "{{value}}".',
+				'Use {{replacement}} instead of the raw provider identifier "{{value}}".',
 		},
 	},
 	create(context) {

src/eslint-rules/no-raw-provider-identifiers.test.mjs

@@ -0,0 +1,39 @@
+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",
+				},
+			],
+		},
+	],
+})

src/shared/__tests__/checkExistApiConfig.spec.ts

@@ -1,6 +1,6 @@
 // npx vitest run src/shared/__tests__/checkExistApiConfig.spec.ts
 
-import { providerIdentifiers, type ProviderSettings } from "@roo-code/types"
+import { providerIdentifiers, retiredProviderIdentifiers, type ProviderSettings } from "@roo-code/types"
 
 import { checkExistKey } from "../checkExistApiConfig"
 
@@ -86,7 +86,7 @@ describe("checkExistKey", () => {
 
 	it("should return false for roo provider without API key", () => {
 		const config: ProviderSettings = {
-			apiProvider: "roo",
+			apiProvider: retiredProviderIdentifiers.roo,
 		}
 		expect(checkExistKey(config)).toBe(false)
 	})

src/utils/__tests__/autoImportSettings.spec.ts

@@ -77,7 +77,7 @@ import { autoImportSettings } from "../autoImportSettings"
 import * as vscode from "vscode"
 import fsPromises from "fs/promises"
 import { fileExistsAtPath } from "../fs"
-import { providerIdentifiers } from "@roo-code/types/provider-identifiers"
+import { providerIdentifiers, retiredProviderIdentifiers } from "@roo-code/types/provider-identifiers"
 
 describe("autoImportSettings", () => {
 	let mockProviderSettingsManager: any
@@ -242,7 +242,7 @@ describe("autoImportSettings", () => {
 				},
 			},
 			globalSettings: {
-				imageGenerationProvider: "roo",
+				imageGenerationProvider: retiredProviderIdentifiers.roo,
 				customInstructions: "Test instructions",
 			},
 		}