Skip to content

Worktrunk is a CLI for Git worktree management, designed for parallel AI agent workflows

fix(fish): Handle empty WORKTRUNK_BIN in completions (#83)

Maximilian Roos50e5cf171dcb
diff --git a/src/commands/configure_shell.rs b/src/commands/configure_shell.rs
index a7c0a5b82..45fb645b2 100644
--- a/src/commands/configure_shell.rs
+++ b/src/commands/configure_shell.rs
@@ -559,7 +559,7 @@ fn prompt_yes_no() -> Result<bool, String> {
/// Fish completion content - finds wt in PATH, with WORKTRUNK_BIN as optional override
const FISH_COMPLETION: &str = r#"# worktrunk completions for fish
-complete --keep-order --exclusive --command wt --arguments "(set -q WORKTRUNK_BIN; or set -l WORKTRUNK_BIN (type -P wt); COMPLETE=fish \$WORKTRUNK_BIN -- (commandline --current-process --tokenize --cut-at-cursor) (commandline --current-token))"
+complete --keep-order --exclusive --command wt --arguments "(test -n \"\$WORKTRUNK_BIN\"; or set -l WORKTRUNK_BIN (type -P wt); COMPLETE=fish \$WORKTRUNK_BIN -- (commandline --current-process --tokenize --cut-at-cursor) (commandline --current-token))"
"#;
/// Process shell completions - either preview or write based on dry_run flag
diff --git a/templates/fish.fish b/templates/fish.fish
index c1c891876..3a6ca5962 100644
--- a/templates/fish.fish
+++ b/templates/fish.fish
@@ -1,11 +1,11 @@
# worktrunk shell integration for fish
# Only initialize if {{ cmd_prefix }} is available (in PATH or via WORKTRUNK_BIN)
-if type -q {{ cmd_prefix }}; or set -q WORKTRUNK_BIN
+if type -q {{ cmd_prefix }}; or test -n "$WORKTRUNK_BIN"
# Capture stdout (shell script), eval in parent shell. stderr streams to terminal.
# WORKTRUNK_BIN can override the binary path (for testing dev builds).
function wt_exec
- set -q WORKTRUNK_BIN; or set -l WORKTRUNK_BIN (type -P {{ cmd_prefix }})
+ test -n "$WORKTRUNK_BIN"; or set -l WORKTRUNK_BIN (type -P {{ cmd_prefix }})
set -l script (command $WORKTRUNK_BIN $argv | string collect)
set -l exit_code $pipestatus[1]
diff --git a/tests/integration_tests/configure_shell.rs b/tests/integration_tests/configure_shell.rs
index c8e72691a..7f60708f2 100644
--- a/tests/integration_tests/configure_shell.rs
+++ b/tests/integration_tests/configure_shell.rs
@@ -236,8 +236,8 @@ fn test_configure_shell_fish_extension_exists() {
);
let contents = std::fs::read_to_string(&completions_file).unwrap();
assert!(
- contents.contains("set -q WORKTRUNK_BIN; or set -l WORKTRUNK_BIN"),
- "Fish completions should use WORKTRUNK_BIN with fallback"
+ contents.contains(r#"test -n \"\$WORKTRUNK_BIN\""#),
+ "Fish completions should check WORKTRUNK_BIN is non-empty with fallback"
);
}
diff --git a/tests/snapshots/integration__integration_tests__init__init_fish.snap b/tests/snapshots/integration__integration_tests__init__init_fish.snap
index ee491306f..8d71f358a 100644
--- a/tests/snapshots/integration__integration_tests__init__init_fish.snap
+++ b/tests/snapshots/integration__integration_tests__init__init_fish.snap
@@ -26,11 +26,11 @@ exit_code: 0
# worktrunk shell integration for fish
# Only initialize if wt is available (in PATH or via WORKTRUNK_BIN)
-if type -q wt; or set -q WORKTRUNK_BIN
+if type -q wt; or test -n "$WORKTRUNK_BIN"
# Capture stdout (shell script), eval in parent shell. stderr streams to terminal.
# WORKTRUNK_BIN can override the binary path (for testing dev builds).
function wt_exec
- set -q WORKTRUNK_BIN; or set -l WORKTRUNK_BIN (type -P wt)
+ test -n "$WORKTRUNK_BIN"; or set -l WORKTRUNK_BIN (type -P wt)
set -l script (command $WORKTRUNK_BIN $argv | string collect)
set -l exit_code $pipestatus[1]