Merge pull request #1792 from Kilo-Org/fix-inifinite-initial-request

Fix initial API requests spinning forever when switching modes

Author: chrarnoldus

.changeset/clear-doodles-drum.md

@@ -0,0 +1,5 @@
+---
+"kilo-code": patch
+---
+
+Fix infinite spinning initial API request

src/core/tools/newTaskTool.ts

@@ -80,18 +80,27 @@ export async function newTaskTool(
 			// Preserve the current mode so we can resume with it later.
 			cline.pausedModeSlug = (await provider.getState()).mode ?? defaultModeSlug
 
-			// Create new task instance first (this preserves parent's current mode in its history)
+			// kilocode_change start: Switch to the desired mode BEFORE creating the task
+			await provider.handleModeSwitch(mode)
+			// Small delay to ensure mode switch has propagated
+			await delay(100)
+			// kilocode_change end
+
+			// Now create the task with the correct mode already set
 			const newCline = await provider.initClineWithTask(unescapedMessage, undefined, cline)
 			if (!newCline) {
+				await provider.handleModeSwitch(cline.pausedModeSlug) // kilocode_change: if task creation failed, switch back to the parent's mode
 				pushToolResult(t("tools:newTask.errors.policy_restriction"))
 				return
 			}
 
-			// Now switch the newly created task to the desired mode
-			await provider.handleModeSwitch(mode)
+			// kilocode_change start: Switch to the desired mode BEFORE creating the task above
+			// // Now switch the newly created task to the desired mode
+			// await provider.handleModeSwitch(mode)
 
-			// Delay to allow mode change to take effect
-			await delay(500)
+			// // Delay to allow mode change to take effect
+			// await delay(500)
+			// kilocode_change end
 
 			cline.emit("taskSpawned", newCline.taskId)