Merge branch 'main' into snapshot_revise

Author: evanliu048

.github/CODEOWNERS

@@ -8,7 +8,7 @@ authors = ["Amazon Q CLI Team ([email protected])", "Chay Nabors (nabochay@amazon
 edition = "2024"
 homepage = "https://aws.amazon.com/q/"
 publish = false
-version = "1.15.0"
+version = "1.16.0"
 license = "MIT OR Apache-2.0"
 
 [workspace.dependencies]

Cargo.lock

@@ -47,7 +47,7 @@ cargo install typos-cli
 
 ## Project Layout
 
-- [`chat_cli`](crates/chat_cli/) - the `q` CLI, allows users to interface with Amazon Q Developer from
+- [`chat_cli`](crates/chat-cli/) - the `q` CLI, allows users to interface with Amazon Q Developer from
   the command line
 - [`scripts/`](scripts/) - Contains ops and build related scripts
 - [`crates/`](crates/) - Contains all rust crates

Cargo.toml

@@ -355,8 +355,10 @@ fn download_feed_json() {
         .args([
             "-H",
             "Accept: application/vnd.github.v3.raw",
-            "-s", // silent
-            "-f", // fail on HTTP errors
+            "-f",           // fail on HTTP errors
+            "-s",           // silent
+            "-v",           // verbose output printed to stderr
+            "--show-error", // print error message to stderr (since -s is used)
             "https://api.github.com/repos/aws/amazon-q-developer-cli-autocomplete/contents/feed.json",
         ])
         .output();
@@ -371,9 +373,9 @@ fn download_feed_json() {
         },
         Ok(result) => {
             let error_msg = if !result.stderr.is_empty() {
-                format!("HTTP error: {}", String::from_utf8_lossy(&result.stderr))
+                format!("{}", String::from_utf8_lossy(&result.stderr))
             } else {
-                "HTTP error occurred".to_string()
+                "An unknown error occurred".to_string()
             };
             panic!("Failed to download feed.json: {}", error_msg);
         },

README.md

@@ -815,7 +815,7 @@ impl Agents {
     // This "static" way avoids needing to construct a tool instance.
     fn default_permission_label(&self, tool_name: &str) -> String {
         let label = match tool_name {
-            "fs_read" => "trusted".dark_green().bold(),
+            "fs_read" => "trust working directory".dark_grey(),
             "fs_write" => "not trusted".dark_grey(),
             #[cfg(not(windows))]
             "execute_bash" => "trust read-only commands".dark_grey(),
@@ -1142,9 +1142,9 @@ mod tests {
 
         let label = agents.display_label("fs_read", &ToolOrigin::Native);
         // With no active agent, it should fall back to default permissions
-        // fs_read has a default of "trusted"
+        // fs_read has a default of "trust working directory"
         assert!(
-            label.contains("trusted"),
+            label.contains("trust working directory"),
             "fs_read should show default trusted permission, instead found: {}",
             label
         );
@@ -1173,7 +1173,7 @@ mod tests {
         // Test default permissions for known tools
         let fs_read_label = agents.display_label("fs_read", &ToolOrigin::Native);
         assert!(
-            fs_read_label.contains("trusted"),
+            fs_read_label.contains("trust working directory"),
             "fs_read should be trusted by default, instead found: {}",
             fs_read_label
         );

crates/chat-cli/build.rs

@@ -46,6 +46,12 @@ pub enum AgentSubcommands {
         #[arg(long, short)]
         from: Option<String>,
     },
+    /// Edit an existing agent config
+    Edit {
+        /// Name of the agent to edit
+        #[arg(long, short)]
+        name: String,
+    },
     /// Validate a config with the given path
     Validate {
         #[arg(long, short)]
@@ -138,6 +144,38 @@ impl AgentArgs {
                     path_with_file_name.display()
                 )?;
             },
+            Some(AgentSubcommands::Edit { name }) => {
+                let _agents = Agents::load(os, None, true, &mut stderr, mcp_enabled).await.0;
+                let (_agent, path_with_file_name) = Agent::get_agent_by_name(os, &name).await?;
+
+                let editor_cmd = std::env::var("EDITOR").unwrap_or_else(|_| "vi".to_string());
+                let mut cmd = std::process::Command::new(editor_cmd);
+
+                let status = cmd.arg(&path_with_file_name).status()?;
+                if !status.success() {
+                    bail!("Editor process did not exit with success");
+                }
+
+                let Ok(content) = os.fs.read(&path_with_file_name).await else {
+                    bail!(
+                        "Post edit validation failed. Error opening {}. Aborting",
+                        path_with_file_name.display()
+                    );
+                };
+                if let Err(e) = serde_json::from_slice::<Agent>(&content) {
+                    bail!(
+                        "Post edit validation failed for agent '{name}' at path: {}. Malformed config detected: {e}",
+                        path_with_file_name.display()
+                    );
+                }
+
+                writeln!(
+                    stderr,
+                    "\n✏️  Edited agent {} '{}'\n",
+                    name,
+                    path_with_file_name.display()
+                )?;
+            },
             Some(AgentSubcommands::Validate { path }) => {
                 let mut global_mcp_config = None::<McpServerConfig>;
                 let agent = Agent::load(os, path.as_str(), &mut global_mcp_config, mcp_enabled, &mut stderr).await;
@@ -386,4 +424,24 @@ mod tests {
             })
         );
     }
+
+    #[test]
+    fn test_agent_subcommand_edit() {
+        assert_parse!(
+            ["agent", "edit", "--name", "existing_agent"],
+            RootSubcommand::Agent(AgentArgs {
+                cmd: Some(AgentSubcommands::Edit {
+                    name: "existing_agent".to_string(),
+                })
+            })
+        );
+        assert_parse!(
+            ["agent", "edit", "-n", "existing_agent"],
+            RootSubcommand::Agent(AgentArgs {
+                cmd: Some(AgentSubcommands::Edit {
+                    name: "existing_agent".to_string(),
+                })
+            })
+        );
+    }
 }

crates/chat-cli/src/cli/agent/mod.rs

@@ -108,7 +108,16 @@ async fn select_experiment(os: &mut Os, session: &mut ChatSession) -> Result<Opt
             sel
         },
         // Ctrl‑C -> Err(Interrupted)
-        Err(dialoguer::Error::IO(ref e)) if e.kind() == std::io::ErrorKind::Interrupted => return Ok(None),
+        Err(dialoguer::Error::IO(ref e)) if e.kind() == std::io::ErrorKind::Interrupted => {
+            // Move to beginning of line and clear everything from warning message down
+            queue!(
+                session.stderr,
+                crossterm::cursor::MoveToColumn(0),
+                crossterm::cursor::MoveUp(experiment_labels.len() as u16 + 3),
+                crossterm::terminal::Clear(crossterm::terminal::ClearType::FromCursorDown),
+            )?;
+            return Ok(None);
+        },
         Err(e) => return Err(ChatError::Custom(format!("Failed to choose experiment: {e}").into())),
     };
 
@@ -161,6 +170,13 @@ async fn select_experiment(os: &mut Os, session: &mut ChatSession) -> Result<Opt
             style::SetForegroundColor(Color::Reset),
             style::SetBackgroundColor(Color::Reset),
         )?;
+    } else {
+        // ESC was pressed - clear the warning message
+        queue!(
+            session.stderr,
+            crossterm::cursor::MoveUp(3), // Move up past selection + 2 disclaimer lines
+            crossterm::terminal::Clear(crossterm::terminal::ClearType::FromCursorDown),
+        )?;
     }
 
     execute!(session.stderr, style::ResetColor)?;

crates/chat-cli/src/cli/agent/root_command_args.rs

@@ -54,9 +54,9 @@ impl McpArgs {
             let msg = msg
                 .iter()
                 .map(|record| match record {
-                    LoadingRecord::Err(content) | LoadingRecord::Warn(content) | LoadingRecord::Success(content) => {
-                        content.clone()
-                    },
+                    LoadingRecord::Err(timestamp, content)
+                    | LoadingRecord::Warn(timestamp, content)
+                    | LoadingRecord::Success(timestamp, content) => format!("[{timestamp}]: {content}"),
                 })
                 .collect::<Vec<_>>()
                 .join("\n--- tools refreshed ---\n");

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

@@ -77,6 +77,12 @@ pub enum AgentSubcommand {
         #[arg(long, short)]
         from: Option<String>,
     },
+    /// Edit an existing agent configuration
+    Edit {
+        /// Name of the agent to edit
+        #[arg(long, short)]
+        name: String,
+    },
     /// Generate an agent configuration using AI
     Generate {},
     /// Delete the specified agent
@@ -242,6 +248,64 @@ impl AgentSubcommand {
                 )?;
             },
 
+            Self::Edit { name } => {
+                let (_agent, path_with_file_name) = Agent::get_agent_by_name(os, &name)
+                    .await
+                    .map_err(|e| ChatError::Custom(Cow::Owned(e.to_string())))?;
+
+                let editor_cmd = std::env::var("EDITOR").unwrap_or_else(|_| "vi".to_string());
+                let mut cmd = std::process::Command::new(editor_cmd);
+
+                let status = cmd.arg(&path_with_file_name).status()?;
+                if !status.success() {
+                    return Err(ChatError::Custom("Editor process did not exit with success".into()));
+                }
+
+                let updated_agent = Agent::load(
+                    os,
+                    &path_with_file_name,
+                    &mut None,
+                    session.conversation.mcp_enabled,
+                    &mut session.stderr,
+                )
+                .await;
+                match updated_agent {
+                    Ok(agent) => {
+                        session.conversation.agents.agents.insert(agent.name.clone(), agent);
+                    },
+                    Err(e) => {
+                        execute!(
+                            session.stderr,
+                            style::SetForegroundColor(Color::Red),
+                            style::Print("Error: "),
+                            style::ResetColor,
+                            style::Print(&e),
+                            style::Print("\n"),
+                        )?;
+
+                        return Err(ChatError::Custom(
+                            format!("Post edit validation failed for agent '{name}'. Malformed config detected: {e}")
+                                .into(),
+                        ));
+                    },
+                }
+
+                execute!(
+                    session.stderr,
+                    style::SetForegroundColor(Color::Green),
+                    style::Print("Agent "),
+                    style::SetForegroundColor(Color::Cyan),
+                    style::Print(name),
+                    style::SetForegroundColor(Color::Green),
+                    style::Print(" has been edited successfully"),
+                    style::SetForegroundColor(Color::Reset),
+                    style::Print("\n"),
+                    style::SetForegroundColor(Color::Yellow),
+                    style::Print("Changes take effect on next launch"),
+                    style::SetForegroundColor(Color::Reset)
+                )?;
+            },
+
             Self::Generate {} => {
                 let agent_name = match crate::util::input("Enter agent name: ", None) {
                     Ok(input) => input.trim().to_string(),
@@ -440,6 +504,7 @@ impl AgentSubcommand {
         match self {
             Self::List => "list",
             Self::Create { .. } => "create",
+            Self::Edit { .. } => "edit",
             Self::Generate { .. } => "generate",
             Self::Delete { .. } => "delete",
             Self::Set { .. } => "set",