fix: normalize anthropic tool results

Author: wangtsiao

Cargo.lock

@@ -32,7 +32,7 @@ resolver = "3"
 edition = "2024"
 license = "MIT"
 rust-version = "1.85"
-version = "0.1.14"
+version = "0.1.15"
 
 [workspace.dependencies]
 ansi-to-tui = "7.0.0"

Cargo.toml

@@ -329,13 +329,15 @@ impl History {
                 }
             }
             merge_consecutive_assistant_messages(&mut messages);
+            devo_protocol::normalize_tool_result_messages(&mut messages);
             return messages;
         }
 
         let mut items = normalize::filter_by_modality(&self.items, modalities);
         normalize::pair_tool_call_items(&mut items);
         let mut messages: Vec<RequestMessage> = items.into_iter().map(Into::into).collect();
         merge_consecutive_assistant_messages(&mut messages);
+        devo_protocol::normalize_tool_result_messages(&mut messages);
         messages
     }
 
@@ -709,7 +711,7 @@ mod tests {
     }
 
     #[test]
-    fn for_prompt_merges_consecutive_assistant_messages_only() {
+    fn for_prompt_merges_assistant_tool_calls_and_groups_tool_results() {
         let mut h = History::new(test_context());
 
         // User message
@@ -744,8 +746,8 @@ mod tests {
 
         let msgs = h.for_prompt(&[InputModality::Text]);
 
-        // Should produce: user, assistant(merged), user, user.
-        assert_eq!(msgs.len(), 4);
+        // Should produce: user, assistant(merged), user(grouped tool results).
+        assert_eq!(msgs.len(), 3);
 
         // Second message: assistant with text + both tool calls merged
         assert_eq!(msgs[1].role, "assistant");
@@ -758,16 +760,14 @@ mod tests {
             matches!(&msgs[1].content[2], RequestContent::ToolUse { id, .. } if id == "call-2")
         );
 
-        // Third and fourth messages: user tool results stay distinct.
+        // Third message: user tool results are grouped for provider adjacency.
         assert_eq!(msgs[2].role, "user");
-        assert_eq!(msgs[2].content.len(), 1);
+        assert_eq!(msgs[2].content.len(), 2);
         assert!(
             matches!(&msgs[2].content[0], RequestContent::ToolResult { tool_use_id, .. } if tool_use_id == "call-1")
         );
-        assert_eq!(msgs[3].role, "user");
-        assert_eq!(msgs[3].content.len(), 1);
         assert!(
-            matches!(&msgs[3].content[0], RequestContent::ToolResult { tool_use_id, .. } if tool_use_id == "call-2")
+            matches!(&msgs[2].content[1], RequestContent::ToolResult { tool_use_id, .. } if tool_use_id == "call-2")
         );
     }
 

crates/core/src/history/mod.rs

@@ -12,6 +12,7 @@ mod permissions;
 pub mod protocol;
 mod provider_vendor;
 mod reference_search;
+mod request_normalize;
 mod request_user_input;
 mod response;
 mod role;
@@ -36,6 +37,7 @@ pub use permissions::*;
 pub use protocol::*;
 pub use provider_vendor::*;
 pub use reference_search::*;
+pub use request_normalize::*;
 pub use request_user_input::*;
 pub use response::*;
 pub use role::*;