From 13370f960f2cb37347a78d598e1cfe5b7b0e9951 Mon Sep 17 00:00:00 2001
From: Roo Code <roomote@roocode.com>
Date: Tue, 16 Sep 2025 23:52:42 +0000
Subject: [PATCH] fix: resolve 'Current ask promise was ignored' error in
 multi-file diffs

- Modified Task.ts ask() method to return placeholder responses for partial updates instead of throwing errors
- Improved error handling in multiApplyDiffTool.ts with better logging and user feedback
- Added proper error recovery for batch diff approval failures
- Prevents disruption of multi-file concurrent diff operations

Fixes #8046
---
 src/core/task/Task.ts                |  8 ++++++--
 src/core/tools/multiApplyDiffTool.ts | 27 +++++++++++++++++++++++++--
 2 files changed, 31 insertions(+), 4 deletions(-)

diff --git a/src/core/task/Task.ts b/src/core/task/Task.ts
index cf16df8dcc7..4c3d4241d22 100644
--- a/src/core/task/Task.ts
+++ b/src/core/task/Task.ts
@@ -739,14 +739,18 @@ export class Task extends EventEmitter<TaskEvents> implements TaskLike {
 					// saves, and only post parts of partial message instead of
 					// whole array in new listener.
 					this.updateClineMessage(lastMessage)
-					throw new Error("Current ask promise was ignored (#1)")
+					// Return a placeholder response for partial updates
+					// This prevents the error from disrupting the flow
+					return { response: "messageResponse" as ClineAskResponse, text: undefined, images: undefined }
 				} else {
 					// This is a new partial message, so add it with partial
 					// state.
 					askTs = Date.now()
 					this.lastMessageTs = askTs
 					await this.addToClineMessages({ ts: askTs, type: "ask", ask: type, text, partial, isProtected })
-					throw new Error("Current ask promise was ignored (#2)")
+					// Return a placeholder response for partial updates
+					// This prevents the error from disrupting the flow
+					return { response: "messageResponse" as ClineAskResponse, text: undefined, images: undefined }
 				}
 			} else {
 				if (isUpdatingPreviousPartial) {
diff --git a/src/core/tools/multiApplyDiffTool.ts b/src/core/tools/multiApplyDiffTool.ts
index d0fe6557503..b8781c42d66 100644
--- a/src/core/tools/multiApplyDiffTool.ts
+++ b/src/core/tools/multiApplyDiffTool.ts
@@ -5,6 +5,7 @@ import { TelemetryService } from "@roo-code/telemetry"
 import { DEFAULT_WRITE_DELAY_MS } from "@roo-code/types"
 
 import { ClineSayTool } from "../../shared/ExtensionMessage"
+import { ClineAskResponse } from "../../shared/WebviewMessage"
 import { getReadablePath } from "../../utils/path"
 import { Task } from "../task/Task"
 import { ToolUse, RemoveClosingTag, AskApproval, HandleError, PushToolResult } from "../../shared/tools"
@@ -101,7 +102,13 @@ export async function applyDiffTool(
 			path: getReadablePath(cline.cwd, filePath),
 		}
 		const partialMessage = JSON.stringify(sharedMessageProps)
-		await cline.ask("tool", partialMessage, block.partial).catch(() => {})
+		// Handle partial message updates gracefully
+		try {
+			await cline.ask("tool", partialMessage, block.partial)
+		} catch (error) {
+			// Log the error for debugging but don't disrupt the flow
+			console.debug(`Partial message update handled: ${error instanceof Error ? error.message : String(error)}`)
+		}
 		return
 	}
 
@@ -306,7 +313,23 @@ Original error: ${errorMessage}`
 				isProtected: hasProtectedFiles,
 			} satisfies ClineSayTool)
 
-			const { response, text, images } = await cline.ask("tool", completeMessage, hasProtectedFiles)
+			let response: ClineAskResponse
+			let text: string | undefined
+			let images: string[] | undefined
+
+			try {
+				const askResult = await cline.ask("tool", completeMessage, hasProtectedFiles)
+				response = askResult.response
+				text = askResult.text
+				images = askResult.images
+			} catch (error) {
+				// If ask fails, provide clear feedback to the model
+				const errorMessage = `Failed to get approval for batch diff operations: ${error instanceof Error ? error.message : String(error)}`
+				await cline.say("error", errorMessage)
+				pushToolResult(errorMessage)
+				cline.processQueuedMessages()
+				return
+			}
 
 			// Process batch response
 			if (response === "yesButtonClicked") {