Fix delegated task parent resolution

Resolve delegated new_task parents by invoking task id instead of visible task state, scope delegation mode/profile switches away from unrelated current tasks, and bump CRC to 3.53.14.

Co-Authored-By: Oz <oz-agent@warp.dev>

Author: allquixotic

src/__tests__/provider-delegation.spec.ts

@@ -42,6 +42,7 @@ describe("ClineProvider.delegateParentAndOpenChild()", () => {
 		const provider = {
 			emit: providerEmit,
 			getCurrentTask: vi.fn(() => parentTask),
+			getTaskById: vi.fn((id: string) => (id === "parent-1" ? parentTask : undefined)),
 			removeClineFromStack,
 			createTask,
 			getTaskWithId,
@@ -63,6 +64,7 @@ describe("ClineProvider.delegateParentAndOpenChild()", () => {
 
 		// Invariant: parent closed before child creation
 		expect(removeClineFromStack).toHaveBeenCalledTimes(1)
+		expect(removeClineFromStack).toHaveBeenCalledWith({ taskId: "parent-1", skipDelegationRepair: true })
 		// Child task is created with startTask: false and initialStatus: "active"
 		expect(createTask).toHaveBeenCalledWith("Do something", undefined, parentTask, {
 			initialTodos: [],
@@ -92,7 +94,7 @@ describe("ClineProvider.delegateParentAndOpenChild()", () => {
 		expect(providerEmit).toHaveBeenCalledWith(RooCodeEventName.TaskDelegated, "parent-1", "child-1")
 
 		// Mode switch
-		expect(handleModeSwitch).toHaveBeenCalledWith("code")
+		expect(handleModeSwitch).toHaveBeenCalledWith("code", { updateCurrentTask: false })
 	})
 
 	it("calls child.start() only after parent metadata is persisted (no race condition)", async () => {
@@ -124,6 +126,7 @@ describe("ClineProvider.delegateParentAndOpenChild()", () => {
 		const provider = {
 			emit: vi.fn(),
 			getCurrentTask: vi.fn(() => parentTask),
+			getTaskById: vi.fn((id: string) => (id === "parent-1" ? parentTask : undefined)),
 			removeClineFromStack,
 			createTask,
 			getTaskWithId,
@@ -142,4 +145,80 @@ describe("ClineProvider.delegateParentAndOpenChild()", () => {
 		// Verify ordering: createTask → updateTaskHistory → child.start
 		expect(callOrder).toEqual(["createTask", "updateTaskHistory", "child.start"])
 	})
+
+	it("uses the invoking parent id when the current visible task differs", async () => {
+		const parentTask = {
+			taskId: "parent-1",
+			emit: vi.fn(),
+			flushPendingToolResultsToHistory: vi.fn().mockResolvedValue(true),
+		} as any
+		const visibleTask = { taskId: "visible-other", emit: vi.fn() } as any
+		const childStart = vi.fn()
+		const updateTaskHistory = vi.fn()
+		const removeClineFromStack = vi.fn().mockResolvedValue(undefined)
+		const createTask = vi.fn().mockResolvedValue({ taskId: "child-1", start: childStart })
+		const handleModeSwitch = vi.fn().mockResolvedValue(undefined)
+		const getTaskWithId = vi.fn().mockImplementation(async (id: string) => {
+			if (id === "parent-1") {
+				return {
+					historyItem: {
+						id: "parent-1",
+						task: "Parent",
+						tokensIn: 0,
+						tokensOut: 0,
+						totalCost: 0,
+						childIds: [],
+					},
+				}
+			}
+			return {
+				historyItem: {
+					id: "child-1",
+					task: "Do something",
+					tokensIn: 0,
+					tokensOut: 0,
+					totalCost: 0,
+				},
+			}
+		})
+
+		const provider = {
+			emit: vi.fn(),
+			getCurrentTask: vi.fn(() => visibleTask),
+			getTaskById: vi.fn((id: string) =>
+				id === "parent-1" ? parentTask : id === "visible-other" ? visibleTask : undefined,
+			),
+			removeClineFromStack,
+			createTask,
+			getTaskWithId,
+			updateTaskHistory,
+			handleModeSwitch,
+			log: vi.fn(),
+		} as unknown as ClineProvider
+
+		const child = await (ClineProvider.prototype as any).delegateParentAndOpenChild.call(provider, {
+			parentTaskId: "parent-1",
+			message: "Do something",
+			initialTodos: [],
+			mode: "code",
+		})
+
+		expect(child.taskId).toBe("child-1")
+		expect(removeClineFromStack).toHaveBeenCalledWith({ taskId: "parent-1", skipDelegationRepair: true })
+		expect(createTask).toHaveBeenCalledWith("Do something", undefined, parentTask, {
+			initialTodos: [],
+			initialStatus: "active",
+			startTask: false,
+		})
+		expect(updateTaskHistory).toHaveBeenCalledWith(
+			expect.objectContaining({
+				id: "parent-1",
+				status: "delegated",
+				delegatedToId: "child-1",
+				awaitingChildId: "child-1",
+			}),
+		)
+		expect(handleModeSwitch).toHaveBeenCalledWith("code", { updateCurrentTask: false })
+		expect(childStart).toHaveBeenCalledTimes(1)
+	})
 })

src/core/webview/ClineProvider.ts

@@ -1635,8 +1635,9 @@ export class ClineProvider
 	 * Handle switching to a new mode, including updating the associated API configuration
 	 * @param newMode The mode to switch to
 	 */
-	public async handleModeSwitch(newMode: Mode) {
-		const task = this.getCurrentTask()
+	public async handleModeSwitch(newMode: Mode, options: { updateCurrentTask?: boolean } = {}) {
+		const { updateCurrentTask = true } = options
+		const task = updateCurrentTask ? this.getCurrentTask() : undefined
 
 		if (task) {
 			task.emit(RooCodeEventName.TaskModeSwitched, task.taskId, newMode)
@@ -1698,7 +1699,7 @@ export class ClineProvider
 				const hasActualSettings = !!fullProfile.apiProvider
 
 				if (hasActualSettings) {
-					await this.activateProviderProfile({ name: profile.name })
+					await this.activateProviderProfile({ name: profile.name }, { updateCurrentTask })
 				} else {
 					// The task will continue with the current/default configuration.
 				}
@@ -1881,12 +1882,13 @@ export class ClineProvider
 
 	async activateProviderProfile(
 		args: { name: string } | { id: string },
-		options?: { persistModeConfig?: boolean; persistTaskHistory?: boolean },
+		options?: { persistModeConfig?: boolean; persistTaskHistory?: boolean; updateCurrentTask?: boolean },
 	) {
 		const { name, id, ...providerSettings } = await this.providerSettingsManager.activateProfile(args)
 
 		const persistModeConfig = options?.persistModeConfig ?? true
 		const persistTaskHistory = options?.persistTaskHistory ?? true
+		const updateCurrentTask = options?.updateCurrentTask ?? true
 
 		// See `upsertProviderProfile` for a description of what this is doing.
 		await Promise.all([
@@ -1901,13 +1903,15 @@ export class ClineProvider
 			await this.providerSettingsManager.setModeConfig(mode, id)
 		}
 
-		// Change the provider for the current task.
-		this.updateTaskApiHandlerIfNeeded(providerSettings, { forceRebuild: true })
+		if (updateCurrentTask) {
+			// Change the provider for the current task.
+			this.updateTaskApiHandlerIfNeeded(providerSettings, { forceRebuild: true })
 
-		// Update the current task's sticky provider profile, unless this activation is
-		// being used purely as a non-persisting restoration (e.g., reopening a task from history).
-		if (persistTaskHistory) {
-			await this.persistStickyProviderProfileToCurrentTask(name)
+			// Update the current task's sticky provider profile, unless this activation is
+			// being used purely as a non-persisting restoration (e.g., reopening a task from history).
+			if (persistTaskHistory) {
+				await this.persistStickyProviderProfileToCurrentTask(name)
+			}
 		}
 
 		await this.postStateToWebview()
@@ -3515,7 +3519,7 @@ export class ClineProvider
 	/**
 	 * Delegate parent task and open child task.
 	 *
-	 * - Enforce single-open invariant
+	 * - Resolve the invoking parent by id, independent of current visible selection
 	 * - Persist parent delegation metadata
 	 * - Emit TaskDelegated (task-level; API forwards to provider/bridge)
 	 * - Create child as sole active and switch mode to child's mode
@@ -3530,14 +3534,14 @@ export class ClineProvider
 
 		// Metadata-driven delegation is always enabled
 
-		// 1) Get parent (must be current task)
-		const parent = this.getCurrentTask()
+		// 1) Get the exact live parent that invoked new_task. Do not use getCurrentTask()
+		// here: the visible/current task can change while approval or async state work is
+		// pending, and rejecting on that stale selection blocks valid delegation.
+		const parent = this.getTaskById(parentTaskId)
 		if (!parent) {
-			throw new Error("[delegateParentAndOpenChild] No current task")
-		}
-		if (parent.taskId !== parentTaskId) {
+			const current = this.getCurrentTask()
 			throw new Error(
-				`[delegateParentAndOpenChild] Parent mismatch: expected ${parentTaskId}, current ${parent.taskId}`,
+				`[delegateParentAndOpenChild] Parent task not open: expected ${parentTaskId}, current ${current?.taskId ?? "none"}`,
 			)
 		}
 		// 2) Flush pending tool results to API history BEFORE disposing the parent.
@@ -3578,7 +3582,7 @@ export class ClineProvider
 		//    This ensures we never have >1 tasks open at any time during delegation.
 		//    Await abort completion to ensure clean disposal and prevent unhandled rejections.
 		try {
-			await this.removeClineFromStack({ skipDelegationRepair: true })
+			await this.removeClineFromStack({ taskId: parentTaskId, skipDelegationRepair: true })
 		} catch (error) {
 			this.log(
 				`[delegateParentAndOpenChild] Error during parent disposal (non-fatal): ${
@@ -3593,7 +3597,7 @@ export class ClineProvider
 		//    The mode switch must happen before createTask() because the Task constructor
 		//    initializes its mode from provider.getState() during initializeTaskMode().
 		try {
-			await this.handleModeSwitch(mode as any)
+			await this.handleModeSwitch(mode as any, { updateCurrentTask: false })
 		} catch (e) {
 			this.log(
 				`[delegateParentAndOpenChild] handleModeSwitch failed for mode '${mode}': ${

src/core/webview/__tests__/ClineProvider.sticky-mode.spec.ts

@@ -434,6 +434,31 @@ describe("ClineProvider - Sticky Mode", () => {
 				}),
 			)
 		})
+
+		it("should skip current task metadata when requested", async () => {
+			const mockTask = {
+				taskId: "test-task-id",
+				taskMode: "code",
+				emit: vi.fn(),
+				saveClineMessages: vi.fn(),
+				clineMessages: [],
+				apiConversationHistory: [],
+				updateApiConfiguration: vi.fn(),
+			}
+
+			await provider.addClineToStack(mockTask as any)
+
+			const updateTaskHistorySpy = vi
+				.spyOn(provider, "updateTaskHistory")
+				.mockImplementation(() => Promise.resolve([]))
+
+			await provider.handleModeSwitch("architect", { updateCurrentTask: false })
+
+			expect(mockContext.globalState.update).toHaveBeenCalledWith("mode", "architect")
+			expect(updateTaskHistorySpy).not.toHaveBeenCalled()
+			expect(mockTask.emit).not.toHaveBeenCalledWith("taskModeSwitched", mockTask.taskId, "architect")
+			expect((mockTask as any)._taskMode).toBeUndefined()
+		})
 	})
 
 	describe("createTaskWithHistoryItem", () => {

src/package.json

@@ -3,7 +3,7 @@
 	"displayName": "%extension.displayName%",
 	"description": "%extension.description%",
 	"publisher": "allquixotic",
-	"version": "3.53.13",
+	"version": "3.53.14",
 	"icon": "assets/icons/icon.png",
 	"galleryBanner": {
 		"color": "#617A91",