fix: add task creation guard and delegation check to prevent races

hannesrudolph · hannesrudolph · commit 9141d92ae120 · 2026-02-11T15:59:34.000-07:00
diff --git a/src/core/webview/ClineProvider.ts b/src/core/webview/ClineProvider.ts
@@ -173,6 +173,7 @@ export class ClineProvider
 	private clineMessagesSeq = 0
 
 	public isViewLaunched = false
+	public isTaskCreationInProgress = false
 	public settingsImportedAt?: number
 	public readonly latestAnnouncementId = "feb-2026-v3.47.0-opus-4.6-gpt-5.3-codex" // v3.47.0 Claude Opus 4.6 & GPT-5.3-Codex
 	public readonly providerSettingsManager: ProviderSettingsManager
@@ -3027,6 +3028,12 @@ export class ClineProvider
 		options: CreateTaskOptions = {},
 		configuration: RooCodeSettings = {},
 	): Promise<Task> {
+		if (this.delegationInProgress) {
+			this.log("[createTask] Blocked: delegation in progress")
+			vscode.window.showInformationMessage("Task delegation in progress, please wait...")
+			throw new Error("Cannot create task while delegation is in progress")
+		}
+
 		if (configuration) {
 			await this.setValues(configuration)
 
diff --git a/src/core/webview/webviewMessageHandler.ts b/src/core/webview/webviewMessageHandler.ts
@@ -547,10 +547,14 @@ export const webviewMessageHandler = async (
 			provider.isViewLaunched = true
 			break
 		case "newTask":
-			// Initializing new instance of Cline will make sure that any
-			// agentically running promises in old instance don't affect our new
-			// task. This essentially creates a fresh slate for the new task.
+			if (provider.isTaskCreationInProgress) {
+				break
+			}
+			provider.isTaskCreationInProgress = true
 			try {
+				// Initializing new instance of Cline will make sure that any
+				// agentically running promises in old instance don't affect our new
+				// task. This essentially creates a fresh slate for the new task.
 				const resolved = await resolveIncomingImages({ text: message.text, images: message.images })
 				await provider.createTask(resolved.text, resolved.images)
 				// Task created successfully - notify the UI to reset
@@ -562,6 +566,8 @@ export const webviewMessageHandler = async (
 				vscode.window.showErrorMessage(
 					`Failed to create task: ${error instanceof Error ? error.message : String(error)}`,
 				)
+			} finally {
+				provider.isTaskCreationInProgress = false
 			}
 			break
 		case "customInstructions":
