From 722a8f4d9d0b569a060f0b50f6881f9eda01fdd6 Mon Sep 17 00:00:00 2001 From: Avi Fenesh Date: Mon, 26 Oct 2026 19:00:44 +0200 Subject: [PATCH 1/2] build(deps): bump gpui and gpui_platform to 347f171 together The two crates come from the same zed commit and must move together; the separate Dependabot PRs (#138, #139) each bumped one and failed to build. gpui renamed ScrollWheelEvent to ScrollEvent and on_scroll_wheel to on_scroll. The integration smoke now checks for the project name anywhere in the README's first line, which became an HTML heading in #157. --- Cargo.lock | 85 +++++++++++------------------------- scripts/integration_smoke.sh | 2 +- src/viewer.rs | 6 +-- 3 files changed, 30 insertions(+), 63 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 033c77e..3132efb 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -810,7 +810,7 @@ checksum = "f6140449f97a6e97f9511815c5632d84c8aacf8ac271ad77c559218161a1373c" dependencies = [ "bitflags 1.3.2", "block", - "cocoa-foundation 0.1.2", + "cocoa-foundation", "core-foundation 0.9.4", "core-graphics 0.23.2", "foreign-types", @@ -818,22 +818,6 @@ dependencies = [ "objc", ] -[[package]] -name = "cocoa" -version = "0.26.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f79398230a6e2c08f5c9760610eb6924b52aa9e7950a619602baba59dcbbdbb2" -dependencies = [ - "bitflags 2.13.2", - "block", - "cocoa-foundation 0.2.0", - "core-foundation 0.10.0", - "core-graphics 0.24.0", - "foreign-types", - "libc", - "objc", -] - [[package]] name = "cocoa-foundation" version = "0.1.2" @@ -848,20 +832,6 @@ dependencies = [ "objc", ] -[[package]] -name = "cocoa-foundation" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e14045fb83be07b5acf1c0884b2180461635b433455fa35d1cd6f17f1450679d" -dependencies = [ - "bitflags 2.13.2", - "block", - "core-foundation 0.10.0", - "core-graphics-types 0.2.0", - "libc", - "objc", -] - [[package]] name = "codespan-reporting" version = "0.13.1" @@ -876,7 +846,7 @@ dependencies = [ [[package]] name = "collections" version = "0.1.0" -source = "git+https://github.com/zed-industries/zed?branch=main#56934ec0560bce8929025497411de7f5322fb6ca" +source = "git+https://github.com/zed-industries/zed?branch=main#347f171a3fd00a3b672382d78348b37bd969d17c" dependencies = [ "gpui_util", "indexmap", @@ -1242,7 +1212,7 @@ dependencies = [ [[package]] name = "derive_refineable" version = "0.1.0" -source = "git+https://github.com/zed-industries/zed?branch=main#56934ec0560bce8929025497411de7f5322fb6ca" +source = "git+https://github.com/zed-industries/zed?branch=main#347f171a3fd00a3b672382d78348b37bd969d17c" dependencies = [ "proc-macro2", "quote", @@ -1906,7 +1876,7 @@ dependencies = [ [[package]] name = "gpui" version = "0.2.2" -source = "git+https://github.com/zed-industries/zed?branch=main#56934ec0560bce8929025497411de7f5322fb6ca" +source = "git+https://github.com/zed-industries/zed?branch=main#347f171a3fd00a3b672382d78348b37bd969d17c" dependencies = [ "accesskit", "anyhow", @@ -1970,7 +1940,7 @@ dependencies = [ [[package]] name = "gpui_apple" version = "0.1.0" -source = "git+https://github.com/zed-industries/zed?branch=main#56934ec0560bce8929025497411de7f5322fb6ca" +source = "git+https://github.com/zed-industries/zed?branch=main#347f171a3fd00a3b672382d78348b37bd969d17c" dependencies = [ "anyhow", "async-task", @@ -2011,7 +1981,7 @@ dependencies = [ [[package]] name = "gpui_ios" version = "0.1.0" -source = "git+https://github.com/zed-industries/zed?branch=main#56934ec0560bce8929025497411de7f5322fb6ca" +source = "git+https://github.com/zed-industries/zed?branch=main#347f171a3fd00a3b672382d78348b37bd969d17c" dependencies = [ "anyhow", "block2 0.6.2", @@ -2032,7 +2002,7 @@ dependencies = [ [[package]] name = "gpui_linux" version = "0.1.0" -source = "git+https://github.com/zed-industries/zed?branch=main#56934ec0560bce8929025497411de7f5322fb6ca" +source = "git+https://github.com/zed-industries/zed?branch=main#347f171a3fd00a3b672382d78348b37bd969d17c" dependencies = [ "accesskit", "accesskit_unix", @@ -2076,13 +2046,12 @@ dependencies = [ [[package]] name = "gpui_macos" version = "0.1.0" -source = "git+https://github.com/zed-industries/zed?branch=main#56934ec0560bce8929025497411de7f5322fb6ca" +source = "git+https://github.com/zed-industries/zed?branch=main#347f171a3fd00a3b672382d78348b37bd969d17c" dependencies = [ "accesskit", "accesskit_macos", "anyhow", "block2 0.6.2", - "cocoa 0.26.0", "collections", "core-foundation 0.10.0", "core-foundation-sys", @@ -2097,9 +2066,9 @@ dependencies = [ "image", "itertools", "log", - "objc", "objc2 0.6.4", "objc2-app-kit 0.3.2", + "objc2-core-graphics", "objc2-core-video", "objc2-foundation 0.3.2", "objc2-user-notifications", @@ -2115,7 +2084,7 @@ dependencies = [ [[package]] name = "gpui_macros" version = "0.1.0" -source = "git+https://github.com/zed-industries/zed?branch=main#56934ec0560bce8929025497411de7f5322fb6ca" +source = "git+https://github.com/zed-industries/zed?branch=main#347f171a3fd00a3b672382d78348b37bd969d17c" dependencies = [ "heck 0.5.0", "proc-macro2", @@ -2126,7 +2095,7 @@ dependencies = [ [[package]] name = "gpui_platform" version = "0.1.0" -source = "git+https://github.com/zed-industries/zed?branch=main#56934ec0560bce8929025497411de7f5322fb6ca" +source = "git+https://github.com/zed-industries/zed?branch=main#347f171a3fd00a3b672382d78348b37bd969d17c" dependencies = [ "anyhow", "console_error_panic_hook", @@ -2141,7 +2110,7 @@ dependencies = [ [[package]] name = "gpui_shared_string" version = "0.1.0" -source = "git+https://github.com/zed-industries/zed?branch=main#56934ec0560bce8929025497411de7f5322fb6ca" +source = "git+https://github.com/zed-industries/zed?branch=main#347f171a3fd00a3b672382d78348b37bd969d17c" dependencies = [ "schemars", "serde", @@ -2151,7 +2120,7 @@ dependencies = [ [[package]] name = "gpui_util" version = "0.1.0" -source = "git+https://github.com/zed-industries/zed?branch=main#56934ec0560bce8929025497411de7f5322fb6ca" +source = "git+https://github.com/zed-industries/zed?branch=main#347f171a3fd00a3b672382d78348b37bd969d17c" dependencies = [ "anyhow", "log", @@ -2161,7 +2130,7 @@ dependencies = [ [[package]] name = "gpui_web" version = "0.1.0" -source = "git+https://github.com/zed-industries/zed?branch=main#56934ec0560bce8929025497411de7f5322fb6ca" +source = "git+https://github.com/zed-industries/zed?branch=main#347f171a3fd00a3b672382d78348b37bd969d17c" dependencies = [ "anyhow", "async-channel", @@ -2189,7 +2158,7 @@ dependencies = [ [[package]] name = "gpui_wgpu" version = "0.1.0" -source = "git+https://github.com/zed-industries/zed?branch=main#56934ec0560bce8929025497411de7f5322fb6ca" +source = "git+https://github.com/zed-industries/zed?branch=main#347f171a3fd00a3b672382d78348b37bd969d17c" dependencies = [ "anyhow", "bytemuck", @@ -2215,7 +2184,7 @@ dependencies = [ [[package]] name = "gpui_windows" version = "0.1.0" -source = "git+https://github.com/zed-industries/zed?branch=main#56934ec0560bce8929025497411de7f5322fb6ca" +source = "git+https://github.com/zed-industries/zed?branch=main#347f171a3fd00a3b672382d78348b37bd969d17c" dependencies = [ "accesskit", "accesskit_windows", @@ -2385,7 +2354,7 @@ dependencies = [ [[package]] name = "http_client" version = "0.1.0" -source = "git+https://github.com/zed-industries/zed?branch=main#56934ec0560bce8929025497411de7f5322fb6ca" +source = "git+https://github.com/zed-industries/zed?branch=main#347f171a3fd00a3b672382d78348b37bd969d17c" dependencies = [ "anyhow", "bytes", @@ -3594,8 +3563,7 @@ checksum = "9f7c3e4beb33f85d45ae3e3a1792185706c8e16d043238c593331cc7cd313b50" [[package]] name = "oo7" version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "78f2bfed90f1618b4b48dcad9307f25e14ae894e2949642c87c351601d62cebd" +source = "git+https://github.com/zed-industries/oo7?rev=731c1215edb6905876c6137ab300428c7b8d7c13#731c1215edb6905876c6137ab300428c7b8d7c13" dependencies = [ "aes", "ashpd", @@ -4263,7 +4231,7 @@ dependencies = [ [[package]] name = "refineable" version = "0.1.0" -source = "git+https://github.com/zed-industries/zed?branch=main#56934ec0560bce8929025497411de7f5322fb6ca" +source = "git+https://github.com/zed-industries/zed?branch=main#347f171a3fd00a3b672382d78348b37bd969d17c" dependencies = [ "derive_refineable", ] @@ -4474,7 +4442,7 @@ dependencies = [ [[package]] name = "scheduler" version = "0.1.0" -source = "git+https://github.com/zed-industries/zed?branch=main#56934ec0560bce8929025497411de7f5322fb6ca" +source = "git+https://github.com/zed-industries/zed?branch=main#347f171a3fd00a3b672382d78348b37bd969d17c" dependencies = [ "async-task", "backtrace", @@ -4921,7 +4889,7 @@ checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292" [[package]] name = "sum_tree" version = "0.1.0" -source = "git+https://github.com/zed-industries/zed?branch=main#56934ec0560bce8929025497411de7f5322fb6ca" +source = "git+https://github.com/zed-industries/zed?branch=main#347f171a3fd00a3b672382d78348b37bd969d17c" dependencies = [ "heapless", "rayon", @@ -5014,11 +4982,10 @@ dependencies = [ [[package]] name = "taffy" -version = "0.13.0" +version = "0.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c034e05f6ee85a12daa63863c2245797715075c70649947aa0da54f3f2ab1d0f" +checksum = "3c8480887e8803986d96a7173729565520d4bbb721ad6b7ad6941a22897207aa" dependencies = [ - "arrayvec", "serde", "slotmap", "smallvec", @@ -6883,7 +6850,7 @@ version = "0.0.8-zed" source = "git+https://github.com/zed-industries/scap?rev=4afea48c3b002197176fb19cd0f9b180dd36eaac#4afea48c3b002197176fb19cd0f9b180dd36eaac" dependencies = [ "anyhow", - "cocoa 0.25.0", + "cocoa", "core-graphics-helmer-fork", "log", "objc", @@ -7020,7 +6987,7 @@ checksum = "b8848ee67ecc8aedbaf3e4122217aff892639231befc6a1b58d29fff4c2cabaa" [[package]] name = "ztracing" version = "0.1.0" -source = "git+https://github.com/zed-industries/zed?branch=main#56934ec0560bce8929025497411de7f5322fb6ca" +source = "git+https://github.com/zed-industries/zed?branch=main#347f171a3fd00a3b672382d78348b37bd969d17c" dependencies = [ "tracing", "ztracing_macro", @@ -7029,7 +6996,7 @@ dependencies = [ [[package]] name = "ztracing_macro" version = "0.1.0" -source = "git+https://github.com/zed-industries/zed?branch=main#56934ec0560bce8929025497411de7f5322fb6ca" +source = "git+https://github.com/zed-industries/zed?branch=main#347f171a3fd00a3b672382d78348b37bd969d17c" [[package]] name = "zune-core" diff --git a/scripts/integration_smoke.sh b/scripts/integration_smoke.sh index 9631f63..4fa3c6b 100755 --- a/scripts/integration_smoke.sh +++ b/scripts/integration_smoke.sh @@ -514,7 +514,7 @@ for _ in range(30): time.sleep(0.1) else: raise SystemExit(last)" > "$SMOKE_DIR/browser-probe.json" - assert_json '.succeeded == true and (.stdout.content | contains("# agent-workspace-linux"))' "$SMOKE_DIR/browser-probe.json" + assert_json '.succeeded == true and (.stdout.content | contains("agent-workspace-linux"))' "$SMOKE_DIR/browser-probe.json" run_awl workspace launch --id "$BROWSER_ID" --name browser-local-dev --wait-window --screenshot-window --window-timeout-ms 15000 -- "$BROWSER_BIN" "--user-data-dir=$SMOKE_DIR/browser-profile" --no-first-run --no-default-browser-check --new-window "$BROWSER_README_URL" > "$SMOKE_DIR/browser-launch.json" assert_json '.ok == true and (.screenshot.bytes > 0) and ((.windows | length) > 0) and .apps[0].running == true' "$SMOKE_DIR/browser-launch.json" BROWSER_APP_ID="$(jq -r '.apps[0].id' "$SMOKE_DIR/browser-launch.json")" diff --git a/src/viewer.rs b/src/viewer.rs index 748ab16..324fa30 100644 --- a/src/viewer.rs +++ b/src/viewer.rs @@ -11,7 +11,7 @@ use gpui::{ Bounds, ClickEvent, Context, CursorStyle, DevicePixels, Div, DivFrameState, Element, ElementId, FocusHandle, GlobalElementId, Hitbox, InspectorElementId, InteractiveElement, IntoElement, KeyDownEvent, LayoutId, MouseButton, MouseDownEvent, MouseMoveEvent, MouseUpEvent, ObjectFit, - ParentElement, Pixels, Point, Render, RenderImage, ResizeEdge, ScrollDelta, ScrollWheelEvent, + ParentElement, Pixels, Point, Render, RenderImage, ResizeEdge, ScrollDelta, ScrollEvent, SharedString, Size, Stateful, Styled, Task, Window, WindowBackgroundAppearance, WindowBounds, WindowKind, WindowOptions, }; @@ -1709,7 +1709,7 @@ impl AgentWorkspaceViewer { fn forward_scroll( &mut self, - event: &ScrollWheelEvent, + event: &ScrollEvent, _window: &mut Window, cx: &mut Context, ) { @@ -3338,7 +3338,7 @@ impl Render for AgentWorkspaceViewer { // make human handoff feel noisy/laggy. Clicks still move the // workspace pointer to the target point, and // drag gestures are replayed on release. - .on_scroll_wheel(cx.listener(Self::forward_scroll)) + .on_scroll(cx.listener(Self::forward_scroll)) .capture_key_down(cx.listener(Self::forward_key_down)) .child(match image { Some(image) => img(image) From b9858720314e8168d775bbe74ebc5c31c6f42ef6 Mon Sep 17 00:00:00 2001 From: Avi Fenesh Date: Mon, 26 Oct 2026 19:01:55 +0200 Subject: [PATCH 2/2] ci: group gpui and gpui_platform Dependabot updates --- .github/dependabot.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 11b9402..28863b0 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -4,6 +4,12 @@ updates: directory: / schedule: interval: weekly + groups: + # Both crates come from one zed commit and only build together. + gpui: + patterns: + - gpui + - gpui_platform - package-ecosystem: github-actions directory: / schedule: