Eliminate kilocode-openrouter strings

chrarnoldus · chrarnoldus · commit e2adae39c2d8 · 2025-11-07T12:20:40.000+01:00
diff --git a/cli/src/commands/__tests__/model.test.ts b/cli/src/commands/__tests__/model.test.ts
@@ -37,7 +37,7 @@ describe("/model command", () => {
 		glama: {},
 		unbound: {},
 		requesty: {},
-		"kilocode-openrouter": {},
+		kilocode: {},
 		"io-intelligence": {},
 		deepinfra: {},
 		"vercel-ai-gateway": {},
@@ -400,7 +400,7 @@ describe("/model command", () => {
 				glama: {},
 				unbound: {},
 				requesty: {},
-				"kilocode-openrouter": {},
+				kilocode: {},
 				"io-intelligence": {},
 				deepinfra: {},
 				"vercel-ai-gateway": {},
diff --git a/cli/src/constants/providers/__tests__/models.test.ts b/cli/src/constants/providers/__tests__/models.test.ts
@@ -210,7 +210,7 @@ describe("Static Provider Models", () => {
 			glama: {},
 			unbound: {},
 			requesty: {},
-			"kilocode-openrouter": {},
+			kilocode: {},
 			"io-intelligence": {},
 			deepinfra: {},
 			"vercel-ai-gateway": {},
diff --git a/cli/src/constants/providers/models.ts b/cli/src/constants/providers/models.ts
@@ -56,7 +56,7 @@ export type RouterName =
 	| "glama"
 	| "unbound"
 	| "litellm"
-	| "kilocode-openrouter"
+	| "kilocode"
 	| "ollama"
 	| "lmstudio"
 	| "io-intelligence"
@@ -94,7 +94,7 @@ export type RouterModels = Record<RouterName, ModelRecord>
  * Mapping from ProviderName to RouterName for model fetching
  */
 export const PROVIDER_TO_ROUTER_NAME: Record<ProviderName, RouterName | null> = {
-	kilocode: "kilocode-openrouter",
+	kilocode: "kilocode",
 	openrouter: "openrouter",
 	ollama: "ollama",
 	lmstudio: "lmstudio",
diff --git a/cli/src/utils/__tests__/context.test.ts b/cli/src/utils/__tests__/context.test.ts
@@ -99,7 +99,7 @@ describe("context utilities", () => {
 			}
 
 			const routerModels: Partial<RouterModels> = {
-				"kilocode-openrouter": {
+				kilocode: {
 					"anthropic/claude-sonnet-4.5": {
 						contextWindow: 200000,
 						supportsPromptCache: true,
diff --git a/packages/types/src/provider-settings.ts b/packages/types/src/provider-settings.ts
@@ -48,7 +48,7 @@ export const dynamicProviders = [
 	"huggingface",
 	"litellm",
 	// kilocode_change start
-	"kilocode-openrouter",
+	"kilocode",
 	"ovhcloud",
 	"chutes",
 	"gemini",
@@ -665,7 +665,7 @@ export const modelIdKeysByProvider: Record<TypicalProvider, ModelIdKey> = {
 	"claude-code": "apiModelId",
 	glama: "glamaModelId",
 	openrouter: "openRouterModelId",
-	"kilocode-openrouter": "openRouterModelId",
+	kilocode: "kilocodeModel",
 	bedrock: "apiModelId",
 	vertex: "apiModelId",
 	"openai-native": "openAiModelId",
@@ -696,7 +696,6 @@ export const modelIdKeysByProvider: Record<TypicalProvider, ModelIdKey> = {
 	"io-intelligence": "ioIntelligenceModelId",
 	roo: "apiModelId",
 	"vercel-ai-gateway": "vercelAiGatewayModelId",
-	kilocode: "kilocodeModel",
 	"virtual-quota-fallback": "apiModelId",
 	ovhcloud: "ovhCloudAiEndpointsModelId", // kilocode_change
 	inception: "inceptionLabsModelId", // kilocode_change
@@ -841,7 +840,6 @@ export const MODELS_BY_PROVIDER: Record<
 	ovhcloud: { id: "ovhcloud", label: "OVHcloud AI Endpoints", models: [] },
 	inception: { id: "inception", label: "Inception", models: [] },
 	kilocode: { id: "kilocode", label: "Kilocode", models: [] },
-	"kilocode-openrouter": { id: "kilocode-openrouter", label: "Kilocode", models: [] }, // temporarily needed to satisfy because we're using 2 inconsistent names apparently
 	"virtual-quota-fallback": { id: "virtual-quota-fallback", label: "Virtual Quota Fallback", models: [] },
 	// kilocode_change end
 	deepinfra: { id: "deepinfra", label: "DeepInfra", models: [] },
diff --git a/src/api/index.ts b/src/api/index.ts
@@ -121,8 +121,6 @@ export function buildApiHandler(configuration: ProviderSettings): ApiHandler {
 		// kilocode_change start
 		case "kilocode":
 			return new KilocodeOpenrouterHandler(options)
-		case "kilocode-openrouter": // temp typing fix
-			return new KilocodeOpenrouterHandler(options)
 		case "gemini-cli":
 			return new GeminiCliHandler(options)
 		case "virtual-quota-fallback":
diff --git a/src/api/providers/fetchers/modelCache.ts b/src/api/providers/fetchers/modelCache.ts
@@ -96,7 +96,7 @@ export const getModels = async (options: GetModelsOptions): Promise<ModelRecord>
 				models = await getLiteLLMModels(options.apiKey, options.baseUrl)
 				break
 			// kilocode_change start
-			case "kilocode-openrouter": {
+			case "kilocode": {
 				const backendUrl = options.kilocodeOrganizationId
 					? `https://api.kilocode.ai/api/organizations/${options.kilocodeOrganizationId}`
 					: "https://api.kilocode.ai/api/openrouter"
diff --git a/src/api/providers/kilocode-openrouter.ts b/src/api/providers/kilocode-openrouter.ts
@@ -113,7 +113,7 @@ export class KilocodeOpenrouterHandler extends OpenRouterHandler {
 
 		const [models, endpoints, defaultModel] = await Promise.all([
 			getModels({
-				provider: "kilocode-openrouter",
+				provider: "kilocode",
 				kilocodeToken: this.options.kilocodeToken,
 				kilocodeOrganizationId: this.options.kilocodeOrganizationId,
 			}),
diff --git a/src/core/webview/__tests__/ClineProvider.spec.ts b/src/core/webview/__tests__/ClineProvider.spec.ts
@@ -2780,7 +2780,7 @@ describe("ClineProvider - Router Models", () => {
 				roo: mockModels,
 				chutes: mockModels,
 				litellm: mockModels,
-				"kilocode-openrouter": mockModels,
+				kilocode: mockModels,
 				ollama: mockModels, // kilocode_change
 				lmstudio: {},
 				"vercel-ai-gateway": mockModels,
@@ -2855,7 +2855,7 @@ describe("ClineProvider - Router Models", () => {
 				ollama: {},
 				lmstudio: {},
 				litellm: {},
-				"kilocode-openrouter": {},
+				kilocode: {},
 				"vercel-ai-gateway": mockModels,
 				ovhcloud: mockModels, // kilocode_change
 				inception: mockModels, // kilocode_change
@@ -2893,7 +2893,7 @@ describe("ClineProvider - Router Models", () => {
 			type: "singleRouterModelFetchResponse",
 			success: false,
 			error: "Kilocode-OpenRouter API error",
-			values: { provider: "kilocode-openrouter" },
+			values: { provider: "kilocode" },
 		})
 
 		expect(mockPostMessage).toHaveBeenCalledWith({
@@ -3005,7 +3005,7 @@ describe("ClineProvider - Router Models", () => {
 				roo: mockModels,
 				chutes: mockModels,
 				litellm: {},
-				"kilocode-openrouter": mockModels,
+				kilocode: mockModels,
 				ollama: mockModels, // kilocode_change
 				lmstudio: {},
 				"vercel-ai-gateway": mockModels,
diff --git a/src/core/webview/__tests__/webviewMessageHandler.autoSwitch.spec.ts b/src/core/webview/__tests__/webviewMessageHandler.autoSwitch.spec.ts
@@ -149,9 +149,9 @@ describe("webviewMessageHandler - Automatic Organization Switching", () => {
 			expect(refreshOrganizationModes).toHaveBeenCalled()
 
 			// Verify models were flushed and refetched (via upsertApiConfiguration handler)
-			expect(flushModels).toHaveBeenCalledWith("kilocode-openrouter")
+			expect(flushModels).toHaveBeenCalledWith("kilocode")
 			expect(getModels).toHaveBeenCalledWith({
-				provider: "kilocode-openrouter",
+				provider: "kilocode",
 				kilocodeOrganizationId: "org-1",
 				kilocodeToken: "test-token",
 			})
@@ -217,19 +217,19 @@ describe("webviewMessageHandler - Automatic Organization Switching", () => {
 			})
 
 			// Verify flushModels was called (via upsertApiConfiguration)
-			expect(flushModels).toHaveBeenCalledWith("kilocode-openrouter")
+			expect(flushModels).toHaveBeenCalledWith("kilocode")
 
 			// Verify getModels was called with organization ID (via upsertApiConfiguration)
 			expect(getModels).toHaveBeenCalledWith({
-				provider: "kilocode-openrouter",
+				provider: "kilocode",
 				kilocodeOrganizationId: "org-1",
 				kilocodeToken: "test-token",
 			})
 
 			// Verify models were sent to webview (via upsertApiConfiguration)
 			expect(mockPostMessageToWebview).toHaveBeenCalledWith({
 				type: "routerModels",
-				routerModels: { "kilocode-openrouter": { "model-1": {}, "model-2": {} } },
+				routerModels: { kilocode: { "model-1": {}, "model-2": {} } },
 			})
 		})
 	})
diff --git a/src/core/webview/__tests__/webviewMessageHandler.spec.ts b/src/core/webview/__tests__/webviewMessageHandler.spec.ts
@@ -271,7 +271,7 @@ describe("webviewMessageHandler - requestRouterModels", () => {
 				glama: mockModels,
 				unbound: mockModels,
 				litellm: mockModels,
-				"kilocode-openrouter": mockModels,
+				kilocode: mockModels,
 				roo: mockModels,
 				chutes: mockModels,
 				ollama: mockModels, // kilocode_change
@@ -376,7 +376,7 @@ describe("webviewMessageHandler - requestRouterModels", () => {
 				roo: mockModels,
 				chutes: mockModels,
 				litellm: {},
-				"kilocode-openrouter": mockModels,
+				kilocode: mockModels,
 				ollama: mockModels, // kilocode_change
 				lmstudio: {},
 				"vercel-ai-gateway": mockModels,
@@ -476,7 +476,7 @@ describe("webviewMessageHandler - requestRouterModels", () => {
 				huggingface: {},
 				"io-intelligence": {},
 				// kilocode_change start
-				"kilocode-openrouter": mockModels,
+				kilocode: mockModels,
 				inception: {},
 				gemini: mockModels,
 				ovhcloud: mockModels,
diff --git a/src/core/webview/webviewMessageHandler.ts b/src/core/webview/webviewMessageHandler.ts
@@ -810,7 +810,7 @@ export const webviewMessageHandler = async (
 						// kilocode_change start
 						ovhcloud: {},
 						inception: {},
-						"kilocode-openrouter": {},
+						kilocode: {},
 						gemini: {},
 						// kilocode_change end
 						openrouter: {},
@@ -870,9 +870,9 @@ export const webviewMessageHandler = async (
 				{ key: "glama", options: { provider: "glama" } },
 				{ key: "unbound", options: { provider: "unbound", apiKey: apiConfiguration.unboundApiKey } },
 				{
-					key: "kilocode-openrouter",
+					key: "kilocode",
 					options: {
-						provider: "kilocode-openrouter",
+						provider: "kilocode",
 						kilocodeToken: apiConfiguration.kilocodeToken,
 						kilocodeOrganizationId: apiConfiguration.kilocodeOrganizationId,
 					},
@@ -2161,15 +2161,15 @@ export const webviewMessageHandler = async (
 						await refreshOrganizationModes(message, provider, updateGlobalState)
 
 						// Flush and refetch models
-						await flushModels("kilocode-openrouter")
+						await flushModels("kilocode")
 						const models = await getModels({
-							provider: "kilocode-openrouter",
+							provider: "kilocode",
 							kilocodeOrganizationId: message.apiConfiguration.kilocodeOrganizationId,
 							kilocodeToken: message.apiConfiguration.kilocodeToken,
 						})
 						provider.postMessageToWebview({
 							type: "routerModels",
-							routerModels: { "kilocode-openrouter": models } as Record<RouterName, ModelRecord>,
+							routerModels: { kilocode: models } as Record<RouterName, ModelRecord>,
 						})
 					}
 				} catch (error) {
diff --git a/src/shared/api.ts b/src/shared/api.ts
@@ -159,7 +159,7 @@ const dynamicProviderExtras = {
 	"vercel-ai-gateway": {} as {}, // eslint-disable-line @typescript-eslint/no-empty-object-type
 	huggingface: {} as {}, // eslint-disable-line @typescript-eslint/no-empty-object-type
 	litellm: {} as { apiKey: string; baseUrl: string },
-	"kilocode-openrouter": {} as { kilocodeToken?: string; kilocodeOrganizationId?: string }, // kilocode_change
+	kilocode: {} as { kilocodeToken?: string; kilocodeOrganizationId?: string }, // kilocode_change
 	deepinfra: {} as { apiKey?: string; baseUrl?: string },
 	"io-intelligence": {} as { apiKey: string },
 	requesty: {} as { apiKey?: string; baseUrl?: string },
diff --git a/webview-ui/src/components/kilocode/hooks/__tests__/getModelsByProvider.spec.ts b/webview-ui/src/components/kilocode/hooks/__tests__/getModelsByProvider.spec.ts
@@ -20,7 +20,7 @@ describe("getModelsByProvider", () => {
 			glama: { "test-model": testModel },
 			unbound: { "test-model": testModel },
 			litellm: { "test-model": testModel },
-			"kilocode-openrouter": { "test-model": testModel },
+			kilocode: { "test-model": testModel },
 			ollama: { "test-model": testModel },
 			lmstudio: { "test-model": testModel },
 			"io-intelligence": { "test-model": testModel },
diff --git a/webview-ui/src/components/kilocode/hooks/useProviderModels.ts b/webview-ui/src/components/kilocode/hooks/useProviderModels.ts
@@ -192,14 +192,7 @@ export const getModelsByProvider = ({
 		}
 		case "kilocode": {
 			return {
-				models: routerModels["kilocode-openrouter"],
-				defaultModel: kilocodeDefaultModel,
-			}
-		}
-		// Temporary weird fix
-		case "kilocode-openrouter": {
-			return {
-				models: routerModels["kilocode-openrouter"],
+				models: routerModels.kilocode,
 				defaultModel: kilocodeDefaultModel,
 			}
 		}
diff --git a/webview-ui/src/components/kilocode/settings/providers/KiloCode.tsx b/webview-ui/src/components/kilocode/settings/providers/KiloCode.tsx
@@ -116,7 +116,7 @@ export const KiloCode = ({
 				apiConfiguration={apiConfiguration}
 				setApiConfigurationField={setApiConfigurationField}
 				defaultModelId={kilocodeDefaultModel}
-				models={routerModels?.["kilocode-openrouter"] ?? {}}
+				models={routerModels?.kilocode ?? {}}
 				modelIdKey="kilocodeModel"
 				serviceName="Kilo Code"
 				serviceUrl={getAppUrl()}
diff --git a/webview-ui/src/components/ui/hooks/useSelectedModel.ts b/webview-ui/src/components/ui/hooks/useSelectedModel.ts
@@ -369,9 +369,9 @@ function getSelectedModel({
 		// kilocode_change begin
 		case "kilocode": {
 			// Use the fetched models from routerModels
-			if (routerModels["kilocode-openrouter"] && apiConfiguration.kilocodeModel) {
+			if (routerModels["kilocode"] && apiConfiguration.kilocodeModel) {
 				// Find the model in the fetched models
-				const modelEntries = Object.entries(routerModels["kilocode-openrouter"])
+				const modelEntries = Object.entries(routerModels["kilocode"])
 
 				const selectedModelId = apiConfiguration.kilocodeModel.toLowerCase()
 
@@ -397,7 +397,7 @@ function getSelectedModel({
 			const invalidOrDefaultModel = apiConfiguration.kilocodeModel ?? kilocodeDefaultModel
 			return {
 				id: invalidOrDefaultModel,
-				info: routerModels["kilocode-openrouter"][invalidOrDefaultModel],
+				info: routerModels["kilocode"][invalidOrDefaultModel],
 			}
 		}
 		case "gemini-cli": {
@@ -492,13 +492,7 @@ function getSelectedModel({
 		// case "human-relay":
 		// case "fake-ai":
 		default: {
-			provider satisfies
-				| "anthropic"
-				| "gemini-cli"
-				| "qwen-code"
-				| "human-relay"
-				| "fake-ai"
-				| "kilocode-openrouter"
+			provider satisfies "anthropic" | "gemini-cli" | "qwen-code" | "human-relay" | "fake-ai" | "kilocode"
 			const id = apiConfiguration.apiModelId ?? anthropicDefaultModelId
 			const baseInfo = anthropicModels[id as keyof typeof anthropicModels]
 
diff --git a/webview-ui/src/utils/__tests__/validate.test.ts b/webview-ui/src/utils/__tests__/validate.test.ts
@@ -24,7 +24,7 @@ describe("Model Validation Functions", () => {
 				outputPrice: 5.0,
 			},
 		},
-		"kilocode-openrouter": {
+		kilocode: {
 			"valid-model": {
 				maxTokens: 8192,
 				contextWindow: 200000,

Original file line number	Diff line number	Diff line change
`@@ -99,7 +99,7 @@ describe("context utilities", () => {`
`99`	`99`	`}`
`100`	`100`
`101`	`101`	`const routerModels: Partial<RouterModels> = {`
`102`		`- "kilocode-openrouter": {`
	`102`	`+ kilocode: {`
`103`	`103`	`"anthropic/claude-sonnet-4.5": {`
`104`	`104`	`contextWindow: 200000,`
`105`	`105`	`supportsPromptCache: true,`