fix(csa-acp): include AgentThought in output for claude-code (#375) (#377)

* fix(csa-acp): include thoughts in output and stream to stderr #375

* chore(lockfile): update weave.lock

Author: RyderFreeman4Logos

Cargo.lock

@@ -3,7 +3,7 @@ members = ["crates/*"]
 resolver = "2"
 
 [workspace.package]
-version = "0.1.101"
+version = "0.1.102"
 edition = "2024"
 rust-version = "1.85"
 license = "Apache-2.0"

Cargo.toml

@@ -498,17 +498,27 @@ fn stream_new_agent_messages(
 
         let mut messages = Vec::new();
         for event in &events_ref[*processed_index..] {
-            if let SessionEvent::AgentMessage(chunk) = event {
-                messages.push(chunk.clone());
+            match event {
+                SessionEvent::AgentMessage(chunk) => {
+                    messages.push((chunk.clone(), false));
+                }
+                SessionEvent::AgentThought(chunk) => {
+                    messages.push((chunk.clone(), true));
+                }
+                _ => {}
             }
         }
         *processed_index = events_ref.len();
         messages
     };
 
-    for chunk in &new_messages {
+    for (chunk, is_thought) in &new_messages {
         if stream_stdout_to_stderr {
-            eprint!("[stdout] {chunk}");
+            if *is_thought {
+                eprint!("[thought] {chunk}");
+            } else {
+                eprint!("[stdout] {chunk}");
+            }
         }
         spool_chunk(output_spool, chunk.as_bytes());
     }
@@ -525,8 +535,11 @@ fn spool_chunk(spool: &mut Option<std::fs::File>, bytes: &[u8]) {
 fn collect_agent_output(events: &[SessionEvent]) -> String {
     let mut output = String::new();
     for event in events {
-        if let SessionEvent::AgentMessage(chunk) = event {
-            output.push_str(chunk);
+        match event {
+            SessionEvent::AgentMessage(chunk) | SessionEvent::AgentThought(chunk) => {
+                output.push_str(chunk);
+            }
+            _ => {}
         }
     }
     output

crates/csa-acp/src/connection.rs

@@ -100,6 +100,40 @@ async fn env_remove_strips_claudecode_from_child() {
     );
 }
 
+#[test]
+fn test_collect_agent_output_includes_thoughts() {
+    let events = vec![
+        SessionEvent::AgentMessage("Hello".to_string()),
+        SessionEvent::AgentThought("Thinking...".to_string()),
+        SessionEvent::AgentMessage(" world".to_string()),
+    ];
+    let output = collect_agent_output(&events);
+    assert_eq!(output, "HelloThinking... world");
+}
+
+#[test]
+fn stream_new_agent_messages_includes_thoughts_in_spool() {
+    let events = Rc::new(RefCell::new(Vec::new()));
+    events
+        .borrow_mut()
+        .push(SessionEvent::AgentMessage("hello".to_string()));
+    events
+        .borrow_mut()
+        .push(SessionEvent::AgentThought("...thinking".to_string()));
+
+    let temp = tempfile::tempdir().expect("tempdir");
+    let spool_path = temp.path().join("output.log");
+    let mut spool = open_output_spool_file(Some(&spool_path));
+    let mut index = 0;
+
+    stream_new_agent_messages(&events, &mut index, false, &mut spool);
+    assert_eq!(
+        std::fs::read_to_string(&spool_path).expect("read spool"),
+        "hello...thinking"
+    );
+    assert_eq!(index, 2);
+}
+
 #[test]
 fn stream_new_agent_messages_writes_spool_incrementally() {
     let events = Rc::new(RefCell::new(Vec::new()));

crates/csa-acp/src/connection_tests.rs

@@ -1,6 +1,6 @@
 [versions]
-csa = "0.1.100"
-weave = "0.1.100"
+csa = "0.1.101"
+weave = "0.1.101"
 last_migrated_at = "2026-03-08T12:08:01.820964091Z"
 
 [migrations]