fix: stop embedded shell selection from crashing Taskers

OneNoted · OneNoted · commit 3a7d020b103b · 2026-04-14T15:55:53.000+02:00
Recent desktop launches were aborting inside the Ghostty bridge during GTK snapshot, and the freshest coredumps pointed at the embedded terminal host path. The crash lined up with the shell chooser work: Taskers was forwarding shell-specific argv through Ghostty host options again. This change keeps the embedded Ghostty command stable at the wrapper entrypoint, moves bash/fish/zsh argv synthesis back into the wrapper, and exports shell profile state for fish/zsh so shell choice and clean/default modes still survive relaunch.

Constraint: Embedded Ghostty host launch must avoid brittle shell-specific command overrides while still preserving user shell choice and profile
Rejected: Keep forwarding shell-specific argv through Ghostty | recent coredumps showed that path aborting in the bridge during GTK snapshot
Rejected: Drop shell/profile preservation entirely | that would fix the crash at the cost of regressing configured shell behavior
Confidence: medium
Scope-risk: moderate
Reversibility: clean
Directive: Keep embedded Ghostty on the env-driven wrapper contract; do not reintroduce per-shell argv overrides through host options without proving bridge stability first
Tested: cargo test -p taskers-runtime --lib shell_wrapper
Tested: cargo test -p taskers-runtime --lib fish_and_zsh_launch_specs_preserve_shell_profile_env
Tested: cargo test -p taskers-ghostty --lib host_options
Tested: cargo test -p taskers runtime_bootstrap_tests --bin taskers-gtk
Tested: TASKERS_CONFIG_PATH=&lt;temp fish config&gt; timeout 20s taskers-gtk --diagnostic-log &lt;temp log&gt; --smoke-script baseline --quit-after-ms 1000
Tested: cargo install --path crates/taskers-app --force
Not-tested: Manual desktop launch through the original vicinae launcher path
Related: coredumpctl taskers-gtk PIDs 2021751 and 2029634 on 2026-04-14
diff --git a/crates/taskers-ghostty/src/backend.rs b/crates/taskers-ghostty/src/backend.rs
@@ -68,8 +68,18 @@ impl GhosttyHostOptions {
     pub fn from_shell_launch(shell_launch: &ShellLaunchSpec) -> Self {
         let mut env = BTreeMap::new();
         env.extend(shell_launch.env.clone());
+        let command_argv = if shell_launch
+            .program
+            .file_name()
+            .and_then(|value| value.to_str())
+            == Some("taskers-shell-wrapper.sh")
+        {
+            vec![shell_launch.program.display().to_string()]
+        } else {
+            shell_launch.program_and_args()
+        };
         Self {
-            command_argv: shell_launch.program_and_args(),
+            command_argv,
             env,
             embedded_terminal_appearance: EmbeddedTerminalAppearance::Taskers,
         }
@@ -266,6 +276,33 @@ mod tests {
         );
     }
 
+    #[test]
+    fn host_options_collapse_wrapper_shell_args_for_embedded_ghostty() {
+        let mut env = BTreeMap::new();
+        env.insert("TASKERS_REAL_SHELL".into(), "/usr/bin/fish".into());
+        env.insert("TASKERS_SHELL_PROFILE".into(), "default".into());
+        let shell_launch = ShellLaunchSpec {
+            program: PathBuf::from("/tmp/taskers-runtime/taskers-shell-wrapper.sh"),
+            args: vec![
+                "--interactive".into(),
+                "--init-command".into(),
+                r#"source "$TASKERS_SHELL_INTEGRATION_DIR/taskers-hooks.fish""#.into(),
+            ],
+            env,
+        };
+
+        let options = GhosttyHostOptions::from_shell_launch(&shell_launch);
+
+        assert_eq!(
+            options.command_argv,
+            vec!["/tmp/taskers-runtime/taskers-shell-wrapper.sh"]
+        );
+        assert_eq!(
+            options.env.get("TASKERS_REAL_SHELL").map(String::as_str),
+            Some("/usr/bin/fish")
+        );
+    }
+
     #[test]
     fn host_options_allow_overriding_embedded_terminal_appearance() {
         let options = GhosttyHostOptions::default()
diff --git a/crates/taskers-runtime/assets/shell/taskers-shell-wrapper.sh b/crates/taskers-runtime/assets/shell/taskers-shell-wrapper.sh
@@ -5,6 +5,7 @@ SCRIPT_DIR=$(CDPATH= cd -- "$(dirname "$0")" && pwd)
 REAL_SHELL=${TASKERS_REAL_SHELL:-${SHELL:-/bin/sh}}
 SHELL_NAME=${REAL_SHELL##*/}
 SHELL_NAME=${SHELL_NAME#-}
+SHELL_PROFILE=${TASKERS_SHELL_PROFILE:-default}
 export TASKERS_EMBEDDED=1
 export TERM_PROGRAM=taskers
 current_tty=$(tty 2>/dev/null || true)
@@ -37,22 +38,43 @@ elif [ -n "${TASKERS_TERMINAL_SOCKET:-}" ] && [ -n "${TASKERS_TERMINAL_SESSION_I
 fi
 
 if [ "${TASKERS_DISABLE_SHELL_INTEGRATION:-0}" = "1" ]; then
+  if [ "$#" -eq 0 ]; then
+    case "$SHELL_NAME" in
+      bash)
+        set -- --noprofile --norc -i
+        ;;
+      fish)
+        set -- --no-config --interactive
+        ;;
+      zsh)
+        set -- -d -f -i
+        ;;
+    esac
+  fi
+  exec "$REAL_SHELL" "$@"
+fi
+
+if [ "$#" -eq 0 ]; then
   case "$SHELL_NAME" in
     bash)
-      exec "$REAL_SHELL" --noprofile --norc -i "$@"
+      export TASKERS_USER_BASHRC="${TASKERS_USER_BASHRC:-$HOME/.bashrc}"
+      set -- --rcfile "$SCRIPT_DIR/bash/taskers.bashrc" -i
       ;;
-    *)
-      exec "$REAL_SHELL" "$@"
+    fish)
+      if [ "$SHELL_PROFILE" = "clean" ]; then
+        set -- --no-config --interactive
+      else
+        set -- --interactive --init-command "source \"$TASKERS_SHELL_INTEGRATION_DIR/taskers-hooks.fish\""
+      fi
+      ;;
+    zsh)
+      if [ "$SHELL_PROFILE" = "clean" ]; then
+        set -- -d -i
+      else
+        set -- -i
+      fi
       ;;
   esac
 fi
 
-case "$SHELL_NAME" in
-  bash)
-    export TASKERS_USER_BASHRC="${TASKERS_USER_BASHRC:-$HOME/.bashrc}"
-    exec "$REAL_SHELL" --rcfile "$SCRIPT_DIR/bash/taskers.bashrc" -i "$@"
-    ;;
-  *)
-    exec "$REAL_SHELL" "$@"
-    ;;
-esac
+exec "$REAL_SHELL" "$@"
diff --git a/crates/taskers-runtime/src/shell.rs b/crates/taskers-runtime/src/shell.rs
@@ -127,6 +127,7 @@ impl ShellIntegration {
                     "TASKERS_REAL_SHELL".into(),
                     self.real_shell.display().to_string(),
                 );
+                env.insert("TASKERS_SHELL_PROFILE".into(), profile.clone());
 
                 let mut args = Vec::new();
                 if profile == "clean" {
@@ -153,6 +154,7 @@ impl ShellIntegration {
                     "TASKERS_REAL_SHELL".into(),
                     self.real_shell.display().to_string(),
                 );
+                env.insert("TASKERS_SHELL_PROFILE".into(), profile.clone());
                 env.insert(
                     "ZDOTDIR".into(),
                     zsh_runtime_dir(&self.root).display().to_string(),
@@ -759,6 +761,77 @@ mod tests {
         );
     }
 
+    #[test]
+    fn shell_wrapper_handles_fish_and_zsh_default_launch_modes() {
+        let wrapper = include_str!(concat!(
+            env!("CARGO_MANIFEST_DIR"),
+            "/assets/shell/taskers-shell-wrapper.sh"
+        ));
+        assert!(
+            wrapper.contains("SHELL_PROFILE=${TASKERS_SHELL_PROFILE:-default}"),
+            "expected wrapper to honor TASKERS_SHELL_PROFILE when synthesizing default shell args"
+        );
+        assert!(
+            wrapper.contains("--init-command"),
+            "expected wrapper to synthesize fish init-command integration when no explicit args are passed"
+        );
+        assert!(
+            wrapper.contains("set -- -d -i"),
+            "expected wrapper to synthesize zsh default launch flags when no explicit args are passed"
+        );
+    }
+
+    #[test]
+    fn fish_and_zsh_launch_specs_preserve_shell_profile_env() {
+        let _guard = ENV_LOCK.lock().unwrap_or_else(|poison| poison.into_inner());
+        let original_profile = std::env::var_os("TASKERS_SHELL_PROFILE");
+        let original_disabled = std::env::var_os("TASKERS_DISABLE_SHELL_INTEGRATION");
+        unsafe {
+            std::env::set_var("TASKERS_SHELL_PROFILE", "clean");
+            std::env::remove_var("TASKERS_DISABLE_SHELL_INTEGRATION");
+        }
+
+        let fish_integration = ShellIntegration {
+            root: PathBuf::from("/tmp/taskers-runtime"),
+            wrapper_path: PathBuf::from("/tmp/taskers-runtime/taskers-shell-wrapper.sh"),
+            real_shell: PathBuf::from("/usr/bin/fish"),
+        };
+        let zsh_integration = ShellIntegration {
+            root: PathBuf::from("/tmp/taskers-runtime"),
+            wrapper_path: PathBuf::from("/tmp/taskers-runtime/taskers-shell-wrapper.sh"),
+            real_shell: PathBuf::from("/usr/bin/zsh"),
+        };
+
+        let fish_spec = fish_integration.launch_spec();
+        let zsh_spec = zsh_integration.launch_spec();
+
+        assert_eq!(
+            fish_spec
+                .env
+                .get("TASKERS_SHELL_PROFILE")
+                .map(String::as_str),
+            Some("clean")
+        );
+        assert_eq!(
+            zsh_spec
+                .env
+                .get("TASKERS_SHELL_PROFILE")
+                .map(String::as_str),
+            Some("clean")
+        );
+
+        unsafe {
+            match original_profile {
+                Some(value) => std::env::set_var("TASKERS_SHELL_PROFILE", value),
+                None => std::env::remove_var("TASKERS_SHELL_PROFILE"),
+            }
+            match original_disabled {
+                Some(value) => std::env::set_var("TASKERS_DISABLE_SHELL_INTEGRATION", value),
+                None => std::env::remove_var("TASKERS_DISABLE_SHELL_INTEGRATION"),
+            }
+        }
+    }
+
     #[test]
     fn shell_hooks_and_proxy_require_surface_tty_identity() {
         let bash_hooks = include_str!(concat!(
