fix: outputs error when tool execution fails (#637)

* fix: outputs error when tool execution fails

* fix: fmts with cargo nightly

* fix: makes aws tool to return error when exit code is not 0

Author: dingfeli

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

@@ -533,25 +533,37 @@ Hi, I'm <g>Amazon Q</g>. I can answer questions about your workspace and tooling
                     match tool.1.invoke(&self.ctx, self.output).await {
                         Ok(result) => {
                             debug!("tool result output: {:#?}", result);
+                            if let Some(builder) = corresponding_builder {
+                                builder.is_success = Some(true);
+                            }
+
                             tool_results.push(ToolResult {
                                 tool_use_id: tool.0,
                                 content: vec![result.into()],
                                 status: ToolResultStatus::Success,
                             });
-                            if let Some(builder) = corresponding_builder {
-                                builder.is_success = Some(true);
-                            }
                         },
                         Err(err) => {
                             error!(?err, "An error occurred processing the tool");
                             tool_results.push(ToolResult {
                                 tool_use_id: tool.0,
                                 content: vec![ToolResultContentBlock::Text(format!(
-                                    "An error occurred processing the tool: {}",
+                                    "An error occurred processing the tool: \n{}",
                                     err
                                 ))],
                                 status: ToolResultStatus::Error,
                             });
+
+                            execute!(
+                                self.output,
+                                style::SetAttribute(Attribute::Bold),
+                                style::Print("Tool execution failed: "),
+                                style::SetAttribute(Attribute::Reset),
+                                style::SetForegroundColor(Color::Red),
+                                style::Print(err),
+                                style::SetForegroundColor(Color::Reset)
+                            )?;
+
                             if let Some(builder) = corresponding_builder {
                                 builder.is_success = Some(false);
                             }

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

@@ -83,13 +83,17 @@ impl UseAws {
         let stdout = output.stdout.to_str_lossy();
         let stderr = output.stderr.to_str_lossy();
 
-        Ok(InvokeOutput {
-            output: OutputKind::Json(serde_json::json!({
-                "exit_status": status,
-                "stdout": stdout,
-                "stderr": stderr
-            })),
-        })
+        if status.eq("0") {
+            Ok(InvokeOutput {
+                output: OutputKind::Json(serde_json::json!({
+                    "exit_status": status,
+                    "stdout": stdout,
+                    "stderr": stderr
+                })),
+            })
+        } else {
+            Err(eyre::eyre!(stderr.to_string()))
+        }
     }
 
     pub fn show_readable_intention(&self, updates: &mut impl Write) -> Result<()> {