fix: Improve fs_read display (#634)

Author: brandonskiser

crates/q_cli/src/cli/chat/mod.rs

@@ -487,15 +487,18 @@ Hi, I'm <g>Amazon Q</g>. I can answer questions about your workspace and tooling
                 queue!(self.output, cursor::MoveToNextLine(1))?;
                 queue!(self.output, style::SetAttribute(Attribute::NormalIntensity))?;
                 tool.show_readable_intention(self.output)?;
+                queue!(self.output, style::Print("\n"))?;
                 queue!(self.output, cursor::MoveToNextLine(1))?;
             }
             queue!(self.output, style::Print("─".repeat(terminal_width)))?;
-            execute!(self.output, style::Print("\n"))?;
+            queue!(self.output, style::Print("\n"))?;
             execute!(
                 self.output,
-                style::Print(
-                    "Press `c` to consent to running these tools, or anything else to continue your conversation.\n\n"
-                ),
+                style::Print("Enter "),
+                style::SetForegroundColor(Color::Green),
+                style::Print("y"),
+                style::ResetColor,
+                style::Print(" to consent to running these tools, or anything else to continue your conversation.\n\n")
             )?;
         }
 
@@ -510,7 +513,7 @@ Hi, I'm <g>Amazon Q</g>. I can answer questions about your workspace and tooling
         match user_input.trim() {
             "exit" | "quit" => Ok(None),
             // Tool execution.
-            c if c == "c" && !queued_tools.is_empty() => {
+            c if c.to_lowercase() == "y" && !queued_tools.is_empty() => {
                 // Execute the requested tools.
                 let mut tool_results = vec![];
                 for tool in queued_tools.drain(..) {
@@ -761,7 +764,7 @@ mod tests {
             initial_input: None,
             input_source: InputSource::new_mock(vec![
                 "create a new file".to_string(),
-                "c".to_string(),
+                "y".to_string(),
                 "exit".to_string(),
             ]),
             is_interactive: true,

crates/q_cli/src/cli/chat/tools/fs_read.rs

@@ -54,7 +54,9 @@ impl FsRead {
         let is_file = ctx.fs().symlink_metadata(&self.path).await?.is_file();
 
         if is_file {
-            let relative_path = relative_path(ctx.env().current_dir()?, &path);
+            // TODO(bskiser): improve pathing display
+            // let relative_path = relative_path(ctx.env().current_dir()?, &path);
+            let relative_path = &path;
             if let Some((start, Some(end))) = self.read_range()? {
                 // TODO: file size limit?
                 // TODO: don't read entire file in memory
@@ -166,7 +168,14 @@ impl FsRead {
         let is_file = self.ty.expect("Tool needs to have been validated");
 
         if is_file {
-            queue!(updates, style::Print(format!("Reading file: {}, ", self.path)))?;
+            queue!(
+                updates,
+                style::Print("Reading file: "),
+                style::SetForegroundColor(Color::Green),
+                style::Print(&self.path),
+                style::ResetColor,
+                style::Print(", "),
+            )?;
 
             let read_range = self.read_range.as_ref();
             let start = read_range.and_then(|r| r.first());
@@ -175,20 +184,45 @@ impl FsRead {
             match (start, end) {
                 (Some(start), Some(end)) => Ok(queue!(
                     updates,
-                    style::Print(format!("from line {} to {}\n", start, end))
+                    style::Print("from line "),
+                    style::SetForegroundColor(Color::Green),
+                    style::Print(start),
+                    style::ResetColor,
+                    style::Print(" to "),
+                    style::SetForegroundColor(Color::Green),
+                    style::Print(end),
+                    style::ResetColor,
                 )?),
                 (Some(start), None) => {
-                    let input = if *start > 0 {
-                        format!("from line {} to end of file\n", start)
+                    if *start > 0 {
+                        Ok(queue!(
+                            updates,
+                            style::Print("from line "),
+                            style::SetForegroundColor(Color::Green),
+                            style::Print(start),
+                            style::ResetColor,
+                            style::Print(" to end of file"),
+                        )?)
                     } else {
-                        format!("{} line from the end of file to end of file", start)
-                    };
-                    Ok(queue!(updates, style::Print(input))?)
+                        Ok(queue!(
+                            updates,
+                            style::SetForegroundColor(Color::Green),
+                            style::Print(start),
+                            style::ResetColor,
+                            style::Print(" line from the end of file to end of file"),
+                        )?)
+                    }
                 },
-                _ => Ok(queue!(updates, style::Print("all lines"))?),
+                _ => Ok(queue!(updates, style::Print("all lines".to_string()))?),
             }
         } else {
-            queue!(updates, style::Print(format!("Reading directory: {}, ", self.path)))?;
+            queue!(
+                updates,
+                style::Print("Reading directory: "),
+                style::SetForegroundColor(Color::Green),
+                style::Print(&self.path),
+                style::ResetColor
+            )?;
 
             let depth = if let Some(ref depth) = self.read_range {
                 *depth.first().unwrap_or(&0)

crates/q_cli/tests/chat_response_stubs/fs_read.json

@@ -21,5 +21,15 @@
                 "read_range": [1, 10]
             }
         }
+    ],
+    [
+        {
+            "tool_use_id": "2",
+            "name": "fs_read",
+            "args": {
+                "path": "Cargo.toml",
+                "read_range": [5]
+            }
+        }
     ]
 ]

crates/q_cli/tests/chat_response_stubs/fs_write.json

@@ -0,0 +1,2 @@
+[
+]