Skip to content

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

Stream child process output to preserve TTY behavior

Maximilian Roosecb80ba32102
diff --git a/src/output/handlers.rs b/src/output/handlers.rs
index dcff26f77..ccece6b4d 100644
--- a/src/output/handlers.rs
+++ b/src/output/handlers.rs
@@ -1,7 +1,7 @@
//! Output handlers for worktree operations using the global output context
use crate::commands::worktree::{RemoveResult, SwitchResult};
-use worktrunk::git::{GitError, GitResultExt};
+use worktrunk::git::GitError;
/// Format message for switch operation (includes emoji and color for consistency)
fn format_switch_message(result: &SwitchResult, branch: &str) -> String {
@@ -118,63 +118,74 @@ pub fn handle_remove_output(result: &RemoveResult) -> Result<(), GitError> {
Ok(())
}
-/// Execute a command in a worktree directory
+/// Execute a command with streaming output
///
-/// Merges stdout into stderr using shell redirection (1>&2) to ensure deterministic output ordering.
-/// Per CLAUDE.md guidelines: child process output goes to stderr, worktrunk output goes to stdout.
-/// Streams output line-by-line in real-time (no buffering) to provide immediate feedback for
-/// long-running commands.
+/// Uses Stdio::inherit to preserve TTY behavior - this ensures commands like cargo detect they're
+/// connected to a terminal and don't buffer their output.
///
-/// The shell-level redirect ensures all output flows through a single pipe (stderr) in the order written,
-/// eliminating race conditions that would occur with separate stdout/stderr threads.
+/// If `redirect_stdout_to_stderr` is true, wraps the command in `{ command; } 1>&2` to merge
+/// stdout into stderr. This ensures deterministic output ordering (all output flows through stderr).
+/// Per CLAUDE.md: child process output goes to stderr, worktrunk output goes to stdout.
///
-/// Calls terminate_output() after completion to handle mode-specific cleanup
-/// (NUL terminator in directive mode, no-op in interactive mode).
-pub fn execute_command_in_worktree(
- worktree_path: &std::path::Path,
+/// Returns error if command exits with non-zero status.
+pub(crate) fn execute_streaming(
command: &str,
-) -> Result<(), GitError> {
- use std::io::{BufRead, BufReader, Write};
- use std::process::{Command, Stdio};
-
- // Flush stdout before executing command to ensure all our messages appear
- // before the child process output
- super::flush()?;
-
- // Redirect stdout to stderr in the shell command to merge streams
- // This ensures deterministic ordering: all output flows through a single pipe (stderr)
- // in the order it was written, with no race conditions between threads
- // Per CLAUDE.md: child process output goes to stderr, worktrunk output goes to stdout
- let merged_command = format!("{{ {}; }} 1>&2", command);
+ working_dir: &std::path::Path,
+ redirect_stdout_to_stderr: bool,
+) -> std::io::Result<()> {
+ use std::io;
+ use std::process::Command;
+
+ let command_to_run = if redirect_stdout_to_stderr {
+ format!("{{ {}; }} 1>&2", command)
+ } else {
+ command.to_string()
+ };
let mut child = Command::new("sh")
.arg("-c")
- .arg(&merged_command)
- .current_dir(worktree_path)
- .stdout(Stdio::inherit()) // Inherit stdout for any shell errors (though redirected to stderr)
- .stderr(Stdio::piped())
+ .arg(&command_to_run)
+ .current_dir(working_dir)
+ // Use Stdio::inherit() to preserve TTY behavior
+ // This prevents commands like cargo from buffering output
.spawn()
- .git_context("Failed to execute command")?;
-
- // Read and stream output line-by-line in real-time (no buffering)
- let stderr = child.stderr.take().unwrap();
- let reader = BufReader::new(stderr);
-
- for line in reader.lines().map_while(Result::ok) {
- eprintln!("{}", line);
- let _ = std::io::stderr().flush();
- }
+ .map_err(|e| io::Error::other(format!("Failed to execute command: {}", e)))?;
// Wait for command to complete
- let status = child.wait().git_context("Failed to wait for command")?;
+ let status = child
+ .wait()
+ .map_err(|e| io::Error::other(format!("Failed to wait for command: {}", e)))?;
if !status.success() {
- return Err(GitError::CommandFailed(format!(
+ return Err(io::Error::other(format!(
"Command failed with exit code: {}",
status
)));
}
+ Ok(())
+}
+
+/// Execute a command in a worktree directory
+///
+/// Merges stdout into stderr using shell redirection (1>&2) to ensure deterministic output ordering.
+/// Per CLAUDE.md guidelines: child process output goes to stderr, worktrunk output goes to stdout.
+///
+/// Calls terminate_output() after completion to handle mode-specific cleanup
+/// (NUL terminator in directive mode, no-op in interactive mode).
+pub fn execute_command_in_worktree(
+ worktree_path: &std::path::Path,
+ command: &str,
+) -> Result<(), GitError> {
+ // Flush stdout before executing command to ensure all our messages appear
+ // before the child process output
+ super::flush()?;
+
+ // Execute with stdout→stderr redirect for deterministic ordering
+ // Convert io::Error to GitError::CommandFailed to preserve error message formatting
+ execute_streaming(command, worktree_path, true)
+ .map_err(|e| GitError::CommandFailed(e.to_string()))?;
+
// Flush to ensure all output appears before we continue
super::flush()?;
diff --git a/src/output/interactive.rs b/src/output/interactive.rs
index 060aa70e9..9307588a5 100644
--- a/src/output/interactive.rs
+++ b/src/output/interactive.rs
@@ -4,6 +4,8 @@ use std::io::{self, Write};
use std::path::Path;
use worktrunk::styling::{println, stderr, stdout};
+use super::handlers::execute_streaming;
+
/// Interactive output mode for human users
///
/// Formats messages with colors, emojis, and formatting.
@@ -46,34 +48,11 @@ impl InteractiveOutput {
}
pub fn execute(&mut self, command: String) -> io::Result<()> {
- use std::process::Command;
-
- // Execute command in the target directory
+ // Execute command in the target directory with streaming output
let exec_dir = self.target_dir.as_deref().unwrap_or_else(|| Path::new("."));
- let output = Command::new("sh")
- .arg("-c")
- .arg(&command)
- .current_dir(exec_dir)
- .output()
- .map_err(|e| io::Error::other(format!("Failed to execute command: {}", e)))?;
-
- if !output.status.success() {
- return Err(io::Error::other(format!(
- "Command failed with exit code: {}",
- output.status
- )));
- }
-
- // Print child command output to stderr (all child output goes to stderr)
- if !output.stdout.is_empty() {
- use worktrunk::styling::eprintln;
- eprintln!("{}", String::from_utf8_lossy(&output.stdout).trim_end());
- }
- if !output.stderr.is_empty() {
- use worktrunk::styling::eprintln;
- eprintln!("{}", String::from_utf8_lossy(&output.stderr).trim_end());
- }
+ // Use shared streaming execution (no stdout->stderr redirect for --execute)
+ execute_streaming(&command, exec_dir, false)?;
Ok(())
}
diff --git a/tests/snapshots/integration__integration_tests__init__init_elvish.snap b/tests/snapshots/integration__integration_tests__init__init_elvish.snap
new file mode 100644
index 000000000..32becbe64
--- /dev/null
+++ b/tests/snapshots/integration__integration_tests__init__init_elvish.snap
@@ -0,0 +1,102 @@
+---
+source: tests/integration_tests/init.rs
+info:
+ program: wt
+ args:
+ - init
+ - elvish
+ env:
+ CLICOLOR_FORCE: "1"
+ COLUMNS: "150"
+ GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
+ GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"
+ GIT_CONFIG_GLOBAL: /dev/null
+ GIT_CONFIG_SYSTEM: /dev/null
+ GIT_EDITOR: ""
+ LANG: C
+ LC_ALL: C
+ SOURCE_DATE_EPOCH: "1761609600"
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpQU88tl/test-config.toml
+---
+success: false
+exit_code: 1
+----- stdout -----
+# worktrunk shell integration for elvish
+
+# Only initialize if wt is available
+if (has-external wt) {
+ # Use WORKTRUNK_BIN if set, otherwise default to 'wt'
+ # This allows testing development builds: set E:WORKTRUNK_BIN = ./target/debug/wt
+ var _WORKTRUNK_CMD = wt
+ if (has-env WORKTRUNK_BIN) {
+ set _WORKTRUNK_CMD = $E:WORKTRUNK_BIN
+ }
+
+ # Helper function to parse wt output and handle directives
+ # Directives are NUL-terminated to support multi-line commands
+ fn _wt_exec {|@args|
+ var exit-code = 0
+ var output = ""
+ var exec-cmd = ""
+
+ # Capture stdout for directives, let stderr pass through to terminal
+ # This preserves TTY for color detection
+ # TODO: Capture actual exit code from wt command, not just success/failure
+ try {
+ set output = (e:$_WORKTRUNK_CMD $@args | slurp)
+ } catch e {
+ set exit-code = 1
+ set output = $e[reason][content]
+ }
+
+ # Split output on NUL bytes, process each chunk
+ var chunks = [(str:split "\x00" $output)]
+ for chunk $chunks {
+ if (str:has-prefix $chunk "__WORKTRUNK_CD__") {
+ # CD directive - extract path and change directory
+ var path = (str:trim-prefix $chunk "__WORKTRUNK_CD__")
+ cd $path
+ } elif (str:has-prefix $chunk "__WORKTRUNK_EXEC__") {
+ # EXEC directive - extract command (may contain newlines)
+ set exec-cmd = (str:trim-prefix $chunk "__WORKTRUNK_EXEC__")
+ } elif (!=s $chunk "") {
+ # Regular output - print it (preserving newlines)
+ print $chunk
+ }
+ }
+
+ # Execute command if one was specified
+ if (!=s $exec-cmd "") {
+ eval $exec-cmd
+ }
+
+ # Return exit code (will throw exception if non-zero)
+ if (!=s $exit-code 0) {
+ fail "command failed with exit code "$exit-code
+ }
+ }
+
+ # Override wt command to add --internal flag for switch, remove, and merge
+ fn wt {|@args|
+ if (== (count $args) 0) {
+ e:$_WORKTRUNK_CMD
+ return
+ }
+
+ var subcommand = $args[0]
+
+ if (or (eq $subcommand "switch") (eq $subcommand "remove") (eq $subcommand "merge")) {
+ # Commands that need --internal for directory change support
+ var rest-args = $args[1..]
+ _wt_exec --internal $subcommand $@rest-args
+ } else {
+ # All other commands pass through directly
+ e:$_WORKTRUNK_CMD $@args
+ }
+ }
+}
+
+# Static completions (commands and flags)
+❌ Completion not yet supported for elvish
+
+----- stderr -----
diff --git a/tests/snapshots/integration__integration_tests__init__init_nushell.snap b/tests/snapshots/integration__integration_tests__init__init_nushell.snap
new file mode 100644
index 000000000..e5e6103a7
--- /dev/null
+++ b/tests/snapshots/integration__integration_tests__init__init_nushell.snap
@@ -0,0 +1,88 @@
+---
+source: tests/integration_tests/init.rs
+info:
+ program: wt
+ args:
+ - init
+ - nushell
+ env:
+ CLICOLOR_FORCE: "1"
+ COLUMNS: "150"
+ GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
+ GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"
+ GIT_CONFIG_GLOBAL: /dev/null
+ GIT_CONFIG_SYSTEM: /dev/null
+ GIT_EDITOR: ""
+ LANG: C
+ LC_ALL: C
+ SOURCE_DATE_EPOCH: "1761609600"
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpv1CFmG/test-config.toml
+---
+success: false
+exit_code: 1
+----- stdout -----
+# worktrunk shell integration for nushell
+
+# Only initialize if wt is available
+if (which wt | is-not-empty) {
+ # Use WORKTRUNK_BIN if set, otherwise default to 'wt'
+ # This allows testing development builds: $env.WORKTRUNK_BIN = ./target/debug/wt
+ let _WORKTRUNK_CMD = (if ($env.WORKTRUNK_BIN? | is-not-empty) { $env.WORKTRUNK_BIN } else { "wt" })
+
+ # Helper function to parse wt output and handle directives
+ # Directives are NUL-terminated to support multi-line commands
+ export def --env _wt_exec [...args] {
+ let result = (do { ^$_WORKTRUNK_CMD ...$args } | complete)
+ mut exec_cmd = ""
+
+ # Split output on NUL bytes, process each chunk
+ for chunk in ($result.stdout | split row "\u{0000}") {
+ if ($chunk | str starts-with "__WORKTRUNK_CD__") {
+ # CD directive - extract path and change directory
+ # TODO: Use str replace instead of hard-coded offset (fragile if prefix changes)
+ let path = ($chunk | str substring 16..)
+ cd $path
+ } else if ($chunk | str starts-with "__WORKTRUNK_EXEC__") {
+ # EXEC directive - extract command (may contain newlines)
+ # TODO: Use str replace instead of hard-coded offset (fragile if prefix changes)
+ $exec_cmd = ($chunk | str substring 18..)
+ } else if ($chunk | str length) > 0 {
+ # Regular output - print it with newline
+ print $chunk
+ }
+ }
+
+ # Execute command if one was specified
+ if ($exec_cmd != "") {
+ nu -c $exec_cmd
+ }
+
+ # Return the exit code
+ return $result.exit_code
+ }
+
+ # Override wt command to add --internal flag for switch, remove, and merge
+ # Use --wrapped to pass through all flags without parsing them
+ export def --env --wrapped wt [...rest] {
+ let subcommand = ($rest | get 0? | default "")
+
+ match $subcommand {
+ "switch" | "remove" | "merge" => {
+ # Commands that need --internal for directory change support
+ let rest_args = ($rest | skip 1)
+ let internal_args = (["--internal", $subcommand] | append $rest_args)
+ let exit_code = (_wt_exec ...$internal_args)
+ return $exit_code
+ }
+ _ => {
+ # All other commands pass through directly
+ ^$_WORKTRUNK_CMD ...$rest
+ }
+ }
+ }
+}
+
+# Static completions (commands and flags)
+❌ Completion not yet supported for nushell
+
+----- stderr -----
diff --git a/tests/snapshots/integration__integration_tests__init__init_oil.snap b/tests/snapshots/integration__integration_tests__init__init_oil.snap
new file mode 100644
index 000000000..9bc6370f8
--- /dev/null
+++ b/tests/snapshots/integration__integration_tests__init__init_oil.snap
@@ -0,0 +1,400 @@
+---
+source: tests/integration_tests/init.rs
+info:
+ program: wt
+ args:
+ - init
+ - oil
+ env:
+ CLICOLOR_FORCE: "1"
+ COLUMNS: "150"
+ GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
+ GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"
+ GIT_CONFIG_GLOBAL: /dev/null
+ GIT_CONFIG_SYSTEM: /dev/null
+ GIT_EDITOR: ""
+ LANG: C
+ LC_ALL: C
+ SOURCE_DATE_EPOCH: "1761609600"
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpbvT6J1/test-config.toml
+---
+success: true
+exit_code: 0
+----- stdout -----
+# worktrunk shell integration for oil
+
+# Only initialize if wt is available
+if command -v wt >/dev/null 2>&1; then
+ # Use WORKTRUNK_BIN if set, otherwise default to 'wt'
+ # This allows testing development builds: export WORKTRUNK_BIN=./target/debug/wt
+ _WORKTRUNK_CMD="${WORKTRUNK_BIN:-wt}"
+
+ # Helper function to parse wt output and handle directives
+ # Directives are NUL-terminated to support multi-line commands
+ _wt_exec() {
+ local exec_cmd="" chunk exit_code
+ local exit_code_file
+ exit_code_file=$(mktemp) || { echo "Failed to create temp file" >&2; return 1; }
+
+ # Parse stdout for directives (NUL-delimited)
+ # Let stderr pass through to terminal (preserves TTY for color detection)
+ # Write exit code to temp file since it can't be captured from process substitution
+ # The || [[ -n "$chunk" ]] handles non-NUL-terminated output (e.g., error messages)
+ while IFS= read -r -d '' chunk || [[ -n "$chunk" ]]; do
+ if [[ "$chunk" == __WORKTRUNK_CD__* ]]; then
+ # CD directive - extract path and change directory
+ local path="${chunk#__WORKTRUNK_CD__}"
+ \cd "$path"
+ elif [[ "$chunk" == __WORKTRUNK_EXEC__* ]]; then
+ # EXEC directive - extract command (may contain newlines)
+ exec_cmd="${chunk#__WORKTRUNK_EXEC__}"
+ else
+ # Regular output - print it with newline
+ printf '%s\n' "$chunk"
+ fi
+ done < <(command "$_WORKTRUNK_CMD" "$@"; echo "$?" > "$exit_code_file")
+
+ # Read exit code from temp file
+ exit_code=$(cat "$exit_code_file" 2>/dev/null || echo 0)
+
+ # Cleanup temp file
+ \rm -f "$exit_code_file"
+
+ # Execute command if one was specified
+ # Security: Command is user-provided from -x flag; eval is intentional.
+ # NUL-termination allows multi-line commands.
+ # Exit code semantics: Returns wt's exit code, not the executed command's.
+ # This allows detecting wt failures (e.g., branch creation errors).
+ # The executed command runs for side effects; its failure is logged but doesn't affect exit code.
+ if [[ -n "$exec_cmd" ]]; then
+ if ! eval "$exec_cmd"; then
+ echo "Warning: Command execution failed (exit code $?)" >&2
+ fi
+ fi
+
+ return $exit_code
+ }
+
+ # Override wt command to add --internal flag for switch, remove, and merge
+ wt() {
+ local subcommand="$1"
+
+ case "$subcommand" in
+ switch|remove|merge)
+ # Commands that need --internal for directory change support
+ shift
+ _wt_exec --internal "$subcommand" "$@"
+ ;;
+ *)
+ # All other commands pass through directly
+ command "$_WORKTRUNK_CMD" "$@"
+ ;;
+ esac
+ }
+
+ # Dynamic completion function
+ _wt_complete() {
+ local cur="${COMP_WORDS[COMP_CWORD]}"
+
+ # Call wt complete with current command line
+ local completions=$(command "$_WORKTRUNK_CMD" complete "${COMP_WORDS[@]}" 2>/dev/null)
+ COMPREPLY=($(compgen -W "$completions" -- "$cur"))
+ }
+
+ # Register dynamic completion
+ complete -F _wt_complete wt
+fi
+
+# Static completions (commands and flags)
+_wt() {
+ local i cur prev opts cmd
+ COMPREPLY=()
+ if [[ "${BASH_VERSINFO[0]}" -ge 4 ]]; then
+ cur="$2"
+ else
+ cur="${COMP_WORDS[COMP_CWORD]}"
+ fi
+ prev="$3"
+ cmd=""
+ opts=""
+
+ for i in "${COMP_WORDS[@]:0:COMP_CWORD}"
+ do
+ case "${cmd},${i}" in
+ ",$1")
+ cmd="wt"
+ ;;
+ wt,complete)
+ cmd="wt__complete"
+ ;;
+ wt,completion)
+ cmd="wt__completion"
+ ;;
+ wt,config)
+ cmd="wt__config"
+ ;;
+ wt,configure-shell)
+ cmd="wt__configure__shell"
+ ;;
+ wt,init)
+ cmd="wt__init"
+ ;;
+ wt,list)
+ cmd="wt__list"
+ ;;
+ wt,merge)
+ cmd="wt__merge"
+ ;;
+ wt,push)
+ cmd="wt__push"
+ ;;
+ wt,remove)
+ cmd="wt__remove"
+ ;;
+ wt,switch)
+ cmd="wt__switch"
+ ;;
+ wt__config,init)
+ cmd="wt__config__init"
+ ;;
+ wt__config,list)
+ cmd="wt__config__list"
+ ;;
+ *)
+ ;;
+ esac
+ done
+
+ case "${cmd}" in
+ wt)
+ opts="-v -h -V --verbose --help --version init configure-shell config list switch remove push merge completion complete"
+ if [[ ${cur} == -* || ${COMP_CWORD} -eq 1 ]] ; then
+ COMPREPLY=( $(compgen -W "${opts}" -- "${cur}") )
+ return 0
+ fi
+ case "${prev}" in
+ *)
+ COMPREPLY=()
+ ;;
+ esac
+ COMPREPLY=( $(compgen -W "${opts}" -- "${cur}") )
+ return 0
+ ;;
+ wt__complete)
+ opts="-v -h --verbose --help [ARGS]..."
+ if [[ ${cur} == -* || ${COMP_CWORD} -eq 2 ]] ; then
+ COMPREPLY=( $(compgen -W "${opts}" -- "${cur}") )
+ return 0
+ fi
+ case "${prev}" in
+ *)
+ COMPREPLY=()
+ ;;
+ esac
+ COMPREPLY=( $(compgen -W "${opts}" -- "${cur}") )
+ return 0
+ ;;
+ wt__completion)
+ opts="-v -h --verbose --help bash elvish fish nushell oil powershell xonsh zsh"
+ if [[ ${cur} == -* || ${COMP_CWORD} -eq 2 ]] ; then
+ COMPREPLY=( $(compgen -W "${opts}" -- "${cur}") )
+ return 0
+ fi
+ case "${prev}" in
+ *)
+ COMPREPLY=()
+ ;;
+ esac
+ COMPREPLY=( $(compgen -W "${opts}" -- "${cur}") )
+ return 0
+ ;;
+ wt__config)
+ opts="-v -h --verbose --help init list"
+ if [[ ${cur} == -* || ${COMP_CWORD} -eq 2 ]] ; then
+ COMPREPLY=( $(compgen -W "${opts}" -- "${cur}") )
+ return 0
+ fi
+ case "${prev}" in
+ *)
+ COMPREPLY=()
+ ;;
+ esac
+ COMPREPLY=( $(compgen -W "${opts}" -- "${cur}") )
+ return 0
+ ;;
+ wt__config__init)
+ opts="-v -h --verbose --help"
+ if [[ ${cur} == -* || ${COMP_CWORD} -eq 3 ]] ; then
+ COMPREPLY=( $(compgen -W "${opts}" -- "${cur}") )
+ return 0
+ fi
+ case "${prev}" in
+ *)
+ COMPREPLY=()
+ ;;
+ esac
+ COMPREPLY=( $(compgen -W "${opts}" -- "${cur}") )
+ return 0
+ ;;
+ wt__config__list)
+ opts="-v -h --verbose --help"
+ if [[ ${cur} == -* || ${COMP_CWORD} -eq 3 ]] ; then
+ COMPREPLY=( $(compgen -W "${opts}" -- "${cur}") )
+ return 0
+ fi
+ case "${prev}" in
+ *)
+ COMPREPLY=()
+ ;;
+ esac
+ COMPREPLY=( $(compgen -W "${opts}" -- "${cur}") )
+ return 0
+ ;;
+ wt__configure__shell)
+ opts="-y -v -h --shell --cmd --yes --verbose --help"
+ if [[ ${cur} == -* || ${COMP_CWORD} -eq 2 ]] ; then
+ COMPREPLY=( $(compgen -W "${opts}" -- "${cur}") )
+ return 0
+ fi
+ case "${prev}" in
+ --shell)
+ COMPREPLY=($(compgen -W "bash elvish fish nushell oil powershell xonsh zsh" -- "${cur}"))
+ return 0
+ ;;
+ --cmd)
+ COMPREPLY=($(compgen -f "${cur}"))
+ return 0
+ ;;
+ *)
+ COMPREPLY=()
+ ;;
+ esac
+ COMPREPLY=( $(compgen -W "${opts}" -- "${cur}") )
+ return 0
+ ;;
+ wt__init)
+ opts="-v -h --cmd --verbose --help <SHELL>"
+ if [[ ${cur} == -* || ${COMP_CWORD} -eq 2 ]] ; then
+ COMPREPLY=( $(compgen -W "${opts}" -- "${cur}") )
+ return 0
+ fi
+ case "${prev}" in
+ --cmd)
+ COMPREPLY=($(compgen -f "${cur}"))
+ return 0
+ ;;
+ *)
+ COMPREPLY=()
+ ;;
+ esac
+ COMPREPLY=( $(compgen -W "${opts}" -- "${cur}") )
+ return 0
+ ;;
+ wt__list)
+ opts="-v -h --format --branches --verbose --help"
+ if [[ ${cur} == -* || ${COMP_CWORD} -eq 2 ]] ; then
+ COMPREPLY=( $(compgen -W "${opts}" -- "${cur}") )
+ return 0
+ fi
+ case "${prev}" in
+ --format)
+ COMPREPLY=($(compgen -W "table json" -- "${cur}"))
+ return 0
+ ;;
+ *)
+ COMPREPLY=()
+ ;;
+ esac
+ COMPREPLY=( $(compgen -W "${opts}" -- "${cur}") )
+ return 0
+ ;;
+ wt__merge)
+ opts="-s -k -m -f -v -h --squash --keep --message --no-hooks --force --verbose --help [TARGET]"
+ if [[ ${cur} == -* || ${COMP_CWORD} -eq 2 ]] ; then
+ COMPREPLY=( $(compgen -W "${opts}" -- "${cur}") )
+ return 0
+ fi
+ case "${prev}" in
+ --message)
+ COMPREPLY=($(compgen -f "${cur}"))
+ return 0
+ ;;
+ -m)
+ COMPREPLY=($(compgen -f "${cur}"))
+ return 0
+ ;;
+ *)
+ COMPREPLY=()
+ ;;
+ esac
+ COMPREPLY=( $(compgen -W "${opts}" -- "${cur}") )
+ return 0
+ ;;
+ wt__push)
+ opts="-v -h --allow-merge-commits --verbose --help [TARGET]"
+ if [[ ${cur} == -* || ${COMP_CWORD} -eq 2 ]] ; then
+ COMPREPLY=( $(compgen -W "${opts}" -- "${cur}") )
+ return 0
+ fi
+ case "${prev}" in
+ *)
+ COMPREPLY=()
+ ;;
+ esac
+ COMPREPLY=( $(compgen -W "${opts}" -- "${cur}") )
+ return 0
+ ;;
+ wt__remove)
+ opts="-v -h --verbose --help [WORKTREES]..."
+ if [[ ${cur} == -* || ${COMP_CWORD} -eq 2 ]] ; then
+ COMPREPLY=( $(compgen -W "${opts}" -- "${cur}") )
+ return 0
+ fi
+ case "${prev}" in
+ *)
+ COMPREPLY=()
+ ;;
+ esac
+ COMPREPLY=( $(compgen -W "${opts}" -- "${cur}") )
+ return 0
+ ;;
+ wt__switch)
+ opts="-c -b -x -f -v -h --create --base --execute --force --no-hooks --verbose --help <BRANCH>"
+ if [[ ${cur} == -* || ${COMP_CWORD} -eq 2 ]] ; then
+ COMPREPLY=( $(compgen -W "${opts}" -- "${cur}") )
+ return 0
+ fi
+ case "${prev}" in
+ --base)
+ COMPREPLY=($(compgen -f "${cur}"))
+ return 0
+ ;;
+ -b)
+ COMPREPLY=($(compgen -f "${cur}"))
+ return 0
+ ;;
+ --execute)
+ COMPREPLY=($(compgen -f "${cur}"))
+ return 0
+ ;;
+ -x)
+ COMPREPLY=($(compgen -f "${cur}"))
+ return 0
+ ;;
+ *)
+ COMPREPLY=()
+ ;;
+ esac
+ COMPREPLY=( $(compgen -W "${opts}" -- "${cur}") )
+ return 0
+ ;;
+ esac
+}
+
+if [[ "${BASH_VERSINFO[0]}" -eq 4 && "${BASH_VERSINFO[1]}" -ge 4 || "${BASH_VERSINFO[0]}" -gt 4 ]]; then
+ complete -F _wt -o nosort -o bashdefault -o default wt
+else
+ complete -F _wt -o bashdefault -o default wt
+fi
+
+----- stderr -----
diff --git a/tests/snapshots/integration__integration_tests__init__init_powershell.snap b/tests/snapshots/integration__integration_tests__init__init_powershell.snap
new file mode 100644
index 000000000..8d97a11a1
--- /dev/null
+++ b/tests/snapshots/integration__integration_tests__init__init_powershell.snap
@@ -0,0 +1,104 @@
+---
+source: tests/integration_tests/init.rs
+info:
+ program: wt
+ args:
+ - init
+ - powershell
+ env:
+ CLICOLOR_FORCE: "1"
+ COLUMNS: "150"
+ GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
+ GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"
+ GIT_CONFIG_GLOBAL: /dev/null
+ GIT_CONFIG_SYSTEM: /dev/null
+ GIT_EDITOR: ""
+ LANG: C
+ LC_ALL: C
+ SOURCE_DATE_EPOCH: "1761609600"
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmp4uhsS3/test-config.toml
+---
+success: false
+exit_code: 1
+----- stdout -----
+# worktrunk shell integration for PowerShell
+
+# Only initialize if wt is available
+if (Get-Command wt -ErrorAction SilentlyContinue) {
+ # Use WORKTRUNK_BIN if set, otherwise default to 'wt'
+ # This allows testing development builds: $env:WORKTRUNK_BIN = "./target/debug/wt"
+ $script:_WORKTRUNK_CMD = if ($env:WORKTRUNK_BIN) { $env:WORKTRUNK_BIN } else { "wt" }
+
+ # Helper function to parse wt output and handle directives
+ # Directives are NUL-terminated to support multi-line commands
+ function _wt_exec {
+ param(
+ [Parameter(ValueFromRemainingArguments=$true)]
+ [string[]]$Arguments
+ )
+
+ # Capture stdout for directives, let stderr pass through to terminal
+ # This preserves TTY for color detection
+ $output = & $script:_WORKTRUNK_CMD @Arguments | Out-String
+ $exitCode = $LASTEXITCODE
+ $execCmd = ""
+
+ # Split output on NUL bytes, process each chunk
+ foreach ($chunk in ($output -split "`0")) {
+ if ($chunk -match '^__WORKTRUNK_CD__') {
+ # CD directive - extract path and change directory
+ $path = $chunk -replace '^__WORKTRUNK_CD__', ''
+ Set-Location $path
+ } elseif ($chunk -match '^__WORKTRUNK_EXEC__') {
+ # EXEC directive - extract command (may contain newlines)
+ $execCmd = $chunk -replace '^__WORKTRUNK_EXEC__', ''
+ } elseif ($chunk) {
+ # Regular output - write it with newline
+ # TODO: Use Write-Output instead of Write-Host for redirectable output
+ Write-Host $chunk
+ }
+ }
+
+ # Execute command if one was specified
+ if ($execCmd) {
+ Invoke-Expression $execCmd
+ }
+
+ # Return the exit code
+ return $exitCode
+ }
+
+ # Override wt command to add --internal flag for switch, remove, and merge
+ function wt {
+ param(
+ [Parameter(ValueFromRemainingArguments=$true)]
+ [string[]]$Arguments
+ )
+
+ if ($Arguments.Count -eq 0) {
+ & $script:_WORKTRUNK_CMD
+ return $LASTEXITCODE
+ }
+
+ $subcommand = $Arguments[0]
+
+ switch ($subcommand) {
+ { $_ -in @("switch", "remove", "merge") } {
+ # Commands that need --internal for directory change support
+ $restArgs = $Arguments[1..($Arguments.Count-1)]
+ $exitCode = _wt_exec --internal $subcommand @restArgs
+ return $exitCode
+ }
+ default {
+ # All other commands pass through directly
+ & $script:_WORKTRUNK_CMD @Arguments
+ return $LASTEXITCODE
+ }
+ }
+ }
+}
+
+# Static completions (commands and flags)
+❌ Completion not yet supported for powershell
+
+----- stderr -----
diff --git a/tests/snapshots/integration__integration_tests__init__init_xonsh.snap b/tests/snapshots/integration__integration_tests__init__init_xonsh.snap
new file mode 100644
index 000000000..e925431e7
--- /dev/null
+++ b/tests/snapshots/integration__integration_tests__init__init_xonsh.snap
@@ -0,0 +1,89 @@
+---
+source: tests/integration_tests/init.rs
+info:
+ program: wt
+ args:
+ - init
+ - xonsh
+ env:
+ CLICOLOR_FORCE: "1"
+ COLUMNS: "150"
+ GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
+ GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"
+ GIT_CONFIG_GLOBAL: /dev/null
+ GIT_CONFIG_SYSTEM: /dev/null
+ GIT_EDITOR: ""
+ LANG: C
+ LC_ALL: C
+ SOURCE_DATE_EPOCH: "1761609600"
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmphHRzFG/test-config.toml
+---
+success: false
+exit_code: 1
+----- stdout -----
+# worktrunk shell integration for xonsh
+
+# Only initialize if wt is available
+import shutil
+import os
+if shutil.which("wt") is not None:
+ # Use WORKTRUNK_BIN if set, otherwise default to 'wt'
+ # This allows testing development builds: $WORKTRUNK_BIN = ./target/debug/wt
+ _WORKTRUNK_CMD = os.environ.get('WORKTRUNK_BIN', 'wt')
+
+ def _wt_exec(args):
+ """Helper function to parse wt output and handle directives
+ Directives are NUL-terminated to support multi-line commands"""
+ # Capture full output including return code
+ result = ![@(_WORKTRUNK_CMD) @(args)]
+ exec_cmd = ""
+
+ # Split output on NUL bytes, process each chunk
+ if result.out:
+ for chunk in result.out.split("\0"):
+ if chunk.startswith("__WORKTRUNK_CD__"):
+ # CD directive - extract path and change directory
+ # TODO: Use str.replace instead of hard-coded offset (fragile if prefix changes)
+ path = chunk[16:] # Remove prefix
+ cd @(path)
+ elif chunk.startswith("__WORKTRUNK_EXEC__"):
+ # EXEC directive - extract command (may contain newlines)
+ # TODO: Use str.replace instead of hard-coded offset (fragile if prefix changes)
+ exec_cmd = chunk[18:] # Remove prefix
+ elif chunk:
+ # Regular output - print it with newline
+ print(chunk)
+
+ # Execute command if one was specified
+ if exec_cmd:
+ execx(exec_cmd)
+
+ # Return the exit code
+ # TODO: Add fallback for None: return result.returncode or 0
+ return result.returncode
+
+ def _wt_wrapper(args):
+ """Override wt command to add --internal flag for switch, remove, and merge"""
+ if not args:
+ # No arguments, just run wt
+ ![@(_WORKTRUNK_CMD)]
+ return
+
+ subcommand = args[0]
+
+ if subcommand in ["switch", "remove", "merge"]:
+ # Commands that need --internal for directory change support
+ rest_args = args[1:]
+ return _wt_exec(["--internal", subcommand] + rest_args)
+ else:
+ # All other commands pass through directly
+ result = ![@(_WORKTRUNK_CMD) @(args)]
+ return result.returncode
+
+ # Register the alias
+ aliases['wt'] = _wt_wrapper
+
+# Static completions (commands and flags)
+❌ Completion not yet supported for xonsh
+
+----- stderr -----
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_post_merge_command_failure.snap b/tests/snapshots/integration__integration_tests__merge__merge_post_merge_command_failure.snap
index 273fa6c6e..09028ac61 100644
--- a/tests/snapshots/integration__integration_tests__merge__merge_post_merge_command_failure.snap
+++ b/tests/snapshots/integration__integration_tests__merge__merge_post_merge_command_failure.snap
@@ -17,7 +17,7 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpoxYPhM/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpLFFHQj/test-config.toml
---
success: true
exit_code: 0
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_pre_merge_command_failure.snap b/tests/snapshots/integration__integration_tests__merge__merge_pre_merge_command_failure.snap
index f8dfe8f86..afc6ee2ef 100644
--- a/tests/snapshots/integration__integration_tests__merge__merge_pre_merge_command_failure.snap
+++ b/tests/snapshots/integration__integration_tests__merge__merge_pre_merge_command_failure.snap
@@ -17,7 +17,7 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpDcBPxK/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmp8ZqGY8/test-config.toml
---
success: false
exit_code: 1
diff --git a/tests/snapshots/integration__integration_tests__post_start_commands__post_create_failing_command.snap b/tests/snapshots/integration__integration_tests__post_start_commands__post_create_failing_command.snap
index 8f6b49ea9..455078d3a 100644
--- a/tests/snapshots/integration__integration_tests__post_start_commands__post_create_failing_command.snap
+++ b/tests/snapshots/integration__integration_tests__post_start_commands__post_create_failing_command.snap
@@ -8,6 +8,7 @@ info:
- feature
env:
CLICOLOR_FORCE: "1"
+ COLUMNS: "150"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"
GIT_CONFIG_GLOBAL: /dev/null
@@ -16,7 +17,7 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmp8fvPB1/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpfDh44R/test-config.toml
---
success: true
exit_code: 0
diff --git a/tests/snapshots/integration__integration_tests__switch__switch_execute_multiline.snap b/tests/snapshots/integration__integration_tests__switch__switch_execute_multiline.snap
index d47966871..e3e284632 100644
--- a/tests/snapshots/integration__integration_tests__switch__switch_execute_multiline.snap
+++ b/tests/snapshots/integration__integration_tests__switch__switch_execute_multiline.snap
@@ -10,6 +10,7 @@ info:
- "echo 'line1'\necho 'line2'\necho 'line3'"
env:
CLICOLOR_FORCE: "1"
+ COLUMNS: "150"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"
GIT_CONFIG_GLOBAL: /dev/null
@@ -18,7 +19,7 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmp2CpQIq/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpN8ASNd/test-config.toml
---
success: true
exit_code: 0
@@ -29,8 +30,8 @@ exit_code: 0
  echo 'line2'
  echo 'line3'
-
------ stderr -----
line1
line2
line3
+
+----- stderr -----
diff --git a/tests/snapshots/integration__integration_tests__switch__switch_execute_success.snap b/tests/snapshots/integration__integration_tests__switch__switch_execute_success.snap
index 6c21c03e3..bfb1ef19e 100644
--- a/tests/snapshots/integration__integration_tests__switch__switch_execute_success.snap
+++ b/tests/snapshots/integration__integration_tests__switch__switch_execute_success.snap
@@ -10,6 +10,7 @@ info:
- "echo 'test output'"
env:
CLICOLOR_FORCE: "1"
+ COLUMNS: "150"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"
GIT_CONFIG_GLOBAL: /dev/null
@@ -18,7 +19,7 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpC1eteo/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpyR0ymU/test-config.toml
---
success: true
exit_code: 0
@@ -27,6 +28,6 @@ exit_code: 0
🔄 Executing (--execute):
  echo 'test output'
+test output
----- stderr -----
-test output
diff --git a/tests/snapshots/integration__integration_tests__switch__switch_no_hooks_execute_still_runs.snap b/tests/snapshots/integration__integration_tests__switch__switch_no_hooks_execute_still_runs.snap
index 90fc5fd90..0a642bca2 100644
--- a/tests/snapshots/integration__integration_tests__switch__switch_no_hooks_execute_still_runs.snap
+++ b/tests/snapshots/integration__integration_tests__switch__switch_no_hooks_execute_still_runs.snap
@@ -11,6 +11,7 @@ info:
- "--no-hooks"
env:
CLICOLOR_FORCE: "1"
+ COLUMNS: "150"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"
GIT_CONFIG_GLOBAL: /dev/null
@@ -19,7 +20,7 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpzDqH7z/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpd7PpAa/test-config.toml
---
success: true
exit_code: 0
@@ -28,6 +29,6 @@ exit_code: 0
🔄 Executing (--execute):
  echo 'execute command runs'
+execute command runs
----- stderr -----
-execute command runs
diff --git a/tests/snapshots/integration__integration_tests__switch__switch_no_hooks_existing.snap b/tests/snapshots/integration__integration_tests__switch__switch_no_hooks_existing.snap
index 25e0c3985..784a9e4f6 100644
--- a/tests/snapshots/integration__integration_tests__switch__switch_no_hooks_existing.snap
+++ b/tests/snapshots/integration__integration_tests__switch__switch_no_hooks_existing.snap
@@ -10,6 +10,7 @@ info:
- "--no-hooks"
env:
CLICOLOR_FORCE: "1"
+ COLUMNS: "150"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"
GIT_CONFIG_GLOBAL: /dev/null
@@ -18,7 +19,7 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpblVMRT/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpHtiZXO/test-config.toml
---
success: true
exit_code: 0
@@ -27,6 +28,6 @@ exit_code: 0
🔄 Executing (--execute):
  echo 'execute still runs'
+execute still runs
----- stderr -----
-execute still runs