feat(webview): add batchNearby utility for smarter tool ask batching

Replace batchConsecutive with batchNearby in ChatView.tsx to allow
merging same-type tool asks even when separated by ignorable messages
(api_req_started/finished, empty text rows, reasoning).

Semantic boundaries (user_feedback, visible text, completion_result,
checkpoint_saved, error) stop the merge, preserving correct ordering.

This fixes UX where models like qwen insert API request rows between
tool calls, causing UI to show multiple 'Zoo wants to read this file'
instead of a single batched prompt.

Author: taltas

packages/types/src/__tests__/kimi-code.test.ts

@@ -0,0 +1,29 @@
+import {
+	SECRET_STATE_KEYS,
+	dynamicProviders,
+	kimiCodeDefaultModelId,
+	providerSettingsSchema,
+	providerSettingsSchemaDiscriminated,
+} from "../index.js"
+
+describe("Kimi Code provider types", () => {
+	it("registers Kimi Code as a dynamic provider with a distinct secret", () => {
+		expect(dynamicProviders).toContain("kimi-code")
+		expect(SECRET_STATE_KEYS).toContain("kimiCodeApiKey")
+		expect(SECRET_STATE_KEYS).toContain("moonshotApiKey")
+	})
+
+	it("parses OAuth and API-key settings independently from Moonshot", () => {
+		expect(
+			providerSettingsSchemaDiscriminated.parse({
+				apiProvider: "kimi-code",
+				kimiCodeAuthMethod: "api-key",
+				kimiCodeApiKey: "kimi-key",
+				apiModelId: kimiCodeDefaultModelId,
+			}),
+		).toMatchObject({ kimiCodeApiKey: "kimi-key" })
+		expect(providerSettingsSchema.parse({ apiProvider: "kimi-code", kimiCodeAuthMethod: "oauth" })).toMatchObject({
+			kimiCodeAuthMethod: "oauth",
+		})
+	})
+})

packages/types/src/__tests__/provider-identifiers.test.ts

@@ -45,6 +45,7 @@ const expectedProviderIdentifiers = [
 	"gemini-cli",
 	"mistral",
 	"moonshot",
+	"kimi-code",
 	"minimax",
 	"mimo",
 	"openai-codex",
@@ -104,6 +105,7 @@ describe("provider identifiers", () => {
 			providerIdentifiers.moonshot,
 			providerIdentifiers.opencodeGo,
 			providerIdentifiers.kenari,
+			providerIdentifiers.kimiCode,
 		])
 		expect(localProviders).toEqual([providerIdentifiers.ollama, providerIdentifiers.lmstudio])
 		expect(internalProviders).toEqual([providerIdentifiers.vscodeLm])

packages/types/src/global-settings.ts

@@ -300,6 +300,7 @@ export const SECRET_STATE_KEYS = [
 	"openAiNativeApiKey",
 	"deepSeekApiKey",
 	"moonshotApiKey",
+	"kimiCodeApiKey",
 	"mistralApiKey",
 	"minimaxApiKey",
 	"requestyApiKey",

packages/types/src/model.ts

@@ -122,6 +122,7 @@ export const modelInfoSchema = z.object({
 		})
 		.optional(),
 	description: z.string().optional(),
+	displayName: z.string().optional(),
 	// Default effort value for models that support reasoning effort
 	reasoningEffort: reasoningEffortExtendedSchema.optional(),
 	minTokensPerCachePoint: z.number().optional(),

packages/types/src/provider-identifiers.ts

@@ -28,6 +28,7 @@ export const providerIdentifiers = {
 	geminiCli: "gemini-cli",
 	mistral: "mistral",
 	moonshot: "moonshot",
+	kimiCode: "kimi-code",
 	minimax: "minimax",
 	mimo: "mimo",
 	openaiCodex: "openai-codex",

packages/types/src/provider-settings.ts

@@ -55,6 +55,7 @@ export const dynamicProviders = [
 	providerIdentifiers.moonshot,
 	providerIdentifiers.opencodeGo,
 	providerIdentifiers.kenari,
+	providerIdentifiers.kimiCode,
 ] as const
 
 export type DynamicProvider = (typeof dynamicProviders)[number]
@@ -309,6 +310,14 @@ const moonshotSchema = apiModelIdProviderModelSchema.extend({
 	moonshotApiKey: z.string().optional(),
 })
 
+export const kimiCodeAuthMethodSchema = z.enum(["oauth", "api-key"])
+export type KimiCodeAuthMethod = z.infer<typeof kimiCodeAuthMethodSchema>
+
+const kimiCodeSchema = apiModelIdProviderModelSchema.extend({
+	kimiCodeAuthMethod: kimiCodeAuthMethodSchema.optional(),
+	kimiCodeApiKey: z.string().optional(),
+})
+
 const minimaxSchema = apiModelIdProviderModelSchema.extend({
 	minimaxBaseUrl: z
 		.union([z.literal("https://api.minimax.io/v1"), z.literal("https://api.minimaxi.com/v1")])
@@ -425,6 +434,7 @@ export const providerSettingsSchemaDiscriminated = z.discriminatedUnion("apiProv
 	deepSeekSchema.merge(z.object({ apiProvider: z.literal("deepseek") })),
 	poeSchema.merge(z.object({ apiProvider: z.literal("poe") })),
 	moonshotSchema.merge(z.object({ apiProvider: z.literal("moonshot") })),
+	kimiCodeSchema.merge(z.object({ apiProvider: z.literal("kimi-code") })),
 	minimaxSchema.merge(z.object({ apiProvider: z.literal("minimax") })),
 	mimoSchema.merge(z.object({ apiProvider: z.literal("mimo") })),
 	requestySchema.merge(z.object({ apiProvider: z.literal("requesty") })),
@@ -463,6 +473,7 @@ export const providerSettingsSchema = z.object({
 	...deepSeekSchema.shape,
 	...poeSchema.shape,
 	...moonshotSchema.shape,
+	...kimiCodeSchema.shape,
 	...minimaxSchema.shape,
 	...mimoSchema.shape,
 	...requestySchema.shape,
@@ -544,6 +555,7 @@ export const modelIdKeysByProvider: Record<TypicalProvider, ModelIdKey> = {
 	"gemini-cli": "apiModelId",
 	mistral: "apiModelId",
 	moonshot: "apiModelId",
+	"kimi-code": "apiModelId",
 	minimax: "apiModelId",
 	mimo: "apiModelId",
 	deepseek: "apiModelId",
@@ -652,6 +664,11 @@ export const MODELS_BY_PROVIDER: Record<
 		label: "Moonshot",
 		models: Object.keys(moonshotModels),
 	},
+	"kimi-code": {
+		id: "kimi-code",
+		label: "Kimi Code",
+		models: [],
+	},
 	minimax: {
 		id: "minimax",
 		label: "MiniMax",

packages/types/src/providers/index.ts

@@ -25,6 +25,7 @@ export * from "./xai.js"
 export * from "./vercel-ai-gateway.js"
 export * from "./opencode-go.js"
 export * from "./kenari.js"
+export * from "./kimi-code.js"
 export * from "./zai.js"
 export * from "./minimax.js"
 export * from "./mimo.js"
@@ -53,6 +54,7 @@ import { xaiDefaultModelId } from "./xai.js"
 import { vercelAiGatewayDefaultModelId } from "./vercel-ai-gateway.js"
 import { opencodeGoDefaultModelId } from "./opencode-go.js"
 import { kenariDefaultModelId } from "./kenari.js"
+import { kimiCodeDefaultModelId } from "./kimi-code.js"
 import { internationalZAiDefaultModelId, mainlandZAiDefaultModelId } from "./zai.js"
 import { minimaxDefaultModelId } from "./minimax.js"
 import { mimoDefaultModelId } from "./mimo.js"
@@ -129,6 +131,8 @@ export function getProviderDefaultModelId(
 			return opencodeGoDefaultModelId
 		case "kenari":
 			return kenariDefaultModelId
+		case "kimi-code":
+			return kimiCodeDefaultModelId
 		case "zoo-gateway":
 			return zooGatewayDefaultModelId
 		case "anthropic":

packages/types/src/providers/kimi-code.ts

@@ -0,0 +1,23 @@
+import type { ModelInfo } from "../model.js"
+
+export const KIMI_CODE_BASE_URL = "https://api.kimi.com/coding/v1"
+export const kimiCodeDefaultModelId = "kimi-for-coding"
+
+export const kimiCodeReasoningEfforts = ["low", "high", "max"] as const
+
+export const kimiCodeDefaultModelInfo: ModelInfo = {
+	contextWindow: 262_144,
+	maxTokens: 32_768,
+	supportsImages: false,
+	supportsPromptCache: false,
+	supportsReasoningEffort: [...kimiCodeReasoningEfforts],
+	requiredReasoningEffort: true,
+	reasoningEffort: "max",
+	description: "Kimi Code's coding model for subscription and API-key access.",
+}
+
+export const kimiCodeModels = {
+	[kimiCodeDefaultModelId]: kimiCodeDefaultModelInfo,
+} as const satisfies Record<string, ModelInfo>
+
+export type KimiCodeModelId = keyof typeof kimiCodeModels

packages/types/src/vscode-extension-host.ts

@@ -389,6 +389,14 @@ export type ExtensionState = Pick<
 	mdmCompliant?: boolean
 	taskSyncEnabled: boolean
 	openAiCodexIsAuthenticated?: boolean
+	kimiCodeIsAuthenticated?: boolean
+	kimiCodeOAuthState?: {
+		status: "idle" | "authorizing" | "polling" | "authenticated" | "error"
+		userCode?: string
+		verificationUri?: string
+		expiresAt?: number
+		error?: string
+	}
 	zooCodeIsAuthenticated?: boolean
 	zooCodeUserName?: string
 	zooCodeUserEmail?: string
@@ -538,6 +546,8 @@ export interface WebviewMessage {
 		| "rooCloudManualUrl"
 		| "openAiCodexSignIn"
 		| "openAiCodexSignOut"
+		| "kimiCodeSignIn"
+		| "kimiCodeSignOut"
 		| "zooCodeSignOut"
 		| "switchOrganization"
 		| "condenseTaskContextRequest"

src/api/index.ts

@@ -20,6 +20,7 @@ import {
 	OpenAiNativeHandler,
 	DeepSeekHandler,
 	MoonshotHandler,
+	KimiCodeHandler,
 	MistralHandler,
 	VsCodeLmHandler,
 	RequestyHandler,
@@ -178,6 +179,8 @@ export function buildApiHandler(configuration: ProviderSettings): ApiHandler {
 			return new QwenCodeHandler(options)
 		case "moonshot":
 			return new MoonshotHandler(options)
+		case "kimi-code":
+			return new KimiCodeHandler(options)
 		case "vscode-lm":
 			return new VsCodeLmHandler(options)
 		case "mistral":