[pull] main from Kilo-Org:main

.changeset/clever-moments-melt.md

@@ -0,0 +1,5 @@
+---
+"kilo-code": patch
+---
+
+Fixed that some tasks in task history were red

.changeset/ten-ravens-lose.md

@@ -0,0 +1,5 @@
+---
+"kilo-code": patch
+---
+
+Improve support for VSCode's HTTP proxy settings

apps/storybook/.storybook/preview.ts

@@ -1,6 +1,7 @@
 import type { Preview } from "@storybook/react-vite"
 
 import { withExtensionState } from "../src/decorators/withExtensionState"
+import { withPostMessageMock } from "../src/decorators/withPostMessageMock"
 import { withQueryClient } from "../src/decorators/withQueryClient"
 import { withTheme } from "../src/decorators/withTheme"
 import { withI18n } from "../src/decorators/withI18n"
@@ -49,6 +50,7 @@ const preview: Preview = {
 		withI18n,
 		withQueryClient,
 		withExtensionState,
+		withPostMessageMock,
 		withTheme,
 		withTooltipProvider,
 		withFixedContainment,

apps/storybook/src/decorators/withPostMessageMock.tsx

@@ -0,0 +1,43 @@
+import type { Decorator } from "@storybook/react-vite"
+import React from "react"
+
+type PostMessage = Record<string, unknown>
+
+/**
+ * Decorator to mock VSCode postMessage for components that listen to messages.
+ *
+ * To override in a story, use parameters.postMessages:
+ * ```tsx
+ * export const MyStory: Story = {
+ *   parameters: {
+ *     postMessages: [
+ *       { type: "kilocodeNotificationsResponse", notifications: [...] },
+ *     ],
+ *   },
+ * }
+ * ```
+ *
+ * Multiple messages are sent sequentially
+ */
+export const withPostMessageMock: Decorator = (Story, context) => {
+	const messages = context.parameters?.postMessages as PostMessage[] | undefined
+
+	React.useEffect(() => {
+		if (!messages || messages.length === 0) {
+			return
+		}
+
+		const timers: NodeJS.Timeout[] = []
+		messages.forEach((message, index) => {
+			const event = new MessageEvent("message", { data: message })
+			const timer = setTimeout(() => {
+				window.dispatchEvent(event)
+			})
+			timers.push(timer)
+		})
+
+		return () => timers.forEach(clearTimeout)
+	}, [messages])
+
+	return <Story />
+}

apps/storybook/src/utils/createExtensionStateMock.ts

@@ -17,10 +17,7 @@ export const createExtensionStateMock = (
 ): ExtensionStateContextType => {
 	// Only define properties that Storybook stories actually use
 	const knownProperties: Partial<ExtensionStateContextType> = {
-		// Add properties here as they're needed in stories
-		// For example:
-		// theme: {},
-		// apiConfiguration: null,
+		kilocodeDefaultModel: "claude-sonnet-4",
 	}
 
 	// Merge with overrides

apps/storybook/stories/KilocodeNotifications.stories.tsx

@@ -0,0 +1,71 @@
+import type { Meta, StoryObj } from "@storybook/react-vite"
+import { fn } from "storybook/test"
+import { KilocodeNotifications } from "@/components/kilocode/KilocodeNotifications"
+
+const meta = {
+	title: "Components/KilocodeNotifications",
+	component: KilocodeNotifications,
+	parameters: {
+		extensionState: {
+			dismissedNotificationIds: [],
+		},
+	},
+	args: {
+		onDismiss: fn(),
+	},
+} satisfies Meta<typeof KilocodeNotifications>
+
+export default meta
+type Story = StoryObj<typeof meta>
+
+const defaultNotification = {
+	id: "1",
+	title: "Welcome to Kilo Code!",
+	message: "Get started by setting up your API configuration in the settings.",
+	action: {
+		actionText: "Open Settings",
+		actionURL: "https://example.com/settings",
+	},
+}
+
+export const Default: Story = {
+	parameters: {
+		postMessages: [
+			{
+				type: "kilocodeNotificationsResponse",
+				notifications: [defaultNotification],
+			},
+		],
+	},
+}
+
+export const MultipleNotifications: Story = {
+	parameters: {
+		postMessages: [
+			{
+				type: "kilocodeNotificationsResponse",
+				notifications: [
+					{
+						id: "1",
+						title: "First Notification",
+						message: "This is the first notification in a series.",
+					},
+					{
+						id: "2",
+						title: "Second Notification",
+						message: "You can navigate between notifications using the arrows.",
+					},
+					{
+						id: "3",
+						title: "Third Notification",
+						message: "This is the last notification in this set.",
+						action: {
+							actionText: "Visit Website",
+							actionURL: "https://example.com",
+						},
+					},
+				],
+			},
+		],
+	},
+}

packages/types/src/history.ts

@@ -19,7 +19,6 @@ export const historyItemSchema = z.object({
 	size: z.number().optional(),
 	workspace: z.string().optional(),
 	isFavorited: z.boolean().optional(), // kilocode_change
-	fileNotfound: z.boolean().optional(), // kilocode_change
 	mode: z.string().optional(),
 	status: z.enum(["active", "completed", "delegated"]).optional(),
 	delegatedToId: z.string().optional(), // Last child this parent delegated to

src/api/providers/base-openai-compatible-provider.ts

@@ -13,7 +13,6 @@ import { DEFAULT_HEADERS } from "./constants"
 import { BaseProvider } from "./base-provider"
 import { verifyFinishReason } from "./kilocode/verifyFinishReason"
 import { handleOpenAIError } from "./utils/openai-error-handler"
-import { fetchWithTimeout } from "./kilocode/fetchWithTimeout" // kilocode_change
 import { calculateApiCostOpenAI } from "../../shared/cost"
 import { getApiRequestTimeout } from "./utils/timeout-config"
 
@@ -61,15 +60,11 @@ export abstract class BaseOpenAiCompatibleProvider<ModelName extends string>
 			throw new Error("API key is required")
 		}
 
-		const timeout = getApiRequestTimeout() // kilocode_change
 		this.client = new OpenAI({
 			baseURL,
 			apiKey: this.options.apiKey,
 			defaultHeaders: DEFAULT_HEADERS,
-			// kilocode_change start
-			timeout: timeout,
-			fetch: timeout ? fetchWithTimeout(timeout) : undefined,
-			// kilocode_change end
+			timeout: getApiRequestTimeout(),
 		})
 	}
 

src/api/providers/kilocode/getKilocodeDefaultModel.ts

@@ -2,7 +2,6 @@ import { openRouterDefaultModelId, type ProviderSettings } from "@roo-code/types
 import { getKiloUrlFromToken } from "@roo-code/types"
 import { TelemetryService } from "@roo-code/telemetry"
 import { z } from "zod"
-import { fetchWithTimeout } from "./fetchWithTimeout"
 import { DEFAULT_HEADERS } from "../constants"
 
 type KilocodeToken = string
@@ -15,8 +14,6 @@ const defaultsSchema = z.object({
 	defaultModel: z.string().nullish(),
 })
 
-const fetcher = fetchWithTimeout(5000)
-
 async function fetchKilocodeDefaultModel(
 	kilocodeToken: KilocodeToken,
 	organizationId?: OrganizationId,
@@ -39,7 +36,10 @@ async function fetchKilocodeDefaultModel(
 			headers["X-KILOCODE-TESTER"] = "SUPPRESS"
 		}
 
-		const response = await fetcher(url, { headers })
+		const controller = new AbortController()
+		const timeout = setTimeout(() => controller.abort(), 5000)
+		const response = await fetch(url, { headers, signal: controller.signal })
+		clearTimeout(timeout)
 		if (!response.ok) {
 			throw new Error(`Fetching default model from ${url} failed: ${response.status}`)
 		}