feat(paths): centralize Amazon Q path management with PathResolver

- Add comprehensive paths.rs module with hierarchical path management
- Consolidate workspace (.amazonq/), global (~/.aws/amazonq/), and application data paths
- Replace hardcoded paths in tool_manager.rs, context.rs, and directories.rs
- Use structured PathResolver with workspace(), global(), and application() scopes
- Maintain backward compatibility while providing single source of truth for paths
- Support async Os initialization and proper error handling
- Suppress clippy warnings during migration phase

This enables easier path management and future rebranding efforts by centralizing
all Amazon Q related paths in one location.

🤖 Assisted by Amazon Q Developer

Author: dk19y

.amazonq/cli-todo-lists/1761839203617.json

@@ -0,0 +1 @@
+{"tasks":[{"task_description":"Copy PathResolver from paths.rs to the current workspace","completed":false},{"task_description":"Update tool_manager.rs to use PathResolver for MCP config paths","completed":false},{"task_description":"Update context.rs to use PathResolver for rules pattern","completed":false},{"task_description":"Update util/directories.rs to use PathResolver for global context and profiles","completed":false},{"task_description":"Update fig_util/directories.rs to use centralized path constants","completed":false},{"task_description":"Test the changes to ensure all paths work correctly","completed":false}],"description":"Migrate hardcoded Amazon Q paths to use centralized PathResolver","context":[],"modified_files":[],"id":"1761839203617"}

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

@@ -627,9 +627,11 @@ async fn load_global_config(os: &Os) -> Result<ContextConfig> {
         Ok(config)
     } else {
         // Return default global configuration with predefined paths
+        use crate::util::paths::workspace;
+
         Ok(ContextConfig {
             paths: vec![
-                ".amazonq/rules/**/*.md".to_string(),
+                workspace::RULES_PATTERN.to_string(),
                 "README.md".to_string(),
                 AMAZONQ_FILENAME.to_string(),
             ],

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

@@ -95,7 +95,7 @@ use crate::mcp_client::{
 };
 use crate::os::Os;
 use crate::telemetry::TelemetryThread;
-use crate::util::directories::home_dir;
+use crate::util::paths::PathResolver;
 
 const NAMESPACE_DELIMITER: &str = "___";
 // This applies for both mcp server and tool name since in the end the tool name as seen by the
@@ -104,11 +104,11 @@ const VALID_TOOL_NAME: &str = "^[a-zA-Z][a-zA-Z0-9_]*$";
 const SPINNER_CHARS: [char; 10] = ['⠋', '⠙', '⠹', '⠸', '⠼', '⠴', '⠦', '⠧', '⠇', '⠏'];
 
 pub fn workspace_mcp_config_path(os: &Os) -> eyre::Result<PathBuf> {
-    Ok(os.env.current_dir()?.join(".amazonq").join("mcp.json"))
+    Ok(PathResolver::new(os).workspace().mcp_config()?)
 }
 
 pub fn global_mcp_config_path(os: &Os) -> eyre::Result<PathBuf> {
-    Ok(home_dir(os)?.join(".aws").join("amazonq").join("mcp.json"))
+    Ok(PathResolver::new(os).global().mcp_config()?)
 }
 
 /// Messages used for communication between the tool initialization thread and the loading
@@ -158,12 +158,13 @@ pub struct McpServerConfig {
 
 impl McpServerConfig {
     pub async fn load_config(stderr: &mut impl Write) -> eyre::Result<Self> {
-        let mut cwd = std::env::current_dir()?;
-        cwd.push(".amazonq/mcp.json");
-        let expanded_path = shellexpand::tilde("~/.aws/amazonq/mcp.json");
-        let global_path = PathBuf::from(expanded_path.as_ref() as &str);
+        let os = Os::new().await?;
+        let resolver = PathResolver::new(&os);
+        let workspace_path = resolver.workspace().mcp_config()?;
+        let global_path = resolver.global().mcp_config()?;
+
         let global_buf = tokio::fs::read(global_path).await.ok();
-        let local_buf = tokio::fs::read(cwd).await.ok();
+        let local_buf = tokio::fs::read(workspace_path).await.ok();
         let conf = match (global_buf, local_buf) {
             (Some(global_buf), Some(local_buf)) => {
                 let mut global_conf = Self::from_slice(&global_buf, stderr, "global")?;

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

@@ -3,7 +3,9 @@ use std::path::PathBuf;
 use thiserror::Error;
 
 use crate::os::Os;
+use crate::util::paths::PathResolver;
 
+#[allow(dead_code)] // Allow unused variants during migration
 #[derive(Debug, Error)]
 pub enum DirectoryError {
     #[error("home directory not found")]
@@ -32,6 +34,7 @@ type Result<T, E = DirectoryError> = std::result::Result<T, E>;
 /// - Linux: /home/Alice
 /// - MacOS: /Users/Alice
 /// - Windows: C:\Users\Alice
+#[allow(dead_code)] // Allow unused function during migration
 pub fn home_dir(#[cfg_attr(windows, allow(unused_variables))] os: &Os) -> Result<PathBuf> {
     #[cfg(unix)]
     match cfg!(test) {
@@ -75,9 +78,7 @@ pub fn home_dir(#[cfg_attr(windows, allow(unused_variables))] os: &Os) -> Result
 /// - Linux: `$XDG_DATA_HOME/amazon-q` or `$HOME/.local/share/amazon-q`
 /// - MacOS: `$HOME/Library/Application Support/amazon-q`
 pub fn fig_data_dir() -> Result<PathBuf> {
-    Ok(dirs::data_local_dir()
-        .ok_or(DirectoryError::NoHomeDirectory)?
-        .join("amazon-q"))
+    crate::util::paths::app_data_dir().map_err(|e| DirectoryError::Io(std::io::Error::other(e)))
 }
 
 /// Get the macos tempdir from the `confstr` function
@@ -131,17 +132,24 @@ pub fn logs_dir() -> Result<PathBuf> {
 
 /// The directory to the directory containing config for the `/context` feature in `q chat`.
 pub fn chat_global_context_path(os: &Os) -> Result<PathBuf> {
-    Ok(home_dir(os)?.join(".aws").join("amazonq").join("global_context.json"))
+    PathResolver::new(os)
+        .global()
+        .global_context()
+        .map_err(|e| DirectoryError::Io(std::io::Error::other(e)))
 }
 
 /// The directory to the directory containing config for the `/context` feature in `q chat`.
 pub fn chat_profiles_dir(os: &Os) -> Result<PathBuf> {
-    Ok(home_dir(os)?.join(".aws").join("amazonq").join("profiles"))
+    PathResolver::new(os)
+        .global()
+        .profiles_dir()
+        .map_err(|e| DirectoryError::Io(std::io::Error::other(e)))
 }
 
 /// The path to the fig settings file
 pub fn settings_path() -> Result<PathBuf> {
-    Ok(fig_data_dir()?.join("settings.json"))
+    crate::util::paths::ApplicationPaths::settings_path_static()
+        .map_err(|e| DirectoryError::Io(std::io::Error::other(e)))
 }
 
 /// The path to the local sqlite database

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

@@ -2,6 +2,7 @@ pub mod consts;
 pub mod directories;
 pub mod knowledge_store;
 pub mod open;
+pub mod paths;
 pub mod process;
 pub mod spinner;
 pub mod system_info;