Skip to content

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

Fix: Execute -x command after post-start commands

Maximilian Roosb12e1a93be96
diff --git a/src/commands/worktree.rs b/src/commands/worktree.rs
index bb1601850..7dac0bff6 100644
--- a/src/commands/worktree.rs
+++ b/src/commands/worktree.rs
@@ -265,18 +265,19 @@ pub fn handle_switch(
repo.run_command(&args)
.map_err(|e| GitError::CommandFailed(format!("Failed to create worktree: {}", e)))?;
- if let Some(cmd) = execute {
- execute_command_in_worktree(&worktree_path, cmd)?;
- }
-
// Canonicalize the path for cleaner display
let canonical_path = worktree_path
.canonicalize()
.unwrap_or_else(|_| worktree_path.clone());
- // Execute post-start commands from project config
+ // Execute post-start commands from project config (before -x command)
execute_post_start_commands(&canonical_path, &repo, config, branch, repo_name)?;
+ // Execute -x command last (after setup is complete)
+ if let Some(cmd) = execute {
+ execute_command_in_worktree(&worktree_path, cmd)?;
+ }
+
Ok(SwitchResult::CreatedWorktree {
path: canonical_path,
created_branch: create,
@@ -443,7 +444,7 @@ fn prompt_for_approval(command: &str, project_id: &str) -> io::Result<bool> {
eprintln!(" {}", command);
eprintln!();
eprintln!(
- "{WARNING_EMOJI} {WARNING}WARNING: This will execute with FULL SHELL ACCESS in the new worktree.{WARNING:#}"
+ "{WARNING}WARNING: This will execute with FULL SHELL ACCESS in the new worktree.{WARNING:#}"
);
eprintln!(" The command can read/write files, access network, run arbitrary code.");
eprintln!();