Merge branch 'main' into external-browser

Author: hotzen

Cargo.toml

@@ -165,6 +165,7 @@ unimplemented = "deny"
 
 [dev-dependencies]
 tokio-test = "0.4"
+parking_lot = "0.12"
 
 # OS keystore (macOS Keychain for master key storage)
 [target.'cfg(target_os = "macos")'.dependencies]

src/config.rs

@@ -6714,11 +6714,10 @@ pub fn run_onboarding() -> anyhow::Result<Option<PathBuf>> {
 mod tests {
     use super::*;
     use std::result::Result as StdResult;
-    use std::sync::{Mutex, OnceLock};
 
-    fn env_test_lock() -> &'static Mutex<()> {
-        static LOCK: OnceLock<Mutex<()>> = OnceLock::new();
-        LOCK.get_or_init(|| Mutex::new(()))
+    fn env_test_lock() -> &'static parking_lot::Mutex<()> {
+        static LOCK: std::sync::OnceLock<parking_lot::Mutex<()>> = std::sync::OnceLock::new();
+        LOCK.get_or_init(|| parking_lot::Mutex::new(()))
     }
 
     struct EnvGuard {
@@ -6728,12 +6727,14 @@ mod tests {
 
     impl EnvGuard {
         fn new() -> Self {
-            const KEYS: [&str; 26] = [
+            // NOTE: Keep in sync with provider env vars that affect test behavior
+            const KEYS: [&str; 27] = [
                 "SPACEBOT_DIR",
                 "SPACEBOT_DEPLOYMENT",
                 "SPACEBOT_CRON_TIMEZONE",
                 "SPACEBOT_USER_TIMEZONE",
                 "ANTHROPIC_API_KEY",
+                "ANTHROPIC_BASE_URL",
                 "ANTHROPIC_OAUTH_TOKEN",
                 "OPENAI_API_KEY",
                 "OPENROUTER_API_KEY",
@@ -6896,7 +6897,7 @@ api_key = "sk-proj-xyz789"
 
     #[test]
     fn test_llm_provider_tables_parse_with_env_and_lowercase_keys() {
-        let _lock = env_test_lock().lock().unwrap_or_else(|e| e.into_inner());
+        let _lock = env_test_lock().lock();
         let _env = EnvGuard::new();
 
         let toml = r#"
@@ -6942,6 +6943,9 @@ api_key = "static-provider-key"
 
     #[test]
     fn test_legacy_llm_keys_auto_migrate_to_providers() {
+        let _lock = env_test_lock().lock();
+        let _env = EnvGuard::new();
+
         let toml = r#"
 [llm]
 anthropic_key = "legacy-anthropic-key"
@@ -7072,19 +7076,15 @@ name = "My OpenRouter"
 
     #[test]
     fn test_needs_onboarding_without_config_or_env() {
-        let _lock = env_test_lock()
-            .lock()
-            .expect("failed to lock env test mutex");
+        let _lock = env_test_lock().lock();
         let _env = EnvGuard::new();
 
         assert!(Config::needs_onboarding());
     }
 
     #[test]
     fn test_needs_onboarding_with_anthropic_env_key() {
-        let _lock = env_test_lock()
-            .lock()
-            .expect("failed to lock env test mutex");
+        let _lock = env_test_lock().lock();
         let _env = EnvGuard::new();
 
         unsafe {
@@ -7096,9 +7096,7 @@ name = "My OpenRouter"
 
     #[test]
     fn test_needs_onboarding_false_with_oauth_credentials() {
-        let _lock = env_test_lock()
-            .lock()
-            .expect("failed to lock env test mutex");
+        let _lock = env_test_lock().lock();
         let _env = EnvGuard::new();
 
         // Create an OAuth credentials file in the EnvGuard's temp dir
@@ -7115,9 +7113,7 @@ name = "My OpenRouter"
 
     #[test]
     fn test_needs_onboarding_false_with_openai_oauth_credentials() {
-        let _lock = env_test_lock()
-            .lock()
-            .expect("failed to lock env test mutex");
+        let _lock = env_test_lock().lock();
         let _env = EnvGuard::new();
 
         let instance_dir = Config::default_instance_dir();
@@ -7135,9 +7131,7 @@ name = "My OpenRouter"
 
     #[test]
     fn test_load_from_env_populates_legacy_key_and_provider() {
-        let _lock = env_test_lock()
-            .lock()
-            .expect("failed to lock env test mutex");
+        let _lock = env_test_lock().lock();
         let _env = EnvGuard::new();
 
         unsafe {
@@ -7159,9 +7153,7 @@ name = "My OpenRouter"
 
     #[test]
     fn test_hosted_deployment_forces_api_bind_from_toml() {
-        let _lock = env_test_lock()
-            .lock()
-            .expect("failed to lock env test mutex");
+        let _lock = env_test_lock().lock();
         let _env = EnvGuard::new();
 
         unsafe {
@@ -7181,9 +7173,7 @@ bind = "127.0.0.1"
 
     #[test]
     fn test_hosted_deployment_forces_api_bind_from_env_defaults() {
-        let _lock = env_test_lock()
-            .lock()
-            .expect("failed to lock env test mutex");
+        let _lock = env_test_lock().lock();
         let _env = EnvGuard::new();
 
         unsafe {
@@ -7299,9 +7289,7 @@ bind = "127.0.0.1"
 
     #[test]
     fn test_cron_timezone_resolution_precedence() {
-        let _lock = env_test_lock()
-            .lock()
-            .expect("failed to lock env test mutex");
+        let _lock = env_test_lock().lock();
         let _env = EnvGuard::new();
 
         unsafe {
@@ -7358,9 +7346,7 @@ id = "main"
 
     #[test]
     fn test_cron_timezone_invalid_falls_back_to_system() {
-        let _lock = env_test_lock()
-            .lock()
-            .expect("failed to lock env test mutex");
+        let _lock = env_test_lock().lock();
         let _env = EnvGuard::new();
 
         unsafe {
@@ -7380,9 +7366,7 @@ id = "main"
 
     #[test]
     fn test_cron_timezone_invalid_default_uses_env_fallback() {
-        let _lock = env_test_lock()
-            .lock()
-            .expect("failed to lock env test mutex");
+        let _lock = env_test_lock().lock();
         let _env = EnvGuard::new();
 
         unsafe {
@@ -7405,9 +7389,7 @@ id = "main"
 
     #[test]
     fn test_user_timezone_resolution_precedence() {
-        let _lock = env_test_lock()
-            .lock()
-            .expect("failed to lock env test mutex");
+        let _lock = env_test_lock().lock();
         let _env = EnvGuard::new();
 
         unsafe {
@@ -7454,9 +7436,7 @@ id = "main"
 
     #[test]
     fn test_user_timezone_falls_back_to_cron_timezone() {
-        let _lock = env_test_lock()
-            .lock()
-            .expect("failed to lock env test mutex");
+        let _lock = env_test_lock().lock();
         let _env = EnvGuard::new();
 
         let toml = r#"
@@ -7482,9 +7462,7 @@ id = "main"
 
     #[test]
     fn test_user_timezone_invalid_falls_back_to_cron_timezone() {
-        let _lock = env_test_lock()
-            .lock()
-            .expect("failed to lock env test mutex");
+        let _lock = env_test_lock().lock();
         let _env = EnvGuard::new();
 
         let toml = r#"
@@ -7507,9 +7485,7 @@ id = "main"
 
     #[test]
     fn test_user_timezone_invalid_config_uses_env_fallback() {
-        let _lock = env_test_lock()
-            .lock()
-            .expect("failed to lock env test mutex");
+        let _lock = env_test_lock().lock();
         let _env = EnvGuard::new();
 
         unsafe {
@@ -7797,6 +7773,9 @@ startup_delay_secs = 2
     /// `LlmConfig` without wiring it up in `load_from_env` / `from_toml`, this test fails.
     #[test]
     fn all_shorthand_keys_register_providers_via_toml() {
+        let _lock = env_test_lock().lock();
+        let _env = EnvGuard::new();
+
         // (toml_key, toml_value, provider_name, expected_base_url_substring)
         let cases: &[(&str, &str, &str, &str)] = &[
             ("anthropic_key", "test-key", "anthropic", "anthropic.com"),
@@ -7861,7 +7840,7 @@ startup_delay_secs = 2
 
     #[test]
     fn all_shorthand_keys_register_providers_via_env() {
-        let _lock = env_test_lock().lock().unwrap();
+        let _lock = env_test_lock().lock();
 
         // (env_var, env_value, provider_name, expected_base_url_substring)
         let cases: &[(&str, &str, &str, &str)] = &[
@@ -8285,7 +8264,7 @@ startup_delay_secs = 2
 
     #[test]
     fn toml_round_trip_with_named_instances() {
-        let _guard = env_test_lock().lock().unwrap();
+        let _guard = env_test_lock().lock();
         let guard = EnvGuard::new();
 
         let toml_content = r#"
@@ -8326,7 +8305,7 @@ chat_id = "-100111"
 
     #[test]
     fn toml_backward_compat_no_adapter_field() {
-        let _guard = env_test_lock().lock().unwrap();
+        let _guard = env_test_lock().lock();
         let guard = EnvGuard::new();
 
         let toml_content = r#"