Merge branch 'rs/add-p-worktree-mode-prompt-fix'

Fix another UI regression in the reimplemented "add -p". * rs/add-p-worktree-mode-prompt-fix: add -p: fix worktree patch mode prompts