re-allow changing the mode of an active task via the UI.

(felt like a bug the other way)

Author: axmo

src/core/webview/ClineProvider.ts

@@ -591,7 +591,6 @@ export class ClineProvider
 			experiments,
 		} = await this.getState()
 
-
 		const cline = new Task({
 			provider: this,
 			apiConfiguration,
@@ -808,17 +807,10 @@ export class ClineProvider
 	public async handleModeSwitch(newMode: Mode) {
 		// Telemetry for mode switch (provider level)
 		const cline = this.getCurrentCline() // Get current cline for task ID if available
-		telemetryService.captureModeSwitch(cline?.taskId || "global", newMode)
+		TelemetryService.instance.captureModeSwitch(cline?.taskId || "global", newMode)
 
-		// Emit an event that the provider's mode is switching.
-		// The active Cline instance itself should only update its internal currentModeSlug
-		// if the switch_mode tool is used within its context.
-		// A global mode switch should not change an active task's inherent mode.
 		if (cline) {
 			TelemetryService.instance.captureModeSwitch(cline.taskId, newMode)
-			// Update the Cline instance's current mode *before* emitting the event
-			// and *before* updating global state, to ensure consistency if event handlers
-			// or global state watchers try to access the cline's mode.
 			await cline.updateCurrentModeSlug(newMode)
 			cline.emit("taskModeSwitched", cline.taskId, newMode)
 		}

src/core/webview/__tests__/ClineProvider.test.ts

@@ -2366,135 +2366,6 @@ describe("Task Mode Preservation with Subtasks", () => {
 	})
 })
 
-describe("Task Mode Decoupling from Global UI Mode Changes", () => {
-	let provider: ClineProvider
-	let mockContext: vscode.ExtensionContext
-	let mockOutputChannel: vscode.OutputChannel
-	let mockWebviewView: vscode.WebviewView
-	let mockPostMessage: jest.Mock
-
-	let activeTaskMock: any
-	const taskSpecificMode = "task-specific-mode"
-	const newGlobalUIMode = "new-global-ui-mode"
-
-	beforeEach(async () => {
-		// Reset mocks
-		jest.clearAllMocks()
-
-		// Mock context
-		const globalState: Record<string, string | undefined> = {
-			mode: taskSpecificMode, // Initial global mode is the task's mode
-			currentApiConfigName: "task-specific-config",
-			"apiConfigId_task-specific-mode": "task-specific-config-id",
-			"apiConfiguration_task-specific-config-id": JSON.stringify({
-				apiProvider: "test-task-specific",
-				id: "task-specific-config-id",
-				name: "task-specific-config",
-			}),
-			"apiConfigId_new-global-ui-mode": "new-global-config-id",
-			"apiConfiguration_new-global-config-id": JSON.stringify({
-				apiProvider: "test-new-global",
-				id: "new-global-config-id",
-				name: "new-global-config",
-			}),
-			listApiConfigMeta: JSON.stringify([
-				{ id: "task-specific-config-id", name: "task-specific-config", apiProvider: "test-task-specific" },
-				{ id: "new-global-config-id", name: "new-global-config", apiProvider: "test-new-global" },
-			]),
-		}
-		const secrets: Record<string, string | undefined> = {}
-		mockContext = {
-			extensionPath: "/test/path",
-			extensionUri: {} as vscode.Uri,
-			globalState: {
-				get: jest.fn().mockImplementation((key: string) => {
-					const value = globalState[key]
-					if (key.startsWith("apiConfiguration_") || key === "listApiConfigMeta") {
-						return value ? JSON.parse(value) : undefined
-					}
-					return value
-				}),
-				update: jest.fn().mockImplementation((key: string, value: any) => {
-					if (typeof value === "object") {
-						globalState[key] = JSON.stringify(value)
-					} else {
-						globalState[key] = value
-					}
-				}),
-				keys: jest.fn().mockImplementation(() => Object.keys(globalState)),
-			},
-			secrets: {
-				get: jest.fn().mockImplementation((key: string) => secrets[key]),
-				store: jest.fn().mockImplementation((key: string, value: string | undefined) => (secrets[key] = value)),
-				delete: jest.fn().mockImplementation((key: string) => delete secrets[key]),
-			},
-			subscriptions: [],
-			extension: {
-				packageJSON: { version: "1.0.0" },
-			},
-			globalStorageUri: {
-				fsPath: "/test/storage/path",
-			},
-		} as unknown as vscode.ExtensionContext
-
-		mockOutputChannel = {
-			appendLine: jest.fn(),
-			clear: jest.fn(),
-			dispose: jest.fn(),
-		} as unknown as vscode.OutputChannel
-
-		mockPostMessage = jest.fn()
-		mockWebviewView = {
-			webview: {
-				postMessage: mockPostMessage,
-				html: "",
-				options: {},
-				onDidReceiveMessage: jest.fn(),
-				asWebviewUri: jest.fn(),
-			},
-			visible: true,
-			onDidDispose: jest.fn().mockImplementation((callback) => {
-				callback()
-				return { dispose: jest.fn() }
-			}),
-			onDidChangeVisibility: jest.fn().mockImplementation(() => ({ dispose: jest.fn() })),
-		} as unknown as vscode.WebviewView
-
-		provider = new ClineProvider(mockContext, mockOutputChannel, "sidebar", new ContextProxy(mockContext))
-		// @ts-ignore - Accessing private property for testing.
-		provider.customModesManager = {
-			updateCustomMode: jest.fn().mockResolvedValue(undefined),
-			getCustomModes: jest.fn().mockResolvedValue([]),
-			dispose: jest.fn(),
-		}
-		await provider.resolveWebviewView(mockWebviewView) // Ensure webview is resolved
-		;(Task as unknown as jest.Mock).mockClear()
-		// Set provider's initial state for the active task by calling handleModeSwitch
-		await provider.handleModeSwitch(taskSpecificMode)
-
-		// Initialize the active task. initClineWithTask will use the provider's current state.
-		await provider.initClineWithTask("Active Task")
-		activeTaskMock = provider.getCurrentCline()
-		expect(activeTaskMock.currentModeSlug).toBe(taskSpecificMode)
-		let providerStateAfterTaskInit = await provider.getState()
-		expect(providerStateAfterTaskInit.mode).toBe(taskSpecificMode)
-	})
-
-	test("Global UI mode switch via handleModeSwitch should NOT change active Cline's currentModeSlug", async () => {
-		let providerStateBeforeSwitch = await provider.getState()
-		expect(activeTaskMock.currentModeSlug).toBe(taskSpecificMode)
-		expect(providerStateBeforeSwitch.mode).toBe(taskSpecificMode)
-
-		await provider.handleModeSwitch(newGlobalUIMode) // Corrected: Only one argument
-
-		let providerStateAfterSwitch = await provider.getState()
-		expect(providerStateAfterSwitch.mode).toBe(newGlobalUIMode)
-
-		expect(activeTaskMock.currentModeSlug).toBe(taskSpecificMode) // Task's internal mode should remain unchanged
-		expect(activeTaskMock.updateCurrentModeSlug).not.toHaveBeenCalled()
-	})
-})
-
 describe("Project MCP Settings", () => {
 	let provider: ClineProvider
 	let mockContext: vscode.ExtensionContext