Merge branch 'main' into christiaan/costPerRequest

Author: chrarnoldus

.changeset/angry-fans-mix.md

@@ -0,0 +1,5 @@
+---
+"kilo-code": patch
+---
+
+Kilo Code provider now falls back to the default model when the selected model no longer exists

src/api/index.ts

@@ -45,7 +45,6 @@ import {
 } from "./providers"
 // kilocode_change start
 import { KilocodeOpenrouterHandler } from "./providers/kilocode-openrouter"
-import { KilocodeOllamaHandler } from "./providers/kilocode-ollama"
 // kilocode_change end
 import { NativeOllamaHandler } from "./providers/native-ollama"
 
@@ -116,7 +115,7 @@ export function buildApiHandler(configuration: ProviderSettings): ApiHandler {
 		case "openai":
 			return new OpenAiHandler(options)
 		case "ollama":
-			return new KilocodeOllamaHandler(options)
+			return new NativeOllamaHandler(options)
 		case "lmstudio":
 			return new LmStudioHandler(options)
 		case "gemini":

src/api/providers/kilocode-ollama.ts

@@ -62,9 +62,17 @@ export class KilocodeOpenrouterHandler extends OpenRouterHandler {
 		let info = this.models[id]
 		let defaultTemperature = 0
 
-		if (!this.models[id]) {
-			id = openRouterDefaultModelId
-			info = openRouterDefaultModelInfo
+		if (!info) {
+			const defaultInfo = this.models[this.defaultModel]
+			if (defaultInfo) {
+				console.warn(`${id} no longer exists, falling back to ${this.defaultModel}`)
+				id = this.defaultModel
+				info = defaultInfo
+			} else {
+				console.warn(`${id} no longer exists, falling back to ${openRouterDefaultModelId}`)
+				id = openRouterDefaultModelId
+				info = openRouterDefaultModelInfo
+			}
 		}
 
 		// If a specific provider is requested, use the endpoint for that provider.

src/api/providers/kilocode-openrouter.ts

@@ -8,6 +8,11 @@ import { getOllamaModels } from "./fetchers/ollama"
 import { XmlMatcher } from "../../utils/xml-matcher"
 import type { SingleCompletionHandler, ApiHandlerCreateMessageMetadata } from "../index"
 
+// kilocode_change start
+import { fetchWithTimeout } from "./kilocode/fetchWithTimeout"
+const OLLAMA_TIMEOUT_MS = 3_600_000
+// kilocode_change end
+
 function convertToOllamaMessages(anthropicMessages: Anthropic.Messages.MessageParam[]): Message[] {
 	const ollamaMessages: Message[] = []
 
@@ -140,9 +145,18 @@ export class NativeOllamaHandler extends BaseProvider implements SingleCompletio
 	private ensureClient(): Ollama {
 		if (!this.client) {
 			try {
+				// kilocode_change start
+				const headers = this.options.ollamaApiKey
+					? { Authorization: this.options.ollamaApiKey } //Yes, this is weird, its not a Bearer token
+					: undefined
+				// kilocode_change end
+
 				this.client = new Ollama({
 					host: this.options.ollamaBaseUrl || "http://localhost:11434",
-					// Note: The ollama npm package handles timeouts internally
+					// kilocode_change start
+					fetch: fetchWithTimeout(OLLAMA_TIMEOUT_MS, headers),
+					headers: headers,
+					// kilocode_change end
 				})
 			} catch (error: any) {
 				throw new Error(`Error creating Ollama client: ${error.message}`)

src/api/providers/native-ollama.ts

@@ -25,7 +25,7 @@ import { formatReminderSection } from "./reminder"
 import { OpenRouterHandler } from "../../api/providers/openrouter"
 import { TelemetryService } from "@roo-code/telemetry"
 import { t } from "../../i18n"
-import { KilocodeOllamaHandler } from "../../api/providers/kilocode-ollama"
+import { NativeOllamaHandler } from "../../api/providers/native-ollama"
 // kilocode_change end
 
 export async function getEnvironmentDetails(cline: Task, includeFileDetails: boolean = false) {
@@ -212,7 +212,7 @@ export async function getEnvironmentDetails(cline: Task, includeFileDetails: boo
 
 	// kilocode_change start
 	// Be sure to fetch the model information before we need it.
-	if (cline.api instanceof OpenRouterHandler || cline.api instanceof KilocodeOllamaHandler) {
+	if (cline.api instanceof OpenRouterHandler || cline.api instanceof NativeOllamaHandler) {
 		try {
 			await cline.api.fetchModel()
 		} catch (e) {

src/core/environment/getEnvironmentDetails.ts

@@ -65,9 +65,14 @@ export const ModelSelector = ({ currentApiConfigName, apiConfiguration, fallback
 		return <span className="text-xs text-vscode-descriptionForeground opacity-70 truncate">{fallbackText}</span>
 	}
 
+	const selectedModelNoLongerExistsButDefaultDoes =
+		modelsIds.indexOf(selectedModelId) < 0 && modelsIds.indexOf(providerDefaultModel) >= 0
+
+	const currentValue = selectedModelNoLongerExistsButDefaultDoes ? providerDefaultModel : selectedModelId
+
 	return (
 		<SelectDropdown
-			value={selectedModelId}
+			value={currentValue}
 			disabled={disabled}
 			title={t("chat:selectApiConfig")}
 			options={options}