zgsm-ai
diff --git a/‎.changeset/v3.31.1.md‎
Lines changed: 0 additions & 8 deletions b/‎.changeset/v3.31.1.md‎
Lines changed: 0 additions & 8 deletions
diff --git a/‎packages/types/src/providers/zgsm.ts‎
Lines changed: 1 addition & 1 deletion b/‎packages/types/src/providers/zgsm.ts‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎src/core/webview/ClineProvider.ts‎
Lines changed: 14 additions & 13 deletions b/‎src/core/webview/ClineProvider.ts‎
Lines changed: 14 additions & 13 deletions
diff --git a/‎src/core/webview/__tests__/ClineProvider.apiHandlerRebuild.spec.ts‎
Lines changed: 70 additions & 5 deletions b/‎src/core/webview/__tests__/ClineProvider.apiHandlerRebuild.spec.ts‎
Lines changed: 70 additions & 5 deletions
diff --git a/‎webview-ui/src/components/chat/AutoApproveDropdown.tsx‎
Lines changed: 16 additions & 31 deletions b/‎webview-ui/src/components/chat/AutoApproveDropdown.tsx‎
Lines changed: 16 additions & 31 deletions
diff --git a/‎webview-ui/src/components/chat/AutoApprovedRequestLimitWarning.tsx‎
Lines changed: 3 additions & 3 deletions b/‎webview-ui/src/components/chat/AutoApprovedRequestLimitWarning.tsx‎
Lines changed: 3 additions & 3 deletions
diff --git a/‎webview-ui/src/components/chat/BrowserSessionRow.tsx‎
Lines changed: 5 additions & 5 deletions b/‎webview-ui/src/components/chat/BrowserSessionRow.tsx‎
Lines changed: 5 additions & 5 deletions
@@ -1,6 +1,6 @@
 import { ModelInfo } from "../model.js"
 
-export const zgsmDefaultModelId = "GLM-4.6"
+export const zgsmDefaultModelId = "GLM-4.5"
 
 export const zgsmModels = {
 	default: {
 
@@ -1378,27 +1378,28 @@ export class ClineProvider
 
 	/**
 	 * Updates the current task's API handler if the provider or model has changed.
-	 * This prevents unnecessary context condensing when only non-model settings change.
+	 * Also synchronizes the task.apiConfiguration so subsequent comparisons and logic
+	 * (protocol selection, reasoning display, model metadata) use the latest profile.
 	 * @param providerSettings The new provider settings to apply
 	 */
 	private updateTaskApiHandlerIfNeeded(providerSettings: ProviderSettings): void {
 		const task = this.getCurrentTask()
+		if (!task) return
 
-		if (task && task.apiConfiguration) {
-			// Only rebuild API handler if provider or model actually changed
-			// to avoid triggering unnecessary context condensing
-			const currentProvider = task.apiConfiguration.apiProvider
-			const newProvider = providerSettings.apiProvider
-			const currentModelId = getModelId(task.apiConfiguration)
-			const newModelId = getModelId(providerSettings)
+		// Determine if we need to rebuild using the previous configuration snapshot
+		const prevConfig = task.apiConfiguration
+		const prevProvider = prevConfig?.apiProvider
+		const prevModelId = prevConfig ? getModelId(prevConfig) : undefined
+		const newProvider = providerSettings.apiProvider
+		const newModelId = getModelId(providerSettings)
 
-			if (currentProvider !== newProvider || currentModelId !== newModelId) {
-				task.api = buildApiHandler(providerSettings)
-			}
-		} else if (task) {
-			// Fallback: rebuild if apiConfiguration is not available
+		if (prevProvider !== newProvider || prevModelId !== newModelId) {
 			task.api = buildApiHandler(providerSettings)
 		}
+
+		// Always sync the task's apiConfiguration with the latest provider settings.
+		// Note: Task.apiConfiguration is declared readonly in types, so we cast to any for runtime update.
+		;(task as any).apiConfiguration = providerSettings
 	}
 
 	getProviderProfileEntries(): ProviderSettingsEntry[] {
 
@@ -262,7 +262,7 @@ describe("ClineProvider - API Handler Rebuild Guard", () => {
 	})
 
 	describe("upsertProviderProfile", () => {
-		test("does NOT rebuild API handler when provider and model unchanged", async () => {
+		test("does NOT rebuild API handler when provider and model unchanged, but task.apiConfiguration is synced", async () => {
 			// Create a task with the current config
 			const mockTask = new Task({
 				...defaultTaskOptions,
@@ -301,6 +301,10 @@ describe("ClineProvider - API Handler Rebuild Guard", () => {
 			expect(buildApiHandlerMock).not.toHaveBeenCalled()
 			// Verify the task's api property was NOT reassigned (still same reference)
 			expect(mockTask.api).toBe(originalApi)
+			// Verify task.apiConfiguration was synchronized with non-model fields
+			expect((mockTask as any).apiConfiguration.openRouterModelId).toBe("openai/gpt-4")
+			expect((mockTask as any).apiConfiguration.rateLimitSeconds).toBe(5)
+			expect((mockTask as any).apiConfiguration.modelTemperature).toBe(0.7)
 		})
 
 		test("rebuilds API handler when provider changes", async () => {
@@ -398,12 +402,13 @@ describe("ClineProvider - API Handler Rebuild Guard", () => {
 	})
 
 	describe("activateProviderProfile", () => {
-		test("does NOT rebuild API handler when provider and model unchanged", async () => {
+		test("does NOT rebuild API handler when provider and model unchanged, but task.apiConfiguration is synced", async () => {
 			const mockTask = new Task({
 				...defaultTaskOptions,
 				apiConfiguration: {
 					apiProvider: "openrouter",
 					openRouterModelId: "openai/gpt-4",
+					modelTemperature: 0.3,
 				},
 			})
 			const originalApi = {
@@ -418,12 +423,14 @@ describe("ClineProvider - API Handler Rebuild Guard", () => {
 
 			buildApiHandlerMock.mockClear()
 
-			// Mock activateProfile to return same provider/model
+			// Mock activateProfile to return same provider/model but different non-model setting
 			;(provider as any).providerSettingsManager.activateProfile = vi.fn().mockResolvedValue({
 				name: "test-config",
 				id: "test-id",
 				apiProvider: "openrouter",
 				openRouterModelId: "openai/gpt-4",
+				modelTemperature: 0.9,
+				rateLimitSeconds: 7,
 			})
 
 			await provider.activateProviderProfile({ name: "test-config" })
@@ -432,9 +439,13 @@ describe("ClineProvider - API Handler Rebuild Guard", () => {
 			expect(buildApiHandlerMock).not.toHaveBeenCalled()
 			// Verify the API reference wasn't changed
 			expect(mockTask.api).toBe(originalApi)
+			// Verify task.apiConfiguration was synchronized
+			expect((mockTask as any).apiConfiguration.openRouterModelId).toBe("openai/gpt-4")
+			expect((mockTask as any).apiConfiguration.modelTemperature).toBe(0.9)
+			expect((mockTask as any).apiConfiguration.rateLimitSeconds).toBe(7)
 		})
 
-		test("rebuilds API handler when provider changes", async () => {
+		test("rebuilds API handler when provider changes and syncs task.apiConfiguration", async () => {
 			const mockTask = new Task({
 				...defaultTaskOptions,
 				apiConfiguration: {
@@ -470,9 +481,12 @@ describe("ClineProvider - API Handler Rebuild Guard", () => {
 					apiModelId: "claude-3-5-sonnet-20241022",
 				}),
 			)
+			// And task.apiConfiguration synced
+			expect((mockTask as any).apiConfiguration.apiProvider).toBe("anthropic")
+			expect((mockTask as any).apiConfiguration.apiModelId).toBe("claude-3-5-sonnet-20241022")
 		})
 
-		test("rebuilds API handler when model changes", async () => {
+		test("rebuilds API handler when model changes and syncs task.apiConfiguration", async () => {
 			const mockTask = new Task({
 				...defaultTaskOptions,
 				apiConfiguration: {
@@ -508,6 +522,57 @@ describe("ClineProvider - API Handler Rebuild Guard", () => {
 					openRouterModelId: "anthropic/claude-3-5-sonnet-20241022",
 				}),
 			)
+			// And task.apiConfiguration synced
+			expect((mockTask as any).apiConfiguration.apiProvider).toBe("openrouter")
+			expect((mockTask as any).apiConfiguration.openRouterModelId).toBe("anthropic/claude-3-5-sonnet-20241022")
+		})
+	})
+
+	describe("profile switching sequence", () => {
+		test("A -> B -> A updates task.apiConfiguration each time", async () => {
+			const mockTask = new Task({
+				...defaultTaskOptions,
+				apiConfiguration: {
+					apiProvider: "openrouter",
+					openRouterModelId: "openai/gpt-4",
+				},
+			})
+			mockTask.api = {
+				getModel: vi.fn().mockReturnValue({
+					id: "openai/gpt-4",
+					info: { contextWindow: 128000 },
+				}),
+			} as any
+
+			await provider.addClineToStack(mockTask)
+
+			// First switch: A -> B (openrouter -> anthropic)
+			buildApiHandlerMock.mockClear()
+			;(provider as any).providerSettingsManager.activateProfile = vi.fn().mockResolvedValue({
+				name: "anthropic-config",
+				id: "anthropic-id",
+				apiProvider: "anthropic",
+				apiModelId: "claude-3-5-sonnet-20241022",
+			})
+			await provider.activateProviderProfile({ name: "anthropic-config" })
+
+			expect(buildApiHandlerMock).toHaveBeenCalled()
+			expect((mockTask as any).apiConfiguration.apiProvider).toBe("anthropic")
+			expect((mockTask as any).apiConfiguration.apiModelId).toBe("claude-3-5-sonnet-20241022")
+
+			// Second switch: B -> A (anthropic -> openrouter gpt-4)
+			buildApiHandlerMock.mockClear()
+			;(provider as any).providerSettingsManager.activateProfile = vi.fn().mockResolvedValue({
+				name: "test-config",
+				id: "test-id",
+				apiProvider: "openrouter",
+				openRouterModelId: "openai/gpt-4",
+			})
+			await provider.activateProviderProfile({ name: "test-config" })
+
+			// API handler may or may not rebuild depending on mock model id, but apiConfiguration must be updated
+			expect((mockTask as any).apiConfiguration.apiProvider).toBe("openrouter")
+			expect((mockTask as any).apiConfiguration.openRouterModelId).toBe("openai/gpt-4")
 		})
 	})
 
 
@@ -6,7 +6,7 @@ import { cn } from "@/lib/utils"
 import { useExtensionState } from "@/context/ExtensionStateContext"
 import { useAppTranslation } from "@/i18n/TranslationContext"
 import { useRooPortal } from "@/components/ui/hooks/useRooPortal"
-import { Popover, PopoverContent, PopoverTrigger, StandardTooltip, ToggleSwitch } from "@/components/ui"
+import { Popover, PopoverContent, PopoverTrigger, StandardTooltip, ToggleSwitch, Button } from "@/components/ui"
 import { AutoApproveSetting, autoApproveSettingsConfig } from "../settings/AutoApproveToggle"
 import { useAutoApprovalToggles } from "@/hooks/useAutoApprovalToggles"
 import { IconButton } from "./IconButton"
@@ -242,24 +242,21 @@ export const AutoApproveDropdown = ({ disabled = false, triggerClassName = "" }:
 							const isEnabled = toggles[key]
 							return (
 								<StandardTooltip key={key} content={t(descriptionKey)}>
-									<button
+									<Button
+										variant={isEnabled ? "primary" : "secondary"}
 										onClick={() => onAutoApproveToggle(key, !isEnabled)}
 										className={cn(
-											"flex items-center gap-2 px-2 py-2 rounded text-sm text-left",
+											"flex items-center gap-2 px-2 py-2 text-sm text-left justify-start h-auto",
 											"transition-all duration-150",
-											"opacity-100 hover:opacity-70",
-											"cursor-pointer",
 											!effectiveAutoApprovalEnabled &&
 												"opacity-50 cursor-not-allowed hover:opacity-50",
-											isEnabled
-												? "bg-vscode-button-background text-vscode-button-foreground"
-												: "bg-vscode-button-background/15 text-vscode-foreground hover:bg-vscode-list-hoverBackground",
+											!isEnabled && "bg-vscode-button-background/15",
 										)}
 										disabled={!effectiveAutoApprovalEnabled}
 										data-testid={`auto-approve-${key}`}>
 										<span className={`codicon codicon-${icon} text-sm flex-shrink-0`} />
 										<span className="flex-1 truncate">{t(labelKey)}</span>
-									</button>
+									</Button>
 								</StandardTooltip>
 							)
 						})}
@@ -270,44 +267,32 @@ export const AutoApproveDropdown = ({ disabled = false, triggerClassName = "" }:
 						<IconButton iconClass="codicon-settings-gear" onClick={handleOpenSettings} />
 
 						<div className="flex flex-row gap-1">
-							<button
+							<Button
+								variant="ghost"
+								size="sm"
 								aria-label={t("chat:autoApprove.selectAll")}
 								onClick={handleSelectAll}
 								disabled={!effectiveAutoApprovalEnabled}
 								className={cn(
-									"relative inline-flex items-center justify-center gap-1",
-									"bg-transparent border-none px-2 py-1",
-									"rounded-md text-base font-bold",
-									"text-vscode-foreground",
-									"transition-all duration-150",
-									"hover:opacity-100 hover:bg-[rgba(255,255,255,0.03)]",
-									"focus:outline-none focus-visible:ring-1 focus-visible:ring-vscode-focusBorder",
-									"active:bg-[rgba(255,255,255,0.1)]",
-									"cursor-pointer",
+									"gap-1 px-2 py-1 text-base font-bold h-auto",
 									!effectiveAutoApprovalEnabled && "opacity-50 hover:opacity-50 cursor-not-allowed",
 								)}>
 								<ListChecks className="w-3.5 h-3.5" />
 								<span>{t("chat:autoApprove.all")}</span>
-							</button>
-							<button
+							</Button>
+							<Button
+								variant="ghost"
+								size="sm"
 								aria-label={t("chat:autoApprove.selectNone")}
 								onClick={handleSelectNone}
 								disabled={!effectiveAutoApprovalEnabled}
 								className={cn(
-									"relative inline-flex items-center justify-center gap-1",
-									"bg-transparent border-none px-2 py-1",
-									"rounded-md text-base font-bold",
-									"text-vscode-foreground",
-									"transition-all duration-150",
-									"hover:opacity-100 hover:bg-[rgba(255,255,255,0.03)]",
-									"focus:outline-none focus-visible:ring-1 focus-visible:ring-vscode-focusBorder",
-									"active:bg-[rgba(255,255,255,0.1)]",
-									"cursor-pointer",
+									"gap-1 px-2 py-1 text-base font-bold h-auto",
 									!effectiveAutoApprovalEnabled && "opacity-50 hover:opacity-50 cursor-not-allowed",
 								)}>
 								<LayoutList className="w-3.5 h-3.5" />
 								<span>{t("chat:autoApprove.none")}</span>
-							</button>
+							</Button>
 						</div>
 					</div>
 				</div>
 
@@ -1,10 +1,10 @@
 import React, { memo, useState } from "react"
-import { VSCodeButton } from "@vscode/webview-ui-toolkit/react"
 import { Trans } from "react-i18next"
 
 import type { ClineMessage } from "@roo-code/types"
 
 import { vscode } from "@src/utils/vscode"
+import { Button } from "@src/components/ui"
 
 type AutoApprovedRequestLimitWarningProps = {
 	message: ClineMessage
@@ -50,15 +50,15 @@ export const AutoApprovedRequestLimitWarning = memo(({ message }: AutoApprovedRe
 				<div className="flex justify-between items-center">
 					<Trans i18nKey={descriptionKey} ns="chat" values={{ count }} />
 				</div>
-				<VSCodeButton
+				<Button
 					style={{ width: "100%", padding: "6px", borderRadius: "4px" }}
 					onClick={(e) => {
 						e.preventDefault()
 						setButtonClicked(true)
 						vscode.postMessage({ type: "askResponse", askResponse: "yesButtonClicked" })
 					}}>
 					<Trans i18nKey={buttonKey} ns="chat" />
-				</VSCodeButton>
+				</Button>
 			</div>
 		</>
 	)
 
@@ -2,14 +2,14 @@ import React, { memo, useEffect, useMemo, useRef, useState } from "react"
 import { useSize } from "react-use"
 import deepEqual from "fast-deep-equal"
 import { useTranslation } from "react-i18next"
-import { VSCodeButton } from "@vscode/webview-ui-toolkit/react"
 
 import type { ClineMessage } from "@roo-code/types"
 
 import { BrowserAction, BrowserActionResult, ClineSayBrowserAction } from "@roo/ExtensionMessage"
 
 import { vscode } from "@src/utils/vscode"
 import { useExtensionState } from "@src/context/ExtensionStateContext"
+import { Button } from "@src/components/ui"
 
 import CodeBlock, { CODE_BLOCK_BG_COLOR } from "../common/CodeBlock"
 import { ChatRowContent } from "./ChatRow"
@@ -372,16 +372,16 @@ const BrowserSessionRow = memo((props: BrowserSessionRowProps) => {
 						{t("chat:browser.navigation.step", { current: currentPageIndex + 1, total: pages.length })}
 					</div>
 					<div style={{ display: "flex", gap: "4px" }}>
-						<VSCodeButton
+						<Button
 							disabled={currentPageIndex === 0 || isBrowsing}
 							onClick={() => setCurrentPageIndex((i) => i - 1)}>
 							{t("chat:browser.navigation.previous")}
-						</VSCodeButton>
-						<VSCodeButton
+						</Button>
+						<Button
 							disabled={currentPageIndex === pages.length - 1 || isBrowsing}
 							onClick={() => setCurrentPageIndex((i) => i + 1)}>
 							{t("chat:browser.navigation.next")}
-						</VSCodeButton>
+						</Button>
 					</div>
 				</div>
 			)}