mirror of
https://github.com/zed-industries/zed.git
synced 2026-06-01 03:14:56 +07:00
86fce66eaa
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](https://github.com/zed-industries/zed/pull/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](https://github.com/zed-industries/zed/pull/51404) / [#54174](https://github.com/zed-industries/zed/pull/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](https://github.com/zed-industries/zed/pull/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> |
||
|---|---|---|
| .. | ||
| badge | ||
| fonts | ||
| icons | ||
| images | ||
| keymaps | ||
| prompts | ||
| settings | ||
| sounds | ||
| themes | ||