fix(agent): directory change (#2426)

Author: dingfeli

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

@@ -71,7 +71,7 @@ use crate::util::{
     directories,
 };
 
-const DEFAULT_AGENT_NAME: &str = "q_cli_default";
+pub const DEFAULT_AGENT_NAME: &str = "q_cli_default";
 
 #[derive(Debug, Error)]
 pub enum AgentConfigError {
@@ -252,7 +252,7 @@ impl Agent {
     pub async fn get_agent_by_name(os: &Os, agent_name: &str) -> eyre::Result<(Agent, PathBuf)> {
         let config_path: Result<PathBuf, PathBuf> = 'config: {
             // local first, and then fall back to looking at global
-            let local_config_dir = directories::chat_local_agent_dir()?.join(format!("{agent_name}.json"));
+            let local_config_dir = directories::chat_local_agent_dir(os)?.join(format!("{agent_name}.json"));
             if os.fs.exists(&local_config_dir) {
                 break 'config Ok(local_config_dir);
             }
@@ -424,7 +424,7 @@ impl Agents {
                 },
             }
 
-            let Ok(path) = directories::chat_local_agent_dir() else {
+            let Ok(path) = directories::chat_local_agent_dir(os) else {
                 break 'local Vec::<Agent>::new();
             };
             let Ok(files) = os.fs.read_dir(path).await else {

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

@@ -25,10 +25,7 @@ use super::{
 };
 use crate::database::settings::Setting;
 use crate::os::Os;
-use crate::util::directories::{
-    self,
-    agent_config_dir,
-};
+use crate::util::directories;
 
 #[derive(Clone, Debug, Subcommand, PartialEq, Eq)]
 pub enum AgentSubcommands {
@@ -319,7 +316,7 @@ pub async fn create_agent(
             bail!("Path must be a directory");
         }
 
-        agent_config_dir(path)?
+        directories::agent_config_dir(path)?
     } else {
         directories::chat_global_agent_path(os)?
     };

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

@@ -1,3 +1,5 @@
+use crate::cli::agent::DEFAULT_AGENT_NAME;
+
 /// Components extracted from a prompt string
 #[derive(Debug, PartialEq)]
 pub struct PromptComponents {
@@ -40,7 +42,7 @@ pub fn generate_prompt(current_profile: Option<&str>, warning: bool) -> String {
     // Generate plain text prompt that will be colored by highlight_prompt
     let warning_symbol = if warning { "!" } else { "" };
     let profile_part = current_profile
-        .filter(|&p| p != "default")
+        .filter(|&p| p != DEFAULT_AGENT_NAME)
         .map(|p| format!("[{p}] "))
         .unwrap_or_default();
 
@@ -58,7 +60,7 @@ mod tests {
         // Test default prompt with warning
         assert_eq!(generate_prompt(None, true), "!> ");
         // Test default profile (should be same as no profile)
-        assert_eq!(generate_prompt(Some("default"), false), "> ");
+        assert_eq!(generate_prompt(Some(DEFAULT_AGENT_NAME), false), "> ");
         // Test custom profile
         assert_eq!(generate_prompt(Some("test-profile"), false), "[test-profile] > ");
         // Test another custom profile with warning

crates/chat-cli/src/util/directories.rs

@@ -32,6 +32,9 @@ pub enum DirectoryError {
 
 type Result<T, E = DirectoryError> = std::result::Result<T, E>;
 
+const WORKSPACE_AGENT_DIR_RELATIVE: &str = ".amazonq/cli-agents";
+const GLOBAL_AGENT_DIR_RELATIVE_TO_HOME: &str = ".aws/amazonq/cli-agents";
+
 /// The directory of the users home
 ///
 /// - Linux: /home/Alice
@@ -147,13 +150,13 @@ pub fn chat_legacy_mcp_config(os: &Os) -> Result<PathBuf> {
 
 /// The directory to the directory containing global agents
 pub fn chat_global_agent_path(os: &Os) -> Result<PathBuf> {
-    Ok(home_dir(os)?.join(".aws").join("amazonq").join("agents"))
+    Ok(home_dir(os)?.join(GLOBAL_AGENT_DIR_RELATIVE_TO_HOME))
 }
 
 /// The directory to the directory containing config for the `/context` feature in `q chat`.
-pub fn chat_local_agent_dir() -> Result<PathBuf> {
-    let cwd = std::env::current_dir()?;
-    Ok(cwd.join(".amazonq").join("agents"))
+pub fn chat_local_agent_dir(os: &Os) -> Result<PathBuf> {
+    let cwd = os.env.current_dir()?;
+    Ok(cwd.join(WORKSPACE_AGENT_DIR_RELATIVE))
 }
 
 /// Derives the absolute path to an agent config directory given a "workspace directory".
@@ -162,7 +165,7 @@ pub fn chat_local_agent_dir() -> Result<PathBuf> {
 /// For example, if the given path is /path/one, then the derived config path would be
 /// `/path/one/.amazonq/agents`
 pub fn agent_config_dir(workspace_dir: PathBuf) -> Result<PathBuf> {
-    Ok(workspace_dir.join(".amazonq/agents"))
+    Ok(workspace_dir.join(WORKSPACE_AGENT_DIR_RELATIVE))
 }
 
 /// The directory to the directory containing config for the `/context` feature in `q chat`.

docs/agent-format.md

@@ -5,6 +5,7 @@ The agent configuration file for each agent is a JSON file. The filename (withou
 Every agent configuration file can include the following sections:
 
 - [`name`](#name-field) — The name of the agent (optional, derived from filename if not specified).
+- [`version`](#version-field) - The version of the agent config.
 - [`description`](#description-field) — A description of the agent.
 - [`prompt`](#prompt-field) — High-level context for the agent (not yet implemented).
 - [`mcpServers`](#mcpservers-field) — The MCP servers the agent has access to.