Repository navigation
Agent: move gpui to Zed c7bea343 - #1571
Merged
Merged
Conversation
Moves gpui and gpui_platform from Zed cc053a4a (Aug 7) to c7bea343 (Nov 4), about 230 upstream commits to the gpui crates. The element, style, list and accessibility APIs Maple builds on are unchanged; the changes here are what the new revision requires. - Keystrokes name their host: parse_with_os, unparse(os) and display(os), through a new keymap::host_os(). Keystroke::parse now rejects the secondary- alias the shortcut catalog uses. - KeyBinding::load takes the app instead of a keyboard mapper, so build_binding and shortcuts::prepare take cx. On Windows, bindings now pass through the platform keyboard mapper. - window.blur(cx); on_scroll_wheel and ScrollWheelEvent became on_scroll and ScrollEvent; expect_restart reports arguments too. - gpui's stack growth under deep element trees is now the opt-in `stacker` feature; keep it on. uuid's v7 feature is now ours to enable. - gpui reports hover when content moves under a still pointer and drops it on a key press. A menu row keeps its highlight across a key press, and the sidebar test asserts hover is never stale instead of always clear. - gpui wraps text by the Unicode line breaking rules. Markdown tables measure unbreakable runs with the same icu_segmenter call instead of a copy of the old word-character table. Lockfile: 45 new registry versions, each published at least seven days ago (crates.io created_at, checked Nov 11), pinned to the versions in Zed's own lockfile where the two differed. New git sources, all chosen by Zed's workspace: gfx-rs/wgpu cddb2f5d (wgpu 30), zed-industries/oo7 731c1215 (was crates.io 0.6.0) and zed-industries/scap b5c86ec5. taffy moves from 0.12.2 to 0.15.0. Co-Authored-By: Claude <noreply@anthropic.com>
The pin no longer has to match gpui-libghostty; that experiment was dropped. Co-Authored-By: Claude <noreply@anthropic.com>
The newer gpui can paint how long each frame took to build and paint over the window. Turn its profiler on, as Zed does, and show that overlay in the main window when MAPLE_FRAME_STATS is set; `full` adds percentiles over the last 1000 frames. The performance check gains a step that uses it, so "smooth" can be a number. One new registry dependency, hdrhistogram 7.5.4, the version in Zed's lockfile, published well over seven days ago. Co-Authored-By: Claude <noreply@anthropic.com>
AnthonyRonning
force-pushed
the
codex-gpuibump-maple
branch
from
November 14, 2026 07:55
f34a561 to
666a3b3
Compare
AnthonyRonning
marked this pull request as ready for review
November 14, 2026 16:18
This was referenced Nov 14, 2026
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
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.
First of three PRs in the stack. It moves the dependency, makes the changes the new revision requires, and adds the one thing worth adopting from it right away: a frame-time counter for development. Matt's motion work and our rework of it are the two PRs above.
Why
Maple Work has built against Zed
cc053a4a(Aug 7), a pin chosen for an embedded-terminal experiment that has since been dropped. About 230 upstream commits to the gpui crates have landed since. This moves gpui and gpui_platform toc7bea343(Nov 4), which brings platform fixes we are missing and the animation and frame-pacing APIs the motion work wants. The APIs Maple builds on did not change: theElementtrait,Style,ListState, cached views and the accessibility API are the same.What changed
Keystroke::parse_with_os,unparse(os)anddisplay(os), through a newkeymap::host_os().Keystroke::parsenow takes a static string and rejects thesecondary-alias the shortcut catalog uses, so runtime sequences moved toparse_with_os.KeyBinding::loadtakes the app instead of a keyboard mapper, sobuild_bindingandshortcuts::preparetakecx, and the tests that call them became gpui tests.window.blur(cx);on_scroll_wheelandScrollWheelEventbecameon_scrollandScrollEvent;expect_restartreports arguments too;Modifiers::secondaryneeds the app, so Settings reads this build's host directly.stackerfeature, kept on here.uuid'sv7feature used to arrive through gpui's dependency graph and is now enabled by the app.icu_segmentersegmenter gpui does, so a column's minimum width matches where gpui will actually wrap.Frame counter
MAPLE_FRAME_STATS=1makes gpui draw how long each frame took to build and paint in a corner of the main window.MAPLE_FRAME_STATS=fulladds percentiles over the last 1000 frames. It only shows when the app is started with that variable, so no user sees it; it works in any build, so it can be read on a packaged build in a VM as well as a local one.The counter comes from gpui's
profilerfeature, which this turns on. Zed ships with it on. gpui paints it straight into the scene, so showing it asks for no extra frames.docs/performance-check.mdgains a step that uses it, so the streaming check can record a number instead of "Smooth".It is here because the motion work above turns single-frame state changes into runs of frames, each of which re-renders the chat view. This is how to see what that costs on each platform.
Behaviour changes to check
/instead of before it.Dependencies
Cargo.lock. Each was published at least seven days ago by crates.iocreated_at, checked on Nov 11. Where a freshly resolved version differed from Zed's own lockfile at this revision, the lockfile version was used:icu_*2.3.0, andbit-vec0.10.1 because 0.10.2 was a day old.ar_archive_writerstays at the 0.5.3 already locked because 0.5.5 was hours old.gfx-rs/wgpucddb2f5d(wgpu 30, the Linux renderer; was crates.io 29.0.4),zed-industries/oo7731c1215(was crates.io 0.6.0) andzed-industries/scapb5c86ec5(was4afea48c). These are outside the registry cooldown and were not source-reviewed beyond identifying the commits.hdrhistogram7.5.4 for the frame counter, the version in Zed's lockfile, published well over seven days ago.Validation
cargo test -p maple-agent-app --lockedwith-D warnings,just ci-lint(fmt, the git metadata tests and all four clippy lanes) and the repository pre-commit hook all passed. The pre-commit hook passed again with the frame counter.Rebase
Rebased onto master
b1ecb772on Nov 13. One conflict, indesktop.rs: master's Quit prompt and native dialog code and the frame counter were added at the same spot, and both are kept.Cargo.lockmerged without conflict; every package version in it is either on master or in the lockfile reviewed above, and the build passes with--locked.Not verified
just supply-chainstops locally at the SQLCipher regeneration step with a linker error against the Xcode 27.1 SDK, unrelated to this change. The dependency verifiers before that step pass, and the CI supply-chain lane passed.Not in this PR
🤖 Generated with Claude Code