fix(webview): sync the view-local buffer through wrapped apiConfiguration mutations

- E1: move the provider-release switch test into switchModeTool.spec where the switchModeTool layer is the narrowest proof

- E2: assert the state postMessage shape in the mode-lock switch test

- E3: prune invalid persisted view-state entries before applying the cap

- wrap the upsert and activate buffer-refresh calls so the view-local apiConfiguration buffer tracks the activated profile again; flat provider-settings keys no longer merge into the buffer

Author: easonliang28

src/core/tools/__tests__/switchModeTool.spec.ts

@@ -362,4 +362,38 @@ describe("SwitchModeTool", () => {
 			"Successfully switched from Code mode to Ask mode because: test.",
 		)
 	})
+
+	// SwitchModeTool routes the switch through task.providerRef.deref()?.handleModeSwitch:
+	// when the provider was already disposed the deref is undefined, so the optional chain
+	// must swallow the call and the tool still reports success instead of erroring out.
+	it("should report a successful switch when the provider reference is already released", async () => {
+		const toolTask = {
+			consecutiveMistakeCount: 0,
+			recordToolError: vi.fn(),
+			didToolFailInCurrentTurn: false,
+			sayAndCreateMissingParamError: vi.fn().mockResolvedValue("Missing parameter error"),
+			ask: vi.fn().mockResolvedValue({}),
+			getTaskMode: vi.fn().mockResolvedValue("code"),
+			providerRef: {
+				deref: vi.fn().mockReturnValue(undefined),
+			},
+		} as unknown as Task // structural double: the tool only reads the fields above
+		const callbacks: ToolCallbacks = {
+			askApproval: vi.fn().mockResolvedValue(true),
+			handleError: vi.fn(),
+			pushToolResult: vi.fn(),
+		}
+		const block = {
+			type: "tool_use" as const,
+			name: "switch_mode" as const,
+			params: { mode_slug: "architect", reason: "test" },
+			partial: false,
+			nativeArgs: { mode_slug: "architect", reason: "test" },
+		} as unknown as ToolUse<"switch_mode"> // mirrors the createBlock helper above
+
+		await switchModeTool.handle(toolTask, block, callbacks)
+
+		expect(callbacks.handleError).not.toHaveBeenCalled()
+		expect(callbacks.pushToolResult).toHaveBeenCalledWith(expect.stringContaining("Successfully switched"))
+	})
 })

src/core/webview/ClineProvider.ts

@@ -669,6 +669,7 @@ export class ClineProvider
 	private prunePersistedViewStates(states: Record<string, PersistedViewState>): Record<string, PersistedViewState> {
 		return Object.fromEntries(
 			Object.entries(states)
+				.filter(([, entry]) => !!entry && typeof entry === "object")
 				.sort(([, a], [, b]) => (b.updatedAt ?? 0) - (a.updatedAt ?? 0))
 				.slice(0, ClineProvider.MAX_PERSISTED_VIEW_STATES),
 		)
@@ -2346,7 +2347,7 @@ export class ClineProvider
 						// view-local mutation path: also refresh this view's buffer so a stale
 						// loaded apiConfiguration cannot keep shadowing the new settings in
 						// getState().
-						this._saveViewLocalStateFromMutation(providerSettings),
+						this._saveViewLocalStateFromMutation({ apiConfiguration: providerSettings }),
 					])
 
 					// Other live views may have buffered this profile's settings earlier;
@@ -2553,7 +2554,7 @@ export class ClineProvider
 				// view-local mutation path: also refresh this view's buffer so a stale
 				// loaded apiConfiguration cannot keep shadowing the new settings in
 				// getState().
-				this._saveViewLocalStateFromMutation(providerSettings),
+				this._saveViewLocalStateFromMutation({ apiConfiguration: providerSettings }),
 			])
 
 			// Other live views may have buffered this profile's settings earlier;

src/core/webview/__tests__/ClineProvider.parallelMode.spec.ts

@@ -15,12 +15,9 @@ import {
 import { defaultModeSlug } from "../../../shared/modes"
 import { ContextProxy } from "../../config/ContextProxy"
 import { ClineProvider } from "../ClineProvider"
-import { switchModeTool } from "../../tools/SwitchModeTool"
 import { TelemetryService } from "@roo-code/telemetry"
 
 import type { Task } from "../../task/Task"
-import type { ToolCallbacks } from "../../tools/BaseTool"
-import type { ToolUse } from "../../../shared/tools"
 
 // Mock p-wait-for
 vi.mock("p-wait-for", () => ({
@@ -1111,7 +1108,9 @@ describe("ClineProvider - Parallel Mode Support", () => {
 			await provider.handleModeSwitch("architect")
 
 			expect(getModeConfigIdSpy).not.toHaveBeenCalled()
-			expect(postMessage).toHaveBeenCalled()
+			expect(postMessage).toHaveBeenCalledWith(
+				expect.objectContaining({ type: "state", state: expect.objectContaining({ mode: "architect" }) }),
+			)
 
 			await provider.dispose()
 		})
@@ -1225,40 +1224,6 @@ describe("ClineProvider - Parallel Mode Support", () => {
 			await provider.dispose()
 		})
 
-		// SwitchModeTool routes the switch through task.providerRef.deref()?.handleModeSwitch:
-		// when the provider was already disposed the deref is undefined, so the optional chain
-		// must swallow the call and the tool still reports success instead of erroring out.
-		it("should report a successful switch when the provider reference is already released", async () => {
-			const toolTask = {
-				consecutiveMistakeCount: 0,
-				recordToolError: vi.fn(),
-				didToolFailInCurrentTurn: false,
-				sayAndCreateMissingParamError: vi.fn().mockResolvedValue("Missing parameter error"),
-				ask: vi.fn().mockResolvedValue({}),
-				getTaskMode: vi.fn().mockResolvedValue("code"),
-				providerRef: {
-					deref: vi.fn().mockReturnValue(undefined),
-				},
-			} as unknown as Task // structural double: the tool only reads the fields above
-			const callbacks: ToolCallbacks = {
-				askApproval: vi.fn().mockResolvedValue(true),
-				handleError: vi.fn(),
-				pushToolResult: vi.fn(),
-			}
-			const block = {
-				type: "tool_use" as const,
-				name: "switch_mode" as const,
-				params: { mode_slug: "architect", reason: "test" },
-				partial: false,
-				nativeArgs: { mode_slug: "architect", reason: "test" },
-			} as unknown as ToolUse<"switch_mode"> // mirrors createBlock in switchModeTool.spec.ts
-
-			await switchModeTool.handle(toolTask, block, callbacks)
-
-			expect(callbacks.handleError).not.toHaveBeenCalled()
-			expect(callbacks.pushToolResult).toHaveBeenCalledWith(expect.stringContaining("Successfully switched"))
-		})
-
 		// K1: a no-task switch captures its target before any task is focused; a task gains
 		// focus before the queued mutation runs. The view-level durable write and the
 		// ModeChanged broadcast belong to the view and must still happen.