Run --execute in the worktree even under --no-cd

[max-sixty]

Problem

--no-cd took the --execute program back to the invoking directory along with the shell. wt switch feature --no-cd -x pwd printed the directory you ran it from, so a program that means "act on the new worktree" — an editor, an agent — had to be handed {{ worktree_path }} explicitly.

Nothing decided that. One change_directory() call did two jobs: it wrote the shell's cd directive and it recorded the program's working directory in OutputState::target_dir, which execute() read back. Skipping the directive therefore also dropped the program's directory. The behavior first appears in the docs in #3977, which described what the shared value already did, and #4043 then matched the Executing (--execute) @ … header to it.

In #4042 the reporter wanted exactly this combination — open the worktree in Zed, leave the terminal where it was — and had to work around it by passing the path as an argument.

Solution

The program's directory becomes an argument rather than a leftover of the directive. handle_switch_output computes it once and returns it as SwitchDisplayPaths::execute_dir; execute() takes it from the caller; OutputState loses target_dir, so the two decisions can't be re-coupled through global state. change_directory() now only moves the shell.

--no-cd writes no directive and leaves the shell where it stands. The program starts in the worktree the switch selected, with the subdirectory position resolve_subdir_in_target preserves, exactly as under --cd.

Two consequences worth reading in the diff:

• The git-discovery scrub (GIT_DIR and friends, Inherited GIT_* discovery vars are forwarded into user hooks, misdirecting hook git commands (can pollute core.worktree) #3373) was conditional on having a target directory, so it didn't run under --no-cd. That directory is now always one wt chose, which is the condition CLAUDE.md sets for scrubbing, so the scrub is unconditional.
• The header annotates the program's directory whenever the user's shell won't be there — which now includes --no-cd, where it previously read a bare Executing (--execute):. The updated snapshot shows both halves: pwd prints the worktree, and the header names it.

This changes documented behavior of a flag combination rather than any flag or config key. --execute means "run this against the worktree I just selected", and --no-cd is a statement about the shell; the old behavior made the second silently override the first.

Thanks to @yajo for reporting #4042.

This was written by Claude Code on behalf of max-sixty

🤖 Generated with Claude Code