Merge branch 'main' into saoudrizwan/zai-reasoning-effort

apps/vscode/webview-ui/src/components/settings/providers/ZAiProvider.test.tsx

@@ -0,0 +1,116 @@
+import { toProtobufModelInfo } from "@shared/proto-conversions/models/typeConversion"
+import { render, screen } from "@testing-library/react"
+import type { ChangeEventHandler, ReactNode } from "react"
+import { describe, expect, it, vi } from "vitest"
+import { useExtensionState } from "@/context/ExtensionStateContext"
+import { useProviderConfig } from "@/hooks/useProviderConfig"
+import { useProviderModels } from "@/hooks/useProviderModels"
+import { useStaticProviderSelection } from "@/hooks/useStaticProviderSelection"
+import { ZAiProvider } from "./ZAiProvider"
+
+vi.mock("@/context/ExtensionStateContext", () => ({
+	useExtensionState: vi.fn(),
+}))
+
+vi.mock("@/hooks/useProviderConfig", () => ({
+	useProviderConfig: vi.fn(),
+}))
+
+vi.mock("@/hooks/useProviderModels", () => ({
+	useProviderModels: vi.fn(),
+}))
+
+vi.mock("@/hooks/useStaticProviderSelection", () => ({
+	useStaticProviderSelection: vi.fn(),
+}))
+
+vi.mock("../utils/useApiConfigurationHandlers", () => ({
+	useApiConfigurationHandlers: () => ({
+		handleModeFieldChange: vi.fn(),
+	}),
+}))
+
+vi.mock("@vscode/webview-ui-toolkit/react", async (importOriginal) => {
+	const actual = await importOriginal<typeof import("@vscode/webview-ui-toolkit/react")>()
+	return {
+		...actual,
+		VSCodeDropdown: ({
+			children,
+			id,
+			onChange,
+			value,
+			"aria-label": ariaLabel,
+		}: {
+			children?: ReactNode
+			id?: string
+			onChange?: ChangeEventHandler<HTMLSelectElement>
+			value?: string
+			"aria-label"?: string
+		}) => (
+			<select aria-label={ariaLabel} id={id} onChange={onChange} value={value}>
+				{children}
+			</select>
+		),
+		VSCodeOption: ({ children, value }: { children?: ReactNode; value?: string }) => (
+			<option value={value}>{children}</option>
+		),
+	}
+})
+
+describe("ZAiProvider", () => {
+	it("uses live catalog reasoning support when the saved model snapshot is stale", () => {
+		const liveModelInfo = {
+			name: "GLM 5.2",
+			supportsPromptCache: true,
+			contextWindow: 1_048_576,
+			supportsReasoning: true,
+		}
+
+		vi.mocked(useExtensionState).mockReturnValue({
+			apiConfiguration: {
+				apiProvider: "zai",
+				actModeApiModelId: "glm-5.2",
+				zaiApiKey: "test-key",
+			},
+		} as ReturnType<typeof useExtensionState>)
+		vi.mocked(useProviderModels).mockReturnValue({
+			models: {},
+			defaultModelId: "",
+			isLoading: false,
+			isStale: false,
+			error: undefined,
+			refresh: vi.fn(),
+			fingerprint: "fingerprint",
+		})
+		vi.mocked(useStaticProviderSelection).mockReturnValue({
+			models: {
+				"glm-5.2": liveModelInfo,
+			},
+			defaultModelId: "glm-5.2",
+			selectedModelId: "glm-5.2",
+			selectedModelInfo: {
+				name: "GLM 5.2",
+				supportsPromptCache: true,
+			},
+			hideUsageCost: false,
+		})
+		vi.mocked(useProviderConfig).mockReturnValue({
+			config: {
+				actSelection: {
+					providerId: "zai",
+					modelId: "glm-5.2",
+					modelInfo: toProtobufModelInfo({
+						name: "GLM 5.2",
+						supportsPromptCache: true,
+					}),
+				},
+			},
+			write: vi.fn(async () => undefined),
+			commitSelection: vi.fn(),
+		})
+
+		render(<ZAiProvider currentMode="act" showModelOptions={true} />)
+
+		expect(screen.getByText("Reasoning Effort")).toBeInTheDocument()
+	})
+})

apps/vscode/webview-ui/src/components/settings/providers/ZAiProvider.tsx

@@ -8,6 +8,7 @@ import { useStaticProviderSelection } from "@/hooks/useStaticProviderSelection"
 import { ApiKeyField } from "../common/ApiKeyField"
 import { ModelInfoView } from "../common/ModelInfoView"
 import { DropdownContainer, ModelSelector } from "../common/ModelSelector"
+import ReasoningEffortSelector from "../ReasoningEffortSelector"
 import { useProviderApiKeyField } from "../utils/useProviderApiKeyField"
 
 const PROVIDER_ID = "zai"
@@ -129,6 +130,20 @@ export const ZAiProvider = ({ showModelOptions, isPopup, currentMode }: ZAiProvi
 						selectedModelId={selectedModelId}
 					/>
 
+					{selectedModelInfo.supportsReasoning === true && (
+						<ReasoningEffortSelector
+							currentMode={currentMode}
+							onEffortChange={(effort) => {
+								void write({
+									reasoning: {
+										enabled: effort !== "none",
+										effort: effort !== "none" ? effort : undefined,
+									},
+								}).catch((err) => console.error("Failed to update Z AI reasoning effort:", err))
+							}}
+						/>
+					)}
+
 					<ModelInfoView
 						hideUsageCost={hideUsageCost}
 						isPopup={isPopup}

apps/vscode/webview-ui/src/hooks/useProviderModelSelection.ts

@@ -30,11 +30,15 @@ export function useProviderModelSelection(
 	const committedSelection = currentMode === "plan" ? config?.planSelection : config?.actSelection
 	const fallbackModelId = defaultModelId || Object.keys(models)[0] || ""
 	const selectedModelId = committedSelection?.modelId ?? fallbackModelId
-	const selectedModelInfo = committedSelection?.modelInfo
-		? fromProtobufModelInfo(committedSelection.modelInfo)
-		: (models[selectedModelId] ??
-			(selectedModelId && customModelInfo ? customModelInfo(selectedModelId) : undefined) ??
-			fallbackModelInfo)
+	const persistedModelInfo = committedSelection?.modelInfo ? fromProtobufModelInfo(committedSelection.modelInfo) : undefined
+	const liveModelInfo = models[selectedModelId]
+	const selectedModelInfo =
+		persistedModelInfo || liveModelInfo
+			? {
+					...persistedModelInfo,
+					...liveModelInfo,
+				}
+			: ((selectedModelId && customModelInfo ? customModelInfo(selectedModelId) : undefined) ?? fallbackModelInfo)
 
 	const selectedModel: ProviderModelSelection = {
 		providerId,