fix(agent): local agents being sourced from incorrect local path (#2398)

Author: dingfeli

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

@@ -218,6 +218,7 @@ impl Agent {
             .to_string();
 
         self.name = name.clone();
+        self.path = Some(path.to_path_buf());
 
         if let (true, Some(global_mcp_config)) = (self.use_legacy_mcp_json, global_mcp_config) {
             let mut stderr = std::io::stderr();

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

@@ -214,19 +214,16 @@ pub async fn create_agent(
     from: Option<String>,
 ) -> Result<PathBuf> {
     let path = if let Some(path) = path {
-        let path = PathBuf::from(path);
+        let mut path = PathBuf::from(path);
+        if path.is_relative() {
+            path = os.env.current_dir()?.join(path);
+        }
 
-        // If path points to a file, strip the filename to get the directory
         if !path.is_dir() {
             bail!("Path must be a directory");
         }
 
-        let last_three_segments = agent_config_dir();
-        if path.ends_with(&last_three_segments) {
-            path
-        } else {
-            path.join(&last_three_segments)
-        }
+        agent_config_dir(path)?
     } else {
         directories::chat_global_agent_path(os)?
     };

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

@@ -1,4 +1,7 @@
-use std::path::PathBuf;
+use std::path::{
+    PathBuf,
+    StripPrefixError,
+};
 
 use thiserror::Error;
 
@@ -23,6 +26,8 @@ pub enum DirectoryError {
     FromVecWithNul(#[from] std::ffi::FromVecWithNulError),
     #[error(transparent)]
     IntoString(#[from] std::ffi::IntoStringError),
+    #[error(transparent)]
+    StripPrefix(#[from] StripPrefixError),
 }
 
 type Result<T, E = DirectoryError> = std::result::Result<T, E>;
@@ -142,23 +147,22 @@ 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(agent_config_dir()))
+    Ok(home_dir(os)?.join(".aws").join("amazonq").join("agents"))
 }
 
 /// 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(agent_config_dir()))
+    Ok(cwd.join(".amazonq").join("agents"))
 }
 
-/// The relative path to the agent configuration directory
+/// Derives the absolute path to an agent config directory given a "workspace directory".
+/// A workspace directory is a directory where q chat is to be launched
 ///
-/// This directory contains agent configuration files for Amazon Q.
-/// The path is relative and should be joined with either the home directory
-/// for global agents or the current working directory for local agents.
-// TODO [dingfeli]: implement Brandon's suggestion: https://github.com/aws/amazon-q-developer-cli/pull/2307#discussion_r2207989985
-pub fn agent_config_dir() -> PathBuf {
-    PathBuf::from(".aws/amazonq/agents")
+/// 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"))
 }
 
 /// The directory to the directory containing config for the `/context` feature in `q chat`.