Cherry picks for v0.233.x preview release#54439
Merged
Conversation
cla-bot
Bot
added
the
cla-signed
zed-community-bot
Bot
added
the
staff
eholk
force-pushed
the
cherry-picks-v0.233.x-omnibus-3
branch
from
3fa31f7 to
3747e4b
Compare
maxbrunsfeld
approved these changes
Apr 21, 2026
We were just creating a window without showing it. However, wayland does not respect this setting, so it seemed to work. Now we actually activate the window :) Rather than changing the single call-site, we always do this when calling `Workspace::new_local`, since there were no code paths in the repo that pass `NewWindow` without immediately activating it Release Notes: - N/A or Added/Fixed/Improved ... (cherry picked from commit f7d46cf)
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 c91b917)
…54427) 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 6e900b4)
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)
Use stored thread metadata during reset when no root thread view exists, so retries keep the original session id and title instead of starting a new session. Add a regression test for reconnecting after an initial custom agent load failure. 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) - [x] Tests cover the new/changed behavior - [x] Performance impact has been considered and is acceptable Closes #ISSUE Release Notes: - N/A or Added/Fixed/Improved ... --------- Co-authored-by: Bennet Bo Fenner <bennetbo@gmx.de> (cherry picked from commit 102805a)
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 1942902)
This PR only displays the X icon button to close an workspace when the number of available ones is bigger than one, and does some light UI tweaks to how we display the project labels inside the menu item. Release Notes: - N/A (cherry picked from commit d7eeb5c)
The recent-projects picker, sidebar, welcome screen, and agent thread store all called `recent_workspaces_on_disk`, which combined listing with deleting stale rows. Its retention predicate rejected workspaces with no on-disk directory, including empty workspaces holding unsaved scratch buffers, and the resulting `delete_workspace_by_id` call cascaded into `items`, `pane_groups`, and the per-editor tables. For clarity, the method has been renamed to `recent_workspaces_for_ui`. Meanwhile, `last_session_workspace_locations` used a slightly different form of the same predicate. The two disagreeing on what counts as a valid workspace caused #48799, `Workspace WorkspaceId(N) not found` errors on repeated launches (#50409), the `test_window_edit_state_restoring_enabled` flake (#50871), and the foreign key constraint fail on `projects: open recent` with a dirty scratch buffer (#51456). Note that for the last issue mentioned (#51456) there is no save prompt for scratch buffers. This seems out of scope for this PR so I'll fix that after this is addressed. Self-Review Checklist: - [x] I've reviewed my own diff for quality, security, and reliability - [ ] Unsafe blocks (if any) have justifying comments - [ ] The content is consistent with the [UI/UX checklist](https://github.com/zed-industries/zed/blob/main/CONTRIBUTING.md#uiux-checklist) - [x] Tests cover the new/changed behavior - [x] Performance impact has been considered and is acceptable Closes #48799 Closes #50409 Closes #50871 Closes #51456 Release Notes: - Fixed unsaved scratch buffers being lost across restarts and an occasional error when opening a recent project. (cherry picked from commit 1ea6eb4)
* Project panel "Add Folders to Project" and "Remove folder from Project" * Recent projects "Add Folders to this Project" Release Notes: - N/A (cherry picked from commit f9cb919)
This prevents the user from getting into a state where they have unsaved untitled buffers, but no way to get back to them. Release Notes: - N/A (cherry picked from commit 7fc65c7)
eholk
force-pushed
the
cherry-picks-v0.233.x-omnibus-3
branch
from
5e0efab to
f3eade6
Compare
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
7 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 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.AgentV2FeatureFlag#54430 — RemoveAgentV2FeatureFlagConflict resolution notes
crates/agent_ui/src/agent_panel.rs: four hunks. The incoming patch is against a post-#47154 (gpuiCorner→Anchorrename) tree, which is not onv0.233.x. KeptCornerin thegpui::{...}import, dropped the now-unusedDismissEventimport, removed therender_recent_entries_menufunction body and both.when(show_history_menu && !agent_v2_enabled, ...)call sites in the toolbar — so the end state matches what agent_ui: Remove history view #54402 produces onmainmodulo theCorner/Anchorspelling.conversation_view.rscollided with history-view test code that agent_ui: Remove history view #54402 removes; ordering agent_ui: Remove history view #54402 first made this a no-op).AgentV2FeatureFlag#54430 — Applied cleanly after agent_ui: Remove history view #54402 (same reason: depends on thehas_history_for_selected_agent/agent_v2_enabledlocals being gone).recent_projects_picker_workspacetest helper incrates/workspace/src/persistence.rsinitializes abookmarks: Default::default()field onSerializedWorkspace. That field comes from the Bookmarks MVP (#51404 / #54174) which is not onv0.233.x, so we dropped that one line to match the struct shape on this branch.Release Notes: