From 33af64406b4b0165c6b388970ff9ce3ab28c39cb Mon Sep 17 00:00:00 2001
From: tlongwell-block <109685178+tlongwell-block@users.noreply.github.com>
Date: Mon, 23 Feb 2026 09:36:10 -0500
Subject: [PATCH] fix: handle truncated tool calls that break conversation
 alternation (#7424)

---
 crates/goose/src/agents/agent.rs | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/crates/goose/src/agents/agent.rs b/crates/goose/src/agents/agent.rs
index a1439079ea..858adb811b 100644
--- a/crates/goose/src/agents/agent.rs
+++ b/crates/goose/src/agents/agent.rs
@@ -1443,6 +1443,16 @@ impl Agent {
                                                                 .lock().await.clone();
                                         yield AgentEvent::Message(final_response.clone());
                                         messages_to_add.push(final_response);
+                                    } else {
+                                        let error_msg = format!(
+                                            "[system: Tool call could not be parsed: {}. The response may have been truncated. Try breaking the task into smaller steps.]",
+                                            request.tool_call.as_ref().unwrap_err(),
+                                        );
+                                        let error_response = Message::user()
+                                            .with_generated_id()
+                                            .with_text(&error_msg);
+                                        yield AgentEvent::Message(error_response.clone());
+                                        messages_to_add.push(error_response);
                                     }
                                 }