refactor(providers): canonicalize model router calls

Author: WebMad

src/api/providers/fetchers/lmstudio.ts

@@ -1,7 +1,7 @@
 import axios from "axios"
 import { LLM, LLMInfo, LLMInstanceInfo, LMStudioClient } from "@lmstudio/sdk"
 
-import { type ModelInfo, lMStudioDefaultModelInfo } from "@roo-code/types"
+import { type ModelInfo, lMStudioDefaultModelInfo, providerIdentifiers } from "@roo-code/types"
 
 import { flushModels, getModels } from "./modelCache"
 
@@ -19,7 +19,7 @@ export const forceFullModelDetailsLoad = async (baseUrl: string, modelId: string
 		const client = new LMStudioClient({ baseUrl: lmsUrl })
 		await client.llm.model(modelId)
 		// Flush and refresh cache to get updated model details
-		await flushModels({ provider: "lmstudio", baseUrl }, true)
+		await flushModels({ provider: providerIdentifiers.lmstudio, baseUrl }, true)
 
 		// Mark this model as having full details loaded.
 		modelsWithLoadedDetails.add(modelId)

src/api/providers/fetchers/modelEndpointCache.ts

@@ -4,7 +4,7 @@ import fs from "fs/promises"
 import NodeCache from "node-cache"
 import sanitize from "sanitize-filename"
 
-import type { ModelRecord } from "@roo-code/types"
+import { providerIdentifiers, type ModelRecord } from "@roo-code/types"
 
 import { ContextProxy } from "../../../core/config/ContextProxy"
 import { RouterName } from "../../../shared/api"
@@ -44,7 +44,7 @@ export const getModelEndpoints = async ({
 }): Promise<ModelRecord> => {
 	// OpenRouter is the only provider that supports model endpoints, but you
 	// can see how we'd extend this to other providers in the future.
-	if (router !== "openrouter" || !modelId || !endpoint) {
+	if (router !== providerIdentifiers.openrouter || !modelId || !endpoint) {
 		return {}
 	}
 
@@ -61,7 +61,7 @@ export const getModelEndpoints = async ({
 	// Copy model-level capabilities from the parent model to each endpoint
 	// These are capabilities that don't vary by provider (tools, reasoning, etc.)
 	if (Object.keys(modelProviders).length > 0) {
-		const parentModels = await getModels({ provider: "openrouter" })
+		const parentModels = await getModels({ provider: providerIdentifiers.openrouter })
 		const parentModel = parentModels[modelId]
 
 		if (parentModel) {

src/api/providers/kimi-code.ts

@@ -4,6 +4,7 @@ import {
 	KIMI_CODE_BASE_URL,
 	kimiCodeDefaultModelId,
 	kimiCodeDefaultModelInfo,
+	providerIdentifiers,
 	type ModelInfo,
 	type ModelRecord,
 } from "@roo-code/types"
@@ -63,7 +64,7 @@ export class KimiCodeHandler extends OpenAiHandler {
 		if (!this.modelDiscoveryAttempted) {
 			this.modelDiscoveryAttempted = true
 			try {
-				this.models = await getModels({ provider: "kimi-code", apiKey: accessToken })
+				this.models = await getModels({ provider: providerIdentifiers.kimiCode, apiKey: accessToken })
 			} catch (error) {
 				// Model discovery is best-effort; preserve the configured ID and fallback metadata.
 				console.debug("[KimiCode] Model discovery failed; using fallback model metadata", {

src/api/providers/lm-studio.ts

@@ -2,7 +2,12 @@ import { Anthropic } from "@anthropic-ai/sdk"
 import OpenAI from "openai"
 import axios from "axios"
 
-import { type ModelInfo, openAiModelInfoSaneDefaults, LMSTUDIO_DEFAULT_TEMPERATURE } from "@roo-code/types"
+import {
+	type ModelInfo,
+	openAiModelInfoSaneDefaults,
+	LMSTUDIO_DEFAULT_TEMPERATURE,
+	providerIdentifiers,
+} from "@roo-code/types"
 
 import type { ApiHandlerOptions } from "../../shared/api"
 
@@ -171,7 +176,7 @@ export class LmStudioHandler extends BaseProvider implements SingleCompletionHan
 
 	override getModel(): { id: string; info: ModelInfo } {
 		const models = getModelsFromCache({
-			provider: "lmstudio",
+			provider: providerIdentifiers.lmstudio,
 			baseUrl: this.options.lmStudioBaseUrl,
 		})
 		if (models && this.options.lmStudioModelId && models[this.options.lmStudioModelId]) {

src/api/providers/openrouter.ts

@@ -10,6 +10,7 @@ import {
 	OPENROUTER_DEFAULT_PROVIDER_NAME,
 	OPEN_ROUTER_PROMPT_CACHING_MODELS,
 	DEEP_SEEK_DEFAULT_TEMPERATURE,
+	providerIdentifiers,
 } from "@roo-code/types"
 import { TelemetryService } from "@roo-code/telemetry"
 
@@ -164,9 +165,9 @@ export class OpenRouterHandler extends BaseProvider implements SingleCompletionH
 	private async loadDynamicModels(): Promise<void> {
 		try {
 			const [models, endpoints] = await Promise.all([
-				getModels({ provider: "openrouter" }),
+				getModels({ provider: providerIdentifiers.openrouter }),
 				getModelEndpoints({
-					router: "openrouter",
+					router: providerIdentifiers.openrouter,
 					modelId: this.options.openRouterModelId,
 					endpoint: this.options.openRouterSpecificProvider,
 				}),
@@ -535,9 +536,9 @@ export class OpenRouterHandler extends BaseProvider implements SingleCompletionH
 
 	public async fetchModel() {
 		const [models, endpoints] = await Promise.all([
-			getModels({ provider: "openrouter" }),
+			getModels({ provider: providerIdentifiers.openrouter }),
 			getModelEndpoints({
-				router: "openrouter",
+				router: providerIdentifiers.openrouter,
 				modelId: this.options.openRouterModelId,
 				endpoint: this.options.openRouterSpecificProvider,
 			}),

src/api/providers/poe.ts

@@ -9,6 +9,7 @@ import {
 	type ModelInfo,
 	type ReasoningEffortExtended,
 	ApiProviderError,
+	providerIdentifiers,
 } from "@roo-code/types"
 import { TelemetryService } from "@roo-code/telemetry"
 
@@ -39,7 +40,7 @@ export class PoeHandler extends BaseProvider implements SingleCompletionHandler
 	override getModel() {
 		const id = this.options.apiModelId ?? poeDefaultModelId
 		const cached = getModelsFromCache({
-			provider: "poe",
+			provider: providerIdentifiers.poe,
 			apiKey: this.options.poeApiKey,
 			baseUrl: this.options.poeBaseUrl,
 		})

src/api/providers/requesty.ts

@@ -1,7 +1,13 @@
 import { Anthropic } from "@anthropic-ai/sdk"
 import OpenAI from "openai"
 
-import { type ModelInfo, type ModelRecord, requestyDefaultModelId, requestyDefaultModelInfo } from "@roo-code/types"
+import {
+	type ModelInfo,
+	type ModelRecord,
+	providerIdentifiers,
+	requestyDefaultModelId,
+	requestyDefaultModelInfo,
+} from "@roo-code/types"
 
 import type { ApiHandlerOptions } from "../../shared/api"
 import { calculateApiCostOpenAI } from "../../shared/cost"
@@ -74,7 +80,7 @@ export class RequestyHandler extends BaseProvider implements SingleCompletionHan
 	}
 
 	public async fetchModel() {
-		this.models = await getModels({ provider: "requesty", baseUrl: this.baseURL })
+		this.models = await getModels({ provider: providerIdentifiers.requesty, baseUrl: this.baseURL })
 		return this.getModel()
 	}
 

src/api/providers/unbound.ts

@@ -1,7 +1,13 @@
 import { Anthropic } from "@anthropic-ai/sdk"
 import OpenAI from "openai"
 
-import { type ModelInfo, type ModelRecord, unboundDefaultModelId, unboundDefaultModelInfo } from "@roo-code/types"
+import {
+	type ModelInfo,
+	type ModelRecord,
+	providerIdentifiers,
+	unboundDefaultModelId,
+	unboundDefaultModelInfo,
+} from "@roo-code/types"
 
 import type { ApiHandlerOptions } from "../../shared/api"
 import { calculateApiCostOpenAI } from "../../shared/cost"
@@ -68,7 +74,10 @@ export class UnboundHandler extends BaseProvider implements SingleCompletionHand
 	}
 
 	public async fetchModel() {
-		this.models = await getModels({ provider: "unbound", apiKey: this.options.unboundApiKey })
+		this.models = await getModels({
+			provider: providerIdentifiers.unbound,
+			apiKey: this.options.unboundApiKey,
+		})
 		return this.getModel()
 	}