From 7705e32446c9c6e43b0131a53851a511291f4480 Mon Sep 17 00:00:00 2001
From: Ellie Huxtable <ellie@elliehuxtable.com>
Date: Fri, 16 Jan 2026 15:22:25 -0800
Subject: [PATCH] fix: PWD=/ when launched from finder

---
 crates/atuin-desktop-runtime/src/context/resolution.rs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/crates/atuin-desktop-runtime/src/context/resolution.rs b/crates/atuin-desktop-runtime/src/context/resolution.rs
index 7eb82a21..527ecfaf 100644
--- a/crates/atuin-desktop-runtime/src/context/resolution.rs
+++ b/crates/atuin-desktop-runtime/src/context/resolution.rs
@@ -339,9 +339,9 @@ impl ContextResolver {
 fn default_cwd() -> String {
     // Check for PWD env var first (set by shell, reflects current directory)
     // This allows CLI tools to inherit the user's current working directory
-    // Falls back to home directory for desktop app / GUI contexts
+    // Skip "/" as it's not useful - macOS sets PWD="/" when launching GUI apps from Finder
     if let Ok(pwd) = std::env::var("PWD") {
-        if !pwd.is_empty() {
+        if !pwd.is_empty() && pwd != "/" {
             return pwd;
         }
     }