feat: add branch switcher with cmd+b shortcut#331
Conversation
Add a quick branch switcher modal accessible via cmd+b (configurable): - New BranchSwitcherPrompt component for branch selection UI - useBranchSwitcher hook for managing switcher state and logic - useBranchSwitcherShortcut hook for keyboard shortcut handling - Settings integration for customizing the shortcut - Support switching to branches in linked worktrees - Fix cmd+n shortcut to ignore shift key combinations - Fix notification compilation on release builds
|
There is also a git related issue that I fixed in a separate PR: #332 That bug was causing issues with the head of the checked out branch being unclean. |
|
@codex review |
![chatgpt-codex-connector[bot]](https://avatars.githubusercontent.com/in/1144995?s=60&v=4){kind=small}
There was a problem hiding this comment.
💡 Codex Review
Here are some automated review suggestions for this pull request.
Reviewed commit: c1947bb3f9
ℹ️ About Codex in GitHub
Your team has set up Codex to review pull requests in this repo. Reviews are triggered when you
- Open a pull request for review
- Mark a draft as ready
- Comment "@codex review".
If Codex has suggestions, it will comment; otherwise it will react with 👍.
Codex can also answer questions or update the PR. Try commenting "@codex address that feedback".
| return ( | ||
| workspaces.find( | ||
| (ws) => ws.kind === "worktree" && ws.worktree?.branch === branch, | ||
| ) ?? null |
There was a problem hiding this comment.
The branch switcher treats any worktree with the same branch name as a match, regardless of which repo it belongs to. If the user has multiple workspaces with common branch names like main or develop, selecting a branch from the active repo can incorrectly switch to an unrelated worktree from a different repo because getWorktreeByBranch scans the full workspaces list. This only happens when there is at least one other worktree sharing the branch name, but in that case the switcher jumps to the wrong workspace. Consider restricting the search to worktrees whose parentId (or repo root) matches the active workspace.
Useful? React with 👍 / 👎.
Co-authored-by: Thomas Ricouard <ricouard77@gmail.com>
Co-authored-by: Thomas Ricouard <ricouard77@gmail.com>
2 participants
Add a quick branch switcher modal accessible via cmd+b (configurable):
Small unrelated fix: