diff --git a/src/mcp/mod.rs b/src/mcp/mod.rs
index 2109a00..3eea017 100644
--- a/src/mcp/mod.rs
+++ b/src/mcp/mod.rs
@@ -224,9 +224,10 @@ fn handle_chat_save(params: ChatSaveParams) -> Result<String> {
 
     // Get output directory
     let output_dir = env::var("CHAT_OUTPUT").unwrap_or_else(|_| {
-        env::current_dir()
+        dirs::config_dir()
             .unwrap_or_default()
-            .join("public/at")
+            .join(BUNDLE_ID)
+            .join("at")
             .to_string_lossy()
             .to_string()
     });
@@ -282,9 +283,10 @@ fn handle_chat_save(params: ChatSaveParams) -> Result<String> {
 /// Handle chat_list tool
 fn handle_chat_list() -> Result<String> {
     let output_dir = env::var("CHAT_OUTPUT").unwrap_or_else(|_| {
-        env::current_dir()
+        dirs::config_dir()
             .unwrap_or_default()
-            .join("public/at")
+            .join(BUNDLE_ID)
+            .join("at")
             .to_string_lossy()
             .to_string()
     });