@@ -2544,6 +2544,15 @@ export class ClineProvider
 					// applies only mode, currentApiConfigName, apiConfiguration and provider-settings keys, so a
 					// listApiConfigMeta-only payload (deleted call or empty object) is a behavior-preserving no-op.
 					this._updateViewLocalStateFromMutation({ listApiConfigMeta })
+
+					// A save that does not activate still changes the profile's settings, and
+					// every view pinned to it buffers a full copy of them. Refresh those views
+					// (and this one when it is the pinned view) or their getState() keeps
+					// serving the settings captured before the save under the same name.
+					if (this.pinnedProfileName === name) {
+						await this._saveViewLocalStateFromMutation({ apiConfiguration: providerSettings })
+					}
+					await this.refreshViewLocalStateForUpdatedProfile(name, providerSettings)
 				}
 
 				await this.postStateToWebview()
@@ -3072,8 +3081,10 @@ export class ClineProvider
 						// picks up the new token immediately for the current task.
 						await this.upsertProviderProfile(entry.name, updated, true)
 					} else {
-						// Non-active profiles just need the token saved to disk.
-						await this.providerSettingsManager.saveConfig(entry.name, updated)
+						// Non-active profiles need the token saved to disk and the views pinned
+						// to them refreshed: a direct saveConfig leaves a pinned view serving the
+						// old token until it reloads.
+						await this.upsertProviderProfile(entry.name, updated, false)
 					}
 				}
 			}
@@ -3886,11 +3897,21 @@ export class ClineProvider
 		const taskSyncEnabled: boolean = false
 
 		// Return the same structure as before.
+		// A view-local profile is a complete snapshot, not a patch over the shared store.
+		// Spreading it on top of providerSettings would let a key the profile never defined
+		// leak in from another profile, which ContextProxy.setProviderSettings deliberately
+		// prevents by clearing omitted keys. Use the view's own settings in place and take
+		// only apiProvider from the shared state when the profile does not carry one.
+		const viewApiConfiguration = mergedStateValues.apiConfiguration
+		const resolvedApiConfiguration = viewApiConfiguration
+			? {
+					...viewApiConfiguration,
+					apiProvider: viewApiConfiguration.apiProvider ?? providerSettings.apiProvider,
+				}
+			: providerSettings
+
 		return {
-			apiConfiguration: {
-				...providerSettings,
-				...mergedStateValues.apiConfiguration,
-			},
+			apiConfiguration: resolvedApiConfiguration,
 			lastShownAnnouncementId: mergedStateValues.lastShownAnnouncementId,
 			customInstructions: mergedStateValues.customInstructions,
 			apiModelId: mergedStateValues.apiModelId,
 
@@ -501,6 +501,13 @@ describe("ClineProvider", () => {
 	let mockPostMessage: any
 	let updateGlobalStateSpy: any
 
+	afterEach(() => {
+		// Tests construct providers directly and many never dispose them; clear the
+		// static registry so a leaked instance cannot claim stable view state ids
+		// ahead of a later test.
+		ClineProvider["activeInstances"] = new Set()
+	})
+
 	beforeEach(() => {
 		vi.clearAllMocks()
 
@@ -2351,6 +2358,10 @@ describe("ClineProvider", () => {
 			})
 			// @ts-ignore - Replace providerSettingsManager with a test double for the profile lookup.
 			provider.providerSettingsManager = { getProfile: getProfileSpy }
+			// The ownership check requires the writer to release the id before the
+			// next view adopts it; the durable entry it wrote stays in storage.
+			await writer.dispose()
+
 			await provider.contextProxy.setValue(
 				"viewStates",
 				mockContext.globalState.get<RooCodeSettings["viewStates"]>("viewStates"),
@@ -2363,7 +2374,6 @@ describe("ClineProvider", () => {
 			})
 			expect(getProfileSpy).toHaveBeenCalledWith({ name: "my-profile" })
 			expect(logSpy).toHaveBeenCalledWith(expect.stringContaining("Loaded state for viewId"))
-			await writer.dispose()
 			await provider.dispose()
 		})
 
@@ -2491,6 +2501,10 @@ describe("ClineProvider", () => {
 			}
 			// A pre-load buffer write that was never persisted must not be merged over the load.
 			provider["viewLocalState"] = { mode: "architect" }
+			// The ownership check requires the writer to release the id before the
+			// next view adopts it; the durable entry it wrote stays in storage.
+			await writer.dispose()
+
 			await provider.contextProxy.setValue(
 				"viewStates",
 				mockContext.globalState.get<RooCodeSettings["viewStates"]>("viewStates"),
@@ -2502,7 +2516,6 @@ describe("ClineProvider", () => {
 				apiProvider: providerIdentifiers.openrouter,
 				openRouterModelId: "model-x",
 			})
-			await writer.dispose()
 			await provider.dispose()
 		})
 
@@ -2892,6 +2905,10 @@ describe("ClineProvider", () => {
 				}),
 			}
 			vi.spyOn(provider, "postStateToWebview").mockResolvedValue(undefined)
+			// The ownership check requires the writer to release the id before the
+			// next view adopts it; the durable entry it wrote stays in storage.
+			await writer.dispose()
+
 			await provider.contextProxy.setValue(
 				"viewStates",
 				mockContext.globalState.get<RooCodeSettings["viewStates"]>("viewStates"),
@@ -2904,7 +2921,6 @@ describe("ClineProvider", () => {
 			// The buffer must track the activated profile so getValues() agrees with the proxy.
 			expect(provider.getValues().currentApiConfigName).toBe("new-profile")
 			expect(provider.contextProxy.getValue("currentApiConfigName")).toBe("new-profile")
-			await writer.dispose()
 			await provider.dispose()
 		})
 
@@ -6997,6 +7013,11 @@ describe("getTelemetryProperties", () => {
 			const { CloudService } = await import("@roo-code/cloud")
 			const mockCloudService = {
 				isAuthenticated: vi.fn().mockReturnValue(true),
+
+				// Provider dispose detaches the settings listener; later tests construct
+				// and dispose providers against this surviving instance getter.
+				on: vi.fn(),
+				off: vi.fn(),
 			}
 
 			// Update the existing mock
@@ -7015,6 +7036,11 @@ describe("getTelemetryProperties", () => {
 			const { CloudService } = await import("@roo-code/cloud")
 			const mockCloudService = {
 				isAuthenticated: vi.fn().mockReturnValue(false),
+
+				// Provider dispose detaches the settings listener; later tests construct
+				// and dispose providers against this surviving instance getter.
+				on: vi.fn(),
+				off: vi.fn(),
 			}
 
 			// Update the existing mock
@@ -7056,6 +7082,11 @@ describe("getTelemetryProperties", () => {
 				isAuthenticated: vi.fn().mockImplementation(() => {
 					throw new Error("Authentication check error")
 				}),
+
+				// Provider dispose detaches the settings listener; later tests construct
+				// and dispose providers against this surviving instance getter.
+				on: vi.fn(),
+				off: vi.fn(),
 			}
 
 			// Update the existing mock
@@ -8560,12 +8591,15 @@ describe("ClineProvider - Comprehensive Edit/Delete Edge Cases", () => {
 					}),
 					true,
 				)
-				expect(saveConfig).toHaveBeenCalledWith(
+				// The non-active profile now goes through upsertProviderProfile so the views
+				// pinned to it are refreshed, not just the file on disk.
+				expect(upsertSpy).toHaveBeenCalledWith(
 					"Backup Zoo",
 					expect.objectContaining({
 						zooSessionToken: "new-token",
 						zooGatewayBaseUrl: "https://www.zoocode.dev/api/gateway/v1",
 					}),
+					false,
 				)
 			})
 
@@ -8662,4 +8696,85 @@ describe("ClineProvider - Comprehensive Edit/Delete Edge Cases", () => {
 			})
 		})
 	})
+	describe("profile save without activation and overlay completeness", () => {
+		it("refreshes views pinned to a profile saved without activation", async () => {
+			// Defensive: the doubles in this suite can leave console writes pending
+			// at worker teardown.
+			vi.spyOn(console, "log").mockImplementation(() => {})
+			vi.spyOn(console, "warn").mockImplementation(() => {})
+			vi.spyOn(console, "error").mockImplementation(() => {})
+			const sibling = new ClineProvider(
+				mockContext,
+				mockOutputChannel,
+				"editor",
+				new ContextProxy(mockContext),
+				new WebviewFocusTracker(),
+			)
+			try {
+				// The sibling loaded the profile earlier: its buffer pins the name and
+				// carries the settings snapshot taken at that load.
+				sibling["viewLocalState"].currentApiConfigName = "saved-profile"
+				sibling["viewLocalState"].apiConfiguration = {
+					apiProvider: providerIdentifiers.anthropic,
+					apiKey: "old-key",
+				}
+				vi.spyOn(sibling, "postStateToWebview").mockResolvedValue(undefined)
+				vi.spyOn(provider, "postStateToWebview").mockResolvedValue(undefined)
+				// @ts-ignore - Replace providerSettingsManager with a test double.
+				provider.providerSettingsManager = {
+					saveConfig: vi.fn().mockResolvedValue("saved-id"),
+					listConfig: vi.fn().mockResolvedValue([]),
+					setModeConfig: vi.fn(),
+				}
+
+				await provider.upsertProviderProfile(
+					"saved-profile",
+					{ apiProvider: providerIdentifiers.anthropic, apiKey: "new-key" },
+					false,
+				)
+
+				// A save that does not activate still rewrites the profile; the pinned
+				// sibling must not keep serving the pre-save snapshot.
+				expect(sibling["viewLocalState"].apiConfiguration).toEqual({
+					apiProvider: providerIdentifiers.anthropic,
+					apiKey: "new-key",
+				})
+				// Let queued view-local persistence settle while the console spies are
+				// still installed, so teardown has no pending writes.
+				await new Promise((resolve) => setTimeout(resolve, 50))
+			} finally {
+				await sibling.dispose()
+			}
+		})
+
+		it("does not leak shared provider keys into a pinned view's api configuration", async () => {
+			vi.spyOn(console, "log").mockImplementation(() => {})
+			vi.spyOn(console, "warn").mockImplementation(() => {})
+			// The shared store sits on a profile with keys the pinned profile never
+			// sets; spreading the overlay over the shared keys would report a mixed
+			// configuration (e.g. another profile's model id and region).
+			await provider.contextProxy.setValue("apiProvider", providerIdentifiers.bedrock)
+			await provider.contextProxy.setValue("apiModelId", "anthropic.claude-v1")
+			await provider.contextProxy.setValue("awsRegion", "us-east-1")
+			provider["viewLocalState"].currentApiConfigName = "pinned-profile"
+			provider["viewLocalState"].apiConfiguration = {
+				apiProvider: providerIdentifiers.anthropic,
+				apiKey: "k",
+			}
+
+			// The cloud doubles in this suite make getState() log its defensive catch
+			// branches; silence them so teardown has no pending console writes.
+			vi.spyOn(console, "error").mockImplementation(() => {})
+
+			const state = await provider.getState()
+
+			expect(state.apiConfiguration.apiProvider).toBe(providerIdentifiers.anthropic)
+			expect(state.apiConfiguration.apiKey).toBe("k")
+			expect(state.apiConfiguration.apiModelId).toBeUndefined()
+			expect(state.apiConfiguration.awsRegion).toBeUndefined()
+
+			// Let any deferred logging settle while the spies are installed.
+			await new Promise((resolve) => setTimeout(resolve, 50))
+		})
+	})
 })