From 12c645e15481d9625c43fac230aace62b9d189f1 Mon Sep 17 00:00:00 2001
From: Michael Sloan <michael@zed.dev>
Date: Fri, 25 Apr 2025 14:21:20 -0600
Subject: [PATCH] Fix inclusion of message when counting tokens from message
 editor (#29443)

Accidentally omitted this in #29233

Release Notes:

- N/A
---
 crates/agent/src/message_editor.rs | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/crates/agent/src/message_editor.rs b/crates/agent/src/message_editor.rs
index 3a68546adbcfd78d6e0ce77f2282988588633a6b..25c1ea3f8fc778af9f2eacef2b0b93a8d4f44fd5 100644
--- a/crates/agent/src/message_editor.rs
+++ b/crates/agent/src/message_editor.rs
@@ -20,7 +20,9 @@ use gpui::{
     Task, TextStyle, WeakEntity, linear_color_stop, linear_gradient, point, pulsating_between,
 };
 use language::{Buffer, Language};
-use language_model::{ConfiguredModel, LanguageModelRegistry, LanguageModelRequestMessage};
+use language_model::{
+    ConfiguredModel, LanguageModelRegistry, LanguageModelRequestMessage, MessageContent,
+};
 use language_model_selector::ToggleModelSelector;
 use multi_buffer;
 use project::Project;
@@ -1089,6 +1091,12 @@ impl MessageEditor {
                     loaded_context.add_to_request_message(&mut request_message);
                 }
 
+                if !message_text.is_empty() {
+                    request_message
+                        .content
+                        .push(MessageContent::Text(message_text));
+                }
+
                 let request = language_model::LanguageModelRequest {
                     thread_id: None,
                     prompt_id: None,