Conversation
cla-bot
Bot
added
the
cla-signed
zed-community-bot
Bot
added
the
staff
zed-zippy
Bot
added
the
PR state:needs review
Member
|
@zed-industries/approved |
zed-zippy
Bot
removed
the
PR state:needs review
Member
Author
|
/cherry-pick preview |
Contributor
|
🍒💥 Cherry-pick did not succeed |
10 tasks
eholk
pushed a commit
that referenced
this pull request
Apr 21, 2026
Self-Review Checklist: - [x] I've reviewed my own diff for quality, security, and reliability - [x] Unsafe blocks (if any) have justifying comments - [x] The content is consistent with the [UI/UX checklist](https://github.com/zed-industries/zed/blob/main/CONTRIBUTING.md#uiux-checklist) - [ ] Tests cover the new/changed behavior - [x] Performance impact has been considered and is acceptable Release Notes: - N/A (cherry picked from commit cfebe3a)
eholk
pushed a commit
that referenced
this pull request
Apr 21, 2026
Self-Review Checklist: - [x] I've reviewed my own diff for quality, security, and reliability - [x] Unsafe blocks (if any) have justifying comments - [x] The content is consistent with the [UI/UX checklist](https://github.com/zed-industries/zed/blob/main/CONTRIBUTING.md#uiux-checklist) - [ ] Tests cover the new/changed behavior - [x] Performance impact has been considered and is acceptable Release Notes: - N/A (cherry picked from commit cfebe3a)
eholk
added a commit
that referenced
this pull request
Apr 21, 2026
Cherry picks for the next v0.233.x preview release, focused on agent panel and sidebar fixes and improvements. Built incrementally so CI can validate as we go. ### Cherry-picked PRs Listed in the order they were applied (chronological merge order on `main`). `[x]` = applied on this branch. - [x] #54055 — sidebar: Move to new workspace non-Wayland - [x] #54417 — agent_ui: Sort thread import agents by display name - [x] #54427 — agent_ui: Handle pagination of session/list correctly when importing - [x] #54402 — agent_ui: Remove history view - [x] #54411 — agent_ui: Preserve session resume state after load errors - [x] #54430 — Remove `AgentV2FeatureFlag` - [x] #54360 — sidebar: Adjust display of workspaces in header's ellipsis menu - [x] #54224 — workspace: Fix recent-projects cleanup wiping active workspaces - [x] #54438 — Tweak wording around multi-folder project actions - [x] #54450 — Close the empty project before adding a project to a window ### Conflict resolution notes - **#54402** — `crates/agent_ui/src/agent_panel.rs`: four hunks. The incoming patch is against a post-[#47154](#47154) (gpui `Corner` → `Anchor` rename) tree, which is not on `v0.233.x`. Kept `Corner` in the `gpui::{...}` import, dropped the now-unused `DismissEvent` import, removed the `render_recent_entries_menu` function body and both `.when(show_history_menu && !agent_v2_enabled, ...)` call sites in the toolbar — so the end state matches what #54402 produces on `main` modulo the `Corner`/`Anchor` spelling. - **#54411** — Applied cleanly after #54402 (in the original failed attempt, a test-helper hunk in `conversation_view.rs` collided with history-view test code that #54402 removes; ordering #54402 first made this a no-op). - **#54430** — Applied cleanly after #54402 (same reason: depends on the `has_history_for_selected_agent` / `agent_v2_enabled` locals being gone). - **#54224** — Applied cleanly, but the new `recent_projects_picker_workspace` test helper in `crates/workspace/src/persistence.rs` initializes a `bookmarks: Default::default()` field on `SerializedWorkspace`. That field comes from the Bookmarks MVP ([#51404](#51404) / [#54174](#54174)) which is not on `v0.233.x`, so we dropped that one line to match the struct shape on this branch. Release Notes: - Fixed unsaved scratch buffers being lost across restarts and an occasional error when opening a recent project. ([#54224](#54224)) --------- Co-authored-by: Cameron Mcloughlin <cameron.studdstreet@gmail.com> Co-authored-by: Ben Brandt <benjamin.j.brandt@gmail.com> Co-authored-by: Bennet Bo Fenner <bennet@zed.dev> Co-authored-by: Bennet Bo Fenner <bennetbo@gmx.de> Co-authored-by: Danilo Leal <67129314+danilo-leal@users.noreply.github.com> Co-authored-by: allison <28279548+transitoryangel@users.noreply.github.com> Co-authored-by: Max Brunsfeld <maxbrunsfeld@gmail.com>
MasoudAlali
pushed a commit
to MasoudAlali/zed-ide
that referenced
this pull request
Apr 22, 2026
This reverts commit cfebe3a.
MasoudAlali
pushed a commit
to MasoudAlali/zed-ide
that referenced
this pull request
Apr 23, 2026
This reverts commit c034503.
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
2 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.
Self-Review Checklist:
Release Notes: