Merge branch 'main' into beatlevic/fetch-openrouter-models-for-org

Author: beatlevic

.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

.changeset/giant-eyes-approve.md

@@ -0,0 +1,5 @@
+---
+"kilo-code": patch
+---
+
+Improvements to German language translation

.changeset/good-chicken-yell.md

@@ -0,0 +1,5 @@
+---
+"kilo-code": patch
+---
+
+Show message when Virtual Quota Fallback Provider switches profiles

.changeset/shaggy-mails-study.md

@@ -0,0 +1,5 @@
+---
+"kilo-code": patch
+---
+
+Changed the API domain for the Kilo Code provider

.changeset/unlucky-knives-cheer.md

@@ -0,0 +1,5 @@
+---
+"kilo-code": patch
+---
+
+The Kilo Code API Provider settings now also shows the average cost per request in addition to the average cost per million tokens for a particular model.

packages/telemetry/src/PostHogTelemetryClient.ts

@@ -129,7 +129,7 @@ export class PostHogTelemetryClient extends BaseTelemetryClient {
 		}
 		const id = ++this.counter
 		try {
-			const response = await fetch("https://kilocode.ai/api/profile", {
+			const response = await fetch("https://api.kilocode.ai/api/profile", {
 				headers: {
 					Authorization: `Bearer ${kilocodeToken}`,
 					"Content-Type": "application/json",

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/__tests__/constants.spec.ts

@@ -53,7 +53,7 @@ describe("DEFAULT_HEADERS", () => {
 		})
 	})
 
-	it("should have exactly 3 headers", () => {
+	it("should have exactly 4 headers", () => {
 		const headerKeys = Object.keys(DEFAULT_HEADERS)
 		expect(headerKeys).toHaveLength(4)
 		expect(headerKeys).toEqual(["HTTP-Referer", "X-Title", "X-KiloCode-Version", "User-Agent"])

src/api/providers/__tests__/virtual-quota-fallback-provider.spec.ts

@@ -1,4 +1,4 @@
-// npx vitest run src/api/providers/__tests__/virtual-quota-fallback-provider.spec.spec.ts
+// npx vitest run src/api/providers/__tests__/virtual-quota-fallback-provider.spec.ts
 
 // Mock vscode first to avoid import errors
 vitest.mock("vscode", () => ({
@@ -298,14 +298,12 @@ describe("VirtualQuotaFallbackProvider", () => {
 
 		describe("adjustActiveHandler", () => {
 			beforeEach(() => {
-				// kilocode_change start
 				;(mockSettingsManager.getProfile as any).mockImplementation(async ({ id }: { id: string }) => {
 					if (id === "p1") return { id: "p1", name: "primary-profile" }
 					if (id === "p2") return { id: "p2", name: "secondary-profile" }
 					if (id === "p3") return { id: "p3", name: "backup-profile" }
 					return undefined
 				})
-				// kilocode_change end
 			})
 			it("should set first handler as active if it is under limit", async () => {
 				const handler = new VirtualQuotaFallbackHandler({
@@ -505,7 +503,15 @@ describe("VirtualQuotaFallbackProvider", () => {
 			it("should delegate to the active handler", () => {
 				const handler = new VirtualQuotaFallbackHandler({} as any)
 				const getModelMock = vitest.fn().mockReturnValue({ id: "test-model" })
+
+				// Set up handler configs to ensure the active handler isn't overridden by our default logic
+				;(handler as any).handlerConfigs = [
+					{ handler: { getModel: getModelMock }, profileId: "p1", config: { profileId: "p1" } },
+				]
+
+				// Set the active handler
 				;(handler as any).activeHandler = { getModel: getModelMock }
+				;(handler as any).activeProfileId = "p1"
 
 				const result = handler.getModel()
 
@@ -565,17 +571,22 @@ describe("VirtualQuotaFallbackProvider", () => {
 					profiles: manyProfiles,
 				} as any)
 
-				// The constructor already calls initialize through initializationPromise
-				// We don't need to call it again, but we need to wait for it to complete
-				await (handler as any).initializationPromise
+				// Explicitly call initialize since constructor no longer does this automatically
+				await handler.initialize()
 
 				// Verify that all profiles were processed
-				// In the current implementation, buildApiHandler is called for each profile
-				expect(buildApiHandler).toHaveBeenCalledTimes(1)
+				// buildApiHandler should be called for each profile
+				expect(buildApiHandler).toHaveBeenCalledTimes(manyProfiles.length)
 
 				// Verify that handler configs were created for all profiles
 				const handlerConfigs = (handler as any).handlerConfigs
-				expect(handlerConfigs).toHaveLength(0)
+				expect(handlerConfigs).toHaveLength(manyProfiles.length)
+
+				// Verify each handler config has the correct profileId
+				handlerConfigs.forEach((config: any, index: number) => {
+					expect(config.profileId).toBe(manyProfiles[index].profileId)
+					expect(config.handler.getModel().id).toBe(`${manyProfiles[index].profileId}-model`)
+				})
 			})
 			it("should maintain active handler if it's still valid", async () => {
 				const handler = new VirtualQuotaFallbackHandler({