diff --git a/src/agent/context.rs b/src/agent/context.rs
index 05ad935..47e6c7a 100644
--- a/src/agent/context.rs
+++ b/src/agent/context.rs
@@ -146,9 +146,9 @@ impl NodeBody {
                 out.push_str("\n</tool_call>\n");
             }
             Self::ToolResult(text) => {
-                out.push_str("<|im_start|>tool\n");
+                out.push_str("<|im_start|>user\n<tool_response>\n");
                 out.push_str(text);
-                out.push_str("<|im_end|>\n");
+                out.push_str("\n</tool_response><|im_end|>\n");
             }
             Self::Memory { text, .. } => {
                 out.push_str("<|im_start|>memory\n");
@@ -1035,7 +1035,7 @@ mod tests {
     #[test]
     fn test_render_tool_result() {
         let node = AstNode::tool_result("output here");
-        assert_eq!(node.render(), "<|im_start|>tool\noutput here<|im_end|>\n");
+        assert_eq!(node.render(), "<|im_start|>user\n<tool_response>\noutput here\n</tool_response><|im_end|>\n");
     }
 
     #[test]