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

Author: kevinvandijk

.changeset/angry-fans-mix.md

@@ -1,5 +1,28 @@
 # kilo-code
 
+## [v4.84.0]
+
+- [#1961](https://github.com/Kilo-Org/kilocode/pull/1961) [`d4a7cb6`](https://github.com/Kilo-Org/kilocode/commit/d4a7cb6300d8e00d5889e1079057e43de19ff95e) Thanks [@chrarnoldus](https://github.com/chrarnoldus)! - Updates to the experimental Morph FastApply support
+
+    - A visual indication is now included in the task view whenever Morph is used.
+    - The traditional file editing tools are now disabled to ensure Morph is used to edit files.
+    - Morph is now automatically disabled when the API provider does not support it and no Morph API key is configured.
+    - The Morph API key is no longer lost when switching provider profiles.
+
+- [#1886](https://github.com/Kilo-Org/kilocode/pull/1886) [`0221aaa`](https://github.com/Kilo-Org/kilocode/commit/0221aaa4febea9dfeea8cfbb26fa355204e75d1b) Thanks [@mcowger](https://github.com/mcowger)! - Add collapsible MCP tool calls with memory management
+
+### Patch Changes
+
+- [#2095](https://github.com/Kilo-Org/kilocode/pull/2095) [`8623bb8`](https://github.com/Kilo-Org/kilocode/commit/8623bb8516a7453d299512bd11c5000f43ecb952) Thanks [@chrarnoldus](https://github.com/chrarnoldus)! - Kilo Code provider now falls back to the default model when the selected model no longer exists
+
+- [#2090](https://github.com/Kilo-Org/kilocode/pull/2090) [`fd147b8`](https://github.com/Kilo-Org/kilocode/commit/fd147b8ed35c8963ec66c5fae89f37829529574f) Thanks [@Mats4k](https://github.com/Mats4k)! - Improvements to German language translation
+
+- [#2030](https://github.com/Kilo-Org/kilocode/pull/2030) [`11e8c7d`](https://github.com/Kilo-Org/kilocode/commit/11e8c7dda9f03b769e22f233b5ea487c9a12bd66) Thanks [@ivanarifin](https://github.com/ivanarifin)! - Show message when Virtual Quota Fallback Provider switches profiles
+
+- [#2100](https://github.com/Kilo-Org/kilocode/pull/2100) [`5ed3d7b`](https://github.com/Kilo-Org/kilocode/commit/5ed3d7be3273fef7ff0eeede8db064fc9bdb4fe0) Thanks [@RSO](https://github.com/RSO)! - Changed the API domain for the Kilo Code provider
+
+- [#1964](https://github.com/Kilo-Org/kilocode/pull/1964) [`6b0dfbf`](https://github.com/Kilo-Org/kilocode/commit/6b0dfbf10a397063f02e0dd6964d1fb1b773cf12) Thanks [@chrarnoldus](https://github.com/chrarnoldus)! - 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.
+
 ## [v4.83.1]
 
 - [#2073](https://github.com/Kilo-Org/kilocode/pull/2073) [`a4b8770`](https://github.com/Kilo-Org/kilocode/commit/a4b8770ba82cbb366bb986a36026b6860129f799) Thanks [@chrarnoldus](https://github.com/chrarnoldus)! - Ensured free model usage is reported as free

.changeset/giant-eyes-approve.md

@@ -0,0 +1,172 @@
+import type { Meta, StoryObj } from "@storybook/react-vite"
+import { fn } from "storybook/test"
+
+import { McpExecution } from "../../../webview-ui/src/components/chat/McpExecution"
+import { withTooltipProvider } from "../src/decorators/withTooltipProvider"
+
+const meta = {
+	title: "Chat/Row/McpExecution",
+	component: McpExecution,
+	parameters: { layout: "padded" },
+} satisfies Meta<typeof McpExecution>
+
+export default meta
+type Story = StoryObj<typeof meta>
+
+// Mock server configuration
+const mockServer = {
+	tools: [
+		{
+			name: "get_weather",
+			description: "Get current weather information for a location",
+			alwaysAllow: false,
+		},
+		{
+			name: "search_files",
+			description: "Search for files in the project directory",
+			alwaysAllow: true,
+		},
+	],
+	source: "global" as const,
+}
+
+// Sample JSON arguments
+const jsonArguments = JSON.stringify(
+	{
+		location: "San Francisco, CA",
+		units: "metric",
+		include_forecast: true,
+	},
+	null,
+	2,
+)
+
+// Sample JSON response
+const jsonResponse = JSON.stringify(
+	{
+		location: "San Francisco, CA",
+		temperature: 18,
+		humidity: 65,
+		conditions: "Partly cloudy",
+		forecast: [
+			{ day: "Tomorrow", high: 20, low: 15, conditions: "Sunny" },
+			{ day: "Tuesday", high: 19, low: 14, conditions: "Cloudy" },
+		],
+	},
+	null,
+	2,
+)
+
+export const CompletedWithJsonResponse: Story = {
+	name: "Completed - JSON Response",
+	args: {
+		executionId: "exec-003",
+		text: jsonArguments,
+		serverName: "weather-server",
+		useMcpServer: {
+			type: "use_mcp_tool",
+			serverName: "weather-server",
+			toolName: "get_weather",
+			arguments: jsonArguments,
+			response: jsonResponse,
+		},
+		server: mockServer,
+		alwaysAllowMcp: false,
+		initiallyExpanded: true,
+	},
+}
+
+export const CompletedWithMarkdownResponse: Story = {
+	name: "Completed - Markdown Response",
+	args: {
+		executionId: "exec-004",
+		text: jsonArguments,
+		serverName: "weather-server",
+		useMcpServer: {
+			type: "use_mcp_tool",
+			serverName: "weather-server",
+			toolName: "get_weather",
+			arguments: jsonArguments,
+			response: `# Weather Report
+
+**Location:** San Francisco, CA  
+**Temperature:** 18°C  
+**Humidity:** 65%  
+**Conditions:** Partly cloudy
+
+## 3-Day Forecast
+
+- **Tomorrow:** Sunny, High: 20°C, Low: 15°C
+- **Tuesday:** Cloudy, High: 19°C, Low: 14°C
+- **Wednesday:** Rain, High: 17°C, Low: 12°C`,
+		},
+		server: mockServer,
+		alwaysAllowMcp: false,
+		initiallyExpanded: true,
+	},
+}
+
+export const RunningState: Story = {
+	name: "Running State",
+	args: {
+		executionId: "exec-005",
+		text: jsonArguments,
+		serverName: "weather-server",
+		useMcpServer: {
+			type: "use_mcp_tool",
+			serverName: "weather-server",
+			toolName: "get_weather",
+			arguments: jsonArguments,
+		},
+		server: mockServer,
+		alwaysAllowMcp: false,
+	},
+	play: async ({ canvasElement }) => {
+		// Simulate a running execution by dispatching a status message
+		window.dispatchEvent(
+			new MessageEvent("message", {
+				data: {
+					type: "mcpExecutionStatus",
+					text: JSON.stringify({
+						executionId: "exec-005",
+						status: "started",
+						serverName: "weather-server",
+						toolName: "get_weather",
+					}),
+				},
+			}),
+		)
+	},
+}
+
+export const ErrorState: Story = {
+	name: "Error State",
+	args: {
+		executionId: "exec-006",
+		text: jsonArguments,
+		serverName: "weather-server",
+		useMcpServer: {
+			type: "use_mcp_tool",
+			serverName: "weather-server",
+			toolName: "get_weather",
+			arguments: jsonArguments,
+		},
+		server: mockServer,
+		alwaysAllowMcp: false,
+	},
+	play: async ({ canvasElement }) => {
+		// Simulate an error state
+		window.dispatchEvent(
+			new MessageEvent("message", {
+				data: {
+					type: "mcpExecutionStatus",
+					text: JSON.stringify({
+						executionId: "exec-006",
+						status: "error",
+						error: "Connection timeout to weather service",
+					}),
+				},
+			}),
+		)
+	},
+}

.changeset/good-chicken-yell.md

@@ -133,6 +133,8 @@ export const globalSettingsSchema = z.object({
 	fuzzyMatchThreshold: z.number().optional(),
 	experiments: experimentsSchema.optional(),
 
+	morphApiKey: z.string().optional(), // kilocode_change: Morph fast apply
+
 	codebaseIndexModels: codebaseIndexModelsSchema.optional(),
 	codebaseIndexConfig: codebaseIndexConfigSchema.optional(),
 

.changeset/shaggy-mails-study.md

@@ -95,8 +95,6 @@ const baseProviderSettingsSchema = z.object({
 	modelMaxTokens: z.number().optional(),
 	modelMaxThinkingTokens: z.number().optional(),
 
-	morphApiKey: z.string().optional(), // kilocode_change: Morph fast apply
-
 	// Model verbosity.
 	verbosity: verbosityLevelsSchema.optional(),
 })

.changeset/unlucky-knives-cheer.md

@@ -0,0 +1,99 @@
+// npx vitest run api/providers/__tests__/fetch-with-timeout.spec.ts
+
+import { vi, describe, it, expect, beforeEach } from "vitest"
+
+// Declare hoisted mocks to be safely referenced inside vi.mock factory
+const hoisted = vi.hoisted(() => {
+	return {
+		mockFetch: vi.fn(),
+		mockAgentConstructor: vi.fn(),
+		agentInstances: [] as any[],
+	}
+})
+
+// Mock the undici module used by the implementation
+vi.mock("undici", () => {
+	return {
+		Agent: vi.fn().mockImplementation((opts: any) => {
+			hoisted.mockAgentConstructor(opts)
+			const instance = { __mock: "Agent" }
+			hoisted.agentInstances.push(instance)
+			return instance
+		}),
+		fetch: hoisted.mockFetch,
+	}
+})
+
+// Import after mocking so the implementation picks up our mocks
+import { fetchWithTimeout } from "../kilocode/fetchWithTimeout"
+
+describe("fetchWithTimeout - header precedence and timeout wiring", () => {
+	beforeEach(() => {
+		vi.clearAllMocks()
+		hoisted.agentInstances.length = 0
+	})
+
+	it("should prefer persistent headers over request-specific headers (application/json overrides text/plain)", async () => {
+		hoisted.mockFetch.mockResolvedValueOnce({ ok: true } as any)
+
+		const timeoutMs = 5_000
+		const f = fetchWithTimeout(timeoutMs, {
+			"Content-Type": "application/json",
+			"X-Test": "A",
+		})
+
+		await f("http://example.com", {
+			method: "POST",
+			headers: {
+				"Content-Type": "text/plain",
+				"X-Test": "B",
+			},
+			body: '{"x":1}',
+		})
+
+		// Agent constructed with correct timeouts
+		expect(hoisted.mockAgentConstructor).toHaveBeenCalledWith({
+			headersTimeout: timeoutMs,
+			bodyTimeout: timeoutMs,
+		})
+
+		// Fetch called with merged headers where persistent wins
+		expect(hoisted.mockFetch).toHaveBeenCalledTimes(1)
+		const [url, init] = hoisted.mockFetch.mock.calls[0]
+		expect(url).toBe("http://example.com")
+
+		// Dispatcher is the agent instance we created
+		expect(init.dispatcher).toBe(hoisted.agentInstances[0])
+
+		// Persistent headers must override request-specific ones
+		expect(init.headers).toEqual(
+			expect.objectContaining({
+				"Content-Type": "application/json",
+				"X-Test": "A",
+			}),
+		)
+	})
+
+	it("should apply persistent application/json when request-specific Content-Type is omitted (prevents defaulting to text/plain)", async () => {
+		hoisted.mockFetch.mockResolvedValueOnce({ ok: true } as any)
+
+		const f = fetchWithTimeout(10_000, {
+			"Content-Type": "application/json",
+		})
+
+		await f("http://example.com", {
+			method: "POST",
+			body: '{"x":1}',
+		})
+
+		expect(hoisted.mockFetch).toHaveBeenCalledTimes(1)
+		const [, init] = hoisted.mockFetch.mock.calls[0]
+
+		// Ensure Content-Type remains application/json
+		expect(init.headers).toEqual(
+			expect.objectContaining({
+				"Content-Type": "application/json",
+			}),
+		)
+	})
+})