Fix: core agentic bug fixes before release

Author: chaynabors

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

@@ -15,6 +15,7 @@ use std::io::{
 use std::process::ExitCode;
 use std::sync::Arc;
 use std::sync::atomic::AtomicBool;
+use std::time::Duration;
 
 use conversation_state::ConversationState;
 use crossterm::style::{
@@ -430,15 +431,21 @@ Hi, I'm <g>Amazon Q</g>. Ask me anything.
                             None => break, // Data was incomplete
                         },
                     }
+
+                    // TODO: We should buffer output based on how much we have to parse, not as a constant
+                    // Do not remove unless you are nabochay :)
+                    std::thread::sleep(Duration::from_millis(8));
                 }
 
                 // Set spinner after showing all of the assistant text content so far.
                 if let (Some(name), true) = (&tool_name_being_recvd, self.is_interactive) {
-                    execute!(self.output, style::Print("\n"))?;
-                    self.spinner = Some(Spinner::new(
-                        Spinners::Dots,
-                        format!("Creating tool {}...", name.clone().green()),
-                    ));
+                    queue!(
+                        self.output,
+                        style::SetForegroundColor(Color::Blue),
+                        style::Print(format!("\n{name}: ")),
+                        style::SetForegroundColor(Color::Reset),
+                    )?;
+                    self.spinner = Some(Spinner::new(Spinners::Dots, "Thinking...".to_string()));
                 }
 
                 if ended {
@@ -676,11 +683,11 @@ Hi, I'm <g>Amazon Q</g>. Ask me anything.
                         let tool_start = std::time::Instant::now();
                         queue!(
                             self.output,
-                            style::Print("\n"),
-                            style::Print("▔".repeat(terminal_width)),
-                            style::Print("\nExecuting "),
+                            style::Print("\n\nExecuting "),
                             style::SetForegroundColor(Color::Cyan),
-                            style::Print(format!("{}...\n\n", tool.1.display_name())),
+                            style::Print(format!("{}...\n", tool.1.display_name())),
+                            style::SetForegroundColor(Color::DarkGrey),
+                            style::Print(format!("{}\n", "▔".repeat(terminal_width))),
                             style::SetForegroundColor(Color::Reset),
                         )?;
                         should_terminate.store(false, std::sync::atomic::Ordering::SeqCst);
@@ -711,7 +718,7 @@ Hi, I'm <g>Amazon Q</g>. Ask me anything.
                                     style::SetForegroundColor(Color::Green),
                                     style::Print(format!("🟢 Completed in {}s", tool_time)),
                                     style::SetForegroundColor(Color::Reset),
-                                    style::Print("\n\n"),
+                                    style::Print("\n"),
                                 )?;
                                 if let Some(builder) = corresponding_builder {
                                     builder.is_success = Some(true);

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

@@ -19,6 +19,7 @@ use serde::Deserialize;
 
 use super::{
     InvokeOutput,
+    MAX_TOOL_RESPONSE_SIZE,
     OutputKind,
 };
 
@@ -38,15 +39,15 @@ impl ExecuteBash {
             style::Print("\n"),
         )?;
 
-        let (stdin, stdout, stderr) = match self.interactive {
-            Some(true) => (Stdio::inherit(), Stdio::inherit(), Stdio::inherit()),
-            _ => (Stdio::piped(), Stdio::piped(), Stdio::piped()),
+        let (stdout, stderr) = match self.interactive {
+            Some(true) => (Stdio::inherit(), Stdio::inherit()),
+            _ => (Stdio::piped(), Stdio::piped()),
         };
 
         let output = tokio::process::Command::new("bash")
             .arg("-c")
             .arg(&self.command)
-            .stdin(stdin)
+            .stdin(Stdio::inherit())
             .stdout(stdout)
             .stderr(stderr)
             .spawn()
@@ -62,12 +63,34 @@ impl ExecuteBash {
             execute!(updates, style::Print(&stdout))?;
         }
 
+        let stdout = format!(
+            "{}{}",
+            &stdout[0..stdout.len().min(MAX_TOOL_RESPONSE_SIZE / 3)],
+            if stdout.len() > MAX_TOOL_RESPONSE_SIZE / 3 {
+                " ... truncated"
+            } else {
+                ""
+            }
+        );
+
+        let stderr = format!(
+            "{}{}",
+            &stderr[0..stderr.len().min(MAX_TOOL_RESPONSE_SIZE / 3)],
+            if stderr.len() > MAX_TOOL_RESPONSE_SIZE / 3 {
+                " ... truncated"
+            } else {
+                ""
+            }
+        );
+
+        let output = serde_json::json!({
+            "exit_status": status,
+            "stdout": stdout,
+            "stderr": stderr,
+        });
+
         Ok(InvokeOutput {
-            output: OutputKind::Json(serde_json::json!({
-                "exit_status": status,
-                "stdout": stdout,
-                "stderr": stderr,
-            })),
+            output: OutputKind::Json(output),
         })
     }
 

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

@@ -19,6 +19,7 @@ use tracing::warn;
 
 use super::{
     InvokeOutput,
+    MAX_TOOL_RESPONSE_SIZE,
     OutputKind,
     format_path,
     sanitize_path_tool_arg,
@@ -78,22 +79,31 @@ impl FsRead {
                     .take(end - start + 1)
                     .collect::<Vec<_>>()
                     .join("\n");
-                queue!(
-                    updates,
-                    style::SetForegroundColor(Color::Green),
-                    style::Print("Reading:\n"),
-                    style::ResetColor,
-                    style::Print("\n"),
-                )?;
 
                 let formatted = stylize_output_if_able(ctx, &path, file_contents.as_str(), Some(start + 1), None);
                 queue!(updates, style::Print(formatted), style::ResetColor, style::Print("\n"))?;
+
+                // TODO: We copy and paste this below so the control flow needs work in this tool
+                let byte_count = file_contents.len();
+                if byte_count > MAX_TOOL_RESPONSE_SIZE {
+                    bail!(
+                        "This tool only supports reading {MAX_TOOL_RESPONSE_SIZE} bytes at a time. You tried to read {byte_count} bytes. Try executing with fewer lines specified."
+                    );
+                }
+
                 return Ok(InvokeOutput {
                     output: OutputKind::Text(file_contents),
                 });
             }
 
             let file = ctx.fs().read_to_string(&path).await?;
+            let byte_count = file.len();
+            if byte_count > MAX_TOOL_RESPONSE_SIZE {
+                bail!(
+                    "This tool only supports reading up to {MAX_TOOL_RESPONSE_SIZE} bytes at a time. You tried to read {byte_count} bytes. Try executing with fewer lines specified."
+                );
+            }
+
             let file_text = stylize_output_if_able(ctx, path, file.as_str(), None, None);
             queue!(
                 updates,
@@ -157,8 +167,17 @@ impl FsRead {
                     }
                 }
             }
+
+            let result = result.join("\n");
+            let byte_count = result.len();
+            if byte_count > MAX_TOOL_RESPONSE_SIZE {
+                bail!(
+                    "This tool only supports reading up to {MAX_TOOL_RESPONSE_SIZE} bytes at a time. You tried to read {byte_count} bytes. Try executing with fewer lines specified."
+                );
+            }
+
             Ok(InvokeOutput {
-                output: OutputKind::Text(result.join("\n")),
+                output: OutputKind::Text(result),
             })
         }
     }
@@ -243,6 +262,7 @@ impl FsRead {
         }
 
         let is_file = ctx.fs().symlink_metadata(&path).await?.is_file();
+
         self.ty = Some(is_file);
 
         Ok(())

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

@@ -44,6 +44,8 @@ use use_aws::UseAws;
 
 use super::parser::ToolUse;
 
+pub const MAX_TOOL_RESPONSE_SIZE: usize = 30720;
+
 static SYNTAX_SET: LazyLock<SyntaxSet> = LazyLock::new(SyntaxSet::load_defaults_newlines);
 static THEME_SET: LazyLock<ThemeSet> = LazyLock::new(ThemeSet::load_defaults);
 

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

@@ -20,6 +20,7 @@ use serde::Deserialize;
 
 use super::{
     InvokeOutput,
+    MAX_TOOL_RESPONSE_SIZE,
     OutputKind,
 };
 
@@ -66,16 +67,36 @@ impl UseAws {
         let stdout = output.stdout.to_str_lossy();
         let stderr = output.stderr.to_str_lossy();
 
+        let stdout = format!(
+            "{}{}",
+            &stdout[0..stdout.len().min(MAX_TOOL_RESPONSE_SIZE / 3)],
+            if stdout.len() > MAX_TOOL_RESPONSE_SIZE / 3 {
+                " ... truncated"
+            } else {
+                ""
+            }
+        );
+
+        let stderr = format!(
+            "{}{}",
+            &stderr[0..stderr.len().min(MAX_TOOL_RESPONSE_SIZE / 3)],
+            if stderr.len() > MAX_TOOL_RESPONSE_SIZE / 3 {
+                " ... truncated"
+            } else {
+                ""
+            }
+        );
+
         if status.eq("0") {
             Ok(InvokeOutput {
                 output: OutputKind::Json(serde_json::json!({
                     "exit_status": status,
                     "stdout": stdout,
-                    "stderr": stderr
+                    "stderr": stderr.clone()
                 })),
             })
         } else {
-            Err(eyre::eyre!(stderr.to_string()))
+            Err(eyre::eyre!(stderr))
         }
     }