Worktrunk is a CLI for Git worktree management, designed for parallel AI agent workflows
Fix: Suppress bash job control notifications in `wt_exec`
Maximilian Roosca931796f28b
diff --git a/templates/posix_directives.sh b/templates/posix_directives.shindex bb1e4aba7..a3e2f2e46 100644--- a/templates/posix_directives.sh+++ b/templates/posix_directives.sh@@ -7,10 +7,39 @@# Note: Uses ${_WORKTRUNK_CMD:-{{ cmd_prefix }}} fallback because shell snapshot# systems may capture functions but not environment variables.wt_exec() {- # Disable job control notifications in zsh (prevents "[1] 12345" / "[1] + done" messages)- # For bash, this is handled at the backgrounding site using fd redirection+ # ┌─────────────────────────────────────────────────────────────────────────┐+ # │ BASH JOB CONTROL: Why we need TWO suppression mechanisms │+ # │ │+ # │ Bash has two separate job notification mechanisms that are controlled │+ # │ by DIFFERENT flags: │+ # │ │+ # │ 1. START notification "[1] 12345" (when `&` runs): │+ # │ - Controlled by `interactive` flag, NOT `monitor` (-m) │+ # │ - Printed by describe_pid() via DESCRIBE_PID macro in jobs.c │+ # │ - Cannot be disabled by any shell option in an interactive shell │+ # │ - Must be suppressed via stderr redirection: { cmd & } 2>/dev/null │+ # │ │+ # │ 2. DONE notification "[1]+ Done ..." (at next prompt): │+ # │ - Controlled by `monitor` (-m) option │+ # │ - Only printed for jobs started while monitor mode was ON │+ # │ - Suppressed by `set +m` BEFORE backgrounding the job │+ # │ │+ # │ References: │+ # │ - https://www.gnu.org/s/bash/manual/html_node/Job-Control-Basics.html │+ # │ - https://superuser.com/questions/489722 (job notifications vs monitor) │+ # │ - https://stackoverflow.com/questions/20707316 (suppress background) │+ # └─────────────────────────────────────────────────────────────────────────┘++ # Suppress DONE notifications by disabling monitor mode.+ # zsh: LOCAL_OPTIONS makes the change function-scoped (automatic restore)+ # bash: must manually save/restore since set +m affects the global shell+ # Note: We only touch -m, not -b (notify), to preserve user's notify preference.+ local _wt_saved_monitor=""if [[ -n "${ZSH_VERSION:-}" ]]; thensetopt LOCAL_OPTIONS NO_MONITOR+ elif [[ -n "${BASH_VERSION:-}" && $- == *m* ]]; then+ _wt_saved_monitor=1+ set +mfilocal exec_cmd="" chunk="" exit_code=0 tmp_dir="" fifo_path="" runner_pid=""@@ -24,6 +53,8 @@ wt_exec() {# Remove temp files/bin/rm -f "$fifo_path" 2>/dev/null || true/bin/rmdir "$tmp_dir" 2>/dev/null || true+ # Restore bash job control if we disabled it+ [[ -n "$_wt_saved_monitor" ]] && set -m}# On SIGINT: cleanup and exit immediately with 130@@ -32,6 +63,7 @@ wt_exec() {# Create temp directory with FIFO for streaming outputtmp_dir=$(mktemp -d "${TMPDIR:-/tmp}/wt.XXXXXX") || {echo "Failed to create temp directory for worktrunk shim" >&2+ [[ -n "$_wt_saved_monitor" ]] && set -mreturn 1}fifo_path="$tmp_dir/stdout.fifo"@@ -39,18 +71,27 @@ wt_exec() {if ! mkfifo "$fifo_path"; thenecho "Failed to create FIFO for worktrunk shim" >&2/bin/rm -rf "$tmp_dir"+ [[ -n "$_wt_saved_monitor" ]] && set -mreturn 1fi- # Run worktrunk in background, piping stdout to FIFO- # (stderr stays attached to TTY for child process colors/progress)- # For bash, redirect stderr for the { & } to suppress job notifications,- # but keep command's stderr on the original fd+ # Run worktrunk in background, piping stdout to FIFO.+ # Backgrounding is required: the FIFO blocks until both ends connect, so we+ # must background the writer (wt) while the foreground reads from it.+ #+ # For bash: Suppress the START notification "[1] 12345" via fd redirection.+ # The job-start message is printed by bash's describe_pid() to stderr when+ # `&` executes. By wrapping in { } with 2>/dev/null, we catch that message+ # while preserving the command's own stderr via fd 9.+ #+ # This pattern is stable across bash 3.x-5.x: describe_pid() has printed to+ # stderr since early bash versions, and redirections on grouped commands+ # affecting the shell's own writes is standard POSIX behavior.if [[ -n "${BASH_VERSION:-}" ]]; then- exec 9>&2+ exec 9>&2 # Save real stderr to fd 9 for the command's errors{ command "${_WORKTRUNK_CMD:-{{ cmd_prefix }}}" "$@" >"$fifo_path" 2>&9 & } 2>/dev/nullrunner_pid=$!- exec 9>&-+ exec 9>&- # Close fd 9elsecommand "${_WORKTRUNK_CMD:-{{ cmd_prefix }}}" "$@" >"$fifo_path" &runner_pid=$!@@ -71,7 +112,11 @@ wt_exec() {fidone <"$fifo_path"- # Wait for worktrunk to complete and capture its exit code+ # Wait for worktrunk to complete and capture its exit code.+ # Note: `wait $pid` works correctly even with monitor mode disabled (set +m).+ # Unlike `disown` which removes jobs from bash's tracking entirely, `set +m`+ # only disables job control features (fg/bg, DONE notifications) while still+ # allowing exit status retrieval via wait.wait "$runner_pid" >/dev/null 2>&1 || exit_code=$?# Cleanupdiff --git a/tests/snapshots/integration__integration_tests__init__init_bash.snap b/tests/snapshots/integration__integration_tests__init__init_bash.snapindex 5ff5276c9..06f7e1bdd 100644--- a/tests/snapshots/integration__integration_tests__init__init_bash.snap+++ b/tests/snapshots/integration__integration_tests__init__init_bash.snap@@ -41,10 +41,39 @@ if command -v wt >/dev/null 2>&1 || [[ -n "${WORKTRUNK_BIN:-}" ]]; then# Note: Uses ${_WORKTRUNK_CMD:-wt} fallback because shell snapshot# systems may capture functions but not environment variables.wt_exec() {- # Disable job control notifications in zsh (prevents "[1] 12345" / "[1] + done" messages)- # For bash, this is handled at the backgrounding site using fd redirection+ # ┌─────────────────────────────────────────────────────────────────────────┐+ # │ BASH JOB CONTROL: Why we need TWO suppression mechanisms │+ # │ │+ # │ Bash has two separate job notification mechanisms that are controlled │+ # │ by DIFFERENT flags: │+ # │ │+ # │ 1. START notification "[1] 12345" (when `&` runs): │+ # │ - Controlled by `interactive` flag, NOT `monitor` (-m) │+ # │ - Printed by describe_pid() via DESCRIBE_PID macro in jobs.c │+ # │ - Cannot be disabled by any shell option in an interactive shell │+ # │ - Must be suppressed via stderr redirection: { cmd & } 2>/dev/null │+ # │ │+ # │ 2. DONE notification "[1]+ Done ..." (at next prompt): │+ # │ - Controlled by `monitor` (-m) option │+ # │ - Only printed for jobs started while monitor mode was ON │+ # │ - Suppressed by `set +m` BEFORE backgrounding the job │+ # │ │+ # │ References: │+ # │ - https://www.gnu.org/s/bash/manual/html_node/Job-Control-Basics.html │+ # │ - https://superuser.com/questions/489722 (job notifications vs monitor) │+ # │ - https://stackoverflow.com/questions/20707316 (suppress background) │+ # └─────────────────────────────────────────────────────────────────────────┘++ # Suppress DONE notifications by disabling monitor mode.+ # zsh: LOCAL_OPTIONS makes the change function-scoped (automatic restore)+ # bash: must manually save/restore since set +m affects the global shell+ # Note: We only touch -m, not -b (notify), to preserve user's notify preference.+ local _wt_saved_monitor=""if [[ -n "${ZSH_VERSION:-}" ]]; thensetopt LOCAL_OPTIONS NO_MONITOR+ elif [[ -n "${BASH_VERSION:-}" && $- == *m* ]]; then+ _wt_saved_monitor=1+ set +mfilocal exec_cmd="" chunk="" exit_code=0 tmp_dir="" fifo_path="" runner_pid=""@@ -58,6 +87,8 @@ wt_exec() {# Remove temp files/bin/rm -f "$fifo_path" 2>/dev/null || true/bin/rmdir "$tmp_dir" 2>/dev/null || true+ # Restore bash job control if we disabled it+ [[ -n "$_wt_saved_monitor" ]] && set -m}# On SIGINT: cleanup and exit immediately with 130@@ -66,6 +97,7 @@ wt_exec() {# Create temp directory with FIFO for streaming outputtmp_dir=$(mktemp -d "${TMPDIR:-/tmp}/wt.XXXXXX") || {echo "Failed to create temp directory for worktrunk shim" >&2+ [[ -n "$_wt_saved_monitor" ]] && set -mreturn 1}fifo_path="$tmp_dir/stdout.fifo"@@ -73,18 +105,27 @@ wt_exec() {if ! mkfifo "$fifo_path"; thenecho "Failed to create FIFO for worktrunk shim" >&2/bin/rm -rf "$tmp_dir"+ [[ -n "$_wt_saved_monitor" ]] && set -mreturn 1fi- # Run worktrunk in background, piping stdout to FIFO- # (stderr stays attached to TTY for child process colors/progress)- # For bash, redirect stderr for the { & } to suppress job notifications,- # but keep command's stderr on the original fd+ # Run worktrunk in background, piping stdout to FIFO.+ # Backgrounding is required: the FIFO blocks until both ends connect, so we+ # must background the writer (wt) while the foreground reads from it.+ #+ # For bash: Suppress the START notification "[1] 12345" via fd redirection.+ # The job-start message is printed by bash's describe_pid() to stderr when+ # `&` executes. By wrapping in { } with 2>/dev/null, we catch that message+ # while preserving the command's own stderr via fd 9.+ #+ # This pattern is stable across bash 3.x-5.x: describe_pid() has printed to+ # stderr since early bash versions, and redirections on grouped commands+ # affecting the shell's own writes is standard POSIX behavior.if [[ -n "${BASH_VERSION:-}" ]]; then- exec 9>&2+ exec 9>&2 # Save real stderr to fd 9 for the command's errors{ command "${_WORKTRUNK_CMD:-wt}" "$@" >"$fifo_path" 2>&9 & } 2>/dev/nullrunner_pid=$!- exec 9>&-+ exec 9>&- # Close fd 9elsecommand "${_WORKTRUNK_CMD:-wt}" "$@" >"$fifo_path" &runner_pid=$!@@ -105,7 +146,11 @@ wt_exec() {fidone <"$fifo_path"- # Wait for worktrunk to complete and capture its exit code+ # Wait for worktrunk to complete and capture its exit code.+ # Note: `wait $pid` works correctly even with monitor mode disabled (set +m).+ # Unlike `disown` which removes jobs from bash's tracking entirely, `set +m`+ # only disables job control features (fg/bg, DONE notifications) while still+ # allowing exit status retrieval via wait.wait "$runner_pid" >/dev/null 2>&1 || exit_code=$?# Cleanupdiff --git a/tests/snapshots/integration__integration_tests__init__init_zsh.snap b/tests/snapshots/integration__integration_tests__init__init_zsh.snapindex c493bc696..1a3aea6ee 100644--- a/tests/snapshots/integration__integration_tests__init__init_zsh.snap+++ b/tests/snapshots/integration__integration_tests__init__init_zsh.snap@@ -41,10 +41,39 @@ if command -v wt >/dev/null 2>&1 || [[ -n "${WORKTRUNK_BIN:-}" ]]; then# Note: Uses ${_WORKTRUNK_CMD:-wt} fallback because shell snapshot# systems may capture functions but not environment variables.wt_exec() {- # Disable job control notifications in zsh (prevents "[1] 12345" / "[1] + done" messages)- # For bash, this is handled at the backgrounding site using fd redirection+ # ┌─────────────────────────────────────────────────────────────────────────┐+ # │ BASH JOB CONTROL: Why we need TWO suppression mechanisms │+ # │ │+ # │ Bash has two separate job notification mechanisms that are controlled │+ # │ by DIFFERENT flags: │+ # │ │+ # │ 1. START notification "[1] 12345" (when `&` runs): │+ # │ - Controlled by `interactive` flag, NOT `monitor` (-m) │+ # │ - Printed by describe_pid() via DESCRIBE_PID macro in jobs.c │+ # │ - Cannot be disabled by any shell option in an interactive shell │+ # │ - Must be suppressed via stderr redirection: { cmd & } 2>/dev/null │+ # │ │+ # │ 2. DONE notification "[1]+ Done ..." (at next prompt): │+ # │ - Controlled by `monitor` (-m) option │+ # │ - Only printed for jobs started while monitor mode was ON │+ # │ - Suppressed by `set +m` BEFORE backgrounding the job │+ # │ │+ # │ References: │+ # │ - https://www.gnu.org/s/bash/manual/html_node/Job-Control-Basics.html │+ # │ - https://superuser.com/questions/489722 (job notifications vs monitor) │+ # │ - https://stackoverflow.com/questions/20707316 (suppress background) │+ # └─────────────────────────────────────────────────────────────────────────┘++ # Suppress DONE notifications by disabling monitor mode.+ # zsh: LOCAL_OPTIONS makes the change function-scoped (automatic restore)+ # bash: must manually save/restore since set +m affects the global shell+ # Note: We only touch -m, not -b (notify), to preserve user's notify preference.+ local _wt_saved_monitor=""if [[ -n "${ZSH_VERSION:-}" ]]; thensetopt LOCAL_OPTIONS NO_MONITOR+ elif [[ -n "${BASH_VERSION:-}" && $- == *m* ]]; then+ _wt_saved_monitor=1+ set +mfilocal exec_cmd="" chunk="" exit_code=0 tmp_dir="" fifo_path="" runner_pid=""@@ -58,6 +87,8 @@ wt_exec() {# Remove temp files/bin/rm -f "$fifo_path" 2>/dev/null || true/bin/rmdir "$tmp_dir" 2>/dev/null || true+ # Restore bash job control if we disabled it+ [[ -n "$_wt_saved_monitor" ]] && set -m}# On SIGINT: cleanup and exit immediately with 130@@ -66,6 +97,7 @@ wt_exec() {# Create temp directory with FIFO for streaming outputtmp_dir=$(mktemp -d "${TMPDIR:-/tmp}/wt.XXXXXX") || {echo "Failed to create temp directory for worktrunk shim" >&2+ [[ -n "$_wt_saved_monitor" ]] && set -mreturn 1}fifo_path="$tmp_dir/stdout.fifo"@@ -73,18 +105,27 @@ wt_exec() {if ! mkfifo "$fifo_path"; thenecho "Failed to create FIFO for worktrunk shim" >&2/bin/rm -rf "$tmp_dir"+ [[ -n "$_wt_saved_monitor" ]] && set -mreturn 1fi- # Run worktrunk in background, piping stdout to FIFO- # (stderr stays attached to TTY for child process colors/progress)- # For bash, redirect stderr for the { & } to suppress job notifications,- # but keep command's stderr on the original fd+ # Run worktrunk in background, piping stdout to FIFO.+ # Backgrounding is required: the FIFO blocks until both ends connect, so we+ # must background the writer (wt) while the foreground reads from it.+ #+ # For bash: Suppress the START notification "[1] 12345" via fd redirection.+ # The job-start message is printed by bash's describe_pid() to stderr when+ # `&` executes. By wrapping in { } with 2>/dev/null, we catch that message+ # while preserving the command's own stderr via fd 9.+ #+ # This pattern is stable across bash 3.x-5.x: describe_pid() has printed to+ # stderr since early bash versions, and redirections on grouped commands+ # affecting the shell's own writes is standard POSIX behavior.if [[ -n "${BASH_VERSION:-}" ]]; then- exec 9>&2+ exec 9>&2 # Save real stderr to fd 9 for the command's errors{ command "${_WORKTRUNK_CMD:-wt}" "$@" >"$fifo_path" 2>&9 & } 2>/dev/nullrunner_pid=$!- exec 9>&-+ exec 9>&- # Close fd 9elsecommand "${_WORKTRUNK_CMD:-wt}" "$@" >"$fifo_path" &runner_pid=$!@@ -105,7 +146,11 @@ wt_exec() {fidone <"$fifo_path"- # Wait for worktrunk to complete and capture its exit code+ # Wait for worktrunk to complete and capture its exit code.+ # Note: `wait $pid` works correctly even with monitor mode disabled (set +m).+ # Unlike `disown` which removes jobs from bash's tracking entirely, `set +m`+ # only disables job control features (fg/bg, DONE notifications) while still+ # allowing exit status retrieval via wait.wait "$runner_pid" >/dev/null 2>&1 || exit_code=$?# Cleanup