agent: Inline worktree info fetching to remove expects in agent_panel#54006
Merged
Anthony-Eid merged 1 commit intomainfrom Apr 15, 2026
Merged
agent: Inline worktree info fetching to remove expects in agent_panel#54006Anthony-Eid merged 1 commit intomainfrom
Anthony-Eid merged 1 commit intomainfrom
Conversation
The `worktree_receivers` and `worktree_directory_setting` were pre-computed as `Option`s before the async block, then unwrapped with `expect` inside the match arm that always had them set. Move the fetching directly into the `WorktreeCreationArgs::New` arm so the values are never optional, replacing the panicking expects with error propagation via `?`.
cla-bot
Bot
added
the
cla-signed
zed-community-bot
Bot
added
the
staff
mikayla-maki
approved these changes
Apr 15, 2026
25 tasks
eholk
pushed a commit
that referenced
this pull request
Apr 20, 2026
…#54006) The `worktree_receivers` and `worktree_directory_setting` were pre computed as `Option`s before the async block, then unwrapped with `expect` inside the match arm that always had them set. Move the fetching directly into the `WorktreeCreationArgs::New` arm so the values are never optional, replacing the panicking expects with error propagation via `?`. The expects were guaranteed to never panic because the `Some` codepath used the same branching logic of the unwrap codepath later on. This change is just for future maintainability though. 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 Release Notes: - N/A or Added/Fixed/Improved ... (cherry picked from commit bf25cb1)
eholk
added a commit
that referenced
this pull request
Apr 21, 2026
Cherry picks for the next v0.233.x preview release, focused on sidebar and agent panel 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; `[ ]` = todo; `[-]` = skipped. - [x] #53956 — sidebar: Remove View More batched thread expansion - [x] #53998 — Make flexible dock widths more closely match full-height pane splits - [x] #54006 — agent: Inline worktree info fetching to remove expects in agent_panel - [x] #53854 — Simplify parallel agents onboarding - [x] #54025 — sidebar: Add some UI adjustments - [-] #53982 — sidebar: Refactor thread time storage (skipped — paired with revert #54078, net zero) - [-] #54078 — Revert "sidebar: Refactor thread time storage (#53982)" (skipped — paired with #53982, net zero) - [x] #54090 — agent_ui: Do not show token limit callout for external agents - [x] #54126 — agent_ui: Adjust thread item component and fix thread switcher - [x] #54075 — Rename Archive view to Thread History - [x] #54125 — agent: Auto-select user model when there's no default - [x] #54128 — sidebar: Fix cmd-click in the header not taking to the last workspace - [x] #54178 — agent_ui: Fix UI issues with activity bar - [x] #54187 — agent_ui: Only surface the regenerate title item for the Zed agent - [x] #54205 — agent: Clean up old remove worktree manage folder code - [x] #54207 — Add list of open workspaces to the project group menu in the sidebar - [x] #54198 — Fix remote projects not appearing in the sidebar after adding them to the window - [x] #54206 — Feature flag overrides - [-] #53100 — workspace: Skip read-only paths when choosing default save location (skipped for this release) - [-] #54183 — Move the worktree picker to the title bar + make it always visible (skipped — very large refactor, deferred to a future release) - [x] #54314 — agent_ui: Add `show thread metadata` action - [x] #54317 — sidebar: Open project header ellipsis menu on right-click - [x] #54316 — agent_ui: Add setting for turning off content max-width - [x] #54256 — Add support for Netpbm image previews - [x] #54320 — sidebar: Consistently set `interacted_at` - [x] #54318 — agent: Respect favorite model settings and sync UI changes back to settings - [x] #54348 — Always use `ArchiveSelectedThread` action for archiving threads - [x] #54353 — agent: When opening a remote thread check that the linked worktree path exists - [x] #54365 — Avoid constantly scrolling thread history to top as agent generates ### Conflict resolution notes - **#53956** — On `v0.233.x`, `sidebar_tests.rs` still contained `test_search_finds_threads_hidden_behind_view_more`, which exercised behavior #53956 removes. Deleted the test along with the rest of the View More functionality; no changes to the substance of the cherry-picked patch. - **#53998** — Supersedes standalone cherry-pick PR #54366 (which can be closed). - **#53982 / #54078** — Skipped both. They form a refactor-and-revert pair on `main` with net zero change. Since `v0.233.x` already has #54173 ("sidebar: Fix sidebar thread times") applied on top of the pre-#53982 state, pulling both in would be churn with no end-state difference. - **#54025** — `crates/ui/src/components/ai/thread_item.rs`: accepted incoming side for the `worktree_tooltip_title` removal and converted the patch's `match (wt.kind, wt.branch_name)` structure back to `v0.233.x`'s `match wt.kind` structure (the #54067 tuple match isn't on this branch). Dropped the `linked_worktree_count` local after it became unused. - **#54207** — `crates/sidebar/src/sidebar.rs`: accepted incoming side for the project group menu restructure. This removes the `show_multi_project_entries` gate around the "Remove Project" entry that #54025 added — matching `main`'s state at #54207's parent. - **#54314** — `crates/agent_ui/src/agent_panel.rs`: merged both sides of two import conflicts, adding `ShowAllSidebarThreadMetadata` and `ShowThreadMetadata` alongside the `CreateWorktree`/`NewWorktreeBranchTarget`/`SwitchWorktree`/`ToggleWorktreeSelector` imports that remain on `v0.233.x` (#54183 isn't here). Also merged the `anyhow` and `chrono` `use` lines. - **#54183** — Skipped. It's a 3,379/4,702-line refactor that moves the worktree picker from the agent panel to the title bar. Too risky for a preview release; should be handled as a dedicated PR if/when we want it on `v0.233.x`. Release Notes: - Fixed a bug where flexible docks resized incorrectly in certain cases. ([#53998](#53998)) - Fixed an issue where resizing a flexible-width panel in the left dock would also resize fixed-width panels. ([#53998](#53998)) - Agent: Fixed worktree and branch labels not showing up in the thread switcher. ([#54126](#54126)) - Agent: Fixed the thread switcher not selecting on hover. ([#54126](#54126)) - Renamed the threads Archive view to Thread History and updated its icon to a clock. ([#54075](#54075)) - Agent: Automatically select a model when there's no selected model or configured default. ([#54125](#54125)) - Agent: Fixed a bug where cmd-clicking on the project header wouldn't actually take you to the last active workspace. ([#54128](#54128)) - Agent: Added a new `limit_content_width` setting in the agent panel that allows turning off the content max-width limit. ([#54316](#54316)) - Added support for PNM image previews (`.pbm`, `.ppm`, `.pgm`). ([#54256](#54256)) - Agent favorite models now remember and restore per-model thinking, effort level, and fast mode preferences. ([#54318](#54318)) --------- Co-authored-by: Nathan Sobo <nathan@zed.dev> Co-authored-by: Max Brunsfeld <maxbrunsfeld@gmail.com> Co-authored-by: Anthony Eid <56899983+Anthony-Eid@users.noreply.github.com> Co-authored-by: Danilo Leal <67129314+danilo-leal@users.noreply.github.com> Co-authored-by: Bennet Bo Fenner <bennet@zed.dev> Co-authored-by: Danilo Leal <daniloleal09@gmail.com> Co-authored-by: Mikayla Maki <mikayla@zed.dev> Co-authored-by: Cameron Mcloughlin <cameron.studdstreet@gmail.com> Co-authored-by: Vinícius Dutra <dutravinisousa2@usp.br> Co-authored-by: Smit Barmase <heysmitbarmase@gmail.com>
G36maid
pushed a commit
to G36maid/zed
that referenced
this pull request
Apr 29, 2026
…zed-industries#54006) The `worktree_receivers` and `worktree_directory_setting` were pre computed as `Option`s before the async block, then unwrapped with `expect` inside the match arm that always had them set. Move the fetching directly into the `WorktreeCreationArgs::New` arm so the values are never optional, replacing the panicking expects with error propagation via `?`. The expects were guaranteed to never panic because the `Some` codepath used the same branching logic of the unwrap codepath later on. This change is just for future maintainability though. 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 Release Notes: - N/A or Added/Fixed/Improved ...
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.
The
worktree_receiversandworktree_directory_settingwere pre computed asOptions before the async block, then unwrapped withexpectinside the match arm that always had them set. Move the fetching directly into theWorktreeCreationArgs::Newarm so the values are never optional, replacing the panicking expects with error propagation via?.The expects were guaranteed to never panic because the
Somecodepath used the same branching logic of the unwrap codepath later on. This change is just for future maintainability though.Self-Review Checklist:
Release Notes: