From 796eac558caf0408970a8902885fc76729529ff4 Mon Sep 17 00:00:00 2001
From: Saoud Rizwan <7799382+saoudrizwan@users.noreply.github.com>
Date: Sun, 16 Feb 2025 15:15:27 -0800
Subject: [PATCH] Fix sending message when toggling plan/act mode

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

diff --git a/src/core/Cline.ts b/src/core/Cline.ts
index 1e9ea6bbb4..3632f25c1b 100644
--- a/src/core/Cline.ts
+++ b/src/core/Cline.ts
@@ -2716,9 +2716,6 @@ 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.]` +
@@ -2728,6 +2725,13 @@ export class Cline {
 											images,
 										),
 									)
+								} else {
+									// if we didn't switch to ACT MODE, then we can just send the user_feedback message
+									pushToolResult(formatResponse.toolResult(`<user_message>\n${text}\n</user_message>`, images))
+								}
+
+								if (text || images) {
+									await this.say("user_feedback", text ?? "", images)
 								}
 
 								//