refactor(api): use canonical provider identifiers

Author: WebMad

src/api/__tests__/index.spec.ts

@@ -1,5 +1,7 @@
 // npx vitest run src/api/__tests__/index.spec.ts
 
+import fs from "node:fs"
+
 // Mock vscode first to avoid import errors
 vitest.mock("vscode", () => ({
 	workspace: {
@@ -9,15 +11,22 @@ vitest.mock("vscode", () => ({
 	},
 }))
 
-import type { ProviderSettings } from "@roo-code/types"
+import {
+	providerIdentifiers,
+	retiredProviderIdentifiers,
+	type ProviderSettings,
+	type ProviderNameWithRetired,
+} from "@roo-code/types"
 
 import { buildApiHandler } from "../index"
+import { AnthropicHandler } from "../providers/anthropic"
 import { KenariHandler } from "../providers/kenari"
+import { OpenRouterHandler } from "../providers/openrouter"
 
 describe("buildApiHandler", () => {
 	it("returns a KenariHandler for the kenari provider", () => {
 		const configuration: ProviderSettings = {
-			apiProvider: "kenari",
+			apiProvider: providerIdentifiers.kenari,
 			kenariApiKey: "test-key",
 			kenariModelId: "glm-5-2",
 		}
@@ -26,4 +35,45 @@ describe("buildApiHandler", () => {
 
 		expect(handler).toBeInstanceOf(KenariHandler)
 	})
+
+	it.each([
+		[providerIdentifiers.anthropic, AnthropicHandler],
+		[providerIdentifiers.openrouter, OpenRouterHandler],
+	] as const)("returns the expected handler for %s", (apiProvider, Handler) => {
+		const handler = buildApiHandler({ apiProvider })
+
+		expect(handler).toBeInstanceOf(Handler)
+	})
+
+	it("preserves the dedicated removal error for the retired Roo provider", () => {
+		expect(() =>
+			buildApiHandler({
+				apiProvider: retiredProviderIdentifiers.roo,
+			}),
+		).toThrow("Roo Code Router has been removed")
+	})
+
+	it("rejects other retired providers", () => {
+		expect(() =>
+			buildApiHandler({
+				apiProvider: retiredProviderIdentifiers.cerebras,
+			}),
+		).toThrow("this provider is no longer supported")
+	})
+
+	it("falls back to Anthropic for an unsupported provider value", () => {
+		const handler = buildApiHandler({
+			apiProvider: "unsupported-provider" as ProviderNameWithRetired,
+		})
+
+		expect(handler).toBeInstanceOf(AnthropicHandler)
+	})
+
+	it("uses canonical identifiers instead of provider literals in the handler factory", () => {
+		const factorySource = fs.readFileSync(new URL("../index.ts", import.meta.url), "utf8")
+
+		expect(factorySource).toContain("providerIdentifiers.anthropic")
+		expect(factorySource).toContain("retiredProviderIdentifiers.roo")
+		expect(factorySource).not.toMatch(/case\s+["']/)
+	})
 })

src/api/index.ts

@@ -1,7 +1,13 @@
 import { Anthropic } from "@anthropic-ai/sdk"
 import OpenAI from "openai"
 
-import { isRetiredProvider, type ProviderSettings, type ModelInfo } from "@roo-code/types"
+import {
+	isRetiredProvider,
+	providerIdentifiers,
+	retiredProviderIdentifiers,
+	type ProviderSettings,
+	type ModelInfo,
+} from "@roo-code/types"
 
 import { getRouterRemovalMessage } from "../core/config/routerRemoval"
 import { ApiStream } from "./transform/stream"
@@ -140,7 +146,7 @@ export interface ApiHandler {
 export function buildApiHandler(configuration: ProviderSettings): ApiHandler {
 	const { apiProvider, ...options } = configuration
 
-	if (apiProvider === "roo") {
+	if (apiProvider === retiredProviderIdentifiers.roo) {
 		throw new Error(getRouterRemovalMessage())
 	}
 
@@ -151,73 +157,73 @@ export function buildApiHandler(configuration: ProviderSettings): ApiHandler {
 	}
 
 	switch (apiProvider) {
-		case "anthropic":
+		case providerIdentifiers.anthropic:
 			return new AnthropicHandler(options)
-		case "openrouter":
+		case providerIdentifiers.openrouter:
 			return new OpenRouterHandler(options)
-		case "bedrock":
+		case providerIdentifiers.bedrock:
 			return new AwsBedrockHandler(options)
-		case "vertex":
+		case providerIdentifiers.vertex:
 			return options.apiModelId?.startsWith("claude")
 				? new AnthropicVertexHandler(options)
 				: new VertexHandler(options)
-		case "openai":
+		case providerIdentifiers.openai:
 			return new OpenAiHandler(options)
-		case "ollama":
+		case providerIdentifiers.ollama:
 			return new NativeOllamaHandler(options)
-		case "lmstudio":
+		case providerIdentifiers.lmstudio:
 			return new LmStudioHandler(options)
-		case "gemini":
+		case providerIdentifiers.gemini:
 			return new GeminiHandler(options)
-		case "openai-codex":
+		case providerIdentifiers.openaiCodex:
 			return new OpenAiCodexHandler(options)
-		case "openai-native":
+		case providerIdentifiers.openaiNative:
 			return new OpenAiNativeHandler(options)
-		case "deepseek":
+		case providerIdentifiers.deepseek:
 			return new DeepSeekHandler(options)
-		case "qwen-code":
+		case providerIdentifiers.qwenCode:
 			return new QwenCodeHandler(options)
-		case "moonshot":
+		case providerIdentifiers.moonshot:
 			return new MoonshotHandler(options)
-		case "kimi-code":
+		case providerIdentifiers.kimiCode:
 			return new KimiCodeHandler(options)
-		case "vscode-lm":
+		case providerIdentifiers.vscodeLm:
 			return new VsCodeLmHandler(options)
-		case "mistral":
+		case providerIdentifiers.mistral:
 			return new MistralHandler(options)
-		case "requesty":
+		case providerIdentifiers.requesty:
 			return new RequestyHandler(options)
-		case "unbound":
+		case providerIdentifiers.unbound:
 			return new UnboundHandler(options)
-		case "fake-ai":
+		case providerIdentifiers.fakeAi:
 			return new FakeAIHandler(options)
-		case "xai":
+		case providerIdentifiers.xai:
 			return new XAIHandler(options)
-		case "litellm":
+		case providerIdentifiers.litellm:
 			return new LiteLLMHandler(options)
-		case "sambanova":
+		case providerIdentifiers.sambanova:
 			return new SambaNovaHandler(options)
-		case "mimo":
+		case providerIdentifiers.mimo:
 			return new MimoHandler(options)
-		case "zai":
+		case providerIdentifiers.zai:
 			return new ZAiHandler(options)
-		case "fireworks":
+		case providerIdentifiers.fireworks:
 			return new FireworksHandler(options)
-		case "friendli":
+		case providerIdentifiers.friendli:
 			return new FriendliHandler(options)
-		case "vercel-ai-gateway":
+		case providerIdentifiers.vercelAiGateway:
 			return new VercelAiGatewayHandler(options)
-		case "opencode-go":
+		case providerIdentifiers.opencodeGo:
 			return new OpencodeGoHandler(options)
-		case "kenari":
+		case providerIdentifiers.kenari:
 			return new KenariHandler(options)
-		case "zoo-gateway":
+		case providerIdentifiers.zooGateway:
 			return new ZooGatewayHandler(options)
-		case "minimax":
+		case providerIdentifiers.minimax:
 			return new MiniMaxHandler(options)
-		case "baseten":
+		case providerIdentifiers.baseten:
 			return new BasetenHandler(options)
-		case "poe":
+		case providerIdentifiers.poe:
 			return new PoeHandler(options)
 		default:
 			return new AnthropicHandler(options)