Skip to content

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

Centralize external command output handling

Maximilian Roose79b17285d12
diff --git a/src/output/directive.rs b/src/output/directive.rs
index 7b927b756..f4923b3a7 100644
--- a/src/output/directive.rs
+++ b/src/output/directive.rs
@@ -54,6 +54,20 @@ impl DirectiveOutput {
io::stdout().flush()?;
io::stderr().flush()
}
+
+ pub fn command_output(&mut self, stdout: &str, stderr: &str) -> io::Result<()> {
+ // Always write NUL to stderr first, even if empty
+ // This ensures subsequent directives are in separate chunks
+ write!(io::stderr(), "{}\0", stderr.trim_end())?;
+ io::stderr().flush()?;
+
+ // Always write NUL to stdout, even if empty
+ // This maintains consistent chunk boundaries for the shell wrapper
+ write!(io::stdout(), "{}\0", stdout.trim_end())?;
+ io::stdout().flush()?;
+
+ Ok(())
+ }
}
impl Default for DirectiveOutput {
diff --git a/src/output/global.rs b/src/output/global.rs
index 032119092..e04b45f26 100644
--- a/src/output/global.rs
+++ b/src/output/global.rs
@@ -112,6 +112,18 @@ pub fn flush() -> io::Result<()> {
})
}
+/// Emit command output (stdout/stderr from external processes)
+///
+/// In directive mode, ensures output is NUL-terminated so subsequent directives
+/// are in separate chunks for the shell wrapper to parse correctly.
+/// In interactive mode, prints output normally with colors.
+pub fn command_output(stdout: &str, stderr: &str) -> io::Result<()> {
+ OUTPUT_CONTEXT.with(|ctx| match &mut *ctx.borrow_mut() {
+ OutputHandler::Interactive(i) => i.command_output(stdout, stderr),
+ OutputHandler::Directive(d) => d.command_output(stdout, stderr),
+ })
+}
+
#[cfg(test)]
mod tests {
use super::*;
diff --git a/src/output/handlers.rs b/src/output/handlers.rs
index ad5654899..aab5c3e97 100644
--- a/src/output/handlers.rs
+++ b/src/output/handlers.rs
@@ -113,27 +113,28 @@ pub fn execute_command_in_worktree(
worktree_path: &std::path::Path,
command: &str,
) -> Result<(), GitError> {
- use std::process::{Command, Stdio};
+ use std::process::Command;
- // Use Stdio::inherit() to connect subprocess stdout/stderr directly to parent's
- // This enables:
- // - Real-time streaming output (no buffering)
- // - Color detection (subprocess sees the parent's TTY)
- let status = Command::new("sh")
+ let output = Command::new("sh")
.arg("-c")
.arg(command)
.current_dir(worktree_path)
- .stdout(Stdio::inherit())
- .stderr(Stdio::inherit())
- .status()
+ .output()
.map_err(|e| GitError::CommandFailed(format!("Failed to execute command: {}", e)))?;
- if !status.success() {
+ if !output.status.success() {
return Err(GitError::CommandFailed(format!(
"Command failed with exit code: {}",
- status
+ output.status
)));
}
+ // Print command output through the framework
+ super::command_output(
+ &String::from_utf8_lossy(&output.stdout),
+ &String::from_utf8_lossy(&output.stderr),
+ )
+ .map_err(|e| GitError::CommandFailed(e.to_string()))?;
+
Ok(())
}
diff --git a/src/output/interactive.rs b/src/output/interactive.rs
index 2facd997e..1e2265a13 100644
--- a/src/output/interactive.rs
+++ b/src/output/interactive.rs
@@ -36,11 +36,35 @@ impl InteractiveOutput {
}
pub fn execute(&mut self, command: String) -> io::Result<()> {
+ use std::process::Command;
+
// Execute command in the target directory
let exec_dir = self.target_dir.as_deref().unwrap_or_else(|| Path::new("."));
- crate::output::execute_command_in_worktree(exec_dir, &command)
- .map_err(|e| io::Error::other(e.to_string()))
+ 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 output directly (we're already inside the output framework)
+ if !output.stdout.is_empty() {
+ println!("{}", 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());
+ }
+
+ Ok(())
}
pub fn flush(&mut self) -> io::Result<()> {
@@ -48,6 +72,17 @@ impl InteractiveOutput {
io::stderr().flush()?;
Ok(())
}
+
+ pub fn command_output(&mut self, stdout: &str, stderr: &str) -> io::Result<()> {
+ if !stdout.is_empty() {
+ println!("{}", stdout.trim_end());
+ }
+ if !stderr.is_empty() {
+ use worktrunk::styling::eprintln;
+ eprintln!("{}", stderr.trim_end());
+ }
+ Ok(())
+ }
}
impl Default for InteractiveOutput {
diff --git a/src/output/mod.rs b/src/output/mod.rs
index 725dc1ba8..579400762 100644
--- a/src/output/mod.rs
+++ b/src/output/mod.rs
@@ -62,7 +62,9 @@ pub mod handlers;
pub mod interactive;
// Re-export the public API
-pub use global::{OutputMode, change_directory, execute, flush, initialize, progress, success};
+pub use global::{
+ OutputMode, change_directory, command_output, execute, flush, initialize, progress, success,
+};
// Re-export output handlers
pub use handlers::{execute_command_in_worktree, handle_remove_output, handle_switch_output};
diff --git a/tests/snapshots/integration__integration_tests__init__init_elvish.snap b/tests/snapshots/integration__integration_tests__init__init_elvish.snap
deleted file mode 100644
index 5eec3dd5e..000000000
--- a/tests/snapshots/integration__integration_tests__init__init_elvish.snap
+++ /dev/null
@@ -1,99 +0,0 @@
----
-source: tests/integration_tests/init.rs
-info:
- program: wt
- args:
- - init
- - elvish
- env:
- CLICOLOR_FORCE: "1"
- 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: "1704067200"
----
-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 output and handle potential non-zero exit
- # TODO: Capture actual exit code from wt command, not just success/failure
- try {
- set output = (e:$_WORKTRUNK_CMD $@args 2>&1 | 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 $subcommand --internal $@rest-args
- } else {
- # All other commands pass through directly
- e:$_WORKTRUNK_CMD $@args
- }
- }
-}
-
-# Static completions (commands and flags)
-
------ stderr -----
-❌ Completion not yet supported for elvish
diff --git a/tests/snapshots/integration__integration_tests__init__init_nushell.snap b/tests/snapshots/integration__integration_tests__init__init_nushell.snap
deleted file mode 100644
index cd19864a0..000000000
--- a/tests/snapshots/integration__integration_tests__init__init_nushell.snap
+++ /dev/null
@@ -1,86 +0,0 @@
----
-source: tests/integration_tests/init.rs
-info:
- program: wt
- args:
- - init
- - nushell
- env:
- CLICOLOR_FORCE: "1"
- 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: "1704067200"
----
-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 (preserving newlines)
- print -n $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 = ([$subcommand, "--internal"] | 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)
-
------ stderr -----
-❌ Completion not yet supported for nushell
diff --git a/tests/snapshots/integration__integration_tests__init__init_oil.snap b/tests/snapshots/integration__integration_tests__init__init_oil.snap
deleted file mode 100644
index 25d25fdea..000000000
--- a/tests/snapshots/integration__integration_tests__init__init_oil.snap
+++ /dev/null
@@ -1,398 +0,0 @@
----
-source: tests/integration_tests/init.rs
-info:
- program: wt
- args:
- - init
- - oil
- env:
- CLICOLOR_FORCE: "1"
- 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: "1704067200"
----
-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 output directly from wt (command substitution strips NUL bytes!)
- # Use process substitution to preserve NUL bytes
- # 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 (preserving newlines)
- printf '%s' "$chunk"
- fi
- done < <(command "$_WORKTRUNK_CMD" "$@" 2>&1; 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 "$subcommand" --internal "$@"
- ;;
- *)
- # 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-verify --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"
- 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-config-commands --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
deleted file mode 100644
index f37bcff55..000000000
--- a/tests/snapshots/integration__integration_tests__init__init_powershell.snap
+++ /dev/null
@@ -1,101 +0,0 @@
----
-source: tests/integration_tests/init.rs
-info:
- program: wt
- args:
- - init
- - powershell
- env:
- CLICOLOR_FORCE: "1"
- 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: "1704067200"
----
-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 output and exit code
- $output = & $script:_WORKTRUNK_CMD @Arguments 2>&1 | 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 (preserving newlines)
- # TODO: Use Write-Output instead of Write-Host for redirectable output
- Write-Host -NoNewline $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 $subcommand --internal @restArgs
- return $exitCode
- }
- default {
- # All other commands pass through directly
- & $script:_WORKTRUNK_CMD @Arguments
- return $LASTEXITCODE
- }
- }
- }
-}
-
-# Static completions (commands and flags)
-
------ stderr -----
-❌ Completion not yet supported for powershell
diff --git a/tests/snapshots/integration__integration_tests__init__init_xonsh.snap b/tests/snapshots/integration__integration_tests__init__init_xonsh.snap
deleted file mode 100644
index 5731ae577..000000000
--- a/tests/snapshots/integration__integration_tests__init__init_xonsh.snap
+++ /dev/null
@@ -1,87 +0,0 @@
----
-source: tests/integration_tests/init.rs
-info:
- program: wt
- args:
- - init
- - xonsh
- env:
- CLICOLOR_FORCE: "1"
- 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: "1704067200"
----
-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 (preserving newlines)
- print(chunk, end='')
-
- # 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([subcommand, "--internal"] + 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)
-
------ stderr -----
-❌ Completion not yet supported for xonsh
diff --git a/tests/snapshots/integration__integration_tests__post_start_commands__execute_with_post_start.snap b/tests/snapshots/integration__integration_tests__post_start_commands__execute_with_post_start.snap
index 8e490667d..90bf97848 100644
--- a/tests/snapshots/integration__integration_tests__post_start_commands__execute_with_post_start.snap
+++ b/tests/snapshots/integration__integration_tests__post_start_commands__execute_with_post_start.snap
@@ -1,6 +1,5 @@
---
source: tests/integration_tests/post_start_commands.rs
-assertion_line: 30
info:
program: wt
args:
@@ -16,10 +15,10 @@ info:
GIT_CONFIG_GLOBAL: /dev/null
GIT_CONFIG_SYSTEM: /dev/null
GIT_EDITOR: ""
- HOME: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpqHAOk6
LANG: C
LC_ALL: C
- SOURCE_DATE_EPOCH: "1704067200"
+ SOURCE_DATE_EPOCH: "1761609600"
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpgXSNYY/test-config.toml
---
success: true
exit_code: 0
diff --git a/tests/snapshots/integration__integration_tests__switch__switch_execute_creates_file.snap b/tests/snapshots/integration__integration_tests__switch__switch_execute_creates_file.snap
index dc86ab9ac..d2e1aa545 100644
--- a/tests/snapshots/integration__integration_tests__switch__switch_execute_creates_file.snap
+++ b/tests/snapshots/integration__integration_tests__switch__switch_execute_creates_file.snap
@@ -1,6 +1,5 @@
---
source: tests/integration_tests/switch.rs
-assertion_line: 23
info:
program: wt
args:
@@ -18,7 +17,8 @@ info:
GIT_EDITOR: ""
LANG: C
LC_ALL: C
- SOURCE_DATE_EPOCH: "1704067200"
+ SOURCE_DATE_EPOCH: "1761609600"
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmp8dZtKD/test-config.toml
---
success: true
exit_code: 0
diff --git a/tests/snapshots/integration__integration_tests__switch__switch_execute_existing.snap b/tests/snapshots/integration__integration_tests__switch__switch_execute_existing.snap
index 228e8f5cd..39099f760 100644
--- a/tests/snapshots/integration__integration_tests__switch__switch_execute_existing.snap
+++ b/tests/snapshots/integration__integration_tests__switch__switch_execute_existing.snap
@@ -1,6 +1,5 @@
---
source: tests/integration_tests/switch.rs
-assertion_line: 23
info:
program: wt
args:
@@ -17,7 +16,8 @@ info:
GIT_EDITOR: ""
LANG: C
LC_ALL: C
- SOURCE_DATE_EPOCH: "1704067200"
+ SOURCE_DATE_EPOCH: "1761609600"
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpVs8XgR/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 6580b4ee7..7a2b7c8e3 100644
--- a/tests/snapshots/integration__integration_tests__switch__switch_execute_multiline.snap
+++ b/tests/snapshots/integration__integration_tests__switch__switch_execute_multiline.snap
@@ -1,6 +1,5 @@
---
source: tests/integration_tests/switch.rs
-assertion_line: 23
info:
program: wt
args:
@@ -18,7 +17,8 @@ info:
GIT_EDITOR: ""
LANG: C
LC_ALL: C
- SOURCE_DATE_EPOCH: "1704067200"
+ SOURCE_DATE_EPOCH: "1761609600"
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpP9BwWT/test-config.toml
---
success: true
exit_code: 0
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 d6497787e..4dcc20c4d 100644
--- a/tests/snapshots/integration__integration_tests__switch__switch_execute_success.snap
+++ b/tests/snapshots/integration__integration_tests__switch__switch_execute_success.snap
@@ -17,7 +17,8 @@ info:
GIT_EDITOR: ""
LANG: C
LC_ALL: C
- SOURCE_DATE_EPOCH: "1704067200"
+ SOURCE_DATE_EPOCH: "1761609600"
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpNQdbOL/test-config.toml
---
success: true
exit_code: 0
diff --git a/tests/snapshots/integration__integration_tests__switch__switch_no_config_commands_execute_still_runs.snap b/tests/snapshots/integration__integration_tests__switch__switch_no_config_commands_execute_still_runs.snap
index 8b039ed8a..fc01ef7c8 100644
--- a/tests/snapshots/integration__integration_tests__switch__switch_no_config_commands_execute_still_runs.snap
+++ b/tests/snapshots/integration__integration_tests__switch__switch_no_config_commands_execute_still_runs.snap
@@ -18,7 +18,8 @@ info:
GIT_EDITOR: ""
LANG: C
LC_ALL: C
- SOURCE_DATE_EPOCH: "1704067200"
+ SOURCE_DATE_EPOCH: "1761609600"
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpPPnK37/test-config.toml
---
success: true
exit_code: 0
diff --git a/tests/snapshots/integration__integration_tests__switch__switch_no_config_commands_existing.snap b/tests/snapshots/integration__integration_tests__switch__switch_no_config_commands_existing.snap
index b3bb6573e..7b2749181 100644
--- a/tests/snapshots/integration__integration_tests__switch__switch_no_config_commands_existing.snap
+++ b/tests/snapshots/integration__integration_tests__switch__switch_no_config_commands_existing.snap
@@ -17,7 +17,8 @@ info:
GIT_EDITOR: ""
LANG: C
LC_ALL: C
- SOURCE_DATE_EPOCH: "1704067200"
+ SOURCE_DATE_EPOCH: "1761609600"
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpYEjLMv/test-config.toml
---
success: true
exit_code: 0