fix: clean up windows directories

Author: cwoolum

crates/fig_util/src/directories.rs

@@ -70,25 +70,6 @@ pub enum DirectoryError {
 
 type Result<T, E = DirectoryError> = std::result::Result<T, E>;
 
-/// The fig directory
-///
-/// - Linux: `$HOME/.local/share/amazon-q`
-/// - MacOS: `$HOME/Library/Application Support/amazon-q`
-/// - Windows: `%LOCALAPPDATA%\Fig`
-pub fn fig_dir() -> Result<PathBuf> {
-    cfg_if::cfg_if! {
-        if #[cfg(unix)] {
-            Ok(dirs::data_local_dir()
-                .ok_or(DirectoryError::NoHomeDirectory)?
-                .join("amazon-q"))
-        } else if #[cfg(windows)] {
-            Ok(dirs::data_local_dir()
-                .ok_or(DirectoryError::NoHomeDirectory)?
-                .join("Fig"))
-        }
-    }
-}
-
 /// The directory of the users home
 ///
 /// - Linux: /home/Alice
@@ -148,29 +129,26 @@ pub fn config_dir() -> Result<PathBuf> {
 /// This should be removed at some point in the future, once all our users have migrated
 /// - MacOS: `$HOME/Library/Application Support/codewhisperer`
 pub fn old_fig_data_dir() -> Result<PathBuf> {
-    cfg_if::cfg_if! {
-        if #[cfg(unix)] {
-            Ok(dirs::data_local_dir()
-                .ok_or(DirectoryError::NoHomeDirectory)?
-                .join("codewhisperer"))
-        } else if #[cfg(windows)] {
-            Ok(fig_dir()?.join("userdata"))
-        }
-    }
+    Ok(dirs::data_local_dir()
+        .ok_or(DirectoryError::NoHomeDirectory)?
+        .join("codewhisperer"))
 }
 
 /// The q data directory
 ///
 /// - Linux: `$XDG_DATA_HOME/amazon-q` or `$HOME/.local/share/amazon-q`
 /// - MacOS: `$HOME/Library/Application Support/amazon-q`
+/// - Windows: `%LOCALAPPDATA%\AmazonQ`
 pub fn fig_data_dir() -> Result<PathBuf> {
     cfg_if::cfg_if! {
         if #[cfg(unix)] {
             Ok(dirs::data_local_dir()
                 .ok_or(DirectoryError::NoHomeDirectory)?
                 .join("amazon-q"))
         } else if #[cfg(windows)] {
-            Ok(fig_dir()?.join("userdata"))
+            Ok(dirs::data_local_dir()
+            .ok_or(DirectoryError::NoHomeDirectory)?
+            .join("AmazonQ"))
         }
     }
 }
@@ -208,14 +186,17 @@ pub fn local_data_dir<Ctx: FsProvider + EnvProvider + PlatformProvider>(ctx: &Ct
 ///
 /// - Linux: `$XDG_CACHE_HOME/amazon-q` or `$HOME/.cache/amazon-q`
 /// - MacOS: `$HOME/Library/Caches/amazon-q`
+/// - Windows: `%LOCALAPPDATA%\AmazonQ\cache`
 pub fn cache_dir() -> Result<PathBuf> {
     cfg_if::cfg_if! {
         if #[cfg(unix)] {
             Ok(dirs::cache_dir()
                 .ok_or(DirectoryError::NoHomeDirectory)?
                 .join("amazon-q"))
         } else if #[cfg(windows)] {
-            Ok(fig_dir()?.join("cache"))
+            Ok(dirs::cache_dir()
+            .ok_or(DirectoryError::NoHomeDirectory)?
+            .join("AmazonQ"))
         }
     }
 }
@@ -265,12 +246,13 @@ pub fn runtime_dir() -> Result<PathBuf> {
 ///
 /// - Linux: $XDG_RUNTIME_DIR/cwrun
 /// - MacOS: $TMPDIR/cwrun
+/// - Windows: %TEMP%\sockets
 pub fn sockets_dir() -> Result<PathBuf> {
     cfg_if::cfg_if! {
         if #[cfg(unix)] {
             Ok(runtime_dir()?.join(RUNTIME_DIR_NAME))
         } else if #[cfg(windows)] {
-            Ok(fig_dir()?.join("sockets"))
+            Ok(runtime_dir()?.join("sockets"))
         }
     }
 }
@@ -282,6 +264,7 @@ pub fn sockets_dir() -> Result<PathBuf> {
 ///
 /// - Linux: $XDG_RUNTIME_DIR/cwrun
 /// - MacOS: $TMPDIR/cwrun
+/// - Windows: %TEMP%\sockets
 pub fn host_sockets_dir() -> Result<PathBuf> {
     // TODO: make this work again
     // #[cfg(target_os = "linux")]
@@ -320,27 +303,24 @@ pub fn autocomplete_specs_dir() -> Result<PathBuf> {
 /// The directory to all the fig logs
 /// - Linux: `/tmp/fig/$USER/logs`
 /// - MacOS: `$TMPDIR/logs`
-/// - Windows: `%TEMP%\fig\logs`
+/// - Windows: `%TEMP%\AmazonQ\logs`
 pub fn logs_dir() -> Result<PathBuf> {
     cfg_if::cfg_if! {
         if #[cfg(unix)] {
             use crate::CLI_BINARY_NAME;
             Ok(runtime_dir()?.join(format!("{CLI_BINARY_NAME}log")))
         } else if #[cfg(windows)] {
-            Ok(std::env::temp_dir().join("amazon-q").join("logs"))
+            Ok(std::env::temp_dir().join("AmazonQ").join("logs"))
         }
     }
 }
 
 /// The directory where fig places all data-sensitive backups
+///
+/// - Linux/MacOS: `$HOME/.amazon-q.dotfiles.bak`
+/// - Windows: `%USERPROFILE%\.amazon-q.dotfiles.bak`
 pub fn backups_dir() -> Result<PathBuf> {
-    cfg_if::cfg_if! {
-        if #[cfg(unix)] {
-            Ok(home_dir()?.join(".amazon-q.dotfiles.bak"))
-        } else if #[cfg(windows)] {
-            Ok(fig_data_dir()?.join("backups"))
-        }
-    }
+    Ok(home_dir()?.join(".amazon-q.dotfiles.bak"))
 }
 
 /// The directory for time based data-sensitive backups
@@ -371,7 +351,7 @@ pub fn chat_profiles_dir<Ctx: FsProvider + EnvProvider>(ctx: &Ctx) -> Result<Pat
 ///
 /// - MacOS: `$TMPDIR/cwrun/desktop.sock`
 /// - Linux: `$XDG_RUNTIME_DIR/cwrun/desktop.sock`
-/// - Windows: `%APPDATA%/Fig/desktop.sock`
+/// - Windows: `%TEMP%\sockets\desktop.sock`
 pub fn desktop_socket_path() -> Result<PathBuf> {
     Ok(host_sockets_dir()?.join("desktop.sock"))
 }
@@ -381,8 +361,9 @@ pub fn desktop_socket_path() -> Result<PathBuf> {
 // - Linux/MacOS not on ssh:
 /// - MacOS: `$TMPDIR/cwrun/remote.sock`
 /// - Linux: `$XDG_RUNTIME_DIR/cwrun/remote.sock`
-/// - Windows: `%APPDATA%/Fig/%USER%/remote.sock`
+/// - Windows: `%TEMP%\sockets\remote.sock`
 pub fn remote_socket_path() -> Result<PathBuf> {
+    // Normal implementation for non-test code
     // TODO(grant): This is only enabled on Linux for now to prevent public dist
     if is_remote() && !in_cloudshell() && cfg!(target_os = "linux") {
         if let Some(parent_socket) = std::env::var_os(Q_PARENT) {
@@ -399,7 +380,7 @@ pub fn remote_socket_path() -> Result<PathBuf> {
 ///
 /// - MacOS: `$TMPDIR/cwrun/remote.sock`
 /// - Linux: `$XDG_RUNTIME_DIR/cwrun/remote.sock`
-/// - Windows: `%APPDATA%/Fig/%USER%/remote.sock`
+/// - Windows: `%TEMP%\sockets\remote.sock`
 pub fn local_remote_socket_path() -> Result<PathBuf> {
     Ok(host_sockets_dir()?.join("remote.sock"))
 }
@@ -409,30 +390,24 @@ pub fn local_remote_socket_path() -> Result<PathBuf> {
 /// - Linux/Macos: `/var/tmp/fig/%USERNAME%/figterm/$SESSION_ID.sock`
 /// - MacOS: `$TMPDIR/cwrun/t/$SESSION_ID.sock`
 /// - Linux: `$XDG_RUNTIME_DIR/cwrun/t/$SESSION_ID.sock`
-/// - Windows: `%LOCALAPPDATA%\Fig\sockets\figterm\$SESSION_ID.sock`
+/// - Windows: `%TEMP%\sockets\t\$SESSION_ID.sock`
 pub fn figterm_socket_path(session_id: impl Display) -> Result<PathBuf> {
-    cfg_if::cfg_if! {
-        if #[cfg(unix)] {
-            Ok(sockets_dir()?.join("t").join(format!("{session_id}.sock")))
-        } else if #[cfg(windows)] {
-            Ok(sockets_dir()?.join("figterm").join(format!("{session_id}.sock")))
-        }
-    }
+    Ok(sockets_dir()?.join("t").join(format!("{session_id}.sock")))
 }
 
 /// The path to the resources directory
 ///
 /// - MacOS: "/Applications/Amazon Q.app/Contents/Resources"
 /// - Linux: "/usr/share/fig"
-/// - Windows: "%LOCALAPPDATA%\Fig\resources"
+/// - Windows: "%LOCALAPPDATA%\AmazonQ\resources"
 pub fn resources_path() -> Result<PathBuf> {
     cfg_if::cfg_if! {
         if #[cfg(all(unix, not(target_os = "macos")))] {
             Ok(std::path::Path::new("/usr/share/fig").into())
         } else if #[cfg(target_os = "macos")] {
             Ok(crate::app_bundle_path().join(crate::macos::BUNDLE_CONTENTS_RESOURCE_PATH))
         } else if #[cfg(windows)] {
-            Ok(fig_dir()?.join("resources"))
+            Ok(fig_data_dir()?.join("resources"))
         }
     }
 }
@@ -451,29 +426,25 @@ pub fn resources_path_ctx<Ctx: EnvProvider + PlatformProvider>(ctx: &Ctx) -> Res
                 Ok(format!("/usr/share/{}", PACKAGE_NAME).into())
             }
         },
-        fig_os_shim::Os::Windows => Ok(fig_dir()?.join("resources")),
+        fig_os_shim::Os::Windows => Ok(fig_data_dir()?.join("resources")),
         _ => Err(DirectoryError::UnsupportedOs(os)),
     }
 }
 
 /// The path to the managed binaries directory
 ///
-/// - Windows: "%LOCALAPPDATA%\Fig\bin"
+/// - Linux: "/usr/share/fig"
+/// - MacOS: "/Applications/Amazon Q.app/Contents/Resources"
+/// - Windows: "%LOCALAPPDATA%\AmazonQ\resources\bin"
 pub fn managed_binaries_dir() -> Result<PathBuf> {
-    cfg_if::cfg_if! {
-        if #[cfg(windows)] {
-            Ok(fig_dir()?.join("bin"))
-        } else {
-            Ok(resources_path()?)
-        }
-    }
+    Ok(resources_path()?.join("bin"))
 }
 
 /// The path to the fig install manifest
 ///
 /// - MacOS: "/Applications/Amazon Q.app/Contents/Resources/manifest.json"
 /// - Linux: "/usr/share/fig/manifest.json"
-/// - Windows: "%LOCALAPPDATA%\Fig\bin\manifest.json"
+/// - Windows: "%LOCALAPPDATA%\AmazonQ\resources\bin\manifest.json"
 pub fn manifest_path() -> Result<PathBuf> {
     cfg_if::cfg_if! {
         if #[cfg(unix)] {
@@ -497,11 +468,19 @@ pub fn bundle_metadata_path<Ctx: EnvProvider + PlatformProvider>(ctx: &Ctx) -> R
 }
 
 /// The path to the fig settings file
+///
+/// - Linux: `$HOME/.local/share/amazon-q/settings.json`
+/// - MacOS: `$HOME/Library/Application Support/amazon-q/settings.json`
+/// - Windows: `%LOCALAPPDATA%\AmazonQ\settings.json`
 pub fn settings_path() -> Result<PathBuf> {
     Ok(fig_data_dir()?.join("settings.json"))
 }
 
 /// The path to the lock file used to indicate that the app is updating
+///
+/// - Linux: `$HOME/.local/share/amazon-q/update.lock`
+/// - MacOS: `$HOME/Library/Application Support/amazon-q/update.lock`
+/// - Windows: `%LOCALAPPDATA%\AmazonQ\update.lock`
 pub fn update_lock_path(ctx: &impl FsProvider) -> Result<PathBuf> {
     Ok(fig_data_dir_ctx(ctx)?.join("update.lock"))
 }
@@ -578,7 +557,6 @@ pub fn local_webview_data_dir<Ctx: FsProvider + EnvProvider + PlatformProvider>(
 utf8_dir!(home_dir);
 #[cfg(unix)]
 utf8_dir!(home_local_bin);
-utf8_dir!(fig_dir);
 utf8_dir!(fig_data_dir);
 utf8_dir!(sockets_dir);
 utf8_dir!(remote_socket_path);
@@ -599,7 +577,6 @@ mod linux_tests {
         assert!(home_dir().is_ok());
         #[cfg(unix)]
         assert!(home_local_bin().is_ok());
-        assert!(fig_dir().is_ok());
         assert!(fig_data_dir().is_ok());
         assert!(sockets_dir().is_ok());
         assert!(remote_socket_path().is_ok());
@@ -731,89 +708,82 @@ mod tests {
         macos!(home_local_bin(), @"$HOME/.local/bin");
     }
 
-    #[test]
-    fn snapshot_fig_dir() {
-        linux!(fig_dir(), @"$HOME/.local/share/amazon-q");
-        macos!(fig_dir(), @"$HOME/Library/Application Support/amazon-q");
-        windows!(fig_dir(), @r"C:\Users\$USER\AppData\Local\Fig");
-    }
-
     #[test]
     fn snapshot_fig_data_dir() {
         linux!(fig_data_dir(), @"$HOME/.local/share/amazon-q");
         macos!(fig_data_dir(), @"$HOME/Library/Application Support/amazon-q");
-        windows!(fig_data_dir(), @r"C:\Users\$USER\AppData\Local\Fig\userdata");
+        windows!(fig_data_dir(), @r"C:\Users\$USER\AppData\Local\AmazonQ");
     }
 
     #[test]
     fn snapshot_sockets_dir() {
         linux!(sockets_dir(), @"$XDG_RUNTIME_DIR/cwrun");
         macos!(sockets_dir(), @"$TMPDIR/cwrun");
-        windows!(sockets_dir(), @r"C:\Users\$USER\AppData\Local\Fig\sockets");
+        windows!(sockets_dir(), @r"C:\Users\$USER\AppData\Local\Temp\sockets");
     }
 
     #[test]
     fn snapshot_themes_dir() {
         linux!(themes_dir(&Context::new()), @"/usr/share/fig/themes");
         macos!(themes_dir(&Context::new()), @"/Applications/Amazon Q.app/Contents/Resources/themes");
-        windows!(themes_dir(&Context::new()), @r"C:\Users\$USER\AppData\Local\Fig\resources\themes");
+        windows!(themes_dir(&Context::new()), @r"C:\Users\$USER\AppData\Local\AmazonQ\resources\themes");
     }
 
     #[test]
     fn snapshot_backups_dir() {
         linux!(backups_dir(), @"$HOME/.amazon-q.dotfiles.bak");
         macos!(backups_dir(), @"$HOME/.amazon-q.dotfiles.bak");
-        windows!(backups_dir(), @r"C:\Users\$USER\AppData\Local\Fig\userdata\backups");
+        windows!(backups_dir(), @r"C:\Users\$USER\.amazon-q.dotfiles.bak");
     }
 
     #[test]
     fn snapshot_fig_socket_path() {
         linux!(desktop_socket_path(), @"$XDG_RUNTIME_DIR/cwrun/desktop.sock");
         macos!(desktop_socket_path(), @"$TMPDIR/cwrun/desktop.sock");
-        windows!(desktop_socket_path(), @r"C:\Users\$USER\AppData\Local\Fig\sockets\desktop.sock");
+        windows!(desktop_socket_path(), @r"C:\Users\$USER\AppData\Local\Temp\sockets\desktop.sock");
     }
 
     #[test]
     fn snapshot_remote_socket_path() {
         linux!(remote_socket_path(), @"$XDG_RUNTIME_DIR/cwrun/remote.sock");
         macos!(remote_socket_path(), @"$TMPDIR/cwrun/remote.sock");
-        windows!(remote_socket_path(), @r"C:\Users\$USER\AppData\Local\Fig\sockets\remote.sock");
+        windows!(remote_socket_path(), @r"C:\Users\$USER\AppData\Local\Temp\sockets\remote.sock");
     }
 
     #[test]
     fn snapshot_local_remote_socket_path() {
         linux!(local_remote_socket_path(), @"$XDG_RUNTIME_DIR/cwrun/remote.sock");
         macos!(local_remote_socket_path(), @"$TMPDIR/cwrun/remote.sock");
-        windows!(local_remote_socket_path(), @r"C:\Users\$USER\AppData\Local\Fig\sockets\remote.sock");
+        windows!(local_remote_socket_path(), @r"C:\Users\$USER\AppData\Local\Temp\sockets\remote.sock");
     }
 
     #[test]
     fn snapshot_figterm_socket_path() {
         linux!(figterm_socket_path("$SESSION_ID"), @"$XDG_RUNTIME_DIR/cwrun/t/$SESSION_ID.sock");
         macos!(figterm_socket_path("$SESSION_ID"), @"$TMPDIR/cwrun/t/$SESSION_ID.sock");
-        windows!(figterm_socket_path("$SESSION_ID"), @r"C:\Users\$USER\AppData\Local\Fig\sockets\figterm\$SESSION_ID.sock");
+        windows!(figterm_socket_path("$SESSION_ID"), @r"C:\Users\$USER\AppData\Local\Temp\sockets\t\$SESSION_ID.sock");
     }
 
     #[test]
     fn snapshot_managed_binaries_dir() {
         linux!(managed_binaries_dir(), @"/usr/share/fig");
         macos!(managed_binaries_dir(), @"/Applications/Amazon Q.app/Contents/Resources");
-        windows!(managed_binaries_dir(), @r"C:\Users\$USER\AppData\Local\Fig\bin");
+        windows!(managed_binaries_dir(), @r"C:\Users\$USER\AppData\Local\AmazonQ\resources\bin");
     }
 
     #[test]
     fn snapshot_settings_path() {
         linux!(settings_path(), @"$HOME/.local/share/amazon-q/settings.json");
         macos!(settings_path(), @"$HOME/Library/Application Support/amazon-q/settings.json");
-        windows!(settings_path(), @r"C:\Users\$USER\AppData\Local\Fig\userdata\settings.json");
+        windows!(settings_path(), @r"C:\Users\$USER\AppData\Local\AmazonQ\settings.json");
     }
 
     #[test]
     fn snapshot_update_lock_path() {
         let ctx = Context::new();
         linux!(update_lock_path(&ctx), @"$HOME/.local/share/amazon-q/update.lock");
         macos!(update_lock_path(&ctx), @"$HOME/Library/Application Support/amazon-q/update.lock");
-        windows!(update_lock_path(&ctx), @r"C:\Users\$USER\AppData\Local\Fig\userdata\update.lock");
+        windows!(update_lock_path(&ctx), @r"C:\Users\$USER\AppData\Local\AmazonQ\update.lock");
     }
 
     #[test]