Path fall back .amazonq to .kiro migration functionality

dk19y · dk19y · commit dc64487fed42 · 2025-11-03T15:41:59.000-08:00
- Support workspace and global path migration
- Maintain backward compatibility with existing .amazonq configs
- Follow proper precedence rules (amazonq &gt; kiro when both exist)
- Add comprehensive unit tests covering all migration scenarios
-
diff --git a/crates/agent/src/agent/agent_config/mod.rs b/crates/agent/src/agent/agent_config/mod.rs
@@ -34,8 +34,6 @@ use tracing::{
 use super::util::directories::{
     global_agents_path,
     legacy_global_mcp_config_path,
-};
-use crate::agent::util::directories::{
     legacy_workspace_mcp_config_path,
     local_agents_path,
 };
diff --git a/crates/agent/src/agent/util/directories.rs b/crates/agent/src/agent/util/directories.rs
@@ -14,7 +14,6 @@ use super::error::{
 use crate::agent::util::consts::env_var::CLI_DATA_DIR;
 
 const DATA_DIR_NAME: &str = "amazon-q";
-const AWS_DIR_NAME: &str = "amazonq";
 
 type Result<T, E = UtilError> = std::result::Result<T, E>;
 
@@ -57,28 +56,51 @@ pub fn settings_schema_path(base: impl AsRef<Path>) -> PathBuf {
     base.as_ref().join("settings_schema.json")
 }
 
+fn resolve_migrated_path(is_global: bool, subpath: &str) -> Result<PathBuf> {
+    let (kiro_base, amazonq_base) = if is_global {
+        let home = home_dir()?;
+        (home.join(".aws/kiro"), home.join(".aws/amazonq"))
+    } else {
+        let cwd = env::current_dir()
+            .context("unable to get the current directory")?;
+        (cwd.join(".kiro"), cwd.join(".amazonq"))
+    };
+    
+    let scope = if is_global { "global" } else { "workspace" };
+    
+    match (kiro_base.exists(), amazonq_base.exists()) {
+        (true, false) => {
+            warn!("Using .kiro {} configuration", scope);
+            Ok(kiro_base.join(subpath))
+        },
+        (false, true) => {
+            warn!("Migration notice: Using .amazonq {} configs", scope);
+            Ok(amazonq_base.join(subpath))
+        },
+        (true, true) => {
+            warn!("Both .amazonq and .kiro {} configs exist, using .amazonq", scope);
+            Ok(amazonq_base.join(subpath))
+        },
+        (false, false) => Ok(kiro_base.join(subpath)), // Default to kiro
+    }
+}
+
 /// Path to the directory containing local agent configs.
 pub fn local_agents_path() -> Result<PathBuf> {
-    Ok(env::current_dir()
-        .context("unable to get the current directory")?
-        .join(format!(".{}", AWS_DIR_NAME))
-        .join("cli-agents"))
+    resolve_migrated_path(false, "cli-agents")
 }
 
 /// Path to the directory containing global agent configs.
 pub fn global_agents_path() -> Result<PathBuf> {
-    Ok(home_dir()?.join(".aws").join(AWS_DIR_NAME).join("cli-agents"))
+    resolve_migrated_path(true, "cli-agents")
 }
 
 /// Legacy workspace MCP server config path
 pub fn legacy_workspace_mcp_config_path() -> Result<PathBuf> {
-    Ok(env::current_dir()
-        .context("unable to get the current directory")?
-        .join(format!(".{}", AWS_DIR_NAME))
-        .join("mcp.json"))
+    resolve_migrated_path(false, "mcp.json")
 }
 
 /// Legacy global MCP server config path
 pub fn legacy_global_mcp_config_path() -> Result<PathBuf> {
-    Ok(home_dir()?.join(".aws").join(AWS_DIR_NAME).join("mcp.json"))
+    resolve_migrated_path(true, "mcp.json")
 }
diff --git a/crates/chat-cli/src/cli/agent/mod.rs b/crates/chat-cli/src/cli/agent/mod.rs
@@ -197,7 +197,8 @@ impl Default for Agent {
             resources: {
                 let mut resources = Vec::new();
                 resources.extend(paths::workspace::DEFAULT_AGENT_RESOURCES.iter().map(|&s| s.into()));
-                resources.push(format!("file://{}", paths::workspace::RULES_PATTERN).into());
+                // Default fallback pattern - will be updated dynamically in load() function
+                resources.push("file://.amazonq/rules/**/*.md".into());
                 resources
             },
             hooks: Default::default(),
@@ -742,6 +743,16 @@ impl Agents {
 
             all_agents.push({
                 let mut agent = Agent::default();
+                
+                // Update rules pattern to use dynamic path resolution
+                if let Ok(rules_dir) = resolver.workspace().rules_dir() {
+                    let rules_pattern = format!("{}/**/*.md", rules_dir.display());
+                    // Replace the hardcoded rules pattern with the dynamic one
+                    if let Some(pos) = agent.resources.iter().position(|r| r.as_str().contains(".amazonq/rules/")) {
+                        agent.resources[pos] = format!("file://{}", rules_pattern).into();
+                    }
+                }
+                
                 if mcp_enabled {
                     'load_legacy_mcp_json: {
                         if global_mcp_config.is_none() {
diff --git a/crates/chat-cli/src/cli/agent/root_command_args.rs b/crates/chat-cli/src/cli/agent/root_command_args.rs
@@ -25,7 +25,6 @@ use super::{
 use crate::database::settings::Setting;
 use crate::os::Os;
 use crate::theme::StyledText;
-use crate::util::paths;
 use crate::util::paths::PathResolver;
 
 #[derive(Clone, Debug, Subcommand, PartialEq, Eq)]
@@ -337,7 +336,7 @@ pub async fn create_agent(
             bail!("Path must be a directory");
         }
 
-        path.join(paths::workspace::AGENTS_DIR)
+        PathResolver::new(os).workspace().agents_dir()?
     } else {
         PathResolver::new(os).global().agents_dir()?
     };
diff --git a/crates/chat-cli/src/cli/chat/cli/prompts.rs b/crates/chat-cli/src/cli/chat/cli/prompts.rs
@@ -733,10 +733,13 @@ impl PromptsArgs {
             }
 
             if !global_prompts.is_empty() {
+                let global_dir = PathResolver::new(os).global().prompts_dir()
+                    .map(|p| p.display().to_string())
+                    .unwrap_or_else(|_| "global prompts".to_string());
                 queue!(
                     session.stderr,
                     style::SetAttribute(Attribute::Bold),
-                    style::Print(&format!("Global ({}):", crate::util::paths::global::PROMPTS_DIR)),
+                    style::Print(&format!("Global ({}):", global_dir)),
                     StyledText::reset_attributes(),
                     style::Print("\n"),
                 )?;
@@ -750,10 +753,13 @@ impl PromptsArgs {
                 if !global_prompts.is_empty() {
                     queue!(session.stderr, style::Print("\n"))?;
                 }
+                let local_dir = PathResolver::new(os).workspace().prompts_dir()
+                    .map(|p| p.display().to_string())
+                    .unwrap_or_else(|_| "local prompts".to_string());
                 queue!(
                     session.stderr,
                     style::SetAttribute(Attribute::Bold),
-                    style::Print(&format!("Local ({}):", crate::util::paths::workspace::PROMPTS_DIR)),
+                    style::Print(&format!("Local ({}):", local_dir)),
                     StyledText::reset_attributes(),
                     style::Print("\n"),
                 )?;
@@ -2069,8 +2075,8 @@ mod tests {
         let temp_dir = TempDir::new().unwrap();
 
         // Create test prompts in temp directory structure
-        let global_dir = temp_dir.path().join(crate::util::paths::global::PROMPTS_DIR);
-        let local_dir = temp_dir.path().join(crate::util::paths::workspace::PROMPTS_DIR);
+        let global_dir = temp_dir.path().join(".aws/amazonq/prompts");
+        let local_dir = temp_dir.path().join(".amazonq/prompts");
 
         create_prompt_file(&global_dir, "global_only", "Global content");
         create_prompt_file(&global_dir, "shared", "Global shared");
@@ -2090,8 +2096,8 @@ mod tests {
         let temp_dir = TempDir::new().unwrap();
 
         // Create global and local directories
-        let global_dir = temp_dir.path().join(crate::util::paths::global::PROMPTS_DIR);
-        let local_dir = temp_dir.path().join(crate::util::paths::workspace::PROMPTS_DIR);
+        let global_dir = temp_dir.path().join(".aws/amazonq/prompts");
+        let local_dir = temp_dir.path().join(".amazonq/prompts");
 
         // Create prompts: one with same name in both directories, one unique to each
         create_prompt_file(&global_dir, "shared", "Global version");
diff --git a/crates/chat-cli/src/util/paths.rs b/crates/chat-cli/src/util/paths.rs
