From 31cd0ab8551c61ba2eb4867e8daadb2244bf0f9f Mon Sep 17 00:00:00 2001
From: Mega Mind <146339422+M3gA-Mind@users.noreply.github.com>
Date: Thu, 7 May 2026 05:16:26 +0530
Subject: [PATCH] fix(tauri): disable GPU compositing on Intel macOS to prevent
 SIGABRT crash (#1315)

---
 app/src-tauri/src/lib.rs | 53 ++++++++++++++++++++++++++++++++++++++++
 1 file changed, 53 insertions(+)

diff --git a/app/src-tauri/src/lib.rs b/app/src-tauri/src/lib.rs
index 873910ade..ffbe251e5 100644
--- a/app/src-tauri/src/lib.rs
+++ b/app/src-tauri/src/lib.rs
@@ -1098,6 +1098,17 @@ pub fn run() {
         sample_rate: 1.0,
         ..sentry::ClientOptions::default()
     });
+    // Tag every Sentry event with CPU architecture and OS so Intel-specific
+    // crashes (issue #1012 — SIGABRT in CrBrowserMain on x86_64 macOS) are
+    // clearly identified without needing a separate build identifier.
+    sentry::configure_scope(|scope| {
+        scope.set_tag("cpu_arch", std::env::consts::ARCH);
+        scope.set_tag("os_name", std::env::consts::OS);
+        #[cfg(target_os = "macos")]
+        if let Some(ver) = macos_os_version() {
+            scope.set_tag("os_version", ver);
+        }
+    });
 
     // Optional smoke trigger for verifying the Sentry pipeline end-to-end.
     // Run with `OPENHUMAN_TAURI_SENTRY_TEST=panic` to fire a panic, or
@@ -1128,6 +1139,19 @@ pub fn run() {
     // replacing the previous stderr-only `env_logger`.
     file_logging::init();
 
+    // Log platform identity early so every log session is tagged with arch
+    // and OS version — essential for reproducing and triaging Intel-only
+    // crashes like issue #1012 (SIGABRT in CrBrowserMain on x86_64 macOS).
+    {
+        let arch = std::env::consts::ARCH;
+        let os = std::env::consts::OS;
+        #[cfg(target_os = "macos")]
+        let os_ver = macos_os_version().unwrap_or_else(|| "unknown".to_string());
+        #[cfg(not(target_os = "macos"))]
+        let os_ver = "n/a".to_string();
+        log::info!("[startup] platform: arch={arch} os={os} os_version={os_ver}");
+    }
+
     // The vendored tauri-cef dev-server proxy builds a reqwest 0.13 client
     // (see vendor/tauri-cef/crates/tauri/src/protocol/tauri.rs) which calls
     // rustls 0.23's `CryptoProvider::get_default()`. rustls 0.23 no longer
@@ -1213,6 +1237,18 @@ pub fn run() {
         // `about:blank` (blank panel for Telegram / WhatsApp / Slack / Discord).
         // Same port the `cdp::CDP_HOST`/`cdp::CDP_PORT` constants expect.
         args.push(("--remote-debugging-port", Some("19222")));
+        // Issue #1012 — Intel macOS (x86_64) crashes with EXC_CRASH (SIGABRT)
+        // inside CrBrowserMain when CEF 146 tries to use GPU compositing via
+        // Metal on Intel GPU hardware/drivers. Disable GPU compositing on
+        // x86_64 macOS so the browser process falls back to software
+        // compositing instead of aborting. This flag is a no-op on Apple
+        // Silicon (arm64) and on non-macOS targets; all other GPU paths
+        // (WebGL, video decode) remain unaffected.
+        #[cfg(all(target_os = "macos", target_arch = "x86_64"))]
+        {
+            args.push(("--disable-gpu-compositing", None));
+            log::info!("[cef-startup] Intel macOS detected: adding --disable-gpu-compositing (issue #1012)");
+        }
         tauri::Builder::<tauri::Cef>::new().command_line_args::<&str, &str>(args)
     };
 
@@ -1786,6 +1822,23 @@ fn resolve_sentry_environment() -> String {
     "production".to_string()
 }
 
+/// Returns the macOS product version string (e.g. `"14.5"`) by reading
+/// `sw_vers -productVersion`. Returns `None` on non-macOS targets or when
+/// the command is unavailable. Used to tag Sentry events and startup logs
+/// with OS version so Intel-specific crashes (issue #1012) can be filtered
+/// by macOS release.
+#[cfg(target_os = "macos")]
+fn macos_os_version() -> Option<String> {
+    std::process::Command::new("sw_vers")
+        .arg("-productVersion")
+        .output()
+        .ok()
+        .filter(|o| o.status.success())
+        .and_then(|o| String::from_utf8(o.stdout).ok())
+        .map(|s| s.trim().to_string())
+        .filter(|s| !s.is_empty())
+}
+
 #[cfg(test)]
 mod tests {
     use super::*;