From e1745d7ff90379055f763feebabe35ef09a5b46e Mon Sep 17 00:00:00 2001
From: David Wales <daviewales@disroot.org>
Date: Mon, 17 Nov 2025 00:18:56 -0800
Subject: [PATCH] Avoid invalid terminal working directory (#3428)

Don't use the working directory of the last child of the active window
when opening a new terminal with Super+Enter.

Fixes #3427.
---
 bin/omarchy-cmd-terminal-cwd | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/bin/omarchy-cmd-terminal-cwd b/bin/omarchy-cmd-terminal-cwd
index 062c35fa..b651148d 100755
--- a/bin/omarchy-cmd-terminal-cwd
+++ b/bin/omarchy-cmd-terminal-cwd
@@ -6,8 +6,10 @@ shell_pid=$(pgrep -P "$terminal_pid" | tail -n1)
 
 if [[ -n $shell_pid ]]; then
   cwd=$(readlink -f "/proc/$shell_pid/cwd" 2>/dev/null)
+  shell=$(readlink -f "/proc/$shell_pid/exe" 2>/dev/null)
 
-  if [[ -d $cwd ]]; then
+  # Check if $shell is a valid shell and $cwd is a directory.
+  if grep -qs "$shell" /etc/shells && [[ -d $cwd ]]; then
     echo "$cwd"
   else
     echo "$HOME"