component_preview: Fix example rendering no text or icons by grishy · Pull Request #59241 · zed-industries/zed

grishy · 2026-06-13T05:57:37Z

cargo run -p component_preview --example component_preview does not work.
On current main it panics at startup:

thread 'main' panicked at crates/gpui/src/action.rs:296:13:
Action with name `zed::Quit` already registered

With that panic fixed, the window opens but renders no text and no icons (see Showcase below).s

Solution

Root cause for the blank window: component_preview package resolves gpui_platform with just "screen-capture".

On macOS the missing font-kit feature makes MacPlatform fall back to gpui::NoopTextSystem, as mentiond also in README (or CONTRIBUTE) file.

On Linux the missing wayland/x11 features leave no windowing backend at all.

list of changes:

Enable the same gpui_platform features as the zed binary.
Attach Assets and load the embedded fonts.
Initialize env_logger so platform warnings reach the terminal.
Fix three startup panics: move the example's Quit action to the component_preview namespace.

Testing

Tested on macOS/Linux, not tested on Windows. I use Parallel VMs.

Self-Review Checklist:

I've reviewed my own diff for quality, security, and reliability
Unsafe blocks (if any) have justifying comments
The content adheres to Zed's UI standards (UX/UI and icon guidelines)

Showcase

Before:

After:

Release Notes:

N/A

The example never attached the embedded asset source and built gpui_platform without any platform text-system features. On macOS the missing "font-kit" feature makes MacPlatform fall back to gpui::NoopTextSystem, which accepts fonts and resolves font ids but rasterizes every glyph to an empty bitmap, so the window rendered no text at all. On Linux the missing "wayland"/"x11" features leave no windowing backend either. Icons were missing because the SVG assets were never embedded. Attach Assets and load the embedded fonts (the default ".ZedSans" UI font resolves to the bundled IBM Plex Sans, which is not a system font), and enable the same gpui_platform features as the zed binary. Initialize env_logger so platform warnings reach the terminal. Also fix three startup panics: - zed::Quit is already registered by zed_actions (linked through the workspace crate), so the example's own Quit action moves to the component_preview namespace. - db::kvp::KeyValueStore::global panics unless the app database global is set first. - ui_input::InputField panics unless the editor factory registered by editor::init exists.

ChristopherBiscardi

thanks!

…59247) # Objective Without the `font-kit` feature, `MacPlatform` silently substitutes `gpui::NoopTextSystem`, which accepts fonts and resolves font ids but rasterizes every glyph to an empty bitmap. I hit this with the `component_preview` example zed-industries#59241. ## Solution Log a warning at startup in `MacPlatform::new()` when falling back to `NoopTextSystem`. Skipped in headless mode, where no text is expected to render and the fallback is a reasonable configuration. ## Testing Checked as part of zed-industries#59241 ## 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 adheres to Zed's UI standards ([UX/UI](https://github.com/zed-industries/zed/blob/main/CONTRIBUTING.md#uiux-checklist) and [icon](https://github.com/zed-industries/zed/blob/main/crates/icons/README.md) guidelines) ## Showcase It just render as like without any error: <img width="1312" height="945" alt="cp_pr1_before" src="https://github.com/user-attachments/assets/f5faf3c0-9523-4c5f-9756-e65cbaf3456f" /> --- Release Notes: - N/A or Added/Fixed/Improved ...

# Objective Without the `font-kit` feature, `MacPlatform` silently substitutes `gpui::NoopTextSystem`, which accepts fonts and resolves font ids but rasterizes every glyph to an empty bitmap. I hit this with the `component_preview` example zed-industries/zed#59241. ## Solution Log a warning at startup in `MacPlatform::new()` when falling back to `NoopTextSystem`. Skipped in headless mode, where no text is expected to render and the fallback is a reasonable configuration. ## Testing Checked as part of zed-industries/zed#59241 ## 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 adheres to Zed's UI standards ([UX/UI](https://github.com/zed-industries/zed/blob/main/CONTRIBUTING.md#uiux-checklist) and [icon](https://github.com/zed-industries/zed/blob/main/crates/icons/README.md) guidelines) ## Showcase It just render as like without any error: <img width="1312" height="945" alt="cp_pr1_before" src="https://github.com/user-attachments/assets/f5faf3c0-9523-4c5f-9756-e65cbaf3456f" /> --- Release Notes: - N/A or Added/Fixed/Improved ... zed-upstream: 759bacff378bc886c1545a0da015d347c25bf15d

…ries#59241) `cargo run -p component_preview --example component_preview` does not work. On current main it panics at startup: ``` thread 'main' panicked at crates/gpui/src/action.rs:296:13: Action with name `zed::Quit` already registered ``` With that panic fixed, the window opens but renders no text and no icons (see Showcase below).s ## Solution Root cause for the blank window: `component_preview` package resolves `gpui_platform` with just `"screen-capture"`. On macOS the missing `font-kit` feature makes `MacPlatform` fall back to `gpui::NoopTextSystem`, as mentiond also in README (or CONTRIBUTE) file. On Linux the missing `wayland`/`x11` features leave no windowing backend at all. list of changes: - Enable the same `gpui_platform` features as the `zed` binary. - Attach `Assets` and load the embedded fonts. - Initialize `env_logger` so platform warnings reach the terminal. - Fix three startup panics: move the example's `Quit` action to the `component_preview` namespace. ## Testing Tested on macOS/Linux, not tested on Windows. I use Parallel VMs. ## 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 adheres to Zed's UI standards ([UX/UI](https://github.com/zed-industries/zed/blob/main/CONTRIBUTING.md#uiux-checklist) and [icon](https://github.com/zed-industries/zed/blob/main/crates/icons/README.md) guidelines) ## Showcase Before: <img width="1312" height="945" alt="cp_pr1_before" src="https://github.com/user-attachments/assets/4611596f-6775-4863-bd4a-5f4d8c642e35" /> After: <img width="1312" height="945" alt="cp_pr1_after" src="https://github.com/user-attachments/assets/8f8082e6-c8cd-48f5-946a-032ce8186d30" /> --- Release Notes: - N/A

…59247) # Objective Without the `font-kit` feature, `MacPlatform` silently substitutes `gpui::NoopTextSystem`, which accepts fonts and resolves font ids but rasterizes every glyph to an empty bitmap. I hit this with the `component_preview` example zed-industries#59241. ## Solution Log a warning at startup in `MacPlatform::new()` when falling back to `NoopTextSystem`. Skipped in headless mode, where no text is expected to render and the fallback is a reasonable configuration. ## Testing Checked as part of zed-industries#59241 ## 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 adheres to Zed's UI standards ([UX/UI](https://github.com/zed-industries/zed/blob/main/CONTRIBUTING.md#uiux-checklist) and [icon](https://github.com/zed-industries/zed/blob/main/crates/icons/README.md) guidelines) ## Showcase It just render as like without any error: <img width="1312" height="945" alt="cp_pr1_before" src="https://github.com/user-attachments/assets/f5faf3c0-9523-4c5f-9756-e65cbaf3456f" /> --- Release Notes: - N/A or Added/Fixed/Improved ...

* gpui: Allow chaining `flex_grow()` and `flex_shrink()` with custom factors (#58142) 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: - Allow chaining of `flex_grow()` and `flex_shrink()` with custom factors, following Tailwind CSS conventions. _For example:_ <img width="509" height="308" alt="aaa" src="https://github.com/user-attachments/assets/02094fb2-d762-4ac9-a1d9-ef06e2fb047f" /> Before: ``` rust div() .flex() .flex_row() .size_full() .bg(gpui::white()) .child( div() .map(|mut this| { this.style().flex_grow = Some(1.); this }) .bg(gpui::blue()), ) .child( div() .map(|mut this| { this.style().flex_grow = Some(2.); this }) .bg(gpui::green()), ) .child( div() .map(|mut this| { this.style().flex_grow = Some(3.); this }) .bg(gpui::red()), ) ``` After: ``` rust div() .flex() .flex_row() .size_full() .bg(gpui::white()) .child(div().flex_grow(1.).bg(gpui::blue())) .child(div().flex_grow(2.).bg(gpui::green())) .child(div().flex_grow(3.).bg(gpui::red())) ``` zed-upstream: 8982fb17bc58deb62fd5b1b077a18388ed27c0b2 * gpui: Fix stuck tooltips after mouse leaves origin (#58134) 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 Release Notes: - N/A I encountered this bug while building my app with GPUI where tooltips were getting stuck when i move my mouse away from the origin element. Zed kinda gets away with it because tab close buttons use `visible_on_hover`, so when the mouse leaves the tab, close button disappears. This triggers a redraw which makes GPUI recheck and hide the tooltip. In the "Before" version i had to trigger the recheck by moving my mouse over an element with hover styles to make the tooltip disappear. ### Before https://github.com/user-attachments/assets/f405620f-6d6d-4a24-8992-214180bc7b76 ### After https://github.com/user-attachments/assets/2e41fbca-af61-4f34-bd5d-ab288f34e73a zed-upstream: 507d043d960d4f2a1cd0b382f51bcd3ec20f6e9a * gpui: Allow repositioning macOS traffic lights at runtime (#58169) 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) - [ ] Tests cover the new/changed behavior - [x] Performance impact has been considered and is acceptable Release Notes: - N/A Right now we can only set the traffic light position when creating a window. This adds a public API so that we can update the position at runtime, such as when titlebar height or layout changes dynamically. zed-upstream: 137eeea67be12540b91e41014339c91a63febcd1 * Change .join("") to .concat() (#58200) 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 zed-upstream: df4058ebfe267cc65e2cd95125ebf87a05609d92 * gpui: Add bare bones benchmark framework (#58191) ### Summary Adds the first pass at `#[gpui::bench]`, backed by Criterion, with a new `BenchAppContext` for GPUI benchmarks. This ports one editor benchmark to the new setup while keeping the existing Criterion render benchmarks in place. ### Follow Ups I eventually want to improve this framework to create custom tracy profiles that includes additional information such as - notify count - entity.update count and time - event emitted and time for that I also want to use this to create custom measurements so benches can be used for - Frames dropped - foreground thread time - Render time - etc This PR is a very small proof of initial concept and I'll continue to build this infrastructure out so Zed and other gpui apps can become a lot more resilient to dropping frames and hangs. Plus it will make improving performance a lot easier as well in the future. 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 zed-upstream: aa6f03bedd562374d55003608357d313e3cafe05 * git: Further extract gitlib2 dependencies (#58280) Extraction done from #53453 I removed the default Oid implementation we had and added support back for SHA264 back as well. I also removed the hex dependency and just added some of those functions we needed in house so we can avoid building yet another dependency 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 zed-upstream: e07d9a438b37fa6e41cff42630facfb653aa4012 * Log worst hanging tasks and actions (#57835) We have a lot of long blocking tasks on both the foreground and background, this is a start of getting some insight into those. We will now log tasks running longer then 100ms on the foreground or background. Hanging actions will also be logged including their name. We simultaneously collect statistics on task and action performance and send those to telemetry. This includes quantiles and averages for each hanging task. Finally this adds tree dev actions: - hang action - hang foreground - hang background These cause a hang to check if hang reporting is working and in the future telemetry. 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: - Added logging and telemetry of tasks and actions with performance issues zed-upstream: 39f7849a0fedc52def5ba8763344245f2a543532 * Improve sandbox write-path handling (#58283) Follow-up hardening on top of #57972 (granular sandbox write permissions), based on a review of that branch. The most important fix is that model-requested `fs_write_paths` were joined but never normalized, so a path containing `..` could pass the lexical subtree-containment checks while seatbelt canonicalized it to somewhere else entirely — causing skipped approval prompts and silent runtime write denials. Write paths are now lexically normalized (via `util::paths::normalize_lexically`) at the point they enter the system, both for model requests and for hand-edited persistent grants, so the containment check, the approval prompt, and the enforced sandbox policy all operate on the same path. The subtree insert/prune and containment logic had drifted into roughly five near-identical copies across `agent`, `agent_settings`, and `settings_content`; these now share `util::paths::insert_subtree` and `path_within_subtree`. The dead `SandboxPermissions::covers` (only ever exercised by its own tests, duplicating the production `covers_with_persistent`) is removed, and its tests rewritten to cover the real settings-compilation path including `..` normalization. The remaining changes reduce brittleness: the sandbox permission option ids (`allow`, `allow_thread`, `allow_always`, `deny`) are now shared constants in `acp_thread` instead of bare string literals scattered across the agent and UI, `persist_sandbox_always_permission` logs instead of silently doing nothing when no filesystem is available, and a comment documents why replay always resolves the terminal tool to the non-sandboxed variant. Release Notes: - N/A --------- Co-authored-by: Martin Ye <martin@zed.dev> Co-authored-by: MartinYe1234 <52641447+MartinYe1234@users.noreply.github.com> zed-upstream: 89cac4944d66e00945b57090c8ac56cafcf3567d * gpui: Anchor IME candidate window to the start of the visual line (#55876) ## Summary This PR fixes horizontal jumping of the IME candidate window during text composition. On the shared `selected_bounds` path used by Windows, the candidate window no longer follows the preedit caret character-by-character. Instead, it anchors to the start of the current visual line, which keeps the candidate window stable while typing. Linux Wayland uses a different IME positioning path, so it was not affected by the original implementation in this PR. This PR now also includes a Wayland-specific adjustment so that Wayland uses the same visual-line anchoring behavior. ## Changes 1. **Shared / Windows path** Updated `selected_bounds` in `crates/gpui/src/platform.rs` to use a visual-line-aware anchor for preedit text. This removes the distracting horizontal movement of the candidate window while typing and keeps the anchor aligned with the active visual line. 2. **Linux Wayland path** Updated the Wayland IME area calculation in `crates/gpui_linux/src/linux/wayland/window.rs` to use the same visual-line-start anchoring strategy for preedit text. This brings Linux Wayland in line with the Windows behavior while preserving Wayland's platform-specific IME handling. ## Notes I had previously tried a separate Wayland-specific fix in 5d0c96872bc3aeed7405ab7bee668b8e77ec7430, but later reverted it in 8cfe7a2a54441f89c170fbdd165a49b3e787b3c4 because the behavior was not good enough and it regressed the original positioning behavior. The current Wayland implementation is a new, simpler approach that keeps the original behavior intact while also removing horizontal candidate-window jumping. ## Visuals ### Windows / shared path * **Before the fix:** (The candidate box moves along with the preedit text, which is distracting) <img width="918" height="675" alt="before" src="https://github.com/user-attachments/assets/29cb05e4-3e99-4b54-9ce3-78710b307ce6" /> <img width="478" height="682" alt="before_1" src="https://github.com/user-attachments/assets/cff38b65-96dd-4ed7-b06b-7fbcd448fab9" /> * **After the fix:** (Candidate box stays fixed at the line start during typing, correctly jumps to new lines or follows active segments) <img width="918" height="675" alt="after" src="https://github.com/user-attachments/assets/4f50a710-dc0d-4959-a313-1184122ab759" /> <img width="478" height="683" alt="after_1" src="https://github.com/user-attachments/assets/8e9df121-ffcc-45ad-ba0b-f1ad3cef87bc" /> ### Linux Wayland * **Before / previous behavior** <img width="552" height="796" alt="before" src="https://github.com/user-attachments/assets/e3e84312-c626-41cb-945f-66c13aa96df6" /> * **After / current implementation** <img width="546" height="772" alt="after" src="https://github.com/user-attachments/assets/a01ab6d7-a3b6-4d56-a1cb-b2b112b6b914" /> --- ## 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 * [x] Tests cover the new/changed behavior (manual verification only) * [x] Performance impact has been considered and is acceptable Release Notes: - N/A zed-upstream: 737f55a1a14d3a95d776e2cfa32554f0fd03fbe7 * gpui: Make tooltip show delay configurable (#58291) 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 Release Notes: - N/A This adds a `tooltip_show_delay(Duration)` API so callers can override the default 500ms delay. zed-upstream: b3bc83b57e746001fdbbac5c01fa321c3eecb7fe * gpui: Fix cursor styles not applying to panel-backed windows (#58493) `set_active_window_cursor_style` only matched `WINDOW_CLASS` (used by `WindowKind::Normal`). Panel-backed windows (`Floating`/`Dialog`/`PopUp`) use the sibling `PANEL_CLASS`, so the check failed for them: a focused panel fell through to `mainWindow`, applying the cursor to the wrong window and leaving `cursor_pointer()` with no visible effect. Add an `is_gpui_window` helper that accepts both classes (both carry `WINDOW_STATE_IVAR`) and use it to resolve the active window. ### Before https://github.com/user-attachments/assets/f1bf820e-7af8-44f2-bfcd-d51e60706454 ### After https://github.com/user-attachments/assets/d4fa319d-029d-4516-922e-70ed753fa90a Self-Review Checklist: - [x] I've reviewed my own diff for quality, security, and reliability - [ ] 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 zed-upstream: 96165ec62647cb5db0a5cf1c57214f2970c6eda4 * Use no-op hasher for TypeId hashing (#58629) TypeId is effectively already a hash, so re-hashing it with fxhash is unnecessary. Release Notes: - N/A or Added/Fixed/Improved ... --------- Co-authored-by: zed-zippy[bot] <234243425+zed-zippy[bot]@users.noreply.github.com> zed-upstream: a85f8ad090d793a98b96989489243fda9cfbf465 * Fix macOS system font fallback cascade append (#58020) Fixes #57916. `append_system_fallbacks` used `.map(...)` for the `CFArrayAppendValue` side effect, but the iterator was never consumed. This changes it to a `for` loop so the fallback descriptors are actually appended. zed-upstream: 486cf9ef3c08d7fe5d796915c08962ca8a14f8e5 * Disable the IME on linux/wayland when text input is unexpected (#58237) 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) - [ ] Tests cover the new/changed behavior - [ ] Performance impact has been considered and is acceptable This PR follows the approach from #51041 and currently includes only the Wayland implementation. [录屏 2026-06-01 23-11-17.webm](https://github.com/user-attachments/assets/c9f87503-4d64-4868-b9d8-5b832ade3e5a) Release Notes: - On Linux wayland, the IME is disabled in Vim normal and visual modes. zed-upstream: 126c0ee41a380b9e0ce42380764a3dec08a1cc85 * Fix agent permission row flicker when scrolled away from a tall plan (#58689) When a pending tool call awaiting permission contains tall content (e.g. a full plan in Claude Code plan mode) and the inline prompt is scrolled out of view, the floating awaiting-permission row embeds that content and can grow to consume the entire panel, squeezing the conversation list to zero height. `ListState::item_is_above_viewport` / `item_is_below_viewport` returned `None` for a zero-height viewport, so the row's visibility decision oscillated from frame to frame, flickering between the conversation and the permission prompt and making the thread unusable. This PR fixes the root cause and hardens the UI: - `gpui`: `item_is_above_viewport` / `item_is_below_viewport` now answer definitively from the last layout bounds even when the viewport is zero-height, so callers that size sibling UI based on these queries can't oscillate. Adds a regression test. - `agent_ui`: adds a `Floating` tool call layout used by the awaiting-permission row that caps the embedded tool call content with a scrollable max height, so the row can never crowd the conversation list out of view while keeping the permission buttons visible. Adds an integration test that drives real window draws and asserts the row's visibility is stable across frames. Closes AI-372 Closes https://github.com/zed-industries/zed/issues/58564 Release Notes: - Fixed the agent panel flickering and becoming unusable when a permission prompt with tall content (such as a plan awaiting approval) was scrolled out of view. zed-upstream: 1cecd7d66a5f962301d8a06da1b16b5f371f9307 * Fix Wayland IME handling with multiple windows (#58712) 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) - [ ] Tests cover the new/changed behavior - [ ] Performance impact has been considered and is acceptable Fix an issue introduced by PR #58237 where IME could not be enabled when multiple windows were open. The fix ensures that `update_ime_enabled` only updates IME state for the active window. Release Notes: - N/A zed-upstream: 137e677a0561eb7284cfad1bedccea70155e2473 * Fix profiler breaking concurrent tests (#58813) 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 #58699 Release Notes: - N/A zed-upstream: ea50042f70911a220edc48e03b7c29090ac49f6b * linux: Fix Wayland clipboard reads blocking indefinitely (#58826) Closes FR-44 Unlike X11, where Zed already times out clipboard reads, on Wayland we had no timeout at all. We read the clipboard from a pipe the source app writes into, and we were doing a blocking `read_to_end` on it. So if the other app opened the pipe but never wrote anything, or stalled partway through, the read would block forever and hang Zed. This PR replaces it with a non-blocking read driven by `poll` with a 4s timeout, so: - a stalled writer fails cleanly instead of freezing us. - a slow writer that's still making progress on a large payload keeps working. This roughly mirrors what the X11 path already does. I have tested pasting text, large image, drag-n-drop, etc cases. To Reproduce: 1. Copy text from a web page in Firefox. 2. `kill -STOP "$(pgrep -o firefox)"` 3. Paste into Zed. Zed hangs indefinitely. <img width="400" src="https://github.com/user-attachments/assets/532d1c55-1500-4143-8227-127e0024efba" /> Release Notes: - Fixed a freeze on Linux Wayland when reading the clipboard from a slow or unresponsive application. zed-upstream: bda5ac3626c6160681cc4100560ed0e0323e4ec3 * Change "Ok" to "OK" in UI (#58744) Self-Review Checklist: - [x] I've reviewed my own diff for quality, security, and reliability - [ ] 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 Closes #58543 and extends to all instances of "Ok" button labels. Release Notes: - N/A --------- Co-authored-by: Danilo Leal <daniloleal09@gmail.com> zed-upstream: 1d1a4bee340203e805ae0eee50c1064959b8bc2e * Fix `TestScheduler::spawn_dedicated` leaking due to cycle (#58802) Release Notes: - N/A or Added/Fixed/Improved ... zed-upstream: b14229f1a062817f719233b4d7a527dd0ec16b1b * Use unstable sorts if deduplicating (#58751) # Impact Recent Project picker, `find all references`, the sidebar's `rebuild_contents` might get a slight speed boost. # Reasoning Unstable sort variants https://doc.rust-lang.org/stable/std/primitive.slice.html#method.sort_unstable are non-allocating but potentially destructive. Since we're deduplicating elements anyways, use the unstable variant. This call will use ipnsort https://github.com/Voultapher/sort-research-rs/blob/main/writeup/unreasonable/text.md#various-generic-algorithms I expect the speedups to be at least 30%, though it's highly input dependent. 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 zed-upstream: 78658778a28fe9bfac2de9caddcdad0eb4ea1cd7 * gpui: Free atlas tile space when removing tiles (#58874) Partially addresses #54659 `PlatformAtlas::remove` removed the tile from `tiles_by_key` and decremented the texture's refcount, but never returned the tile's rectangle to the etagere allocator. Removed tiles' space could only be reclaimed if the entire texture was dropped, which doesn't happen if glyph/emoji share the texture. Because we don't have correct glyph/emoji removal I added regression tests on all three platforms to prevent this from occurring as well. Note: this doesn't fix glyph eviction or the nil-texture panic from #54659; those are follow ups. 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 adheres to Zed's UI standards ([UX/UI](https://github.com/zed-industries/zed/blob/main/CONTRIBUTING.md#uiux-checklist) and [icon](https://github.com/zed-industries/zed/blob/main/crates/icons/README.md) guidelines) - [x] Tests cover the new/changed behavior - [x] Performance impact has been considered and is acceptable Closes #ISSUE Release Notes: - gpui: Fix GPUI memory growing unboundedly when images are repeatedly loaded and released zed-upstream: 0d8a4d4292dac3fceaa40e73f1bbae038d7de30f * Disable profiler with feature (#58942) Reopening @yara-blue's change to try to fix CI: > This disables the GPUI profiler by default, it is opt in using the feature gpui/profiler. We had one report of a possible deadlock, until that is resolved the profiler will be disabled. By doing this with a feature we can keep the code and fix forward on nightly post release. It will also be useful to other GPUI users who are not using the profiler infrastructure and now no longer need to pay the overhead (0.1%). 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 adheres to Zed's UI standards ([UX/UI](https://github.com/zed-industries/zed/blob/main/CONTRIBUTING.md#uiux-checklist) and [icon](https://github.com/zed-industries/zed/blob/main/crates/icons/README.md) guidelines) - [x] Tests cover the new/changed behavior - [x] Performance impact has been considered and is acceptable Release Notes: - N/A --------- Co-authored-by: Yara <git@yara.blue> zed-upstream: 48511e0b9cdcc32a25902d715145ec58c617b7af * gpui: Fix title bar clicks being delayed on macOS 27 (#58947) Fixes a macOS 27 beta regression where clicks on custom titlebar controls were delayed by the system double-click interval. After updating to macOS 27 dev beta, I noticed that our titlebar buttons had a delay before click events took effect. After some digging, I discovered that AppKit can treat that titlebar region as system-owned and delay click delivery while waiting to disambiguate double-clicks. I noticed that Slack had titlebar buttons that weren't affected by the double-click disambiguation delay, so I had Claude dig through the Chromium/Electron codebase to discover what they did differently. Chromium uses a private AppKit SPI, `_opaqueRectForWindowMoveWhenInTitlebar`, that allows them to set what regions should be treated as owned by a view vs. owned by AppKit. My fix uses the same API and returns the view bounds when `NSWindowStyleMask::NSFullSizeContentViewWindowMask` is set, which happens when a GPUI app uses a full-size content view for a custom titlebar. Otherwise, we return bounds of `NSRect::new(NSPoint::new(0., 0.), NSSize::new(0., 0.))` so apps using macOS's native titlebar still work as expected. ### Before https://github.com/user-attachments/assets/ba9e0d2d-b85c-4d98-bc7d-bea00368d9cf ### After https://github.com/user-attachments/assets/b78bd7d4-6b43-48d3-a615-2c7a29e32e71 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 adheres to Zed's UI standards ([UX/UI](https://github.com/zed-industries/zed/blob/main/CONTRIBUTING.md#uiux-checklist) and [icon](https://github.com/zed-industries/zed/blob/main/crates/icons/README.md) guidelines) - [x] Tests cover the new/changed behavior - [x] Performance impact has been considered and is acceptable Release Notes: - Fixed clicks on titlebar controls being delayed on the macOS 27 beta. zed-upstream: c8554b46e78985931b0709a3d024462924e39c8d * gpui: Document standalone app setup (#58766) Summary: - Document `gpui_platform::application()` as the entry point for standalone GPUI apps. - Add platform-specific `gpui_platform` feature guidance for macOS, Linux/FreeBSD, and Windows. - Use Git dependencies for the repository-based setup example. 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 --------- Co-authored-by: Christopher Biscardi <chris@christopherbiscardi.com> zed-upstream: 170b2dbc96213d2fd910f0cdddf774bbb29322d1 * Fix miscellaneous typos (#58979) Some typos I found while reading the code 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 adheres to Zed's UI standards ([UX/UI](https://github.com/zed-industries/zed/blob/main/CONTRIBUTING.md#uiux-checklist) and [icon](https://github.com/zed-industries/zed/blob/main/crates/icons/README.md) guidelines) - [x] Tests cover the new/changed behavior - [x] Performance impact has been considered and is acceptable Release Notes: - N/A zed-upstream: bb59dc59fa90ee950ab2a92beb8084a04eb12b8f * Bench app context phase 2 (#58202) This PR builds out GPUI's benchmark harness so render benchmarks measure realistic frame costs using GPUI-owned, runtime-gated instrumentation. It adds measurements for frame draw time, dirty-to-draw latency, invalidation coalescing, and frame-budget overruns, and runs benchmark workloads with production-like concurrency. ## How it works **Frame timings flow through the GPUI profiler.** `Window::draw` emits a `FrameTiming { window_id, dirty_at, invalidations, draw_start, draw_end }` event into a global ring buffer in `gpui::profiler`, mirroring the existing task-timing channel. Collection is runtime-gated by `profiler::set_frame_trace_enabled` (one relaxed atomic load when disabled — no `Instant::now` calls in production). `BenchReport` is a pure listener: it drains events through a cursor-based `FrameTimingCollector` and builds histograms in the bench layer. `Window` carries no bench-only cfg fields, and the same event channel can later feed the miniprofiler UI or an in-app frame-time HUD. **`BenchDispatcher`** is a multithreaded `PlatformDispatcher` for benchmarks: background tasks run on a worker pool (same priority queue as `LinuxDispatcher`, with task-profiler hooks), timers fire in real time on a dedicated thread, and foreground tasks queue until the bench thread drains them with a blocking `run_until_idle()`. Unlike `TestDispatcher`, work executes in parallel in real time, so wall-clock measurements reflect production concurrency. In-flight accounting is panic-safe via drop guards. **`gpui::bench_platform()`** returns a per-process `TestPlatform` backed by the `BenchDispatcher`, cached in a thread-local so worker threads persist across Criterion calibration passes. This replaces the earlier approach of constructing a real platform per invocation, which had process-global singleton issues, never ran foreground tasks (no run loop pumped the main queue), and couldn't open windows on headless CI. **Text shaping** uses `NoopTextSystem`: deterministic across machines/font installations and CI-portable. Measured cost of this trade: ~10% of editor draw time vs `MacTextSystem` (Noop still emits one glyph per character at fixed advances, so downstream layout/paint structure is preserved). **GPU coverage (macOS only for now).** `PlatformHeadlessRenderer` gained `render_scene`, which encodes and submits the scene to Metal against a cached offscreen target without blocking on completion or reading pixels back — matching production `present()` CPU cost (`render_scene_to_image` would overstate it: it waits for the GPU and copies pixels back). `TestWindow::draw` forwards scenes to the renderer, the real `MetalAtlas` means glyph/SVG rasterization happens during paint, and `bench_renderer` presents after each measured update. Platforms without a headless renderer degrade to discarding the scene. ## Example ```rust #[gpui::bench] fn editor_render(cx: &mut BenchAppContext) { init_context(cx); let buffer = cx.update(|cx| { /* build a MultiBuffer */ }); let mut window = cx.add_empty_window(); let editor = window.update(|window, cx| { let editor = window.replace_root(cx, |window, cx| { let mut editor = Editor::new(EditorMode::full(), buffer, None, window, cx); editor.set_style(editor::EditorStyle::default(), window, cx); editor }); window.focus(&editor.focus_handle(cx), cx); editor }); let mut move_down = true; cx.bench_renderer(editor, move |editor, window, cx| { if move_down { editor.move_down(&MoveDown, window, cx); } else { editor.move_up(&MoveUp, window, cx); } move_down = !move_down; }); } ``` ## Example output (release, M-series) ``` editor_render time: [329.75 µs 330.17 µs 330.69 µs] GPUI bench report (all observed iterations): editor_render note: includes Criterion warmup/calibration window dirty-to-draw: samples: 31533 mean: 0.321ms p50: 0.322ms p90: 0.336ms p95: 0.342ms p99: 0.360ms max: 0.504ms frame budget overruns total: 0 frame budget overruns max: 0 window draw: samples: 31533 mean: 0.295ms p50: 0.295ms p90: 0.307ms p95: 0.313ms p99: 0.330ms max: 0.455ms frame budget overruns total: 0 frame budget overruns max: 0 invalidations per frame: mean 5.00, max 5 ``` (`invalidations per frame: mean 5.00` is real signal: each `move_down` notifies the window five times before the draw.) ## Known limitations - **Draw-per-flush**: the harness draws synchronously when effects flush rather than coalescing invalidations to a vsync tick, so `dirty-to-draw` excludes queueing delay, and `frame budget overruns` is a draw-time budget proxy rather than actual missed presents. A frame-paced mode is natural follow-up work. - **GPU submission is measured on macOS only**; other platforms have no headless renderer yet. - The GPUI report includes Criterion warmup/calibration samples (noted in the output); Criterion's `time` is the regression-gating number. - `run_until_idle` waits for queued, running, and already-due work, but not for timers that haven't reached their due time — the dispatcher runs in real time and can't skip ahead like `TestDispatcher`'s virtual clock. ## Future work - A vsync-like frame-pacing mode (suppress draw-on-flush; tick-driven draw + present) so dirty-to-draw captures queueing delay - Record present duration in `FrameTiming` so the report can split draw vs present - Benches that scroll through novel content (cold layout caches) and an agent-panel render bench - Headless renderers for Windows/Linux - Move benches into a dedicated crate 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 - [x] Tests cover the new/changed behavior - [x] Performance impact has been considered and is acceptable Release Notes: - N/A zed-upstream: 297c4a4d78a7ca1fe6384770959e921ac2cc8b53 * tab_switcher: Middle-truncate long picker filenames (#59072) ## Context This follow-up was inspired by Christopher’s suggestion in the review comment on #58483: long filenames should truncate in the middle so both the beginning and the suffix/extension remain visible. Previously, very long filenames in picker rows could still be clipped or end-truncated, making files with shared prefixes hard to distinguish. This adds middle-truncation support to GPUI text overflow and applies it to filename-focused picker surfaces: the tab switcher and the Ctrl-P file finder. Normal editor tab bar behavior remains unchanged and continues to use the existing title length cap. ## How to Review - **`crates/gpui/src/style.rs`, `crates/gpui/src/styled.rs`, `crates/gpui/src/elements/text.rs`, `crates/gpui/src/text_system/line_wrapper.rs`**: Adds `TextOverflow::TruncateMiddle`, wires it through text layout, and implements middle truncation while preserving valid text runs. Very narrow widths now show the truncation affix instead of falling back to the abruptly clipped original text. - **`crates/ui/src/components/label/label_like.rs`, `crates/ui/src/components/label/label.rs`, `crates/ui/src/components/label/highlighted_label.rs`**: Exposes middle truncation through the shared label components. - **`crates/workspace/src/item.rs`, `crates/editor/src/items.rs`, `crates/workspace/src/pane.rs`, `crates/tab_switcher/src/tab_switcher.rs`**: Adds an explicit tab-content opt-in for middle truncation. The tab switcher enables it, while the normal tab bar and dragged tabs keep their existing behavior. - **`crates/file_finder/src/file_finder.rs`**: Applies middle truncation to Ctrl-P file finder filenames and lets the path shrink from the start so long paths do not hide important filename suffixes. Manual test before change : [Screencast from 2026-06-10 22-59-28.webm](https://github.com/user-attachments/assets/5e032646-a48c-45f2-8fe2-0424507fd576) Manual test after change : [Screencast from 2026-06-10 22-54-48.webm](https://github.com/user-attachments/assets/4b9253da-f169-4ed1-bdd5-ee71dcf49a83) ## Self-Review Checklist - [x] I've reviewed my own diff for quality, security, and reliability - [ ] Unsafe blocks (if any) have justifying comments - [x] The content is consistent with the UI/UX checklist - [x] Tests cover the new/changed behavior - [x] Performance impact has been considered and is acceptable Release Notes: - Improved long filename truncation in the tab switcher and file finder so extensions remain visible. zed-upstream: 03a8544040ff95ec2e7921ca71c83799ad7f17cd * gpui: Fix list scroll events being reverted by pending scroll (#59002) This PR fixes some cases where scrolling is choppy due to a user inputting a scroll event while a list state is going through a remeasure. Currently, the list state would ignore the user's scroll and fall back to the pending scroll position, this PR fixes this by rebasing the pending scroll onto the user's new scroll position. 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 adheres to Zed's UI standards ([UX/UI](https://github.com/zed-industries/zed/blob/main/CONTRIBUTING.md#uiux-checklist) and [icon](https://github.com/zed-industries/zed/blob/main/crates/icons/README.md) guidelines) - [x] Tests cover the new/changed behavior - [x] Performance impact has been considered and is acceptable Release Notes: - agent_panel: Improve scroll smoothness while a response is streaming zed-upstream: 7fd5ea4bf3d97826d96fb8e31426d18c459e8eb6 * Fix file descriptor leak when process spawning failed on macOS (#59128) Wrap the fds returned by `create_pipe` and `open_dev_null` in `std::fs::File` earlier, so that they are closed if we return early due to an error. Includes a regression test. 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 adheres to Zed's UI standards ([UX/UI](https://github.com/zed-industries/zed/blob/main/CONTRIBUTING.md#uiux-checklist) and [icon](https://github.com/zed-industries/zed/blob/main/crates/icons/README.md) guidelines) - [x] Tests cover the new/changed behavior - [x] Performance impact has been considered and is acceptable Release Notes: - Fixed a file descriptor leak on macOS. --------- Co-authored-by: Marshall Bowers <git@maxdeviant.com> zed-upstream: e1bfcf85db56f75a2f6d67143aad2da22c3d2240 * gpui_macos: Initialize fallback fonts with primary font weight and style (#56771) This PR fixes an issue where font properties like bolds and italics would be lost when falling back to a fallback font. The problem we identified was that when loading the fallback fonts, we were just loading them by name. This meant that when the original font had a different font weight (e.g., bold) or style applied to it this would not cascade to the fallback font. To reproduce the problem, we used the following text in a Markdown file: ```md **한글 bold** ``` With the following font configuration in Zed: ```json "buffer_font_family": "Victor Mono", "buffer_font_fallbacks": [ "D2Coding" ] ``` The fonts can be obtained from their respective locations: - [Victor Mono](https://rubjo.github.io/victor-mono/) - [D2Coding](https://github.com/naver/d2codingfont) #### Before <img width="168" height="46" alt="Screenshot 2026-05-14 at 1 15 15 PM" src="https://github.com/user-attachments/assets/f6883e4b-8f2b-4285-a110-0e18d562c51d" /> #### After <img width="176" height="53" alt="Screenshot 2026-05-14 at 1 16 04 PM" src="https://github.com/user-attachments/assets/88d67207-6711-473b-8027-e0acfa58c258" /> Closes #51460. Release Notes: - macOS: Fixed fallback fonts missing weight/style. --------- Co-authored-by: Mikayla Maki <mikayla.c.maki@gmail.com> zed-upstream: 61ad9ebfcd27ff89e3c9b087f6d54999d08c56b6 * gpui: Add `alpha` method to `Rgba` (#52125) ## Context GPUI API change only: - added `.alpha(a: f32)` method to `RGBA` - added `.opacity(factor: f32)` method to `RGBA` - added documentation for both new methods - added test coverage for both methods These implementations already exist for the `HSLA` struct and were missing for `RGBA`. > [!NOTE] > In my opinion, a trait implementation could be beneficial here. Let me know what you think about that idea before I end up making unwanted changes. ## How to Review Just added the new methods, including documentation and test coverage. ## 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: - Added `gpui::Rgba::alpha` and `gpui::Rgba::opacity` methods for setting and scaling a color's alpha channel, matching the existing `gpui::Hsla` API --------- Co-authored-by: dino <dinojoaocosta@gmail.com> zed-upstream: c899d5b590dc7b470c7edd480855d0076482045c * Fix two random bugs in macOS process spawning (#59133) I asked Claude Fable 5 to review our macOS process spawning layer, and it found two notable bugs: - We didn't mark stdio descriptors as inherited when the `Inherit` option was passed. This means they would be closed in the child due to `POSIX_SPAWN_DEFAULT_CLOEXEC`. Now we correctly mark them as inherited. - Child processes were inheriting Rust's default `SIG_IGN` disposition for `SIGPIPE`. `std::process::Command` resets the disposition to `SIG_DFL` for children, and this PR makes us do that too, with a regression test. 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 adheres to Zed's UI standards ([UX/UI](https://github.com/zed-industries/zed/blob/main/CONTRIBUTING.md#uiux-checklist) and [icon](https://github.com/zed-industries/zed/blob/main/crates/icons/README.md) guidelines) - [x] Tests cover the new/changed behavior - [x] Performance impact has been considered and is acceptable Release Notes: - N/A --------- Co-authored-by: Marshall Bowers <git@maxdeviant.com> zed-upstream: 60ed56b372dba2befe0361ff8b433a29c44562f0 * gpui: Add builder API for BoxShadow (#57743) Replaces the verbose struct-literal construction of `gpui::BoxShadow` with a builder API: - `BoxShadow::new(offset_x, offset_y, color)` takes the required fields, with arguments ordered to match the CSS `box-shadow` property. - `.blur_radius(_)`, `.spread_radius(_)`, and `.inset()` set the optional fields. All in-tree call sites are migrated, including the Tailwind-style `shadow_xs`..`shadow_2xl` helpers in `gpui_macros`, the `ElevationIndex` shadows in `ui`, and various widgets across `editor`, `workspace`, `agent_ui`, and `ai_onboarding`. The fields on `BoxShadow` remain public, so external code using struct-literal construction continues to work. 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 zed-upstream: 34cd17ff5e29b8eef9c48c69c2c56d24a770addc * multi_buffer: Don't eagerly clone `BufferSnapshot` in `range_to_buffer_ranges` (#59190) Both cloning and dropping of these has quite a bit of overhead (despite them being snapshots), so avoid where possible, especially in display map syncing Release Notes: - N/A or Added/Fixed/Improved ... zed-upstream: b6c7496aea2595fdbfbc04b0ac8dd393f363b569 * gpui_macos: Fix traffic light hitbox after repositioning (#58534) Self-Review Checklist: - [x] I've reviewed my own diff for quality, security, and reliability - [x] 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) - [ ] Tests cover the new/changed behavior - [x] Performance impact has been considered and is acceptable Release Notes: - N/A This is a follow up to https://github.com/zed-industries/zed/pull/58169 and https://github.com/zed-industries/zed/pull/58518 after removing a bunch of unsafe usage. Before this, GPUI moved traffic lights by directly changing the native button frames inside AppKit’s existing titlebar layout and the old y-coordinate was based on the native titlebar height, so the buttons moved visually while the titlebar tracking geometry could still be based on the old layout. Now the native titlebar container is resized and repositioned to contain the traffic lights. We capture the original AppKit titlebar/button frames, resize the titlebar container to fit the requested position, move the native close/minimize/zoom buttons inside that container and update AppKit tracking areas. This keeps the visible buttons and hover/click geometry aligned. ### Before https://github.com/user-attachments/assets/77dde6cb-3fc8-4166-bc86-22cf2c93e119 ### After https://github.com/user-attachments/assets/da84ade6-ef47-4e53-ae4a-3779315773f9 --------- Co-authored-by: Yara 🏳️‍⚧️ <git@yara.blue> zed-upstream: 138139f830e6a3a0271c8aac60ed494b752dbc46 * Patch async-process to allow reusing their reaper (#59156) See https://github.com/zed-industries/async-process/commit/0b6d6713570af61806e1e5cb40e0f757cb93fd9d 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 adheres to Zed's UI standards ([UX/UI](https://github.com/zed-industries/zed/blob/main/CONTRIBUTING.md#uiux-checklist) and [icon](https://github.com/zed-industries/zed/blob/main/crates/icons/README.md) guidelines) - [x] Tests cover the new/changed behavior - [x] Performance impact has been considered and is acceptable Release Notes: - Fixed orphaned processes being leaked on macOS --------- Co-authored-by: Jakub Konka <kubkon@jakubkonka.com> zed-upstream: d4cc8d240965e1b3c86b1132df2278e4d01333f6 * Revert "gpui: Fix title bar clicks being delayed on macOS 27 (#58947)" (#59214) This reverts commit c8554b46e78985931b0709a3d024462924e39c8d. Reverting this because it broke dragging the settings UI window. Closes https://github.com/zed-industries/zed/issues/59163 Release Notes: - Fixed not being able to drag the settings UI window on macOS. zed-upstream: fca2ccd403e8d13c8f4b968cda2f2c322f420f5a * gpui_macos: Warn when falling back to NoopTextSystem (#59247) # Objective Without the `font-kit` feature, `MacPlatform` silently substitutes `gpui::NoopTextSystem`, which accepts fonts and resolves font ids but rasterizes every glyph to an empty bitmap. I hit this with the `component_preview` example https://github.com/zed-industries/zed/pull/59241. ## Solution Log a warning at startup in `MacPlatform::new()` when falling back to `NoopTextSystem`. Skipped in headless mode, where no text is expected to render and the fallback is a reasonable configuration. ## Testing Checked as part of https://github.com/zed-industries/zed/pull/59241 ## 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 adheres to Zed's UI standards ([UX/UI](https://github.com/zed-industries/zed/blob/main/CONTRIBUTING.md#uiux-checklist) and [icon](https://github.com/zed-industries/zed/blob/main/crates/icons/README.md) guidelines) ## Showcase It just render as like without any error: <img width="1312" height="945" alt="cp_pr1_before" src="https://github.com/user-attachments/assets/f5faf3c0-9523-4c5f-9756-e65cbaf3456f" /> --- Release Notes: - N/A or Added/Fixed/Improved ... zed-upstream: 759bacff378bc886c1545a0da015d347c25bf15d * agent: Fix shell hang on shell syntax errors with terminal tool usage (#59270) # Objective When the agent's terminal tool runs a command with an unsupported shell syntax (e.g. process substitution `<()` in dash), the shell prints an error and then drops into interactive mode. It shows a `$` prompt and hangs waiting for input, requiring the user to press Ctrl+D to continue. This happens because the stdin redirect wraps the command in a subshell `(...) </dev/null`, which only closes stdin for the inner command. The outer shell still has its stdin connected to the PTY, so after a syntax error it reads from the PTY and waits for more input. ## Solution Replace the subshell wrapping with an `exec`-level redirect. Instead of: ```sh sh -i -c '(command\n) </dev/null' ``` We now produce: ```sh sh -i -c 'exec </dev/null; command' ``` `exec </dev/null;` closes stdin for the **entire shell process**. If the command fails with a syntax error, the shell immediately gets EOF from stdin and exits cleanly instead of prompting for more input. The `-i` flag is preserved so that shells which support it still source their interactive init files and enable job control. This change applies to `ShellKind::Posix` (sh/bash/dash/zsh) and `ShellKind::Fish` in both `ShellBuilder::build()` and `ShellBuilder::build_no_quote()`. ## Testing - Manually verified that `cat <(echo hi)` (process substitution in dash) no longer hangs: the shell exits immediately with the syntax error ## 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 adheres to Zed's UI standards ([UX/UI](https://github.com/zed-industries/zed/blob/main/CONTRIBUTING.md#uiux-checklist) and [icon](https://github.com/zed-industries/zed/blob/main/crates/icons/README.md) guidelines) - [x] Tests cover the new/changed behavior - [x] Performance impact has been considered and is acceptable --- Release Notes: - Fixed agent terminal tool hanging with a `$` prompt when commands encounter syntax errors or unsupported shell features like process substitution zed-upstream: c578f4d12b94be3bf41912aa7fb707ddf5e30382 * util: Use job objects to reap spawned process trees on Windows (#58885) On Windows, `util::process::Child::kill()` only terminated the direct child process, and nothing tied the lifetime of spawned process trees to Zed. External agent servers launched through ACP (e.g. `claude-code-acp` via `npx`) spawn node workers and MCP servers as grandchildren, which were orphaned on every session teardown and accumulated indefinitely — hundreds of idle `node.exe` processes and GBs of RAM over days. This PR assigns spawned processes to a Win32 job object configured with `JOB_OBJECT_LIMIT_KILL_ON_JOB_CLOSE`: - `kill()` now calls `TerminateJobObject`, killing the entire tree instead of just the (shell wrapper) child. - Dropping `Child` closes the job handle, which makes the OS reap the tree — including when Zed exits for any reason (even crashes), since the OS closes its handles. - Unix behavior (process groups via `killpg`) is unchanged. Added two Windows tests that spawn a real `powershell -> ping` process tree and assert the grandchild is terminated on `kill()` and on drop. Both fail without the fix and pass with it. Verified with `cargo test -p util`, `script/clippy -p util`, and `cargo check -p agent_servers -p dap` on Windows 11. Closes #58873 Release Notes: - Fixed external agent servers and debug adapters leaking helper processes (e.g. node workers and MCP servers) on Windows. --------- Co-authored-by: zed-zippy[bot] <234243425+zed-zippy[bot]@users.noreply.github.com> Co-authored-by: Smit Barmase <heysmitbarmase@gmail.com> zed-upstream: c642b422deaf6119aad2943ea22ec3074f39ef3c * Remove gpui's dependency on `async-process` (#59358) This removes gpui's dependency on the `util` crate, which depends on async process. It now depends on `gpui_util` only, and uses `std::process::Command` for the two cases where it was previously using an async `Command`. This lifts the requirement of non-Zed consumers of gpui to depend on our forked async-process (see #59156). Release Notes: - N/A zed-upstream: a873cf402c8d5ffa13ab54efd29ccd4df59c7e46 * editor: Refresh active debug line highlight on theme change (#59274) # Objective Fixes #58736 Pause the debugger on a breakpoint, switch your theme, and the active debug line keeps its old highlight color until you step again or restart Zed. ## Solution The highlight stores a concrete color grabbed from the theme back when `go_to_active_debug_line` ran. A theme switch goes through `theme_changed`, which refreshes brackets, semantic tokens, and outline symbols but never re-applies that highlight, so it stays stale. Re-running `go_to_active_debug_line` from `theme_changed` re-resolves the color against the current theme. ## Testing Added a regression test in `debugger_ui` that stops at a debug line, swaps the theme's `editor.debugger_active_line.background`, and checks the highlight follows. It fails on `main` and passes with the fix. Also tested by hand on Windows: started a debugpy session, paused at a breakpoint, switched themes from the theme selector, and watched the active line recolor live without stepping or restarting. ## Self-Review Checklist: - [x] I've reviewed my own diff for quality, security, and reliability - [x] Unsafe blocks (if any) have justifying comments - [ ] The content adheres to Zed's UI standards ([UX/UI](https://github.com/zed-industries/zed/blob/main/CONTRIBUTING.md#uiux-checklist) and [icon](https://github.com/zed-industries/zed/blob/main/crates/icons/README.md) guidelines) - [x] Tests cover the new/changed behavior - [x] Performance impact has been considered and is acceptable ## Showcase Paused at a breakpoint, switching themes from the theme selector. | Before | After | | --- | --- | | https://github.com/user-attachments/assets/653a7e1b-3a99-4316-b1c9-b16ed7a7a8ba | https://github.com/user-attachments/assets/22a4c876-30f2-44c5-aad9-0f860639074c | --- Release Notes: - Fixed the active debug line color not updating when switching themes while the debugger is paused ([#58736](https://github.com/zed-industries/zed/issues/58736)). --------- Co-authored-by: dino <dinojoaocosta@gmail.com> zed-upstream: 84b753cb51441f104fc35b540b9fe77a409f4529 * editor: Speed up multi cursor editing (#58510) Early draft for #32051 (multi-cursor editing is very slow, and basically hangs at high cursor counts). Opening it early like @Anthony-Eid suggested so we can agree on direction before I go further. ## Root cause Typing with a cursor on every line is mostly O(N)-per-keystroke work spread across a few places. I profiled it with `sample` and per-phase timers around `handle_input`. At 1000 cursors (~24ms before this PR): the post-edit display-map sync is ~11.8ms, the CRDT edit (`apply_local_edit`) ~3.7ms, resolving all N selections plus the per-cursor input loop ~3.5ms, the post-edit selection round-trip ~2.6ms, and `change_selections` plus transact machinery ~2.4ms. The display sync re-runs per-edit `SumTree` work through every layer even when nothing transforms (the plain-text case), and selections get re-resolved through the full display round-trip several times per keystroke. ## What this does - Display fast paths: `InlayMap::sync` (no inlays) and `WrapMap::interpolate` (no soft-wrap) skip the O(edits) transform-tree rebuild and return the passthrough snapshot, gated so a pending inlay splice or existing wraps still take the slow path. - Selection fast path: when nothing collapses buffer content (`!has_folds() && !has_replacement_blocks()`), resolve `Anchor` to `Point` to `Offset` batched and skip the per-selection display round-trip (the `todo(lw)`). - Render and autoscroll resolve only the first/last/newest selections instead of all N per frame. - A parameterized `Multi-cursor input/cursors/{1000,10000,100000}` benchmark. ## Results - Typing (`handle_input`): ~2.1x faster (24ms to 11.7ms at 1k). - Type plus two word-deletes (criterion): 29% faster (89.9 to 63.8ms) at 1k, 37% (959 to 606ms) at 10k. - Post-edit display sync alone: 11.8 to 3.8ms at 1k, 133 to 45ms at 10k. All `editor` (759), `display_map` (67), `multi_buffer` (58), and `text` (36) tests pass, and `./script/clippy` is clean. ## Direction This is ~2x, and I can get the current architecture to roughly 3.5-4.5x with a few more safe changes (hoisting the per-cursor language/editability checks, cheaper snapshot clones). Genuine VS Code numbers (~1-2us/cursor) aren't reachable while the buffer is a CRDT rope of fragments with anchor selections and a 5-layer transform stack. That would need a plain-offset cursor model and/or decoupling display layout from the edit path, which is a bigger effort I'd want to design with you. One thing I'd need your call on: `set_active_selections` sends an `UpdateSelections` collab op every keystroke (building N anchors); can that be debounced to transaction end, or do presence/follow-mode features rely on per-keystroke cursor broadcast? Release Notes: - editor: Improved multi cursor editing performance --------- Co-authored-by: Anthony Eid <anthony@zed.dev> zed-upstream: 1722fe63bc98f2f3056107b17da4a0bbeba698e4 * markdown: Optimize `paint_search_highlights` (#59473) Follow up to #52502 This fixes a severe hang in the markdown preview when searching for text caused by `paint_search_highlights`. We were iterating over all lines for each highlight, and for each highlight we called `layout.line_layout_for_index` which internally would iterate over all the lines of the text layout. With this optimisation we paint all highlights in one pass. We sort the highlight ranges, iterate through the lines and only access `WrappedLineSegments` when we actually have a highlight in that line. E.g. if you copy this text (https://gist.github.com/bennetbo/e313f3023da9fec42e090177a5373152) into the editor, open the markdown preview and search for `codex` Zed Nightly will completely freeze. After this optimisation it is totally smooth even in debug mode. Release Notes: - Improved performance when searching in markdown preview zed-upstream: c7ad65e46817b8bdc71c79ba3f15c898c0bc5678 * a11y: Settings UI (#59429) Adds: - aria attributes to most UI elements in settings UI - a new a11y API to GPUI - a fix for a GPUI keyboard focus bug ## Accesible settings UI Settings UI should now be fully accessible to users of assistive technology. **However**, there are some caveats: - accessibility features require zed to be launched with the `ZED_EXPERIMENTAL_A11Y=1` env var to be set - I have not exhaustively checked every control - There are some quite surprising keyboard focus behaviours which predate this code - The main Zed UI is still largely inaccessible, though a handful of shared components will now report themselves, but the experience is suboptimal. For anyone wishing to try out the settings UI: - make sure `ZED_EXPERIMENTAL_A11Y=1` is set - open zed - press `ctrl-,` (or `cmd+,` on a mac) to open settings UI in a separate window ## `aria_active_descendant` This is equivalent to the [`aria-activedescendant`](https://developer.mozilla.org/en-US/docs/Web/Accessibility/ARIA/Reference/Attributes/aria-activedescendant) API on the web. It allows a container to maintain focus, while indicating that one of its children should be active. Zed uses this for menus and combo boxes, for example. GPUI will report a div with `.aria_active_descendant()` as long as: - an ancestor is focused - only one descendant of the focused ancestor has `.aria_active_descendant()` Two descendants with this property where the focused node is a common ancestor is an error. ## GPUI keyboard fix GPUI will map a space or enter keypress to a div's `on_click` handler, if it exists. However, the keyboard-driven path was missing some checks that the mouseclick path has. With this PR, for an enter/space keypress to be considered a click, between the "key down" and "key up" events: - there must be no other key events - focus must not move to a different node This fixes an existing bug with combo boxes in zed where: - enter maps to `menu::Confirm` **on key down* - the menu item is selected - focus moves to the combo box - enter then triggers the combo box's `on_click` **on key up**, re-opening the menu --- Release Notes: - N/A or Added/Fixed/Improved ... --------- Co-authored-by: zed-zippy[bot] <234243425+zed-zippy[bot]@users.noreply.github.com> zed-upstream: 83d4847462e57a6f72dc314abea05d57d3bdcfb6 * Fix opening folders whose name ends in a position-like suffix (#59384) ## Objective Dragging a folder onto the Zed dock icon (or otherwise opening it by path) failed when the folder's name ended in a parenthesized number, e.g. `Test (1)` or `Test (2,3)`. Instead of opening the folder, Zed opened a non-existent, truncated path (`Test `), so nothing useful appeared. The cause is `PathWithPosition::parse_str`, which supports MSVC-style position suffixes like `file.c(22)` → file `file.c`, row `22`. A folder named `Test (1)` was therefore parsed as path `Test ` at row `1`. `derive_paths_with_position` has a guard that restores the literal path when it exists on disk — but it only checked `fs.is_file(...)`, so directories never qualified and the truncated path was used. ## Solution In `derive_paths_with_position`, restore the original path when it points to an existing file **or directory** (`fs.is_file(...) || fs.is_dir(...)`), instead of files only. ## Testing - Added `test_derive_paths_with_position_directory_with_position_like_name`, which opens `Test (1)`, `Project (2,3)`, and `test project` directories and asserts the full paths survive with no row/column. - Added `test_parse_str_treats_paren_suffix_as_position` in `util` documenting the underlying `parse_str` behavior that necessitates the guard. - Manually verified on macOS: built a debug `Zed Dev.app`, dropped folders named `Test (1)` onto the dock icon — it now open correctly; previously a non-existent folder was opened. ## Self-Review Checklist: - [x] I've reviewed my own diff for quality, security, and reliability - [x] Unsafe blocks (if any) have justifying comments — N/A, no unsafe - [ ] The content adheres to Zed's UI standards — N/A, no UI change - [x] Tests cover the new/changed behavior - [x] Performance impact has been considered and is acceptable — one extra `is_dir` stat only when a path parses to a row and differs from the original --- Release Notes: - Fixed folders whose names end in a parenthesized number (e.g. `Test (1)`) failing to open from the dock or by path zed-upstream: 362035d52aaf5e99f47179961ff3df5e67740316 * perf: Add initial benchmark for markdown element (#59524) ## Summary This PR adds an initial markdown element renderer benchmark, so we could later expand this to benchmark search in markdown, and reparsing. This is important because the agent panel renders a lot of markdown elements, so I want to use these benchmarks to ensure our markdown element performance is good, and later expand them to include the agent panel I added a `bench_util.rs` file that has methods to generate random rust modules, this will later be used by the editor benchmarks, and is currently used by the markdown and edit_file_tool benchmarks. Finally, I made `cx.bench_renderer` also account for ready foreground tasks and poll them. This more accurately mimics gpui dispatcher. (It's not perfect, but it's good enough for a benchmark) ## 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 adheres to Zed's UI standards ([UX/UI](https://github.com/zed-industries/zed/blob/main/CONTRIBUTING.md#uiux-checklist) and [icon](https://github.com/zed-industries/zed/blob/main/crates/icons/README.md) guidelines) - [x] Tests cover the new/changed behavior - [x] Performance impact has been considered and is acceptable Release Notes: - N/A --------- Co-authored-by: Anant Goel <anant@zed.dev> zed-upstream: 6076ce27384ca14bb9f6fb8b1218acf1d78f2878 * agent_ui: Add in-thread search bar (#57231) This is a narrower alternative to #54816, scoped to search only the currently-loaded thread, excluding tool output or thinking blocks (happy to follow up on those, see next). It uses a custom bar confined to `agent_ui` rather than `BufferSearchBar` + `SearchableItem`, avoiding the cross-crate plumbing that #54816 reached. Open as draft pending direction from @benbrandt on what scope/approach would be acceptable for in-thread search. <img width="959" height="609" alt="image" src="https://github.com/user-attachments/assets/8971e432-61d3-46db-a6a4-2bbd35508…

cla-bot Bot added the cla-signed The user has signed the Contributor License Agreement label Jun 13, 2026

zed-community-bot Bot added the first contribution the author's first pull request to Zed. NOTE: the label application is automated via github actions label Jun 13, 2026

grishy mentioned this pull request Jun 13, 2026

gpui_macos: Warn when falling back to NoopTextSystem #59247

Merged

3 tasks

ChristopherBiscardi added the area:gpui GPUI rendering framework support label Jun 15, 2026

ChristopherBiscardi approved these changes Jun 15, 2026

View reviewed changes

ChristopherBiscardi added this pull request to the merge queue Jun 15, 2026

Merged via the queue into zed-industries:main with commit f9d57b5 Jun 15, 2026
52 checks passed

ChristopherBiscardi self-assigned this Jun 15, 2026

This was referenced Jun 18, 2026

fix/commit author #59516

Closed

fix/linked images clickable #59518

Closed

github-actions Bot mentioned this pull request Jun 24, 2026

Review upstream Zed v1.8.2 neozed-industries/neo-zed#46

Open

This was referenced Jul 1, 2026

Review upstream Zed v1.9.0 neozed-industries/neo-zed#47

Open

Review upstream Zed v1.10.0 neozed-industries/neo-zed#48

Open

This was referenced Jul 10, 2026

Review upstream Zed v1.10.2 neozed-industries/neo-zed#49

Open

Review upstream Zed v1.10.3 neozed-industries/neo-zed#50

Open

Navigation Menu

Uh oh!

Uh oh!

component_preview: Fix example rendering no text or icons - #59241

component_preview: Fix example rendering no text or icons#59241
ChristopherBiscardi merged 1 commit into
zed-industries:mainfrom
grishy:component-preview-example

grishy commented Jun 13, 2026

Uh oh!

ChristopherBiscardi left a comment

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

Uh oh!

Uh oh!

Conversation

grishy commented Jun 13, 2026

Solution

Testing

Self-Review Checklist:

Showcase

Uh oh!

ChristopherBiscardi left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants