Worktrunk is a CLI for Git worktree management, designed for parallel AI agent workflows
Remove unnecessary piped stdout bypass from shell wrappers (#278)
Maximilian Roos5656ed4e1b4c
diff --git a/templates/bash.sh b/templates/bash.shindex 1429203b2..f29f30709 100644--- a/templates/bash.sh+++ b/templates/bash.sh@@ -25,12 +25,6 @@ if command -v {{ cmd }} >/dev/null 2>&1 || [[ -n "${WORKTRUNK_BIN:-}" ]]; then# --source: use cargo run (builds from source)if [[ "$use_source" == true ]]; then- # If stdout is not a terminal (piped/redirected), run directly.- # This allows `wt list --format=json | jq` to work.- if [[ ! -t 1 ]]; then- cargo run --bin {{ cmd }} --quiet -- "${args[@]}"- return- filocal directive_file exit_code=0directive_file="$(mktemp)"WORKTRUNK_DIRECTIVE_FILE="$directive_file" cargo run --bin {{ cmd }} --quiet -- "${args[@]}" || exit_code=$?@@ -44,13 +38,6 @@ if command -v {{ cmd }} >/dev/null 2>&1 || [[ -n "${WORKTRUNK_BIN:-}" ]]; thenreturn "$exit_code"fi- # If stdout is not a terminal (piped/redirected), run directly.- # This allows `wt list --format=json | jq` to work.- if [[ ! -t 1 ]]; then- command "${WORKTRUNK_BIN:-{{ cmd }}}" "${args[@]}"- return- fi-_{{ cmd|safe_fn }}_exec "${args[@]}"}diff --git a/templates/fish.fish b/templates/fish.fishindex a65d0c07e..c5f8d0a1b 100644--- a/templates/fish.fish+++ b/templates/fish.fish@@ -40,12 +40,6 @@ if type -q {{ cmd }}; or test -n "$WORKTRUNK_BIN"# --source: use cargo run (builds from source)if test $use_source = true- # If stdout is not a terminal (piped/redirected), run directly.- # This allows `wt list --format=json | jq` to work.- if not isatty stdout- cargo run --bin {{ cmd }} --quiet -- $args- return $status- endset -l directive_file (mktemp)WORKTRUNK_DIRECTIVE_FILE=$directive_file cargo run --bin {{ cmd }} --quiet -- $argsset -l exit_code $status@@ -59,14 +53,6 @@ if type -q {{ cmd }}; or test -n "$WORKTRUNK_BIN"return $exit_codeend- # If stdout is not a terminal (piped/redirected), run directly.- # This allows `wt list --format=json | jq` to work.- if not isatty stdout- test -n "$WORKTRUNK_BIN"; or set -l WORKTRUNK_BIN (type -P {{ cmd }})- command $WORKTRUNK_BIN $args- return $status- end-_{{ cmd|safe_fn }}_exec $argsenddiff --git a/templates/powershell.ps1 b/templates/powershell.ps1index a3e60ff64..9e874fb1c 100644--- a/templates/powershell.ps1+++ b/templates/powershell.ps1@@ -16,15 +16,6 @@ if (Get-Command {{ cmd }} -ErrorAction SilentlyContinue) {)$wtBin = (Get-Command {{ cmd }} -CommandType Application).Source-- # If output is redirected (piped), run directly without wrapper.- # This allows `wt list --format=json | ConvertFrom-Json` to work - the output- # flows through instead of being captured and Invoke-Expression'd.- if ([Console]::IsOutputRedirected) {- & $wtBin @Arguments- return $LASTEXITCODE- }-$directiveFile = [System.IO.Path]::GetTempFileName()try {diff --git a/templates/zsh.zsh b/templates/zsh.zshindex ffdd9b36e..16968ef89 100644--- a/templates/zsh.zsh+++ b/templates/zsh.zsh@@ -28,12 +28,6 @@ if command -v {{ cmd }} >/dev/null 2>&1 || [[ -n "${WORKTRUNK_BIN:-}" ]]; then# --source: use cargo run (builds from source)if [[ "$use_source" == true ]]; then- # If stdout is not a terminal (piped/redirected), run directly.- # This allows `wt list --format=json | jq` to work.- if [[ ! -t 1 ]]; then- cargo run --bin {{ cmd }} --quiet -- "${args[@]}"- return- filocal directive_file exit_code=0directive_file="$(mktemp)"WORKTRUNK_DIRECTIVE_FILE="$directive_file" cargo run --bin {{ cmd }} --quiet -- "${args[@]}" || exit_code=$?@@ -47,13 +41,6 @@ if command -v {{ cmd }} >/dev/null 2>&1 || [[ -n "${WORKTRUNK_BIN:-}" ]]; thenreturn "$exit_code"fi- # If stdout is not a terminal (piped/redirected), run directly.- # This allows `wt list --format=json | jq` to work.- if [[ ! -t 1 ]]; then- command "${WORKTRUNK_BIN:-{{ cmd }}}" "${args[@]}"- return- fi-_{{ cmd|safe_fn }}_exec "${args[@]}"}diff --git a/tests/common/shell.rs b/tests/common/shell.rsindex 811005685..cf8a502c5 100644--- a/tests/common/shell.rs+++ b/tests/common/shell.rs@@ -59,8 +59,8 @@ pub fn get_shell_binary(shell: &str) -> &str {/// Execute a script in the given shell with the repo's isolated environment.///-/// Uses a PTY so that stdout appears as a terminal to the shell. This is required-/// for shell wrapper tests since the wrapper uses `[[ ! -t 1 ]]` to detect piping.+/// Uses a PTY so that stdout appears as a terminal to the shell. This simulates+/// real terminal behavior for shell wrapper tests (combined stdout/stderr, ANSI codes).#[cfg(unix)]pub fn execute_shell_script(repo: &TestRepo, shell: &str, script: &str) -> String {use portable_pty::CommandBuilder;diff --git a/tests/snapshots/integration__integration_tests__init__init_bash.snap b/tests/snapshots/integration__integration_tests__init__init_bash.snapindex 6a1b179db..bc250d318 100644--- a/tests/snapshots/integration__integration_tests__init__init_bash.snap+++ b/tests/snapshots/integration__integration_tests__init__init_bash.snap@@ -76,12 +76,6 @@ _wt_exec() {# --source: use cargo run (builds from source)if [[ "$use_source" == true ]]; then- # If stdout is not a terminal (piped/redirected), run directly.- # This allows `wt list --format=json | jq` to work.- if [[ ! -t 1 ]]; then- cargo run --bin wt --quiet -- "${args[@]}"- return- filocal directive_file exit_code=0directive_file="$(mktemp)"WORKTRUNK_DIRECTIVE_FILE="$directive_file" cargo run --bin wt --quiet -- "${args[@]}" || exit_code=$?@@ -95,13 +89,6 @@ _wt_exec() {return "$exit_code"fi- # If stdout is not a terminal (piped/redirected), run directly.- # This allows `wt list --format=json | jq` to work.- if [[ ! -t 1 ]]; then- command "${WORKTRUNK_BIN:-wt}" "${args[@]}"- return- fi-_wt_exec "${args[@]}"}diff --git a/tests/snapshots/integration__integration_tests__init__init_fish.snap b/tests/snapshots/integration__integration_tests__init__init_fish.snapindex b25c94774..68e8fa7c5 100644--- a/tests/snapshots/integration__integration_tests__init__init_fish.snap+++ b/tests/snapshots/integration__integration_tests__init__init_fish.snap@@ -72,12 +72,6 @@ if type -q wt; or test -n "$WORKTRUNK_BIN"# --source: use cargo run (builds from source)if test $use_source = true- # If stdout is not a terminal (piped/redirected), run directly.- # This allows `wt list --format=json | jq` to work.- if not isatty stdout- cargo run --bin wt --quiet -- $args- return $status- endset -l directive_file (mktemp)WORKTRUNK_DIRECTIVE_FILE=$directive_file cargo run --bin wt --quiet -- $argsset -l exit_code $status@@ -91,14 +85,6 @@ if type -q wt; or test -n "$WORKTRUNK_BIN"return $exit_codeend- # If stdout is not a terminal (piped/redirected), run directly.- # This allows `wt list --format=json | jq` to work.- if not isatty stdout- test -n "$WORKTRUNK_BIN"; or set -l WORKTRUNK_BIN (type -P wt)- command $WORKTRUNK_BIN $args- return $status- end-_wt_exec $argsenddiff --git a/tests/snapshots/integration__integration_tests__init__init_zsh.snap b/tests/snapshots/integration__integration_tests__init__init_zsh.snapindex cfef01f96..d04041814 100644--- a/tests/snapshots/integration__integration_tests__init__init_zsh.snap+++ b/tests/snapshots/integration__integration_tests__init__init_zsh.snap@@ -79,12 +79,6 @@ _wt_exec() {# --source: use cargo run (builds from source)if [[ "$use_source" == true ]]; then- # If stdout is not a terminal (piped/redirected), run directly.- # This allows `wt list --format=json | jq` to work.- if [[ ! -t 1 ]]; then- cargo run --bin wt --quiet -- "${args[@]}"- return- filocal directive_file exit_code=0directive_file="$(mktemp)"WORKTRUNK_DIRECTIVE_FILE="$directive_file" cargo run --bin wt --quiet -- "${args[@]}" || exit_code=$?@@ -98,13 +92,6 @@ _wt_exec() {return "$exit_code"fi- # If stdout is not a terminal (piped/redirected), run directly.- # This allows `wt list --format=json | jq` to work.- if [[ ! -t 1 ]]; then- command "${WORKTRUNK_BIN:-wt}" "${args[@]}"- return- fi-_wt_exec "${args[@]}"}