fix(webview): sync view local state after profile mutations

Author: easonliang28

src/core/webview/ClineProvider.ts

@@ -1800,13 +1800,21 @@ export class ClineProvider
 				// this.contextProxy.setValues({ ...providerSettings, listApiConfigMeta: ..., currentApiConfigName: ... })
 				// We should probably switch to that and verify that it works.
 				// I left the original implementation in just to be safe.
+				const listApiConfigMeta = await this.providerSettingsManager.listConfig()
+
 				await Promise.all([
-					this.updateGlobalState("listApiConfigMeta", await this.providerSettingsManager.listConfig()),
+					this.updateGlobalState("listApiConfigMeta", listApiConfigMeta),
 					this.updateGlobalState("currentApiConfigName", name),
 					this.providerSettingsManager.setModeConfig(mode, id),
 					this.contextProxy.setProviderSettings(providerSettings),
 				])
 
+				this._updateViewLocalStateFromMutation({
+					listApiConfigMeta,
+					currentApiConfigName: name,
+					apiConfiguration: providerSettings,
+				})
+
 				// Change the provider for the current task.
 				// TODO: We should rename `buildApiHandler` for clarity (e.g. `getProviderClient`).
 				this.updateTaskApiHandlerIfNeeded(providerSettings, { forceRebuild: true })
@@ -1849,6 +1857,11 @@ export class ClineProvider
 			listApiConfigMeta: entries,
 		})
 
+		this._updateViewLocalStateFromMutation({
+			currentApiConfigName: profileToActivate,
+			listApiConfigMeta: entries,
+		})
+
 		await this.postStateToWebview()
 	}
 
@@ -1890,12 +1903,20 @@ export class ClineProvider
 		const persistTaskHistory = options?.persistTaskHistory ?? true
 
 		// See `upsertProviderProfile` for a description of what this is doing.
+		const listApiConfigMeta = await this.providerSettingsManager.listConfig()
+
 		await Promise.all([
-			this.contextProxy.setValue("listApiConfigMeta", await this.providerSettingsManager.listConfig()),
+			this.contextProxy.setValue("listApiConfigMeta", listApiConfigMeta),
 			this.contextProxy.setValue("currentApiConfigName", name),
 			this.contextProxy.setProviderSettings(providerSettings),
 		])
 
+		this._updateViewLocalStateFromMutation({
+			listApiConfigMeta,
+			currentApiConfigName: name,
+			apiConfiguration: providerSettings,
+		})
+
 		const { mode } = await this.getState()
 
 		if (id && persistModeConfig) {
@@ -3040,7 +3061,7 @@ export class ClineProvider
 	 * profile upsert/activation/deletion, or resetState. This ensures the local cache stays in
 	 * sync with global state changes that would otherwise be invisible behind mergedStateValues.
 	 */
-	private _updateViewLocalStateFromMutation(values: Partial<RooCodeSettings>): void {
+	private _updateViewLocalStateFromMutation(values: Partial<RooCodeSettings> & Partial<ExtensionState>): void {
 		if ("mode" in values) {
 			const val = values.mode
 			if (val === undefined || val === null) {
@@ -3116,6 +3137,9 @@ export class ClineProvider
 
 		await this.contextProxy.resetAllState()
 
+		// Clear view-local state cache so getState() falls back to ContextProxy defaults.
+		this._clearViewLocalState()
+
 		await this.providerSettingsManager.resetAllConfigs()
 		await this.customModesManager.resetCustomModes()
 		await this.removeClineFromStack()

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

@@ -290,6 +290,10 @@ vi.mock("../../config/ContextProxy", () => {
 			)
 		})
 		setProviderSettings = vi.fn().mockImplementation((settings: Record<string, any>) => this.setValues(settings))
+		resetAllState = vi.fn().mockImplementation(() => {
+			const keys = this.context?.globalState?.keys?.() ?? []
+			return Promise.all(keys.map((key: string) => this.setValue(key, undefined))).then(() => undefined)
+		})
 	}
 	return { ContextProxy: MockContextProxy }
 })
@@ -482,6 +486,7 @@ vi.mock("../../config/ProviderSettingsManager", () => ({
 			})),
 			setModeConfig: vi.fn().mockResolvedValue(undefined),
 			getModeConfigId: vi.fn().mockResolvedValue(undefined),
+			resetAllConfigs: vi.fn().mockResolvedValue(undefined),
 		}
 	}),
 }))
@@ -492,6 +497,7 @@ vi.mock("../../config/CustomModesManager", () => ({
 		return {
 			updateCustomMode: vi.fn().mockResolvedValue(undefined),
 			getCustomModes: vi.fn().mockResolvedValue([]),
+			resetCustomModes: vi.fn().mockResolvedValue(undefined),
 			dispose: vi.fn(),
 		}
 	}),
@@ -1038,6 +1044,106 @@ describe("ClineProvider - Parallel Mode Support", () => {
 		})
 	})
 
+	describe("profile mutations", () => {
+		it("should synchronize viewLocalState when activateProviderProfile mutates ContextProxy", async () => {
+			const provider = new ClineProvider(mockContext, mockOutputChannel, "sidebar", new ContextProxy(mockContext))
+			vi.spyOn(provider.providerSettingsManager, "activateProfile").mockResolvedValueOnce({
+				name: "new-profile",
+				id: "new-profile-id",
+				apiProvider: "openrouter",
+				openRouterModelId: "openrouter/new-model",
+			} as any)
+			vi.spyOn(provider.providerSettingsManager, "listConfig").mockResolvedValueOnce([
+				{ id: "new-profile-id", name: "new-profile", apiProvider: "openrouter" },
+			] as any)
+			;(provider as any).viewLocalState = {
+				currentApiConfigName: "stale-profile",
+				apiConfiguration: { apiProvider: "anthropic" },
+			}
+
+			await provider.activateProviderProfile({ name: "new-profile" })
+			const state = await provider.getState()
+
+			expect(state.currentApiConfigName).toBe("new-profile")
+			expect(state.apiConfiguration).toMatchObject({
+				apiProvider: "openrouter",
+				openRouterModelId: "openrouter/new-model",
+			})
+
+			await provider.dispose()
+		})
+
+		it("should synchronize viewLocalState when upsertProviderProfile activates a saved profile", async () => {
+			const provider = new ClineProvider(mockContext, mockOutputChannel, "sidebar", new ContextProxy(mockContext))
+			vi.spyOn(provider.providerSettingsManager, "listConfig").mockResolvedValue([
+				{ id: "test-id", name: "saved-profile", apiProvider: "bedrock" },
+			] as any)
+			;(provider as any).viewLocalState = {
+				currentApiConfigName: "stale-profile",
+				apiConfiguration: { apiProvider: "anthropic" },
+			}
+
+			await provider.upsertProviderProfile("saved-profile", {
+				apiProvider: "bedrock",
+				awsRegion: "us-east-1",
+			} as any)
+			const state = await provider.getState()
+
+			expect(state.currentApiConfigName).toBe("saved-profile")
+			expect(state.apiConfiguration).toMatchObject({
+				apiProvider: "bedrock",
+				awsRegion: "us-east-1",
+			})
+
+			await provider.dispose()
+		})
+
+		it("should synchronize viewLocalState when deleteProviderProfile selects a replacement profile", async () => {
+			const provider = new ClineProvider(mockContext, mockOutputChannel, "sidebar", new ContextProxy(mockContext))
+			await provider.contextProxy.setValue("currentApiConfigName" as any, "deleted-profile")
+			await provider.contextProxy.setValue("listApiConfigMeta" as any, [
+				{ id: "deleted-id", name: "deleted-profile", apiProvider: "anthropic" },
+				{ id: "replacement-id", name: "replacement-profile", apiProvider: "openrouter" },
+			])
+			;(provider as any).viewLocalState = {
+				currentApiConfigName: "deleted-profile",
+				apiConfiguration: { apiProvider: "anthropic" },
+			}
+
+			await provider.deleteProviderProfile({
+				id: "deleted-id",
+				name: "deleted-profile",
+				apiProvider: "anthropic",
+			} as any)
+			const state = await provider.getState()
+
+			expect(state.currentApiConfigName).toBe("replacement-profile")
+			expect(state.listApiConfigMeta).toEqual([
+				{ id: "replacement-id", name: "replacement-profile", apiProvider: "openrouter" },
+			])
+
+			await provider.dispose()
+		})
+
+		it("should clear viewLocalState when resetState resets ContextProxy", async () => {
+			vi.mocked(vscode.window.showInformationMessage).mockImplementationOnce(
+				async (_message: string, _options: unknown, confirm: unknown) => confirm as any,
+			)
+			const provider = new ClineProvider(mockContext, mockOutputChannel, "sidebar", new ContextProxy(mockContext))
+			;(provider as any).viewLocalState = {
+				mode: "architect",
+				currentApiConfigName: "stale-profile",
+				apiConfiguration: { apiProvider: "openrouter" },
+			}
+
+			await provider.resetState()
+
+			expect((provider as any).viewLocalState).toEqual({})
+
+			await provider.dispose()
+		})
+	})
+
 	describe("handleModeSwitch integration", () => {
 		it("should update viewLocalState.mode when handleModeSwitch is called", async () => {
 			const postMessage = vi.fn()