fix(task): scope profile updates to the focused task

Author: edelauna

src/core/task/Task.ts

@@ -703,6 +703,10 @@ export class Task extends EventEmitter<TaskEvents> implements TaskLike {
 		}
 
 		this.providerProfileChangeListener = async () => {
+			if (provider.getCurrentTask()?.taskId !== this.taskId) {
+				return
+			}
+
 			try {
 				const newState = await provider.getState()
 				if (newState?.apiConfiguration) {
@@ -1537,6 +1541,8 @@ export class Task extends EventEmitter<TaskEvents> implements TaskLike {
 			if (provider) {
 				if (mode) {
 					await provider.setMode(mode)
+					await this.waitForModeInitialization()
+					this._taskMode = mode
 				}
 
 				if (providerProfile) {

src/core/task/__tests__/Task.spec.ts

@@ -8,6 +8,7 @@ import { Anthropic } from "@anthropic-ai/sdk"
 
 import {
 	providerIdentifiers,
+	RooCodeEventName,
 	type GlobalState,
 	type ProviderSettings,
 	type ModelInfo,
@@ -526,6 +527,48 @@ describe("Cline", () => {
 			const metadata = requireDefined(createMessage.mock.calls[0])[2]
 			expect(metadata?.mode).toBe("ask")
 		})
+
+		it("only applies profile changes to the focused task", async () => {
+			const parentConfiguration: ProviderSettings = {
+				...mockApiConfig,
+				apiModelId: "parent-model",
+				rateLimitSeconds: 4,
+			}
+			const childConfiguration: ProviderSettings = {
+				...mockApiConfig,
+				apiModelId: "child-model",
+				rateLimitSeconds: 8,
+			}
+			const activeConfiguration: ProviderSettings = {
+				...mockApiConfig,
+				apiModelId: "active-model",
+				rateLimitSeconds: 12,
+			}
+			const parent = new Task({
+				provider: mockProvider,
+				apiConfiguration: parentConfiguration,
+				taskId: "parent-task",
+				task: "parent task",
+				startTask: false,
+			})
+			const child = new Task({
+				provider: mockProvider,
+				apiConfiguration: childConfiguration,
+				taskId: "child-task",
+				task: "child task",
+				startTask: false,
+			})
+			vi.spyOn(mockProvider, "getCurrentTask").mockReturnValue(child)
+			vi.spyOn(mockProvider, "getState").mockResolvedValue({ apiConfiguration: activeConfiguration })
+
+			mockProvider.emit(RooCodeEventName.ProviderProfileChanged, {
+				name: "active-profile",
+				provider: activeConfiguration.apiProvider,
+			})
+
+			await vi.waitFor(() => expect(child.apiConfiguration).toEqual(activeConfiguration))
+			expect(parent.apiConfiguration).toEqual(parentConfiguration)
+		})
 	})
 
 	describe("sayAndCreateMissingParamError", () => {
@@ -1655,6 +1698,33 @@ describe("Cline", () => {
 				expect(mockProvider.postMessageToWebview).not.toHaveBeenCalled()
 			})
 
+			it("uses a mode selected through submitUserMessage in the next API request", async () => {
+				vi.spyOn(mockProvider, "getState").mockResolvedValue({ mode: "ask", mcpEnabled: false })
+				vi.spyOn(mockProvider, "setMode").mockResolvedValue(undefined)
+				const task = new Task({
+					provider: mockProvider,
+					apiConfiguration: mockApiConfig,
+					task: "initial task",
+					startTask: false,
+				})
+				vi.spyOn(task, "handleWebviewAskResponse").mockImplementation(() => {})
+
+				await task.submitUserMessage("switch modes", undefined, "code")
+				vi.spyOn(getTaskTestAccess(task), "getSystemPrompt").mockResolvedValue("mock system prompt")
+				const stream = (async function* () {
+					yield { type: "text", text: "response" } as ApiStreamChunk
+				})()
+				const createMessage = vi.spyOn(task.api, "createMessage").mockReturnValue(stream)
+				task.apiConversationHistory = [
+					{ role: "user", content: [{ type: "text", text: "test message" }], ts: Date.now() },
+				]
+
+				await task.attemptApiRequest().next()
+
+				expect(mockProvider.setMode).toHaveBeenCalledWith("code")
+				expect(requireDefined(createMessage.mock.calls[0])[2]?.mode).toBe("code")
+			})
+
 			it("should handle empty messages gracefully", async () => {
 				const task = new Task({
 					provider: mockProvider,