Revert "feat: rebrand paths from .aws/amazonq/ and .amazonq/ to .kiro-cli/"

This reverts commit 44dad82.

Author: dk19y

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

@@ -165,7 +165,7 @@ pub struct Agent {
     #[serde(default)]
     #[schemars(schema_with = "tool_settings_schema")]
     pub tools_settings: HashMap<ToolSettingTarget, serde_json::Value>,
-    /// Whether or not to include the legacy ~/.kiro-cli/mcp.json in the agent
+    /// Whether or not to include the legacy ~/.aws/amazonq/mcp.json in the agent
     /// You can reference tools brought in by these servers as just as you would with the servers
     /// you configure in the mcpServers field in this config
     #[serde(default)]
@@ -197,7 +197,7 @@ impl Default for Agent {
                 "file://AmazonQ.md",
                 "file://AGENTS.md",
                 "file://README.md",
-                "file://.kiro-cli/rules/**/*.md",
+                "file://.amazonq/rules/**/*.md",
                 "file://.kiro/steering/**/*.md",
             ]
             .into_iter()

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

@@ -731,7 +731,7 @@ impl PromptsArgs {
                 queue!(
                     session.stderr,
                     style::SetAttribute(Attribute::Bold),
-                    style::Print("Global (.kiro-cli/prompts):"),
+                    style::Print("Global (.aws/amazonq/prompts):"),
                     StyledText::reset_attributes(),
                     style::Print("\n"),
                 )?;
@@ -748,7 +748,7 @@ impl PromptsArgs {
                 queue!(
                     session.stderr,
                     style::SetAttribute(Attribute::Bold),
-                    style::Print("Local (.kiro-cli/prompts):"),
+                    style::Print("Local (.amazonq/prompts):"),
                     StyledText::reset_attributes(),
                     style::Print("\n"),
                 )?;

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

@@ -586,7 +586,7 @@ pub fn rl(
     let mut rl = Editor::with_config(config)?;
     rl.set_helper(Some(h));
 
-    // Load history from ~/.kiro-cli/cli_history
+    // Load history from ~/.aws/amazonq/cli_history
     if let Err(e) = rl.load_history(&rl.helper().unwrap().get_history_path()) {
         if !matches!(e, ReadlineError::Io(ref io_err) if io_err.kind() == std::io::ErrorKind::NotFound) {
             eprintln!("Warning: Failed to load history: {e}");

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

@@ -113,13 +113,13 @@ pub fn workspace_mcp_config_path(os: &Os) -> eyre::Result<PathBuf> {
     if kiro_path.exists() {
         Ok(kiro_path)
     } else {
-        // Fallback to .kiro-cli (legacy format)
-        Ok(current_dir.join(".kiro-cli").join("mcp.json"))
+        // Fallback to .amazonq (legacy format)
+        Ok(current_dir.join(".amazonq").join("mcp.json"))
     }
 }
 
 pub fn global_mcp_config_path(os: &Os) -> eyre::Result<PathBuf> {
-    Ok(home_dir(os)?.join(".kiro-cli").join("mcp.json"))
+    Ok(home_dir(os)?.join(".aws").join("amazonq").join("mcp.json"))
 }
 
 /// Messages used for communication between the tool initialization thread and the loading

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

@@ -50,7 +50,7 @@ use crate::theme::StyledText;
 /// - status: Check agent status (agent optional - defaults to 'all')
 /// - list: Show available agents
 ///
-/// Only one task per agent. Files stored in ~/.kiro-cli/.subagents/
+/// Only one task per agent. Files stored in ~/.aws/amazonq/.subagents/
 ///
 /// Examples:
 /// - Launch: {"operation": "launch", "agent": "rust-agent", "task": "Create snake game"}
@@ -377,7 +377,7 @@ async fn monitor_child_process(child: tokio::process::Child, mut execution: Agen
                 format!("STDOUT:\n{stdout}\n\nSTDERR:\n{stderr}")
             };
 
-            // Save to ~/.kiro-cli/.subagents/{agent}.json
+            // Save to ~/.aws/amazonq/.subagents/{agent}.json
             if let Err(e) = save_agent_execution(&os, &execution).await {
                 eprintln!("Failed to save agent execution: {e}");
             }
@@ -388,7 +388,7 @@ async fn monitor_child_process(child: tokio::process::Child, mut execution: Agen
             execution.exit_code = Some(-1);
             execution.output = format!("Failed to wait for process: {e}");
 
-            // Save to ~/.kiro-cli/.subagents/{agent}.json
+            // Save to ~/.aws/amazonq/.subagents/{agent}.json
             if let Err(e) = save_agent_execution(&os, &execution).await {
                 eprintln!("Failed to save agent execution: {e}");
             }
@@ -515,7 +515,7 @@ pub async fn agent_file_path(os: &Os, agent: &str) -> Result<PathBuf> {
 }
 
 pub async fn subagents_dir(os: &Os) -> Result<PathBuf> {
-    let subagents_dir = os.env.current_dir()?.join(".kiro-cli").join(".subagents");
+    let subagents_dir = os.env.current_dir()?.join(".amazonq").join(".subagents");
     if !subagents_dir.exists() {
         os.fs.create_dir_all(&subagents_dir).await?;
     }

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

@@ -166,7 +166,7 @@ pub async fn delete_todo(os: &Os, id: &str) -> Result<()> {
 /// Returns the local todo list storage directory
 pub fn get_todo_list_dir(os: &Os) -> Result<PathBuf> {
     let cwd = os.env.current_dir()?;
-    Ok(cwd.join(".kiro-cli").join("cli-todo-lists"))
+    Ok(cwd.join(".amazonq").join("cli-todo-lists"))
 }
 
 /// Contains the command definitions that allow the model to create,

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

@@ -42,12 +42,12 @@ pub enum DirectoryError {
 
 type Result<T, E = DirectoryError> = std::result::Result<T, E>;
 
-const WORKSPACE_AGENT_DIR_RELATIVE: &str = ".kiro-cli/cli-agents";
-const GLOBAL_SHADOW_REPO_DIR: &str = ".kiro-cli/cli-checkpoints";
-const GLOBAL_AGENT_DIR_RELATIVE_TO_HOME: &str = ".kiro-cli/cli-agents";
-const WORKSPACE_PROMPTS_DIR_RELATIVE: &str = ".kiro-cli/prompts";
-const GLOBAL_PROMPTS_DIR_RELATIVE_TO_HOME: &str = ".kiro-cli/prompts";
-const CLI_BASH_HISTORY_PATH: &str = ".kiro-cli/.cli_bash_history";
+const WORKSPACE_AGENT_DIR_RELATIVE: &str = ".amazonq/cli-agents";
+const GLOBAL_SHADOW_REPO_DIR: &str = ".aws/amazonq/cli-checkpoints";
+const GLOBAL_AGENT_DIR_RELATIVE_TO_HOME: &str = ".aws/amazonq/cli-agents";
+const WORKSPACE_PROMPTS_DIR_RELATIVE: &str = ".amazonq/prompts";
+const GLOBAL_PROMPTS_DIR_RELATIVE_TO_HOME: &str = ".aws/amazonq/prompts";
+const CLI_BASH_HISTORY_PATH: &str = ".aws/amazonq/.cli_bash_history";
 
 /// The directory of the users home
 ///
@@ -159,7 +159,7 @@ pub fn example_agent_config(os: &Os) -> Result<PathBuf> {
 
 /// Legacy global MCP server config path
 pub fn chat_legacy_global_mcp_config(os: &Os) -> Result<PathBuf> {
-    Ok(home_dir(os)?.join(".kiro-cli").join("mcp.json"))
+    Ok(home_dir(os)?.join(".aws").join("amazonq").join("mcp.json"))
 }
 
 pub fn chat_cli_bash_history_path(os: &Os) -> Result<PathBuf> {
@@ -169,7 +169,7 @@ pub fn chat_cli_bash_history_path(os: &Os) -> Result<PathBuf> {
 /// Legacy workspace MCP server config path
 pub fn chat_legacy_workspace_mcp_config(os: &Os) -> Result<PathBuf> {
     let cwd = os.env.current_dir()?;
-    Ok(cwd.join(".kiro-cli").join("mcp.json"))
+    Ok(cwd.join(".amazonq").join("mcp.json"))
 }
 
 /// The directory to the directory containing global agents
@@ -261,25 +261,25 @@ pub fn add_gitignore_globs(builder: &mut GlobSetBuilder, path: &str) -> Result<(
 /// A workspace directory is a directory where kiro-cli chat is to be launched
 ///
 /// For example, if the given path is /path/one, then the derived config path would be
-/// `/path/one/.kiro-cli/agents`
+/// `/path/one/.amazonq/agents`
 pub fn agent_config_dir(workspace_dir: PathBuf) -> Result<PathBuf> {
     Ok(workspace_dir.join(WORKSPACE_AGENT_DIR_RELATIVE))
 }
 
 /// The directory to the directory containing config for the `/context` feature in `kiro-cli chat`.
 pub fn chat_global_context_path(os: &Os) -> Result<PathBuf> {
-    Ok(home_dir(os)?.join(".kiro-cli").join("global_context.json"))
+    Ok(home_dir(os)?.join(".aws").join("amazonq").join("global_context.json"))
 }
 
 /// The directory to the directory containing config for the `/context` feature in `kiro-cli chat`.
 #[allow(dead_code)]
 pub fn chat_profiles_dir(os: &Os) -> Result<PathBuf> {
-    Ok(home_dir(os)?.join(".kiro-cli").join("profiles"))
+    Ok(home_dir(os)?.join(".aws").join("amazonq").join("profiles"))
 }
 
 /// The directory for knowledge base storage
 pub fn knowledge_bases_dir(os: &Os) -> Result<PathBuf> {
-    Ok(home_dir(os)?.join(".kiro-cli").join("knowledge_bases"))
+    Ok(home_dir(os)?.join(".aws").join("amazonq").join("knowledge_bases"))
 }
 
 /// The directory for agent-specific knowledge base storage