flushes stderr and stdout accordingly to old behavior

Author: dingfeli

crates/chat-cli-ui/src/conduit.rs

@@ -269,6 +269,9 @@ impl std::io::Write for ControlEnd<DestinationStderr> {
             .insert_content(buf)
             .map_err(|_e| std::io::Error::other("Error inserting content"))?;
 
+        // By default stderr is unbuffered (the content is flushed immediately)
+        self.flush()?;
+
         Ok(buf.len())
     }
 
@@ -283,21 +286,57 @@ impl std::io::Write for ControlEnd<DestinationStderr> {
 
 impl std::io::Write for ControlEnd<DestinationStdout> {
     fn write(&mut self, buf: &[u8]) -> std::io::Result<usize> {
-        if self.current_event.is_none() {
-            self.current_event
-                .replace(Event::LegacyPassThrough(LegacyPassThroughOutput::Stdout(
-                    Default::default(),
-                )));
+        // By default stdout is line buffered, so we'll delimit the incoming buffer with new line
+        // and flush accordingly.
+        let mut start = 0_usize;
+        let mut end = 0_usize;
+        while end < buf.len() {
+            let Some(byte) = buf.get(end) else {
+                break;
+            };
+
+            if byte == &10 || byte == &13 {
+                if self.current_event.is_none() {
+                    self.current_event
+                        .replace(Event::LegacyPassThrough(LegacyPassThroughOutput::Stderr(
+                            Default::default(),
+                        )));
+                }
+
+                let current_event = self
+                    .current_event
+                    .as_mut()
+                    .ok_or(std::io::Error::other("No event set"))?;
+
+                current_event
+                    .insert_content(&buf[start..=end])
+                    .map_err(std::io::Error::other)?;
+
+                self.flush()?;
+
+                start = end + 1;
+            }
+
+            end += 1;
         }
 
-        let current_event = self
-            .current_event
-            .as_mut()
-            .ok_or(std::io::Error::other("No event set"))?;
+        if start < end {
+            if self.current_event.is_none() {
+                self.current_event
+                    .replace(Event::LegacyPassThrough(LegacyPassThroughOutput::Stderr(
+                        Default::default(),
+                    )));
+            }
 
-        current_event
-            .insert_content(buf)
-            .map_err(|_e| std::io::Error::other("Error inserting content"))?;
+            let current_event = self
+                .current_event
+                .as_mut()
+                .ok_or(std::io::Error::other("No event set"))?;
+
+            current_event
+                .insert_content(&buf[start..end])
+                .map_err(std::io::Error::other)?;
+        }
 
         Ok(buf.len())
     }

crates/chat-cli/src/cli/chat/custom_spinner.rs

@@ -1,7 +1,6 @@
 use crossterm::{
     cursor,
     execute,
-    style,
     terminal,
 };
 use indicatif::{
@@ -21,7 +20,7 @@ pub struct Spinners {
 impl Spinners {
     pub fn new(message: String) -> Self {
         // Hide the cursor when starting the spinner
-        let _ = execute!(std::io::stderr(), style::Print("\n"), cursor::Hide);
+        let _ = execute!(std::io::stderr(), cursor::Hide);
 
         let pb = ProgressBar::new_spinner();
         pb.set_style(