Feat: Add display name action (#722)

Author: chaynabors

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

@@ -447,19 +447,18 @@ Hi, I'm <g>Amazon Q</g>, your AI Developer Assistant.
             execute!(
                 self.output,
                 style::SetForegroundColor(Color::DarkGrey),
-                style::Print("▁".repeat(terminal_width)),
-                style::ResetColor,
-                style::Print("\n\nEnter "),
+                style::Print("\nEnter "),
                 style::SetForegroundColor(Color::Green),
                 style::Print("y"),
-                style::ResetColor,
+                style::SetForegroundColor(Color::DarkGrey),
                 style::Print(format!(
-                    " to run {}, or otherwise continue your conversation.\n\n",
+                    " to run {}, otherwise continue without.\n\n",
                     match tool_uses.len() == 1 {
                         true => "this tool",
                         false => "these tools",
                     }
                 )),
+                style::SetForegroundColor(Color::Reset),
             )?;
         }
         let user_input = match self.input_source.read_line(Some("> "))? {
@@ -489,7 +488,7 @@ Hi, I'm <g>Amazon Q</g>, your AI Developer Assistant.
         let tool_uses = tool_uses.unwrap_or_default();
         Ok(match command {
             Command::Ask { prompt } => {
-                if ["y", "Y"].contains(&prompt.as_str()) {
+                if ["y", "Y"].contains(&prompt.as_str()) && !tool_uses.is_empty() {
                     return Ok(ChatState::ExecuteTools(tool_uses));
                 }
 
@@ -555,16 +554,15 @@ Hi, I'm <g>Amazon Q</g>, your AI Developer Assistant.
         // Execute the requested tools.
         let terminal_width = self.terminal_width();
         let mut tool_results = vec![];
-        for tool in tool_uses {
+        for (i, tool) in tool_uses.into_iter().enumerate() {
             let mut tool_telemetry = self.tool_use_telemetry_events.entry(tool.0.clone());
             tool_telemetry = tool_telemetry.and_modify(|ev| ev.is_accepted = true);
 
             let tool_start = std::time::Instant::now();
             queue!(
                 self.output,
-                style::Print("\n\nExecuting "),
                 style::SetForegroundColor(Color::Cyan),
-                style::Print(format!("{}...\n", tool.1.display_name())),
+                style::Print(format!("\n{}. {}...\n", i + 1, tool.1.display_name_action())),
                 style::SetForegroundColor(Color::DarkGrey),
                 style::Print(format!("{}\n", "▔".repeat(terminal_width))),
                 style::SetForegroundColor(Color::Reset),

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

@@ -2,14 +2,11 @@ use std::collections::VecDeque;
 use std::io::Write;
 use std::process::Stdio;
 
+use crossterm::queue;
 use crossterm::style::{
     self,
     Color,
 };
-use crossterm::{
-    execute,
-    queue,
-};
 use eyre::{
     Context as EyreContext,
     Result,
@@ -34,14 +31,6 @@ pub struct ExecuteBash {
 
 impl ExecuteBash {
     pub async fn invoke(&self, mut updates: impl Write) -> Result<InvokeOutput> {
-        execute!(
-            updates,
-            style::SetForegroundColor(Color::Green),
-            style::Print(format!("Executing `{}`", &self.command)),
-            style::ResetColor,
-            style::Print("\n"),
-        )?;
-
         // We need to maintain a handle on stderr and stdout, but pipe it to the terminal as well
         let mut child = tokio::process::Command::new("bash")
             .arg("-c")
@@ -64,31 +53,31 @@ impl ExecuteBash {
         let mut stdout_buf = VecDeque::with_capacity(LINE_COUNT);
         let mut stderr_buf = VecDeque::with_capacity(LINE_COUNT);
 
+        let mut stdout_done = false;
+        let mut stderr_done = false;
         let exit_status = loop {
-            child.stdin.take();
-
             select! {
                 biased;
-                line = stdout.next_line() => match line {
+                line = stdout.next_line(), if !stdout_done => match line {
                     Ok(Some(line)) => {
                         writeln!(updates, "{line}")?;
                         if stdout_buf.len() >= LINE_COUNT {
                             stdout_buf.pop_front();
                         }
                         stdout_buf.push_back(line);
                     },
-                    Ok(None) => {},
+                    Ok(None) => stdout_done = true,
                     Err(err) => error!(%err, "Failed to read stdout of child process"),
                 },
-                line = stderr.next_line() => match line {
+                line = stderr.next_line(), if !stderr_done => match line {
                     Ok(Some(line)) => {
                         writeln!(updates, "{line}")?;
                         if stderr_buf.len() >= LINE_COUNT {
                             stderr_buf.pop_front();
                         }
                         stderr_buf.push_back(line);
                     },
-                    Ok(None) => {},
+                    Ok(None) => stderr_done = true,
                     Err(err) => error!(%err, "Failed to read stderr of child process"),
                 },
                 exit_status = child.wait() => {

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

@@ -69,6 +69,17 @@ impl Tool {
         }
     }
 
+    // TODO: Remove, just roll with it for now ya?
+    pub fn display_name_action(&self) -> String {
+        match self {
+            Tool::FsRead(_) => "Reading from filesystem",
+            Tool::FsWrite(_) => "Writing to filesystem",
+            Tool::ExecuteBash(execute_bash) => return format!("Executing `{}`", execute_bash.command),
+            Tool::UseAws(_) => "Using AWS CLI",
+        }
+        .to_owned()
+    }
+
     /// Whether or not the tool should prompt the user for consent before [Self::invoke] is called.
     pub fn requires_consent(&self, _ctx: &Context) -> bool {
         match self {