From 513cbc89f2c47a6ded2495341318e9b45f98ef52 Mon Sep 17 00:00:00 2001
From: Amit Singh <amitksingh1490@gmail.com>
Date: Tue, 14 Apr 2026 12:48:36 +0530
Subject: [PATCH 1/2] test(vscode): fix flaky env var test with thread-safe
 guard

---
 crates/forge_main/src/vscode.rs | 55 ++++++++++++++++++++++++---------
 1 file changed, 40 insertions(+), 15 deletions(-)

diff --git a/crates/forge_main/src/vscode.rs b/crates/forge_main/src/vscode.rs
index 3ec37cf21f..4a9e4afa41 100644
--- a/crates/forge_main/src/vscode.rs
+++ b/crates/forge_main/src/vscode.rs
@@ -58,28 +58,53 @@ pub fn should_install_extension() -> bool {
 #[cfg(test)]
 mod tests {
     use std::env;
+    use std::ffi::OsString;
+    use std::sync::{LazyLock, Mutex, MutexGuard};
 
     use super::*;
 
-    fn with_env_var<F>(key: &str, value: &str, test: F)
+    static ENV_MUTEX: LazyLock<Mutex<()>> = LazyLock::new(|| Mutex::new(()));
+
+    struct EnvGuard {
+        key: &'static str,
+        original_value: Option<OsString>,
+        _lock: MutexGuard<'static, ()>,
+    }
+
+    impl EnvGuard {
+        fn set(key: &'static str, value: &str) -> Self {
+            let lock = ENV_MUTEX.lock().unwrap_or_else(|error| error.into_inner());
+            let original_value = env::var_os(key);
+            unsafe {
+                env::set_var(key, value);
+            }
+            Self {
+                key,
+                original_value,
+                _lock: lock,
+            }
+        }
+    }
+
+    impl Drop for EnvGuard {
+        fn drop(&mut self) {
+            match &self.original_value {
+                Some(value) => unsafe {
+                    env::set_var(self.key, value);
+                },
+                None => unsafe {
+                    env::remove_var(self.key);
+                },
+            }
+        }
+    }
+
+    fn with_env_var<F>(key: &'static str, value: &str, test: F)
     where
         F: FnOnce(),
     {
-        // Set the environment variable
-        // SAFETY: This is only used in single-threaded tests and cleaned up immediately
-        // after
-        unsafe {
-            env::set_var(key, value);
-        }
-
-        // Run the test
+        let _guard = EnvGuard::set(key, value);
         test();
-
-        // Clean up
-        // SAFETY: This is only used in single-threaded tests
-        unsafe {
-            env::remove_var(key);
-        }
     }
 
     #[test]

From 2180fccc3b5a4f822f3ea42786ab08162644b341 Mon Sep 17 00:00:00 2001
From: "autofix-ci[bot]" <114827586+autofix-ci[bot]@users.noreply.github.com>
Date: Tue, 14 Apr 2026 07:22:20 +0000
Subject: [PATCH 2/2] [autofix.ci] apply automated fixes

---
 crates/forge_main/src/vscode.rs | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/crates/forge_main/src/vscode.rs b/crates/forge_main/src/vscode.rs
index 4a9e4afa41..47e8d3c497 100644
--- a/crates/forge_main/src/vscode.rs
+++ b/crates/forge_main/src/vscode.rs
@@ -78,11 +78,7 @@ mod tests {
             unsafe {
                 env::set_var(key, value);
             }
-            Self {
-                key,
-                original_value,
-                _lock: lock,
-            }
+            Self { key, original_value, _lock: lock }
         }
     }