From 7982aebcd7f829745c2ce9b158e9804bf1d5b1c1 Mon Sep 17 00:00:00 2001
From: trifatale <trifatale@users.noreply.github.com>
Date: Wed, 18 Feb 2026 13:22:50 -0900
Subject: [PATCH] fix: improve macOS LS path detection

Ultraworked with [Sisyphus](https://github.com/code-yeongyu/oh-my-opencode)

Co-authored-by: Sisyphus <clio-agent@sisyphuslabs.ai>
---
 src/platform.rs | 23 ++++++++++++++---------
 1 file changed, 14 insertions(+), 9 deletions(-)

diff --git a/src/platform.rs b/src/platform.rs
index d1141b5..ff7468a 100644
--- a/src/platform.rs
+++ b/src/platform.rs
@@ -58,7 +58,11 @@ impl Platform {
         let ca_cert_path = env_or("SSL_CERT_FILE", default_ca_cert_path);
         let ls_user = env_or("ZEROGRAVITY_LS_USER", || "zerogravity-ls".into());
         let state_db_path = env_or("ZEROGRAVITY_STATE_DB", || default_state_db_path(&home));
-        let dns_redirect_so_path = format!("{}/dns-redirect.so", &data_dir);
+        let dns_redirect_so_path = if cfg!(target_os = "macos") {
+            format!("{}/dns-redirect.dylib", &data_dir)
+        } else {
+            format!("{}/dns-redirect.so", &data_dir)
+        };
 
         let config_dir = PathBuf::from(&config_dir);
         let token_path = config_dir.join("token");
@@ -104,18 +108,19 @@ fn default_ls_binary_path() -> String {
 fn default_ls_binary_path() -> String {
     let home = home_dir();
     // Check both /Applications and ~/Applications
+    let candidates = ["language_server_macos_arm", "language_server_darwin_arm64"];
     for base in &[
         "/Applications/Antigravity.app",
         &format!("{home}/Applications/Antigravity.app"),
     ] {
-        let path = format!(
-            "{base}/Contents/Resources/app/extensions/antigravity/bin/language_server_darwin_arm64"
-        );
-        if std::path::Path::new(&path).exists() {
-            return path;
+        for name in candidates {
+            let path = format!("{base}/Contents/Resources/app/extensions/antigravity/bin/{name}");
+            if std::path::Path::new(&path).exists() {
+                return path;
+            }
         }
     }
-    "/Applications/Antigravity.app/Contents/Resources/app/extensions/antigravity/bin/language_server_darwin_arm64".into()
+    "/Applications/Antigravity.app/Contents/Resources/app/extensions/antigravity/bin/language_server_macos_arm".into()
 }
 
 #[cfg(target_os = "windows")]
@@ -295,9 +300,9 @@ pub fn supports_uid_isolation() -> bool {
     }
 }
 
-/// Returns true if LD_PRELOAD DNS redirect is supported (Linux only).
+/// Returns true if DNS redirect preload is supported (Linux/macOS).
 pub fn supports_ld_preload() -> bool {
-    cfg!(target_os = "linux")
+    cfg!(any(target_os = "linux", target_os = "macos"))
 }
 
 #[cfg(test)]