Conversation
…54183) This PR makes Zed only have one worktree picker, as opposed to a flavor of it in the title bar and another in the agent panel. It then moves it to the title bar, making it always present, so that its trigger is separate from the branch picker (which now contains only two views: branches and stashes). For the worktree picker, I'm mostly favoring the behavior we've introduced in the agent-panel-flavored version. It also updates the title bar settings migration to use the JSON `migrate_settings` helper instead of a shallow Tree-sitter rewrite, so old `show_branch_icon = true` values are promoted to `show_branch_status_icon = true` across root, platform, release-channel, and profile settings scopes. - [x] Move worktree creation logic to the `git_ui` crate to make this more generic and less agent-specific - [x] Double-check the remote use case and ensure nothing broke there - [x] Improve the UX for the detached HEAD state; better invite people to create a branch - [x] Migrate `show_branch_icon = true` to `show_branch_status_icon = true` across nested settings scopes Suggested .rules additions When migrating renamed settings keys that can appear in platform overrides, release-channel overrides, or profiles, prefer the JSON `migrations::migrate_settings` helper over shallow Tree-sitter key rewrites unless tests explicitly cover every nested scope that can contain the key. Release Notes: - Improved migration of the title bar branch status icon setting. --------- Co-authored-by: Nathan Sobo <[email protected]> Co-authored-by: Zed Zippy <234243425+zed-zippy[bot]@users.noreply.github.com> Co-authored-by: Ben Brandt <[email protected]> (cherry picked from commit 9daf886)
cla-bot
Bot
added
the
cla-signed
zed-community-bot
Bot
added
the
staff
cameron1024
approved these changes
Apr 21, 2026
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Cherry-pick of #54183 to
v0.233.x.This PR makes Zed only have one worktree picker, as opposed to a flavor of it in the title bar and another in the agent panel. It then moves it to the title bar, making it always present, so that its trigger is separate from the branch picker (which now contains only two views: branches and stashes). For the worktree picker, I'm mostly favoring the behavior we've introduced in the agent-panel-flavored version.
It also updates the title bar settings migration to use the JSON
migrate_settingshelper instead of a shallow Tree-sitter rewrite, so oldshow_branch_icon = truevalues are promoted toshow_branch_status_icon = trueacross root, platform, release-channel, and profile settings scopes.Conflicts resolved
crates/migrator/src/migrations.rsandcrates/migrator/src/migrator.rs— kept both the existingm_2026_04_15(HTTP context servers) migration already onv0.233.xand the newm_2026_04_17(branch icon) migration from this cherry-pick, in order.crates/agent_ui/src/agent_panel.rs— dropped the now-removedCreateWorktree,SwitchWorktree,NewWorktreeBranchTarget, andToggleWorktreeSelectorimports while preservingShowThreadMetadata/ShowAllSidebarThreadMetadatathat landed via the omnibus cherry-pick (Cherry picks for v0.233.x preview release #54368). Removed the top-levelanyhow!import (only used inside#[cfg(test)], which has its own import); keptchronosince it's still used by the metadata UI.Release Notes: