refactor: add centralized message queue processing after file edits

- Added processQueuedMessages() method to Task class for centralized queue handling
- Integrated queue processing in all file editing tools:
  - writeToFileTool: processes queue after completion
  - applyDiffTool: processes queue after completion, rejection, or error
  - insertContentTool: processes queue after completion
  - searchAndReplaceTool: processes queue after completion
  - multiApplyDiffTool: processes queue after completion or error
- Ensures user messages typed during file edits are sent immediately after edit completes
- Prevents messages from getting stuck in the queue

Author: daniel-lxs

src/core/task/Task.ts

@@ -2897,4 +2897,28 @@ export class Task extends EventEmitter<TaskEvents> implements TaskLike {
 	public get cwd() {
 		return this.workspacePath
 	}
+
+	/**
+	 * Process any queued messages by dequeuing and submitting them.
+	 * This ensures that queued user messages are sent when appropriate,
+	 * preventing them from getting stuck in the queue.
+	 *
+	 * @param context - Context string for logging (e.g., the calling tool name)
+	 */
+	public processQueuedMessages(): void {
+		try {
+			if (!this.messageQueueService.isEmpty()) {
+				const queued = this.messageQueueService.dequeueMessage()
+				if (queued) {
+					setTimeout(() => {
+						this.submitUserMessage(queued.text, queued.images).catch((err) =>
+							console.error(`[Task] Failed to submit queued message:`, err),
+						)
+					}, 0)
+				}
+			}
+		} catch (e) {
+			console.error(`[Task] Queue processing error:`, e)
+		}
+	}
 }

src/core/tools/applyDiffTool.ts

@@ -207,6 +207,7 @@ export async function applyDiffToolLegacy(
 
 				if (!didApprove) {
 					await cline.diffViewProvider.revertChanges() // Cline likely handles closing the diff view
+					cline.processQueuedMessages()
 					return
 				}
 
@@ -245,27 +246,15 @@ export async function applyDiffToolLegacy(
 
 			await cline.diffViewProvider.reset()
 
-			// After completing file edits, process one queued user message if present
-			try {
-				if (!cline.messageQueueService.isEmpty()) {
-					const queued = cline.messageQueueService.dequeueMessage()
-					if (queued) {
-						setTimeout(() => {
-							cline
-								.submitUserMessage(queued.text, queued.images)
-								.catch((err) => console.error("[applyDiffTool] Failed to submit queued message:", err))
-						}, 0)
-					}
-				}
-			} catch (e) {
-				console.error("[applyDiffTool] Queue processing error:", e)
-			}
+			// Process any queued messages after file edit completes
+			cline.processQueuedMessages()
 
 			return
 		}
 	} catch (error) {
 		await handleError("applying diff", error)
 		await cline.diffViewProvider.reset()
+		cline.processQueuedMessages()
 		return
 	}
 }

src/core/tools/insertContentTool.ts

@@ -188,21 +188,8 @@ export async function insertContentTool(
 
 		await cline.diffViewProvider.reset()
 
-		// After completing file edits, process one queued user message if present
-		try {
-			if (!cline.messageQueueService.isEmpty()) {
-				const queued = cline.messageQueueService.dequeueMessage()
-				if (queued) {
-					setTimeout(() => {
-						cline
-							.submitUserMessage(queued.text, queued.images)
-							.catch((err) => console.error("[insertContentTool] Failed to submit queued message:", err))
-					}, 0)
-				}
-			}
-		} catch (e) {
-			console.error("[insertContentTool] Queue processing error:", e)
-		}
+		// Process any queued messages after file edit completes
+		cline.processQueuedMessages()
 	} catch (error) {
 		handleError("insert content", error)
 		await cline.diffViewProvider.reset()

src/core/tools/multiApplyDiffTool.ts

@@ -172,6 +172,7 @@ Original error: ${errorMessage}`
 			TelemetryService.instance.captureDiffApplicationError(cline.taskId, cline.consecutiveMistakeCount)
 			await cline.say("diff_error", `Failed to parse apply_diff XML: ${errorMessage}`)
 			pushToolResult(detailedError)
+			cline.processQueuedMessages()
 			return
 		}
 	} else if (legacyPath && typeof legacyDiffContent === "string") {
@@ -195,6 +196,7 @@ Original error: ${errorMessage}`
 			"args (or legacy 'path' and 'diff' parameters)",
 		)
 		pushToolResult(errorMsg)
+		cline.processQueuedMessages()
 		return
 	}
 
@@ -210,6 +212,7 @@ Original error: ${errorMessage}`
 					: "args (must contain at least one valid file element)",
 			),
 		)
+		cline.processQueuedMessages()
 		return
 	}
 
@@ -675,10 +678,12 @@ ${errorDetails ? `\nTechnical details:\n${errorDetails}\n` : ""}
 
 		// Push the final result combining all operation results
 		pushToolResult(results.join("\n\n") + singleBlockNotice)
+		cline.processQueuedMessages()
 		return
 	} catch (error) {
 		await handleError("applying diff", error)
 		await cline.diffViewProvider.reset()
+		cline.processQueuedMessages()
 		return
 	}
 }

src/core/tools/searchAndReplaceTool.ts

@@ -264,23 +264,8 @@ export async function searchAndReplaceTool(
 		cline.recordToolUsage("search_and_replace")
 		await cline.diffViewProvider.reset()
 
-		// After completing file edits, process one queued user message if present
-		try {
-			if (!cline.messageQueueService.isEmpty()) {
-				const queued = cline.messageQueueService.dequeueMessage()
-				if (queued) {
-					setTimeout(() => {
-						cline
-							.submitUserMessage(queued.text, queued.images)
-							.catch((err) =>
-								console.error("[searchAndReplaceTool] Failed to submit queued message:", err),
-							)
-					}, 0)
-				}
-			}
-		} catch (e) {
-			console.error("[searchAndReplaceTool] Queue processing error:", e)
-		}
+		// Process any queued messages after file edit completes
+		cline.processQueuedMessages()
 	} catch (error) {
 		handleError("search and replace", error)
 		await cline.diffViewProvider.reset()

src/core/tools/writeToFileTool.ts

@@ -308,23 +308,8 @@ export async function writeToFileTool(
 
 			await cline.diffViewProvider.reset()
 
-			// After completing file edits, process one queued user message if present
-			try {
-				if (!cline.messageQueueService.isEmpty()) {
-					const queued = cline.messageQueueService.dequeueMessage()
-					if (queued) {
-						setTimeout(() => {
-							cline
-								.submitUserMessage(queued.text, queued.images)
-								.catch((err) =>
-									console.error("[writeToFileTool] Failed to submit queued message:", err),
-								)
-						}, 0)
-					}
-				}
-			} catch (e) {
-				console.error("[writeToFileTool] Queue processing error:", e)
-			}
+			// Process any queued messages after file edit completes
+			cline.processQueuedMessages()
 
 			return
 		}