feat(webview): isolate parallel mode and profile writes

Author: easonliang28

src/core/webview/ClineProvider.ts

@@ -1674,8 +1674,8 @@ export class ClineProvider
 				// The task will continue with the current/default configuration.
 			}
 		} else {
-			// If no saved config for this mode, save current config as default.
-			const currentApiConfigNameAfter = this.getGlobalState("currentApiConfigName")
+			// If no saved config for this mode, save this view's current config as default.
+			const { currentApiConfigName: currentApiConfigNameAfter } = await this.getState()
 
 			if (currentApiConfigNameAfter) {
 				const config = listApiConfig.find((c) => c.name === currentApiConfigNameAfter)
@@ -1772,6 +1772,8 @@ export class ClineProvider
 					this.updateGlobalState("currentApiConfigName", name),
 					this.providerSettingsManager.setModeConfig(mode, id),
 					this.contextProxy.setProviderSettings(providerSettings),
+					this.saveViewState("currentApiConfigName", name),
+					this.saveViewState("apiConfiguration", providerSettings),
 				])
 
 				// Change the provider for the current task.
@@ -1797,8 +1799,10 @@ export class ClineProvider
 	}
 
 	async deleteProviderProfile(profileToDelete: ProviderSettingsEntry) {
-		const globalSettings = this.contextProxy.getValues()
-		let profileToActivate: string | undefined = globalSettings.currentApiConfigName
+		// Use merged state (view-local + global) so this tab reads its own current profile,
+		// not another parallel tab's latest shared ContextProxy value.
+		const { currentApiConfigName } = await this.getState()
+		let profileToActivate: string | undefined = currentApiConfigName
 
 		if (profileToDelete.name === profileToActivate) {
 			profileToActivate = this.getProviderProfileEntries().find(({ name }) => name !== profileToDelete.name)?.name
@@ -1809,12 +1813,14 @@ export class ClineProvider
 		}
 
 		const entries = this.getProviderProfileEntries().filter(({ name }) => name !== profileToDelete.name)
+		const globalSettings = await this.getState()
 
 		await this.contextProxy.setValues({
 			...globalSettings,
 			currentApiConfigName: profileToActivate,
 			listApiConfigMeta: entries,
 		})
+		await this.saveViewState("currentApiConfigName", profileToActivate)
 
 		await this.postStateToWebview()
 	}
@@ -1861,6 +1867,8 @@ export class ClineProvider
 			this.contextProxy.setValue("listApiConfigMeta", await this.providerSettingsManager.listConfig()),
 			this.contextProxy.setValue("currentApiConfigName", name),
 			this.contextProxy.setProviderSettings(providerSettings),
+			this.saveViewState("currentApiConfigName", name),
+			this.saveViewState("apiConfiguration", providerSettings),
 		])
 
 		const { mode } = await this.getState()

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

@@ -1022,6 +1022,132 @@ describe("ClineProvider - Parallel Mode Support", () => {
 		})
 	})
 
+	describe("parallel mode writes", () => {
+		it("should persist mode switches to the stable view-local state key", async () => {
+			const provider = new ClineProvider(mockContext, mockOutputChannel, "sidebar", new ContextProxy(mockContext))
+			await (provider as any).setViewStateId("stable-sidebar-mode")
+			const contextProxySpy = vi.spyOn(provider.contextProxy, "setValue")
+
+			await provider.handleModeSwitch("architect")
+
+			expect(contextProxySpy).toHaveBeenCalledWith("__view_state_stable-sidebar-mode_mode", "architect")
+			const state = await provider.getState()
+			expect(state.mode).toBe("architect")
+
+			await provider.dispose()
+		})
+
+		it("should keep mode switches isolated between parallel provider instances", async () => {
+			const provider1 = new ClineProvider(
+				mockContext,
+				mockOutputChannel,
+				"sidebar",
+				new ContextProxy(mockContext),
+			)
+			const provider2 = new ClineProvider(mockContext, mockOutputChannel, "editor", new ContextProxy(mockContext))
+			await (provider1 as any).setViewStateId("stable-sidebar-mode-a")
+			await (provider2 as any).setViewStateId("stable-editor-mode-b")
+
+			await provider1.handleModeSwitch("architect")
+			await provider2.handleModeSwitch("debugger" as any)
+
+			const state1 = await provider1.getState()
+			const state2 = await provider2.getState()
+			expect(state1.mode).toBe("architect")
+			expect(state2.mode).toBe("debugger")
+			expect(provider1.contextProxy.getValue("__view_state_stable-sidebar-mode-a_mode" as any)).toBe("architect")
+			expect(provider2.contextProxy.getValue("__view_state_stable-editor-mode-b_mode" as any)).toBe("debugger")
+
+			await provider1.dispose()
+			await provider2.dispose()
+		})
+
+		it("should update view-local profile state when activating a provider profile", async () => {
+			const provider = new ClineProvider(mockContext, mockOutputChannel, "sidebar", new ContextProxy(mockContext))
+			await (provider as any).setViewStateId("stable-sidebar-profile")
+			const providerSettings = {
+				apiProvider: "openrouter" as const,
+				openRouterModelId: "openrouter/anthropic/claude-sonnet-4",
+			}
+			vi.spyOn(provider.providerSettingsManager, "activateProfile").mockResolvedValue({
+				name: "profile-a",
+				id: "profile-a-id",
+				...providerSettings,
+			} as any)
+			vi.spyOn(provider.providerSettingsManager, "listConfig").mockResolvedValue([
+				{ name: "profile-a", id: "profile-a-id", apiProvider: "openrouter" },
+			])
+
+			await provider.activateProviderProfile({ name: "profile-a" })
+
+			const state = await provider.getState()
+			expect(state.currentApiConfigName).toBe("profile-a")
+			expect(state.apiConfiguration).toMatchObject(providerSettings)
+			expect(
+				provider.contextProxy.getValue("__view_state_stable-sidebar-profile_currentApiConfigName" as any),
+			).toBe("profile-a")
+			expect(
+				provider.contextProxy.getValue("__view_state_stable-sidebar-profile_apiConfiguration" as any),
+			).toMatchObject(providerSettings)
+
+			await provider.dispose()
+		})
+
+		it("should update view-local profile state when upserting and activating a provider profile", async () => {
+			const provider = new ClineProvider(mockContext, mockOutputChannel, "sidebar", new ContextProxy(mockContext))
+			await (provider as any).setViewStateId("stable-sidebar-upsert")
+			const providerSettings = {
+				apiProvider: "openrouter" as const,
+				openRouterModelId: "openrouter/anthropic/claude-sonnet-4",
+			}
+			vi.spyOn(provider.providerSettingsManager, "saveConfig").mockResolvedValue("profile-b-id")
+			vi.spyOn(provider.providerSettingsManager, "listConfig").mockResolvedValue([
+				{ name: "profile-b", id: "profile-b-id", apiProvider: "openrouter" },
+			])
+
+			await provider.upsertProviderProfile("profile-b", providerSettings, true)
+
+			const state = await provider.getState()
+			expect(state.currentApiConfigName).toBe("profile-b")
+			expect(state.apiConfiguration).toMatchObject(providerSettings)
+			expect(
+				provider.contextProxy.getValue("__view_state_stable-sidebar-upsert_currentApiConfigName" as any),
+			).toBe("profile-b")
+			expect(
+				provider.contextProxy.getValue("__view_state_stable-sidebar-upsert_apiConfiguration" as any),
+			).toMatchObject(providerSettings)
+
+			await provider.dispose()
+		})
+	})
+
+	describe("deleteProviderProfile", () => {
+		it("should use merged view-local state when choosing the profile to keep", async () => {
+			const provider = new ClineProvider(mockContext, mockOutputChannel, "sidebar", new ContextProxy(mockContext))
+			await (provider as any).setViewStateId("stable-delete-profile")
+			await (provider as any).saveViewState("currentApiConfigName", "profile-b")
+
+			await provider.contextProxy.setValues({
+				currentApiConfigName: "profile-a",
+				listApiConfigMeta: [
+					{ id: "a-id", name: "profile-a", apiProvider: "anthropic" },
+					{ id: "b-id", name: "profile-b", apiProvider: "openrouter" },
+					{ id: "del-id", name: "profile-to-delete", apiProvider: "anthropic" },
+				],
+			})
+
+			await provider.deleteProviderProfile({ id: "del-id", name: "profile-to-delete", apiProvider: "anthropic" })
+
+			const state = await provider.getState()
+			expect(state.currentApiConfigName).toBe("profile-b")
+			expect(
+				provider.contextProxy.getValue("__view_state_stable-delete-profile_currentApiConfigName" as any),
+			).toBe("profile-b")
+
+			await provider.dispose()
+		})
+	})
+
 	describe("_clearViewLocalState", () => {
 		it("should clear all view-local state values", async () => {
 			const provider = new ClineProvider(mockContext, mockOutputChannel, "sidebar", new ContextProxy(mockContext))

src/core/webview/__tests__/webviewMessageHandler.spec.ts

@@ -239,6 +239,21 @@ describe("webviewMessageHandler - webviewDidLaunch", () => {
 	})
 })
 
+describe("webviewMessageHandler - mode", () => {
+	beforeEach(() => {
+		vi.clearAllMocks()
+		vi.mocked(mockClineProvider.contextProxy.setValue).mockResolvedValue(undefined)
+		;(mockClineProvider as any).handleModeSwitch = vi.fn().mockResolvedValue(undefined)
+	})
+
+	it("routes mode messages through handleModeSwitch instead of writing ContextProxy directly", async () => {
+		await webviewMessageHandler(mockClineProvider, { type: "mode", text: "architect" })
+
+		expect((mockClineProvider as any).handleModeSwitch).toHaveBeenCalledWith("architect")
+		expect(mockClineProvider.contextProxy.setValue).not.toHaveBeenCalledWith("mode", expect.anything())
+	})
+})
+
 describe("webviewMessageHandler - requestLmStudioModels", () => {
 	beforeEach(() => {
 		vi.clearAllMocks()