From 2babdb458fa936908b0bfe1e288aaff5e9892ce5 Mon Sep 17 00:00:00 2001
From: Jason Rayne <yo@arcayne.dev>
Date: Mon, 16 Jun 2025 09:53:22 -0700
Subject: [PATCH] refactor: simplify ssh integration environment variable
 checks

---
 src/shell-integration/bash/ghostty.bash                       | 2 +-
 src/shell-integration/elvish/lib/ghostty-integration.elv      | 4 ++--
 .../fish/vendor_conf.d/ghostty-shell-integration.fish         | 2 +-
 src/shell-integration/zsh/ghostty-integration                 | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/shell-integration/bash/ghostty.bash b/src/shell-integration/bash/ghostty.bash
index 349f65f1f..6915a3f13 100644
--- a/src/shell-integration/bash/ghostty.bash
+++ b/src/shell-integration/bash/ghostty.bash
@@ -103,7 +103,7 @@ if [[ "$GHOSTTY_SHELL_FEATURES" == *"sudo"* && -n "$TERMINFO" ]]; then
   }
 fi
 
-if [[ -n "$GHOSTTY_SSH_INTEGRATION" && "$GHOSTTY_SSH_INTEGRATION" != "off" ]]; then
+if [[ -n "$GHOSTTY_SSH_INTEGRATION" ]]; then
   # Wrap `ssh` command to provide Ghostty SSH integration.
   #
   # This approach supports wrapping an `ssh` alias, but the alias definition
diff --git a/src/shell-integration/elvish/lib/ghostty-integration.elv b/src/shell-integration/elvish/lib/ghostty-integration.elv
index 257cd7ba6..5c901cbb3 100644
--- a/src/shell-integration/elvish/lib/ghostty-integration.elv
+++ b/src/shell-integration/elvish/lib/ghostty-integration.elv
@@ -99,7 +99,7 @@
   }
 
   fn ssh-with-ghostty-integration {|@args|
-    if (and (has-env GHOSTTY_SSH_INTEGRATION) (not-eq "" $E:GHOSTTY_SSH_INTEGRATION) (not-eq "off" $E:GHOSTTY_SSH_INTEGRATION)) {
+    if (has-env GHOSTTY_SSH_INTEGRATION) {
       if (eq "term-only" $E:GHOSTTY_SSH_INTEGRATION) {
         ssh-term-only $@args
       } elif (eq "basic" $E:GHOSTTY_SSH_INTEGRATION) {
@@ -195,7 +195,7 @@
   }
 
   # Register SSH integration if enabled
-  if (and (has-env GHOSTTY_SSH_INTEGRATION) (not-eq "" $E:GHOSTTY_SSH_INTEGRATION) (not-eq "off" $E:GHOSTTY_SSH_INTEGRATION) (has-external ssh)) {
+  if (and (has-env GHOSTTY_SSH_INTEGRATION) (has-external ssh)) {
     edit:add-var ssh~ $ssh-with-ghostty-integration~
   }
 
diff --git a/src/shell-integration/fish/vendor_conf.d/ghostty-shell-integration.fish b/src/shell-integration/fish/vendor_conf.d/ghostty-shell-integration.fish
index f899764de..482b03cf9 100644
--- a/src/shell-integration/fish/vendor_conf.d/ghostty-shell-integration.fish
+++ b/src/shell-integration/fish/vendor_conf.d/ghostty-shell-integration.fish
@@ -87,7 +87,7 @@ function __ghostty_setup --on-event fish_prompt -d "Setup ghostty integration"
     end
 
     # SSH integration wrapper
-    if test -n "$GHOSTTY_SSH_INTEGRATION"; and test "$GHOSTTY_SSH_INTEGRATION" != off
+    if test -n "$GHOSTTY_SSH_INTEGRATION"
         function ssh -d "Wrap ssh to provide Ghostty SSH integration"
             switch "$GHOSTTY_SSH_INTEGRATION"
                 case term-only
diff --git a/src/shell-integration/zsh/ghostty-integration b/src/shell-integration/zsh/ghostty-integration
index 903b06dac..6bfc6ffd2 100644
--- a/src/shell-integration/zsh/ghostty-integration
+++ b/src/shell-integration/zsh/ghostty-integration
@@ -245,7 +245,7 @@ _ghostty_deferred_init() {
     fi
     
     # SSH
-    if [[ -n "$GHOSTTY_SSH_INTEGRATION" && "$GHOSTTY_SSH_INTEGRATION" != "off" ]]; then
+    if [[ -n "$GHOSTTY_SSH_INTEGRATION" ]]; then
       # Wrap `ssh` command to provide Ghostty SSH integration
       ssh() {
         case "$GHOSTTY_SSH_INTEGRATION" in