Merge branch 'qv2' into qv2-migration

Author: kkashilk

Cargo.toml

@@ -179,7 +179,7 @@ manual_ok_or = "warn"
 map_err_ignore = "warn"
 map_flatten = "warn"
 map_unwrap_or = "warn"
-match_on_vec_items = "warn"
+
 # match_same_arms = "warn"
 match_wild_err_arm = "warn"
 match_wildcard_for_single_variants = "warn"

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,
 };

crates/agent/src/agent/consts.rs

@@ -1,5 +1,4 @@
-/// Name of the default agent.
-pub const DEFAULT_AGENT_NAME: &str = "q_cli_default";
+pub const DEFAULT_AGENT_NAME: &str = "kiro_default";
 
 pub const MAX_CONVERSATION_STATE_HISTORY_LEN: usize = 500;
 

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,50 @@ 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")
 }

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

@@ -60,6 +60,7 @@ use crate::cli::agent::hook::{
     Hook,
     HookTrigger,
 };
+use crate::constants::DEFAULT_AGENT_NAME;
 use crate::database::settings::Setting;
 use crate::os::Os;
 use crate::theme::StyledText;
@@ -71,8 +72,6 @@ use crate::util::{
     paths,
 };
 
-pub const DEFAULT_AGENT_NAME: &str = "q_cli_default";
-
 #[derive(Debug, Error)]
 pub enum AgentConfigError {
     #[error("Json supplied at {} is invalid: {}", path.display(), error)]
@@ -197,7 +196,6 @@ 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());
                 resources
             },
             hooks: Default::default(),
@@ -740,6 +738,13 @@ impl Agents {
 
             all_agents.push({
                 let mut agent = Agent::default();
+
+                // Add rules pattern using dynamic path resolution
+                if let Ok(rules_dir) = resolver.workspace().rules_dir() {
+                    let rules_pattern = paths::workspace::RULES_PATTERN.replace("{}", &rules_dir.display().to_string());
+                    agent.resources.push(rules_pattern.into());
+                }
+
                 if mcp_enabled {
                     'load_legacy_mcp_json: {
                         if global_mcp_config.is_none() {

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)]
@@ -336,7 +335,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()?
     };

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

@@ -29,11 +29,11 @@ impl ClearArgs {
                 "\nAre you sure? This will erase the conversation history and context from hooks for the current session. "
             ),
             style::Print("["),
-            StyledText::success_fg(),
+            StyledText::current_item_fg(),
             style::Print("y"),
             StyledText::secondary_fg(),
             style::Print("/"),
-            StyledText::success_fg(),
+            StyledText::current_item_fg(),
             style::Print("n"),
             StyledText::secondary_fg(),
             style::Print("]:\n\n"),

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

@@ -733,10 +733,14 @@ impl PromptsArgs {
             }
 
             if !global_prompts.is_empty() {
+                let global_dir = PathResolver::new(os)
+                    .global()
+                    .prompts_dir()
+                    .map_or_else(|_| "global prompts".to_string(), |p| p.display().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 +754,14 @@ impl PromptsArgs {
                 if !global_prompts.is_empty() {
                     queue!(session.stderr, style::Print("\n"))?;
                 }
+                let local_dir = PathResolver::new(os)
+                    .workspace()
+                    .prompts_dir()
+                    .map_or_else(|_| "local prompts".to_string(), |p| p.display().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 +2077,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 +2098,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");

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

@@ -15,10 +15,7 @@ use crossterm::{
 };
 
 use crate::api_client::model::Tool as FigTool;
-use crate::cli::agent::{
-    Agent,
-    DEFAULT_AGENT_NAME,
-};
+use crate::cli::agent::Agent;
 use crate::cli::chat::consts::{
     AGENT_FORMAT_TOOLS_DOC_URL,
     DUMMY_TOOL_NAME,
@@ -30,6 +27,7 @@ use crate::cli::chat::{
     ChatState,
     trust_all_text,
 };
+use crate::constants::DEFAULT_AGENT_NAME;
 use crate::constants::help_text::tools_long_help;
 use crate::theme::StyledText;
 use crate::util::consts::MCP_SERVER_TOOL_DELIMITER;

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

@@ -162,7 +162,6 @@ use winnow::stream::Offset;
 
 use super::agent::{
     Agent,
-    DEFAULT_AGENT_NAME,
     PermissionEvalResult,
 };
 use crate::api_client::model::ToolResultStatus;
@@ -191,6 +190,7 @@ use crate::cli::experiment::experiment_manager::{
     ExperimentName,
 };
 use crate::constants::{
+    DEFAULT_AGENT_NAME,
     error_messages,
     tips,
 };