From 83a28001be957568d14e087dd365ac4b1b02cfdf Mon Sep 17 00:00:00 2001
From: Saoud Rizwan <7799382+saoudrizwan@users.noreply.github.com>
Date: Wed, 12 Feb 2025 20:18:36 -0800
Subject: [PATCH] Fix plan/act response prompt

---
 src/core/Cline.ts | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/core/Cline.ts b/src/core/Cline.ts
index b868efd285..1e9ea6bbb4 100644
--- a/src/core/Cline.ts
+++ b/src/core/Cline.ts
@@ -2716,19 +2716,20 @@ export class Cline {
 								this.isAwaitingPlanResponse = false
 
 								if (this.didRespondToPlanAskBySwitchingMode) {
+									if (text) {
+										await this.say("user_feedback", text ?? "", images)
+									}
 									pushToolResult(
 										formatResponse.toolResult(
-											`[The user has switched to ACT MODE, so you may now proceed with the task.]`,
+											`[The user has switched to ACT MODE, so you may now proceed with the task.]` +
+												(text
+													? `\n\nThe user also provided the following message when switching to ACT MODE:\n<user_message>\n${text}\n</user_message>`
+													: ""),
 											images,
 										),
 									)
 								}
 
-								if (text) {
-									await this.say("user_feedback", text ?? "", images)
-									pushToolResult(formatResponse.toolResult(`<user_message>\n${text}\n</user_message>`, images))
-								}
-
 								//
 								break
 							}