Skip to content

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

fix: hide alt-r remove from picker legend and docs (#1696)

Maximilian Roos85a58fa62a90
diff --git a/docs/content/switch.md b/docs/content/switch.md
index 47df0dd25..a3dfb379f 100644
--- a/docs/content/switch.md
+++ b/docs/content/switch.md
@@ -91,7 +91,6 @@ When called without arguments, `wt switch` opens an interactive picker to browse
| (type) | Filter worktrees |
| `Enter` | Switch to selected worktree |
| `Alt-c` | Create new worktree from query |
-| `Alt-r` | Remove selected worktree |
| `Esc` | Cancel |
| `1`–`5` | Switch preview tab |
| `Alt-p` | Toggle preview panel |
diff --git a/skills/worktrunk/reference/switch.md b/skills/worktrunk/reference/switch.md
index 4105050d3..e4b32f505 100644
--- a/skills/worktrunk/reference/switch.md
+++ b/skills/worktrunk/reference/switch.md
@@ -68,7 +68,6 @@ When called without arguments, `wt switch` opens an interactive picker to browse
| (type) | Filter worktrees |
| `Enter` | Switch to selected worktree |
| `Alt-c` | Create new worktree from query |
-| `Alt-r` | Remove selected worktree |
| `Esc` | Cancel |
| `1`–`5` | Switch preview tab |
| `Alt-p` | Toggle preview panel |
diff --git a/src/cli/mod.rs b/src/cli/mod.rs
index 98526b276..625f37ce1 100644
--- a/src/cli/mod.rs
+++ b/src/cli/mod.rs
@@ -317,7 +317,6 @@ When called without arguments, `wt switch` opens an interactive picker to browse
| (type) | Filter worktrees |
| `Enter` | Switch to selected worktree |
| `Alt-c` | Create new worktree from query |
-| `Alt-r` | Remove selected worktree |
| `Esc` | Cancel |
| `1`–`5` | Switch preview tab |
| `Alt-p` | Toggle preview panel |
diff --git a/src/commands/picker/items.rs b/src/commands/picker/items.rs
index 202866b40..51702e5e0 100644
--- a/src/commands/picker/items.rs
+++ b/src/commands/picker/items.rs
@@ -145,7 +145,7 @@ impl WorktreeSkimItem {
// Controls use dim yellow to distinguish from dimmed (white) tabs
let controls = cformat!(
- "<dim,yellow>Enter: switch | alt-c: create | alt-r: remove | Esc: cancel | ctrl-u/d: scroll | alt-p: toggle</>"
+ "<dim,yellow>Enter: switch | alt-c: create | Esc: cancel | ctrl-u/d: scroll | alt-p: toggle</>"
);
// End each tab and controls with full reset to prevent style bleeding
diff --git a/src/commands/picker/snapshots/wt__commands__picker__items__tests__branch_diff.snap b/src/commands/picker/snapshots/wt__commands__picker__items__tests__branch_diff.snap
index 2efee5351..08516cc6e 100644
--- a/src/commands/picker/snapshots/wt__commands__picker__items__tests__branch_diff.snap
+++ b/src/commands/picker/snapshots/wt__commands__picker__items__tests__branch_diff.snap
@@ -3,4 +3,4 @@ source: src/commands/picker/items.rs
expression: "WorktreeSkimItem::render_preview_tabs(mode)"
---
1: HEAD± | 2: log | 3: main…± | 4: remote⇅ | 5: summary
-Enter: switch | alt-c: create | alt-r: remove | Esc: cancel | ctrl-u/d: scroll | alt-p: toggle
+Enter: switch | alt-c: create | Esc: cancel | ctrl-u/d: scroll | alt-p: toggle
diff --git a/src/commands/picker/snapshots/wt__commands__picker__items__tests__log.snap b/src/commands/picker/snapshots/wt__commands__picker__items__tests__log.snap
index fa7d5c91c..1969016c2 100644
--- a/src/commands/picker/snapshots/wt__commands__picker__items__tests__log.snap
+++ b/src/commands/picker/snapshots/wt__commands__picker__items__tests__log.snap
@@ -3,4 +3,4 @@ source: src/commands/picker/items.rs
expression: "WorktreeSkimItem::render_preview_tabs(mode)"
---
1: HEAD± | 2: log | 3: main…± | 4: remote⇅ | 5: summary
-Enter: switch | alt-c: create | alt-r: remove | Esc: cancel | ctrl-u/d: scroll | alt-p: toggle
+Enter: switch | alt-c: create | Esc: cancel | ctrl-u/d: scroll | alt-p: toggle
diff --git a/src/commands/picker/snapshots/wt__commands__picker__items__tests__summary.snap b/src/commands/picker/snapshots/wt__commands__picker__items__tests__summary.snap
index d3ff91ef6..2886afc3e 100644
--- a/src/commands/picker/snapshots/wt__commands__picker__items__tests__summary.snap
+++ b/src/commands/picker/snapshots/wt__commands__picker__items__tests__summary.snap
@@ -3,4 +3,4 @@ source: src/commands/picker/items.rs
expression: "WorktreeSkimItem::render_preview_tabs(mode)"
---
1: HEAD± | 2: log | 3: main…± | 4: remote⇅ | 5: summary
-Enter: switch | alt-c: create | alt-r: remove | Esc: cancel | ctrl-u/d: scroll | alt-p: toggle
+Enter: switch | alt-c: create | Esc: cancel | ctrl-u/d: scroll | alt-p: toggle
diff --git a/src/commands/picker/snapshots/wt__commands__picker__items__tests__upstream_diff.snap b/src/commands/picker/snapshots/wt__commands__picker__items__tests__upstream_diff.snap
index 1663500df..65e2d02ce 100644
--- a/src/commands/picker/snapshots/wt__commands__picker__items__tests__upstream_diff.snap
+++ b/src/commands/picker/snapshots/wt__commands__picker__items__tests__upstream_diff.snap
@@ -3,4 +3,4 @@ source: src/commands/picker/items.rs
expression: "WorktreeSkimItem::render_preview_tabs(mode)"
---
1: HEAD± | 2: log | 3: main…± | 4: remote⇅ | 5: summary
-Enter: switch | alt-c: create | alt-r: remove | Esc: cancel | ctrl-u/d: scroll | alt-p: toggle
+Enter: switch | alt-c: create | Esc: cancel | ctrl-u/d: scroll | alt-p: toggle
diff --git a/src/commands/picker/snapshots/wt__commands__picker__items__tests__working_tree.snap b/src/commands/picker/snapshots/wt__commands__picker__items__tests__working_tree.snap
index 9f10a7053..bbb91ec49 100644
--- a/src/commands/picker/snapshots/wt__commands__picker__items__tests__working_tree.snap
+++ b/src/commands/picker/snapshots/wt__commands__picker__items__tests__working_tree.snap
@@ -3,4 +3,4 @@ source: src/commands/picker/items.rs
expression: "WorktreeSkimItem::render_preview_tabs(mode)"
---
1: HEAD± | 2: log | 3: main…± | 4: remote⇅ | 5: summary
-Enter: switch | alt-c: create | alt-r: remove | Esc: cancel | ctrl-u/d: scroll | alt-p: toggle
+Enter: switch | alt-c: create | Esc: cancel | ctrl-u/d: scroll | alt-p: toggle
diff --git a/tests/snapshots/integration__integration_tests__help__help_switch_long.snap b/tests/snapshots/integration__integration_tests__help__help_switch_long.snap
index e029b5d82..71aeaa517 100644
--- a/tests/snapshots/integration__integration_tests__help__help_switch_long.snap
+++ b/tests/snapshots/integration__integration_tests__help__help_switch_long.snap
@@ -168,7 +168,6 @@ When called without arguments, wt switch opens an interactive picker to
(type) Filter worktrees
Enter Switch to selected worktree
Alt-c Create new worktree from query
- Alt-r Remove selected worktree
Esc Cancel
1–5 Switch preview tab
Alt-p Toggle preview panel
diff --git a/tests/snapshots/integration__integration_tests__switch_picker__switch_picker_abort_escape_preview.snap b/tests/snapshots/integration__integration_tests__switch_picker__switch_picker_abort_escape_preview.snap
index 0b4ece9e5..70b578f57 100644
--- a/tests/snapshots/integration__integration_tests__switch_picker__switch_picker_abort_escape_preview.snap
+++ b/tests/snapshots/integration__integration_tests__switch_picker__switch_picker_abort_escape_preview.snap
@@ -3,6 +3,6 @@ source: tests/integration_tests/switch_picker.rs
expression: preview
---
1: HEAD± | 2: log | 3: main…± | 4: remote⇅ | 5: summary [N/M]
-Enter: switch | alt-c: create | alt-r: remove | Esc: cancel
+Enter: switch | alt-c: create | Esc: cancel | ctrl-u/d: scr
○ main has no uncommitted changes
diff --git a/tests/snapshots/integration__integration_tests__switch_picker__switch_picker_multiple_worktrees_preview.snap b/tests/snapshots/integration__integration_tests__switch_picker__switch_picker_multiple_worktrees_preview.snap
index 0b4ece9e5..70b578f57 100644
--- a/tests/snapshots/integration__integration_tests__switch_picker__switch_picker_multiple_worktrees_preview.snap
+++ b/tests/snapshots/integration__integration_tests__switch_picker__switch_picker_multiple_worktrees_preview.snap
@@ -3,6 +3,6 @@ source: tests/integration_tests/switch_picker.rs
expression: preview
---
1: HEAD± | 2: log | 3: main…± | 4: remote⇅ | 5: summary [N/M]
-Enter: switch | alt-c: create | alt-r: remove | Esc: cancel
+Enter: switch | alt-c: create | Esc: cancel | ctrl-u/d: scr
○ main has no uncommitted changes
diff --git a/tests/snapshots/integration__integration_tests__switch_picker__switch_picker_preview_log_preview.snap b/tests/snapshots/integration__integration_tests__switch_picker__switch_picker_preview_log_preview.snap
index 7e06b9e37..a11a5eaca 100644
--- a/tests/snapshots/integration__integration_tests__switch_picker__switch_picker_preview_log_preview.snap
+++ b/tests/snapshots/integration__integration_tests__switch_picker__switch_picker_preview_log_preview.snap
@@ -3,7 +3,7 @@ source: tests/integration_tests/switch_picker.rs
expression: preview
---
1: HEAD± | 2: log | 3: main…± | 4: remote⇅ | 5: summary [N/M]
-Enter: switch | alt-c: create | alt-r: remove | Esc: cancel
+Enter: switch | alt-c: create | Esc: cancel | ctrl-u/d: scr
* [HASH] +1 [TIME] (feature) Add file 5 with content
* [HASH] +1 [TIME] Add file 4 with content
diff --git a/tests/snapshots/integration__integration_tests__switch_picker__switch_picker_preview_main_diff_preview.snap b/tests/snapshots/integration__integration_tests__switch_picker__switch_picker_preview_main_diff_preview.snap
index c2a59d666..494330b69 100644
--- a/tests/snapshots/integration__integration_tests__switch_picker__switch_picker_preview_main_diff_preview.snap
+++ b/tests/snapshots/integration__integration_tests__switch_picker__switch_picker_preview_main_diff_preview.snap
@@ -3,7 +3,7 @@ source: tests/integration_tests/switch_picker.rs
expression: preview
---
1: HEAD± | 2: log | 3: main…± | 4: remote⇅ | 5: summary [N/M]
-Enter: switch | alt-c: create | alt-r: remove | Esc: cancel
+Enter: switch | alt-c: create | Esc: cancel | ctrl-u/d: scr
feature_code.rs | 6 ++++++
tests.rs | 4 ++++
diff --git a/tests/snapshots/integration__integration_tests__switch_picker__switch_picker_preview_summary_preview.snap b/tests/snapshots/integration__integration_tests__switch_picker__switch_picker_preview_summary_preview.snap
index 08eabcc76..3d208e81f 100644
--- a/tests/snapshots/integration__integration_tests__switch_picker__switch_picker_preview_summary_preview.snap
+++ b/tests/snapshots/integration__integration_tests__switch_picker__switch_picker_preview_summary_preview.snap
@@ -3,7 +3,7 @@ source: tests/integration_tests/switch_picker.rs
expression: preview
---
1: HEAD± | 2: log | 3: main…± | 4: remote⇅ | 5: summary [N/M]
-Enter: switch | alt-c: create | alt-r: remove | Esc: cancel
+Enter: switch | alt-c: create | Esc: cancel | ctrl-u/d: scr
Configure [commit.generation] command to enable LLM summari
diff --git a/tests/snapshots/integration__integration_tests__switch_picker__switch_picker_preview_uncommitted_preview.snap b/tests/snapshots/integration__integration_tests__switch_picker__switch_picker_preview_uncommitted_preview.snap
index f9f0539ed..6807cadde 100644
--- a/tests/snapshots/integration__integration_tests__switch_picker__switch_picker_preview_uncommitted_preview.snap
+++ b/tests/snapshots/integration__integration_tests__switch_picker__switch_picker_preview_uncommitted_preview.snap
@@ -3,7 +3,7 @@ source: tests/integration_tests/switch_picker.rs
expression: preview
---
1: HEAD± | 2: log | 3: main…± | 4: remote⇅ | 5: summary [N/M]
-Enter: switch | alt-c: create | alt-r: remove | Esc: cancel
+Enter: switch | alt-c: create | Esc: cancel | ctrl-u/d: scr
tracked.txt | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/tests/snapshots/integration__integration_tests__switch_picker__switch_picker_with_branches_preview.snap b/tests/snapshots/integration__integration_tests__switch_picker__switch_picker_with_branches_preview.snap
index 0b4ece9e5..70b578f57 100644
--- a/tests/snapshots/integration__integration_tests__switch_picker__switch_picker_with_branches_preview.snap
+++ b/tests/snapshots/integration__integration_tests__switch_picker__switch_picker_with_branches_preview.snap
@@ -3,6 +3,6 @@ source: tests/integration_tests/switch_picker.rs
expression: preview
---
1: HEAD± | 2: log | 3: main…± | 4: remote⇅ | 5: summary [N/M]
-Enter: switch | alt-c: create | alt-r: remove | Esc: cancel
+Enter: switch | alt-c: create | Esc: cancel | ctrl-u/d: scr
○ main has no uncommitted changes