Merge pull request #2113 from Kilo-Org/christiaan/model-selector

Fix modelselector for qwen-code and others

Author: chrarnoldus

.changeset/eight-coats-cover.md

@@ -0,0 +1,5 @@
+---
+"kilo-code": patch
+---
+
+The model selector below the chat now shows the correct model list for Qwen Code and some other providers

webview-ui/src/components/kilocode/hooks/__tests__/getModelsByProvider.spec.ts

@@ -0,0 +1,56 @@
+import { ModelInfo, ProviderName, providerNames } from "@roo-code/types"
+import { RouterModels } from "@roo/api"
+import { getModelsByProvider } from "../useProviderModels"
+
+describe("getModelsByProvider", () => {
+	it("returns models for all providers", () => {
+		const testModel: ModelInfo = {
+			maxTokens: 4096,
+			contextWindow: 8192,
+			supportsImages: false,
+			supportsPromptCache: false,
+			inputPrice: 0.1,
+			outputPrice: 0.2,
+			description: "Test model",
+		}
+
+		const routerModels: RouterModels = {
+			openrouter: { "test-model": testModel },
+			requesty: { "test-model": testModel },
+			glama: { "test-model": testModel },
+			unbound: { "test-model": testModel },
+			litellm: { "test-model": testModel },
+			"kilocode-openrouter": { "test-model": testModel },
+			ollama: { "test-model": testModel },
+			lmstudio: { "test-model": testModel },
+			"io-intelligence": { "test-model": testModel },
+		}
+
+		const exceptions = [
+			"fake-ai", // don't know what this is
+			"huggingface", // don't know what this is
+			"human-relay", // no models
+			"openai", // not implemented
+			"roo", // don't care
+			"virtual-quota-fallback", // no models
+			"zai", // has weird mainland/international distiction
+		]
+
+		const providersWithoutModels = providerNames
+			.map(
+				(provider) =>
+					[
+						provider,
+						getModelsByProvider({
+							provider,
+							routerModels,
+							kilocodeDefaultModel: "test-default-model",
+						}),
+					] satisfies [ProviderName, ReturnType<typeof getModelsByProvider>],
+			)
+			.filter((provider) => exceptions.indexOf(provider[0]) < 0 && Object.values(provider[1].models).length === 0)
+			.map((provider) => provider[0])
+
+		expect(providersWithoutModels).toStrictEqual([])
+	})
+})

webview-ui/src/components/kilocode/hooks/useProviderModels.ts

@@ -28,18 +28,32 @@ import {
 	glamaDefaultModelId,
 	unboundDefaultModelId,
 	litellmDefaultModelId,
+	qwenCodeModels,
+	qwenCodeDefaultModelId,
+	geminiCliModels,
+	claudeCodeModels,
+	claudeCodeDefaultModelId,
+	doubaoModels,
+	doubaoDefaultModelId,
+	fireworksModels,
+	fireworksDefaultModelId,
+	ioIntelligenceDefaultModelId,
+	moonshotModels,
+	moonshotDefaultModelId,
+	sambaNovaModels,
+	sambaNovaDefaultModelId,
 } from "@roo-code/types"
 import { cerebrasModels, cerebrasDefaultModelId } from "@roo/api"
 import type { ModelRecord, RouterModels } from "@roo/api"
 import { useRouterModels } from "../../ui/hooks/useRouterModels"
-import { useExtensionState } from "@/context/ExtensionStateContext" // kilocode_change
+import { useExtensionState } from "@/context/ExtensionStateContext"
 
 const FALLBACK_MODELS = {
 	models: anthropicModels,
 	defaultModel: anthropicDefaultModelId,
 }
 
-const getModelsByProvider = ({
+export const getModelsByProvider = ({
 	provider,
 	routerModels,
 	kilocodeDefaultModel,
@@ -147,16 +161,14 @@ const getModelsByProvider = ({
 			}
 		}
 		case "ollama": {
-			// Only custom models
 			return {
-				models: {},
+				models: routerModels.ollama,
 				defaultModel: "",
 			}
 		}
 		case "lmstudio": {
-			// Only custom models
 			return {
-				models: {},
+				models: routerModels.lmstudio,
 				defaultModel: "",
 			}
 		}
@@ -172,16 +184,72 @@ const getModelsByProvider = ({
 				defaultModel: kilocodeDefaultModel,
 			}
 		}
-		default: {
-			return FALLBACK_MODELS
+		case "claude-code": {
+			return {
+				models: claudeCodeModels,
+				defaultModel: claudeCodeDefaultModelId,
+			}
+		}
+		case "qwen-code": {
+			return {
+				models: qwenCodeModels,
+				defaultModel: qwenCodeDefaultModelId,
+			}
+		}
+		case "gemini-cli": {
+			return {
+				models: geminiCliModels,
+				defaultModel: geminiDefaultModelId,
+			}
+		}
+		case "anthropic": {
+			return {
+				models: anthropicModels,
+				defaultModel: anthropicDefaultModelId,
+			}
+		}
+		case "doubao": {
+			return {
+				models: doubaoModels,
+				defaultModel: doubaoDefaultModelId,
+			}
 		}
+		case "fireworks": {
+			return {
+				models: fireworksModels,
+				defaultModel: fireworksDefaultModelId,
+			}
+		}
+		case "io-intelligence": {
+			return {
+				models: routerModels["io-intelligence"],
+				defaultModel: ioIntelligenceDefaultModelId,
+			}
+		}
+		case "moonshot": {
+			return {
+				models: moonshotModels,
+				defaultModel: moonshotDefaultModelId,
+			}
+		}
+		case "sambanova": {
+			return {
+				models: sambaNovaModels,
+				defaultModel: sambaNovaDefaultModelId,
+			}
+		}
+		default:
+			return {
+				models: {},
+				defaultModel: "",
+			}
 	}
 }
 
 export const useProviderModels = (apiConfiguration?: ProviderSettings) => {
 	const provider = apiConfiguration?.apiProvider || "anthropic"
 
-	const { kilocodeDefaultModel } = useExtensionState() // kilocode_change
+	const { kilocodeDefaultModel } = useExtensionState()
 
 	const routerModels = useRouterModels({
 		openRouterBaseUrl: apiConfiguration?.openRouterBaseUrl,