From 6a68202ff79c402bcf8ca73e36ee71c8dbdee4e2 Mon Sep 17 00:00:00 2001
From: Aditya Sharma <adityaksharma@gmail.com>
Date: Wed, 15 Jul 2026 16:47:36 -0700
Subject: [PATCH 1/3] fix: update GPUI sidebar dependencies

---
 Cargo.lock                                    | 455 ++++++------------
 Cargo.toml                                    |   8 +-
 README.md                                     |   2 +-
 crates/app/src/ui/settings/settings_window.rs |   1 +
 rust-toolchain.toml                           |   4 +
 5 files changed, 161 insertions(+), 309 deletions(-)
 create mode 100644 rust-toolchain.toml

diff --git a/Cargo.lock b/Cargo.lock
index 9474a01..6afec06 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -4,9 +4,9 @@ version = 4
 
 [[package]]
 name = "accesskit"
-version = "0.24.0"
+version = "0.24.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5351dcebb14b579ccab05f288596b2ae097005be7ee50a7c3d4ca9d0d5a66f6a"
+checksum = "d3b7f7f85a7e5f68090000ed7622545829afd484d210358702ae4cb97dd0c320"
 dependencies = [
  "uuid",
 ]
@@ -27,9 +27,9 @@ dependencies = [
 
 [[package]]
 name = "accesskit_consumer"
-version = "0.35.0"
+version = "0.36.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "53cf47daed85312e763fbf85ceca136e0d7abc68e0a7e12abe11f48172bc3b10"
+checksum = "25e0d7e25d06f4dc21d1774d67146e9e80d6789216cbd4d1e88185b0095dba60"
 dependencies = [
  "accesskit",
  "hashbrown 0.16.1",
@@ -37,9 +37,9 @@ dependencies = [
 
 [[package]]
 name = "accesskit_consumer"
-version = "0.36.0"
+version = "0.37.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "25e0d7e25d06f4dc21d1774d67146e9e80d6789216cbd4d1e88185b0095dba60"
+checksum = "f950720ce064757a1b629caad3a408e8d2c63bb01f29b8a3ff8daa331053ffeb"
 dependencies = [
  "accesskit",
  "hashbrown 0.16.1",
@@ -79,12 +79,12 @@ dependencies = [
 
 [[package]]
 name = "accesskit_windows"
-version = "0.32.1"
+version = "0.33.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eff7009f1a532e917d66970a1e80c965140c6cfbbabbdde3d64e5431e6c78e21"
+checksum = "36e93ac7bf50b964f1cbb75f741629a4e950571baa1ef1274457ab5a80d9bcc2"
 dependencies = [
  "accesskit",
- "accesskit_consumer 0.35.0",
+ "accesskit_consumer 0.37.0",
  "hashbrown 0.16.1",
  "static_assertions",
  "windows 0.62.2",
@@ -445,19 +445,16 @@ dependencies = [
 
 [[package]]
 name = "ashpd"
-version = "0.12.2"
+version = "0.13.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "522dc9bec59923af17c43c5911cdabbacdb32ed4f955e83ecf592855618b20b5"
+checksum = "281e6645758940dee594495e28807a7672ce40f11ebf4df6c22c4fcd59e2689f"
 dependencies = [
- "async-fs",
- "async-net",
  "enumflags2",
  "futures-channel",
  "futures-util",
- "rand 0.9.2",
+ "getrandom 0.4.1",
  "serde",
  "serde_repr",
- "url",
  "wayland-backend",
  "wayland-client",
  "wayland-protocols",
@@ -909,30 +906,15 @@ dependencies = [
  "syn 2.0.117",
 ]
 
-[[package]]
-name = "bit-set"
-version = "0.8.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "08807e080ed7f9d5433fa9b275196cfc35414f66a0c79d864dc51a0d825231a3"
-dependencies = [
- "bit-vec 0.8.0",
-]
-
 [[package]]
 name = "bit-set"
 version = "0.9.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "34ddef2995421ab6a5c779542c81ee77c115206f4ad9d5a8e05f4ff49716a3dd"
 dependencies = [
- "bit-vec 0.9.1",
+ "bit-vec",
 ]
 
-[[package]]
-name = "bit-vec"
-version = "0.8.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5e764a1d40d510daf35e07be9eb06e75770908c27d411ee6c92109c9840eaaf7"
-
 [[package]]
 name = "bit-vec"
 version = "0.9.1"
@@ -1370,17 +1352,6 @@ dependencies = [
  "objc",
 ]
 
-[[package]]
-name = "codespan-reporting"
-version = "0.12.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fe6d2e5af09e8c8ad56c969f2157a3d4238cebc7c55f0a517728c38f7b200f81"
-dependencies = [
- "serde",
- "termcolor",
- "unicode-width",
-]
-
 [[package]]
 name = "codespan-reporting"
 version = "0.13.1"
@@ -1395,8 +1366,9 @@ dependencies = [
 [[package]]
 name = "collections"
 version = "0.1.0"
-source = "git+https://github.com/BumpyClock/gpui?rev=510dedc3b44fcf80c791ab17e59530ae66e80558#510dedc3b44fcf80c791ab17e59530ae66e80558"
+source = "git+https://github.com/BumpyClock/gpui?rev=4332ea7deae4838c12bad6ea64292ca22a33cf98#4332ea7deae4838c12bad6ea64292ca22a33cf98"
 dependencies = [
+ "gpui_util",
  "indexmap",
  "rustc-hash 2.1.1",
 ]
@@ -1799,7 +1771,7 @@ dependencies = [
  "wasm-bindgen",
  "wasm-bindgen-futures",
  "web-sys",
- "windows 0.62.2",
+ "windows 0.60.0",
 ]
 
 [[package]]
@@ -1876,7 +1848,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "78c8292055d1c1df0cce5d180393dc8cce0abec0a7102adb6c7b1eef6016d60a"
 dependencies = [
  "generic-array",
- "rand_core 0.6.4",
  "typenum",
 ]
 
@@ -2024,7 +1995,7 @@ dependencies = [
 [[package]]
 name = "derive_refineable"
 version = "0.1.0"
-source = "git+https://github.com/BumpyClock/gpui?rev=510dedc3b44fcf80c791ab17e59530ae66e80558#510dedc3b44fcf80c791ab17e59530ae66e80558"
+source = "git+https://github.com/BumpyClock/gpui?rev=4332ea7deae4838c12bad6ea64292ca22a33cf98#4332ea7deae4838c12bad6ea64292ca22a33cf98"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -2051,15 +2022,6 @@ dependencies = [
  "dirs-sys 0.3.7",
 ]
 
-[[package]]
-name = "dirs"
-version = "5.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "44c45a9d03d6676652bcb5e724c7e988de1acad23a711b5217ab9cbecbec2225"
-dependencies = [
- "dirs-sys 0.4.1",
-]
-
 [[package]]
 name = "dirs"
 version = "6.0.0"
@@ -2080,18 +2042,6 @@ dependencies = [
  "winapi",
 ]
 
-[[package]]
-name = "dirs-sys"
-version = "0.4.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "520f05a5cbd335fae5a99ff7a6ab8627577660ee5cfd6a94a6a929b52ff0321c"
-dependencies = [
- "libc",
- "option-ext",
- "redox_users 0.4.6",
- "windows-sys 0.48.0",
-]
-
 [[package]]
 name = "dirs-sys"
 version = "0.5.0"
@@ -2659,7 +2609,7 @@ version = "0.5.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bbc773e24e02d4ddd8395fd30dc147524273a83e54e0f312d986ea30de5f5646"
 dependencies = [
- "roxmltree",
+ "roxmltree 0.20.0",
 ]
 
 [[package]]
@@ -3025,16 +2975,6 @@ dependencies = [
  "wasip3",
 ]
 
-[[package]]
-name = "gif"
-version = "0.13.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4ae047235e33e2829703574b54fdec96bfbad892062d97fed2f76022287de61b"
-dependencies = [
- "color_quant",
- "weezl",
-]
-
 [[package]]
 name = "gif"
 version = "0.14.1"
@@ -3226,7 +3166,7 @@ dependencies = [
  "log",
  "presser",
  "thiserror 2.0.18",
- "windows 0.62.2",
+ "windows 0.60.0",
 ]
 
 [[package]]
@@ -3252,7 +3192,7 @@ dependencies = [
 [[package]]
 name = "gpui"
 version = "0.2.2"
-source = "git+https://github.com/BumpyClock/gpui?rev=510dedc3b44fcf80c791ab17e59530ae66e80558#510dedc3b44fcf80c791ab17e59530ae66e80558"
+source = "git+https://github.com/BumpyClock/gpui?rev=4332ea7deae4838c12bad6ea64292ca22a33cf98#4332ea7deae4838c12bad6ea64292ca22a33cf98"
 dependencies = [
  "accesskit",
  "anyhow",
@@ -3284,6 +3224,7 @@ dependencies = [
  "gpui_macros",
  "gpui_shared_string",
  "gpui_util",
+ "heapless",
  "http_client",
  "image",
  "inventory",
@@ -3293,7 +3234,6 @@ dependencies = [
  "mach2",
  "media",
  "metal",
- "naga 25.0.1",
  "num_cpus",
  "objc",
  "parking",
@@ -3317,7 +3257,7 @@ dependencies = [
  "smallvec",
  "spin 0.10.0",
  "stacksafe",
- "strum 0.27.2",
+ "strum",
  "sum_tree",
  "taffy",
  "thiserror 2.0.18",
@@ -3329,14 +3269,14 @@ dependencies = [
  "waker-fn",
  "web-time",
  "windows 0.61.3",
- "zed-font-kit 0.14.1-zed (git+https://github.com/zed-industries/font-kit?rev=94b0f28166665e8fd2f53ff6d268a14955c82269)",
+ "zed-font-kit",
  "zed-scap",
 ]
 
 [[package]]
 name = "gpui-component"
 version = "0.5.1"
-source = "git+https://github.com/BumpyClock/gpui-component?rev=bfcbd2036bc0ce4325a28710e513b5b77a7cf3c9#bfcbd2036bc0ce4325a28710e513b5b77a7cf3c9"
+source = "git+https://github.com/BumpyClock/gpui-component?rev=95e4b030ae9549e8583741b16121ff4ad2e1f942#95e4b030ae9549e8583741b16121ff4ad2e1f942"
 dependencies = [
  "aho-corasick",
  "anyhow",
@@ -3379,7 +3319,7 @@ dependencies = [
 [[package]]
 name = "gpui-component-assets"
 version = "0.5.1"
-source = "git+https://github.com/BumpyClock/gpui-component?rev=bfcbd2036bc0ce4325a28710e513b5b77a7cf3c9#bfcbd2036bc0ce4325a28710e513b5b77a7cf3c9"
+source = "git+https://github.com/BumpyClock/gpui-component?rev=95e4b030ae9549e8583741b16121ff4ad2e1f942#95e4b030ae9549e8583741b16121ff4ad2e1f942"
 dependencies = [
  "anyhow",
  "gpui",
@@ -3389,7 +3329,7 @@ dependencies = [
 [[package]]
 name = "gpui-component-macros"
 version = "0.5.1"
-source = "git+https://github.com/BumpyClock/gpui-component?rev=bfcbd2036bc0ce4325a28710e513b5b77a7cf3c9#bfcbd2036bc0ce4325a28710e513b5b77a7cf3c9"
+source = "git+https://github.com/BumpyClock/gpui-component?rev=95e4b030ae9549e8583741b16121ff4ad2e1f942#95e4b030ae9549e8583741b16121ff4ad2e1f942"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -3411,7 +3351,7 @@ dependencies = [
 [[package]]
 name = "gpui_linux"
 version = "0.1.0"
-source = "git+https://github.com/BumpyClock/gpui?rev=510dedc3b44fcf80c791ab17e59530ae66e80558#510dedc3b44fcf80c791ab17e59530ae66e80558"
+source = "git+https://github.com/BumpyClock/gpui?rev=4332ea7deae4838c12bad6ea64292ca22a33cf98#4332ea7deae4838c12bad6ea64292ca22a33cf98"
 dependencies = [
  "accesskit",
  "accesskit_unix",
@@ -3427,8 +3367,10 @@ dependencies = [
  "filedescriptor",
  "futures",
  "gpui",
+ "gpui_util",
  "gpui_wgpu",
  "http_client",
+ "image",
  "itertools 0.14.0",
  "libc",
  "log",
@@ -3436,13 +3378,14 @@ dependencies = [
  "open",
  "parking_lot",
  "pathfinder_geometry",
+ "pollster 0.4.0",
  "profiling",
  "raw-window-handle",
  "smallvec",
  "smol",
- "strum 0.27.2",
+ "strum",
  "swash",
- "util",
+ "url",
  "uuid",
  "wayland-backend",
  "wayland-client",
@@ -3454,7 +3397,7 @@ dependencies = [
  "x11-clipboard",
  "x11rb",
  "xkbcommon 0.8.0",
- "zed-font-kit 0.14.1-zed (git+https://github.com/zed-industries/font-kit?rev=110523127440aefb11ce0cf280ae7c5071337ec5)",
+ "zed-font-kit",
  "zed-scap",
  "zed-xim",
 ]
@@ -3462,7 +3405,7 @@ dependencies = [
 [[package]]
 name = "gpui_macos"
 version = "0.1.0"
-source = "git+https://github.com/BumpyClock/gpui?rev=510dedc3b44fcf80c791ab17e59530ae66e80558#510dedc3b44fcf80c791ab17e59530ae66e80558"
+source = "git+https://github.com/BumpyClock/gpui?rev=4332ea7deae4838c12bad6ea64292ca22a33cf98#4332ea7deae4838c12bad6ea64292ca22a33cf98"
 dependencies = [
  "accesskit",
  "accesskit_macos",
@@ -3484,6 +3427,7 @@ dependencies = [
  "foreign-types 0.5.0",
  "futures",
  "gpui",
+ "gpui_util",
  "image",
  "itertools 0.14.0",
  "libc",
@@ -3492,21 +3436,23 @@ dependencies = [
  "media",
  "metal",
  "objc",
+ "objc2 0.6.3",
+ "objc2-app-kit 0.3.2",
+ "objc2-foundation 0.3.2",
  "parking_lot",
  "pathfinder_geometry",
  "raw-window-handle",
  "semver",
  "smallvec",
- "strum 0.27.2",
- "util",
+ "strum",
  "uuid",
- "zed-font-kit 0.14.1-zed (git+https://github.com/zed-industries/font-kit?rev=110523127440aefb11ce0cf280ae7c5071337ec5)",
+ "zed-font-kit",
 ]
 
 [[package]]
 name = "gpui_macros"
 version = "0.1.0"
-source = "git+https://github.com/BumpyClock/gpui?rev=510dedc3b44fcf80c791ab17e59530ae66e80558#510dedc3b44fcf80c791ab17e59530ae66e80558"
+source = "git+https://github.com/BumpyClock/gpui?rev=4332ea7deae4838c12bad6ea64292ca22a33cf98#4332ea7deae4838c12bad6ea64292ca22a33cf98"
 dependencies = [
  "heck 0.5.0",
  "proc-macro2",
@@ -3517,7 +3463,7 @@ dependencies = [
 [[package]]
 name = "gpui_platform"
 version = "0.1.0"
-source = "git+https://github.com/BumpyClock/gpui?rev=510dedc3b44fcf80c791ab17e59530ae66e80558#510dedc3b44fcf80c791ab17e59530ae66e80558"
+source = "git+https://github.com/BumpyClock/gpui?rev=4332ea7deae4838c12bad6ea64292ca22a33cf98#4332ea7deae4838c12bad6ea64292ca22a33cf98"
 dependencies = [
  "console_error_panic_hook",
  "gpui",
@@ -3530,7 +3476,7 @@ dependencies = [
 [[package]]
 name = "gpui_shared_string"
 version = "0.1.0"
-source = "git+https://github.com/BumpyClock/gpui?rev=510dedc3b44fcf80c791ab17e59530ae66e80558#510dedc3b44fcf80c791ab17e59530ae66e80558"
+source = "git+https://github.com/BumpyClock/gpui?rev=4332ea7deae4838c12bad6ea64292ca22a33cf98#4332ea7deae4838c12bad6ea64292ca22a33cf98"
 dependencies = [
  "schemars",
  "serde",
@@ -3540,16 +3486,17 @@ dependencies = [
 [[package]]
 name = "gpui_util"
 version = "0.1.0"
-source = "git+https://github.com/BumpyClock/gpui?rev=510dedc3b44fcf80c791ab17e59530ae66e80558#510dedc3b44fcf80c791ab17e59530ae66e80558"
+source = "git+https://github.com/BumpyClock/gpui?rev=4332ea7deae4838c12bad6ea64292ca22a33cf98#4332ea7deae4838c12bad6ea64292ca22a33cf98"
 dependencies = [
  "anyhow",
  "log",
+ "which",
 ]
 
 [[package]]
 name = "gpui_web"
 version = "0.1.0"
-source = "git+https://github.com/BumpyClock/gpui?rev=510dedc3b44fcf80c791ab17e59530ae66e80558#510dedc3b44fcf80c791ab17e59530ae66e80558"
+source = "git+https://github.com/BumpyClock/gpui?rev=4332ea7deae4838c12bad6ea64292ca22a33cf98#4332ea7deae4838c12bad6ea64292ca22a33cf98"
 dependencies = [
  "anyhow",
  "console_error_panic_hook",
@@ -3573,7 +3520,7 @@ dependencies = [
 [[package]]
 name = "gpui_wgpu"
 version = "0.1.0"
-source = "git+https://github.com/BumpyClock/gpui?rev=510dedc3b44fcf80c791ab17e59530ae66e80558#510dedc3b44fcf80c791ab17e59530ae66e80558"
+source = "git+https://github.com/BumpyClock/gpui?rev=4332ea7deae4838c12bad6ea64292ca22a33cf98#4332ea7deae4838c12bad6ea64292ca22a33cf98"
 dependencies = [
  "anyhow",
  "bytemuck",
@@ -3596,20 +3543,23 @@ dependencies = [
  "wasm-bindgen-futures",
  "web-sys",
  "wgpu",
+ "zed-font-kit",
 ]
 
 [[package]]
 name = "gpui_windows"
 version = "0.1.0"
-source = "git+https://github.com/BumpyClock/gpui?rev=510dedc3b44fcf80c791ab17e59530ae66e80558#510dedc3b44fcf80c791ab17e59530ae66e80558"
+source = "git+https://github.com/BumpyClock/gpui?rev=4332ea7deae4838c12bad6ea64292ca22a33cf98#4332ea7deae4838c12bad6ea64292ca22a33cf98"
 dependencies = [
  "accesskit",
  "accesskit_windows",
  "anyhow",
  "collections",
+ "dunce",
  "etagere",
  "futures",
  "gpui",
+ "gpui_util",
  "image",
  "itertools 0.14.0",
  "log",
@@ -3617,7 +3567,6 @@ dependencies = [
  "rand 0.9.2",
  "raw-window-handle",
  "smallvec",
- "util",
  "uuid",
  "windows 0.61.3",
  "windows-core 0.61.2",
@@ -3924,7 +3873,7 @@ dependencies = [
 [[package]]
 name = "http_client"
 version = "0.1.0"
-source = "git+https://github.com/BumpyClock/gpui?rev=510dedc3b44fcf80c791ab17e59530ae66e80558#510dedc3b44fcf80c791ab17e59530ae66e80558"
+source = "git+https://github.com/BumpyClock/gpui?rev=4332ea7deae4838c12bad6ea64292ca22a33cf98#4332ea7deae4838c12bad6ea64292ca22a33cf98"
 dependencies = [
  "anyhow",
  "async-compression",
@@ -4201,7 +4150,7 @@ dependencies = [
  "byteorder-lite",
  "color_quant",
  "exr",
- "gif 0.14.1",
+ "gif",
  "image-webp",
  "moxcms",
  "num-traits",
@@ -4227,9 +4176,9 @@ dependencies = [
 
 [[package]]
 name = "imagesize"
-version = "0.13.0"
+version = "0.14.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "edcd27d72f2f071c64249075f42e205ff93c9a4c5f6c6da53e79ed9f9832c285"
+checksum = "09e54e57b4c48b40f7aec75635392b12b3421fa26fe8b4332e63138ed278459c"
 
 [[package]]
 name = "imgref"
@@ -4532,12 +4481,13 @@ dependencies = [
 
 [[package]]
 name = "kurbo"
-version = "0.11.3"
+version = "0.13.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c62026ae44756f8a599ba21140f350303d4f08dcdcc71b5ad9c9bb8128c13c62"
+checksum = "4b60dfc32f652b926df6192e55525b16d186c69d47876c3ead4da5cc9f8450e2"
 dependencies = [
  "arrayvec",
  "euclid",
+ "polycool",
  "smallvec",
 ]
 
@@ -4555,9 +4505,6 @@ name = "lazy_static"
 version = "1.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe"
-dependencies = [
- "spin 0.9.8",
-]
 
 [[package]]
 name = "leak"
@@ -4943,7 +4890,7 @@ dependencies = [
 [[package]]
 name = "media"
 version = "0.1.0"
-source = "git+https://github.com/BumpyClock/gpui?rev=510dedc3b44fcf80c791ab17e59530ae66e80558#510dedc3b44fcf80c791ab17e59530ae66e80558"
+source = "git+https://github.com/BumpyClock/gpui?rev=4332ea7deae4838c12bad6ea64292ca22a33cf98#4332ea7deae4838c12bad6ea64292ca22a33cf98"
 dependencies = [
  "anyhow",
  "bindgen 0.71.1",
@@ -5082,39 +5029,16 @@ dependencies = [
 
 [[package]]
 name = "naga"
-version = "25.0.1"
+version = "29.0.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2b977c445f26e49757f9aca3631c3b8b836942cb278d69a92e7b80d3b24da632"
-dependencies = [
- "arrayvec",
- "bit-set 0.8.0",
- "bitflags 2.11.0",
- "cfg_aliases",
- "codespan-reporting 0.12.0",
- "half",
- "hashbrown 0.15.5",
- "hexf-parse",
- "indexmap",
- "log",
- "num-traits",
- "once_cell",
- "rustc-hash 1.1.0",
- "strum 0.26.3",
- "thiserror 2.0.18",
- "unicode-ident",
-]
-
-[[package]]
-name = "naga"
-version = "29.0.3"
-source = "git+https://github.com/zed-industries/wgpu.git?rev=357a0c56e0070480ad9daea5d2eaa83150b79e88#357a0c56e0070480ad9daea5d2eaa83150b79e88"
+checksum = "b2bf919621e7975acb27d881bae2fb993e0d45c8e0446e85e6272971e00dc8df"
 dependencies = [
  "arrayvec",
- "bit-set 0.9.1",
+ "bit-set",
  "bitflags 2.11.0",
  "cfg-if",
  "cfg_aliases",
- "codespan-reporting 0.13.1",
+ "codespan-reporting",
  "half",
  "hashbrown 0.16.1",
  "hexf-parse",
@@ -5355,16 +5279,16 @@ dependencies = [
 
 [[package]]
 name = "num-bigint-dig"
-version = "0.8.6"
+version = "0.9.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e661dda6640fad38e827a6d4a310ff4763082116fe217f279885c97f511bb0b7"
+checksum = "a7f9a86e097b0d187ad0e65667c2f58b9254671e86e7dbb78036b16692eae099"
 dependencies = [
- "lazy_static",
  "libm",
  "num-integer",
  "num-iter",
  "num-traits",
- "rand 0.8.5",
+ "once_cell",
+ "rand 0.9.2",
  "serde",
  "smallvec",
  "zeroize",
@@ -5472,7 +5396,7 @@ version = "0.7.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ff32365de1b6743cb203b710788263c44a03de03802daf96092f2da4fe6ba4d7"
 dependencies = [
- "proc-macro-crate 3.4.0",
+ "proc-macro-crate 1.3.1",
  "proc-macro2",
  "quote",
  "syn 2.0.117",
@@ -5806,9 +5730,9 @@ dependencies = [
 
 [[package]]
 name = "oo7"
-version = "0.5.0"
+version = "0.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e3299dd401feaf1d45afd8fd1c0586f10fcfb22f244bb9afa942cec73503b89d"
+checksum = "78f2bfed90f1618b4b48dcad9307f25e14ae894e2949642c87c351601d62cebd"
 dependencies = [
  "aes",
  "ashpd",
@@ -5822,15 +5746,15 @@ dependencies = [
  "endi",
  "futures-lite 2.6.1",
  "futures-util",
- "getrandom 0.3.4",
+ "getrandom 0.4.1",
  "hkdf",
  "hmac",
  "md-5",
  "num",
  "num-bigint-dig",
  "pbkdf2",
- "rand 0.9.2",
  "serde",
+ "serde_bytes",
  "sha2",
  "subtle",
  "zbus",
@@ -6078,7 +6002,7 @@ checksum = "9b4f627cb1b25917193a259e49bdad08f671f8d9708acfd5fe0a8c1455d87220"
 [[package]]
 name = "perf"
 version = "0.1.0"
-source = "git+https://github.com/BumpyClock/gpui?rev=510dedc3b44fcf80c791ab17e59530ae66e80558#510dedc3b44fcf80c791ab17e59530ae66e80558"
+source = "git+https://github.com/BumpyClock/gpui?rev=4332ea7deae4838c12bad6ea64292ca22a33cf98#4332ea7deae4838c12bad6ea64292ca22a33cf98"
 dependencies = [
  "collections",
  "serde",
@@ -6273,6 +6197,15 @@ version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2f3a9f18d041e6d0e102a0a46750538147e5e8992d3b4873aaafee2520b00ce3"
 
+[[package]]
+name = "polycool"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "50596ddc09eb5ad5f75cacd40209568e66df71baf86e1499a0e99c4cff12a5a6"
+dependencies = [
+ "arrayvec",
+]
+
 [[package]]
 name = "portable-atomic"
 version = "1.13.1"
@@ -6823,7 +6756,7 @@ dependencies = [
 [[package]]
 name = "refineable"
 version = "0.1.0"
-source = "git+https://github.com/BumpyClock/gpui?rev=510dedc3b44fcf80c791ab17e59530ae66e80558#510dedc3b44fcf80c791ab17e59530ae66e80558"
+source = "git+https://github.com/BumpyClock/gpui?rev=4332ea7deae4838c12bad6ea64292ca22a33cf98#4332ea7deae4838c12bad6ea64292ca22a33cf98"
 dependencies = [
  "derive_refineable",
 ]
@@ -6908,11 +6841,11 @@ dependencies = [
 
 [[package]]
 name = "resvg"
-version = "0.45.1"
+version = "0.46.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a8928798c0a55e03c9ca6c4c6846f76377427d2c1e1f7e6de3c06ae57942df43"
+checksum = "b563218631706d614e23059436526d005b50ab5f2d506b55a17eb65c5eb83419"
 dependencies = [
- "gif 0.13.3",
+ "gif",
  "image-webp",
  "log",
  "pico-args",
@@ -6920,7 +6853,7 @@ dependencies = [
  "svgtypes",
  "tiny-skia",
  "usvg",
- "zune-jpeg 0.4.21",
+ "zune-jpeg 0.5.12",
 ]
 
 [[package]]
@@ -6978,6 +6911,15 @@ version = "0.20.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6c20b6793b5c2fa6553b250154b78d6d0db37e72700ae35fad9387a46f487c97"
 
+[[package]]
+name = "roxmltree"
+version = "0.21.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f1964b10c76125c36f8afe190065a4bf9a87bf324842c05701330bba9f1cacbb"
+dependencies = [
+ "memchr",
+]
+
 [[package]]
 name = "rsqlite-vfs"
 version = "0.1.0"
@@ -7260,7 +7202,7 @@ dependencies = [
 [[package]]
 name = "scheduler"
 version = "0.1.0"
-source = "git+https://github.com/BumpyClock/gpui?rev=510dedc3b44fcf80c791ab17e59530ae66e80558#510dedc3b44fcf80c791ab17e59530ae66e80558"
+source = "git+https://github.com/BumpyClock/gpui?rev=4332ea7deae4838c12bad6ea64292ca22a33cf98#4332ea7deae4838c12bad6ea64292ca22a33cf98"
 dependencies = [
  "async-task",
  "backtrace",
@@ -7387,6 +7329,16 @@ dependencies = [
  "serde_derive",
 ]
 
+[[package]]
+name = "serde_bytes"
+version = "0.11.19"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a5d440709e79d88e51ac01c4b72fc6cb7314017bb7da9eeff678aa94c10e3ea8"
+dependencies = [
+ "serde",
+ "serde_core",
+]
+
 [[package]]
 name = "serde_core"
 version = "1.0.228"
@@ -7833,35 +7785,13 @@ version = "0.11.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f"
 
-[[package]]
-name = "strum"
-version = "0.26.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8fec0f0aef304996cf250b31b5a10dee7980c85da9d759361292b8bca5a18f06"
-dependencies = [
- "strum_macros 0.26.4",
-]
-
 [[package]]
 name = "strum"
 version = "0.27.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "af23d6f6c1a224baef9d3f61e287d2761385a5b88fdab4eb4c6f11aeb54c4bcf"
 dependencies = [
- "strum_macros 0.27.2",
-]
-
-[[package]]
-name = "strum_macros"
-version = "0.26.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4c6bee85a5a24955dc440386795aa378cd9cf82acd5f764469152d2270e581be"
-dependencies = [
- "heck 0.5.0",
- "proc-macro2",
- "quote",
- "rustversion",
- "syn 2.0.117",
+ "strum_macros",
 ]
 
 [[package]]
@@ -7885,7 +7815,7 @@ checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292"
 [[package]]
 name = "sum_tree"
 version = "0.1.0"
-source = "git+https://github.com/BumpyClock/gpui?rev=510dedc3b44fcf80c791ab17e59530ae66e80558#510dedc3b44fcf80c791ab17e59530ae66e80558"
+source = "git+https://github.com/BumpyClock/gpui?rev=4332ea7deae4838c12bad6ea64292ca22a33cf98#4332ea7deae4838c12bad6ea64292ca22a33cf98"
 dependencies = [
  "heapless",
  "log",
@@ -7980,9 +7910,9 @@ checksum = "0193cc4331cfd2f3d2011ef287590868599a2f33c3e69bc22c1a3d3acf9e02fb"
 
 [[package]]
 name = "svgtypes"
-version = "0.15.3"
+version = "0.16.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "68c7541fff44b35860c1a7a47a7cadf3e4a304c457b58f9870d9706ece028afc"
+checksum = "695b5790b3131dafa99b3bbfd25a216edb3d216dad9ca208d4657bfb8f2abc3d"
 dependencies = [
  "kurbo",
  "siphasher",
@@ -8931,14 +8861,13 @@ dependencies = [
  "idna",
  "percent-encoding",
  "serde",
- "serde_derive",
 ]
 
 [[package]]
 name = "usvg"
-version = "0.45.1"
+version = "0.46.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "80be9b06fbae3b8b303400ab20778c80bbaf338f563afe567cf3c9eea17b47ef"
+checksum = "e419dff010bb12512b0ae9e3d2f318dfbdf0167fde7eb05465134d4e8756076f"
 dependencies = [
  "base64 0.22.1",
  "data-url",
@@ -8948,7 +8877,7 @@ dependencies = [
  "kurbo",
  "log",
  "pico-args",
- "roxmltree",
+ "roxmltree 0.21.1",
  "rustybuzz",
  "simplecss",
  "siphasher",
@@ -8982,7 +8911,7 @@ checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821"
 [[package]]
 name = "util"
 version = "0.1.0"
-source = "git+https://github.com/BumpyClock/gpui?rev=510dedc3b44fcf80c791ab17e59530ae66e80558#510dedc3b44fcf80c791ab17e59530ae66e80558"
+source = "git+https://github.com/BumpyClock/gpui?rev=4332ea7deae4838c12bad6ea64292ca22a33cf98#4332ea7deae4838c12bad6ea64292ca22a33cf98"
 dependencies = [
  "anyhow",
  "async-fs",
@@ -9021,7 +8950,7 @@ dependencies = [
 [[package]]
 name = "util_macros"
 version = "0.1.0"
-source = "git+https://github.com/BumpyClock/gpui?rev=510dedc3b44fcf80c791ab17e59530ae66e80558#510dedc3b44fcf80c791ab17e59530ae66e80558"
+source = "git+https://github.com/BumpyClock/gpui?rev=4332ea7deae4838c12bad6ea64292ca22a33cf98#4332ea7deae4838c12bad6ea64292ca22a33cf98"
 dependencies = [
  "perf",
  "quote",
@@ -9450,8 +9379,9 @@ checksum = "a28ac98ddc8b9274cb41bb4d9d4d5c425b6020c50c46f25559911905610b4a88"
 
 [[package]]
 name = "wgpu"
-version = "29.0.3"
-source = "git+https://github.com/zed-industries/wgpu.git?rev=357a0c56e0070480ad9daea5d2eaa83150b79e88#357a0c56e0070480ad9daea5d2eaa83150b79e88"
+version = "29.0.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "76e8840e1ba2881d4cbb18d2147627a56af426ff064c0401eb0c8410c6325d07"
 dependencies = [
  "arrayvec",
  "bitflags 2.11.0",
@@ -9462,7 +9392,7 @@ dependencies = [
  "hashbrown 0.16.1",
  "js-sys",
  "log",
- "naga 29.0.3",
+ "naga",
  "parking_lot",
  "portable-atomic",
  "profiling",
@@ -9479,12 +9409,13 @@ dependencies = [
 
 [[package]]
 name = "wgpu-core"
-version = "29.0.3"
-source = "git+https://github.com/zed-industries/wgpu.git?rev=357a0c56e0070480ad9daea5d2eaa83150b79e88#357a0c56e0070480ad9daea5d2eaa83150b79e88"
+version = "29.0.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2f519832254e56965a9940c4af57dcb75f702b6f6fa4a0b172f685395843a4d7"
 dependencies = [
  "arrayvec",
- "bit-set 0.9.1",
- "bit-vec 0.9.1",
+ "bit-set",
+ "bit-vec",
  "bitflags 2.11.0",
  "bytemuck",
  "cfg_aliases",
@@ -9492,7 +9423,7 @@ dependencies = [
  "hashbrown 0.16.1",
  "indexmap",
  "log",
- "naga 29.0.3",
+ "naga",
  "once_cell",
  "parking_lot",
  "portable-atomic",
@@ -9511,37 +9442,41 @@ dependencies = [
 
 [[package]]
 name = "wgpu-core-deps-apple"
-version = "29.0.3"
-source = "git+https://github.com/zed-industries/wgpu.git?rev=357a0c56e0070480ad9daea5d2eaa83150b79e88#357a0c56e0070480ad9daea5d2eaa83150b79e88"
+version = "29.0.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f5e39e26c4c0e07589e67d18546cf79ff45383659fc72fca4dd293358a0347f3"
 dependencies = [
  "wgpu-hal",
 ]
 
 [[package]]
 name = "wgpu-core-deps-emscripten"
-version = "29.0.3"
-source = "git+https://github.com/zed-industries/wgpu.git?rev=357a0c56e0070480ad9daea5d2eaa83150b79e88#357a0c56e0070480ad9daea5d2eaa83150b79e88"
+version = "29.0.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "01e09be551dc939498bdd5f6b2c66e55ab275dad25825267a08605a80fc9f0af"
 dependencies = [
  "wgpu-hal",
 ]
 
 [[package]]
 name = "wgpu-core-deps-windows-linux-android"
-version = "29.0.3"
-source = "git+https://github.com/zed-industries/wgpu.git?rev=357a0c56e0070480ad9daea5d2eaa83150b79e88#357a0c56e0070480ad9daea5d2eaa83150b79e88"
+version = "29.0.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4e592c1bbef6ad047647ae6e666ebd8cee7a32bb4544d9700ec96cbf73230257"
 dependencies = [
  "wgpu-hal",
 ]
 
 [[package]]
 name = "wgpu-hal"
-version = "29.0.3"
-source = "git+https://github.com/zed-industries/wgpu.git?rev=357a0c56e0070480ad9daea5d2eaa83150b79e88#357a0c56e0070480ad9daea5d2eaa83150b79e88"
+version = "29.0.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "97ace1c17727311c22a46e4e3faf56ea6de81af99dcc839bdfb54857b94d448d"
 dependencies = [
  "android_system_properties",
  "arrayvec",
  "ash",
- "bit-set 0.9.1",
+ "bit-set",
  "bitflags 2.11.0",
  "block2 0.6.2",
  "bytemuck",
@@ -9557,7 +9492,7 @@ dependencies = [
  "libc",
  "libloading 0.8.9",
  "log",
- "naga 29.0.3",
+ "naga",
  "ndk-sys",
  "objc2 0.6.3",
  "objc2-core-foundation",
@@ -9588,17 +9523,19 @@ dependencies = [
 
 [[package]]
 name = "wgpu-naga-bridge"
-version = "29.0.3"
-source = "git+https://github.com/zed-industries/wgpu.git?rev=357a0c56e0070480ad9daea5d2eaa83150b79e88#357a0c56e0070480ad9daea5d2eaa83150b79e88"
+version = "29.0.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "95226013f547544b223281cd16a4fb549aa9dcb562adbda0faae4c73ffbbc161"
 dependencies = [
- "naga 29.0.3",
+ "naga",
  "wgpu-types",
 ]
 
 [[package]]
 name = "wgpu-types"
-version = "29.0.3"
-source = "git+https://github.com/zed-industries/wgpu.git?rev=357a0c56e0070480ad9daea5d2eaa83150b79e88#357a0c56e0070480ad9daea5d2eaa83150b79e88"
+version = "29.0.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "84bf84cd9ca8ca45e2b223a3868f1adf9bfc0c66aeac212e76ee7e40fdadf8f5"
 dependencies = [
  "bitflags 2.11.0",
  "bytemuck",
@@ -10014,15 +9951,6 @@ dependencies = [
  "windows-targets 0.42.2",
 ]
 
-[[package]]
-name = "windows-sys"
-version = "0.48.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9"
-dependencies = [
- "windows-targets 0.48.5",
-]
-
 [[package]]
 name = "windows-sys"
 version = "0.52.0"
@@ -10074,21 +10002,6 @@ dependencies = [
  "windows_x86_64_msvc 0.42.2",
 ]
 
-[[package]]
-name = "windows-targets"
-version = "0.48.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c"
-dependencies = [
- "windows_aarch64_gnullvm 0.48.5",
- "windows_aarch64_msvc 0.48.5",
- "windows_i686_gnu 0.48.5",
- "windows_i686_msvc 0.48.5",
- "windows_x86_64_gnu 0.48.5",
- "windows_x86_64_gnullvm 0.48.5",
- "windows_x86_64_msvc 0.48.5",
-]
-
 [[package]]
 name = "windows-targets"
 version = "0.52.6"
@@ -10146,12 +10059,6 @@ version = "0.42.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8"
 
-[[package]]
-name = "windows_aarch64_gnullvm"
-version = "0.48.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8"
-
 [[package]]
 name = "windows_aarch64_gnullvm"
 version = "0.52.6"
@@ -10170,12 +10077,6 @@ version = "0.42.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43"
 
-[[package]]
-name = "windows_aarch64_msvc"
-version = "0.48.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc"
-
 [[package]]
 name = "windows_aarch64_msvc"
 version = "0.52.6"
@@ -10194,12 +10095,6 @@ version = "0.42.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f"
 
-[[package]]
-name = "windows_i686_gnu"
-version = "0.48.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e"
-
 [[package]]
 name = "windows_i686_gnu"
 version = "0.52.6"
@@ -10230,12 +10125,6 @@ version = "0.42.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060"
 
-[[package]]
-name = "windows_i686_msvc"
-version = "0.48.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406"
-
 [[package]]
 name = "windows_i686_msvc"
 version = "0.52.6"
@@ -10254,12 +10143,6 @@ version = "0.42.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36"
 
-[[package]]
-name = "windows_x86_64_gnu"
-version = "0.48.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e"
-
 [[package]]
 name = "windows_x86_64_gnu"
 version = "0.52.6"
@@ -10278,12 +10161,6 @@ version = "0.42.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3"
 
-[[package]]
-name = "windows_x86_64_gnullvm"
-version = "0.48.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc"
-
 [[package]]
 name = "windows_x86_64_gnullvm"
 version = "0.52.6"
@@ -10302,12 +10179,6 @@ version = "0.42.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0"
 
-[[package]]
-name = "windows_x86_64_msvc"
-version = "0.48.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538"
-
 [[package]]
 name = "windows_x86_64_msvc"
 version = "0.52.6"
@@ -10759,30 +10630,6 @@ dependencies = [
  "zvariant",
 ]
 
-[[package]]
-name = "zed-font-kit"
-version = "0.14.1-zed"
-source = "git+https://github.com/zed-industries/font-kit?rev=110523127440aefb11ce0cf280ae7c5071337ec5#110523127440aefb11ce0cf280ae7c5071337ec5"
-dependencies = [
- "bitflags 2.11.0",
- "byteorder",
- "core-foundation 0.10.0",
- "core-graphics 0.24.0",
- "core-text",
- "dirs 5.0.1",
- "dwrote",
- "float-ord",
- "freetype-sys",
- "lazy_static",
- "libc",
- "log",
- "pathfinder_geometry",
- "pathfinder_simd",
- "walkdir",
- "winapi",
- "yeslogic-fontconfig-sys",
-]
-
 [[package]]
 name = "zed-font-kit"
 version = "0.14.1-zed"
@@ -10956,7 +10803,7 @@ dependencies = [
 [[package]]
 name = "zlog"
 version = "0.1.0"
-source = "git+https://github.com/BumpyClock/gpui?rev=510dedc3b44fcf80c791ab17e59530ae66e80558#510dedc3b44fcf80c791ab17e59530ae66e80558"
+source = "git+https://github.com/BumpyClock/gpui?rev=4332ea7deae4838c12bad6ea64292ca22a33cf98#4332ea7deae4838c12bad6ea64292ca22a33cf98"
 dependencies = [
  "anyhow",
  "chrono",
@@ -10973,7 +10820,7 @@ checksum = "b8848ee67ecc8aedbaf3e4122217aff892639231befc6a1b58d29fff4c2cabaa"
 [[package]]
 name = "ztracing"
 version = "0.1.0"
-source = "git+https://github.com/BumpyClock/gpui?rev=510dedc3b44fcf80c791ab17e59530ae66e80558#510dedc3b44fcf80c791ab17e59530ae66e80558"
+source = "git+https://github.com/BumpyClock/gpui?rev=4332ea7deae4838c12bad6ea64292ca22a33cf98#4332ea7deae4838c12bad6ea64292ca22a33cf98"
 dependencies = [
  "tracing",
  "tracing-subscriber",
@@ -10984,7 +10831,7 @@ dependencies = [
 [[package]]
 name = "ztracing_macro"
 version = "0.1.0"
-source = "git+https://github.com/BumpyClock/gpui?rev=510dedc3b44fcf80c791ab17e59530ae66e80558#510dedc3b44fcf80c791ab17e59530ae66e80558"
+source = "git+https://github.com/BumpyClock/gpui?rev=4332ea7deae4838c12bad6ea64292ca22a33cf98#4332ea7deae4838c12bad6ea64292ca22a33cf98"
 
 [[package]]
 name = "zune-core"
@@ -11034,7 +10881,7 @@ dependencies = [
  "endi",
  "enumflags2",
  "serde",
- "url",
+ "serde_bytes",
  "winnow 1.0.3",
  "zvariant_derive",
  "zvariant_utils",
diff --git a/Cargo.toml b/Cargo.toml
index 463345b..9ac483f 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -40,14 +40,14 @@ sha2 = "0.10"
 arc-swap = "1"
 
 # GPUI and UI dependencies
-gpui = { git = "https://github.com/BumpyClock/gpui", rev = "510dedc3b44fcf80c791ab17e59530ae66e80558", features = [
+gpui = { git = "https://github.com/BumpyClock/gpui", rev = "4332ea7deae4838c12bad6ea64292ca22a33cf98", features = [
   "font-kit",
 ] }
-gpui_platform = { git = "https://github.com/BumpyClock/gpui", rev = "510dedc3b44fcf80c791ab17e59530ae66e80558", features = [
+gpui_platform = { git = "https://github.com/BumpyClock/gpui", rev = "4332ea7deae4838c12bad6ea64292ca22a33cf98", features = [
   "font-kit",
 ] }
-gpui-component = { git = "https://github.com/BumpyClock/gpui-component", rev = "bfcbd2036bc0ce4325a28710e513b5b77a7cf3c9" }
-gpui-component-assets = { git = "https://github.com/BumpyClock/gpui-component", rev = "bfcbd2036bc0ce4325a28710e513b5b77a7cf3c9" }
+gpui-component = { git = "https://github.com/BumpyClock/gpui-component", rev = "95e4b030ae9549e8583741b16121ff4ad2e1f942" }
+gpui-component-assets = { git = "https://github.com/BumpyClock/gpui-component", rev = "95e4b030ae9549e8583741b16121ff4ad2e1f942" }
 
 # Directory and path utilities
 dirs = "6.0.0"
diff --git a/README.md b/README.md
index 4eb1e30..d2669f7 100644
--- a/README.md
+++ b/README.md
@@ -13,7 +13,7 @@ This is a Rust workspace. Crates (see `[workspace].members` in `Cargo.toml` for
 
 ## Prerequisites
 
-- Rust 1.75+ with edition 2024 support
+- Rust 1.95 (installed automatically by `rustup` from `rust-toolchain.toml`)
 - `cmake` available on `PATH` for native speech/model dependencies
 - macOS: Xcode Command Line Tools
 - Linux: `libxcb`, `libxkbcommon`, `libwayland-client`, `libvulkan` development packages
diff --git a/crates/app/src/ui/settings/settings_window.rs b/crates/app/src/ui/settings/settings_window.rs
index c66265c..eb49148 100644
--- a/crates/app/src/ui/settings/settings_window.rs
+++ b/crates/app/src/ui/settings/settings_window.rs
@@ -317,6 +317,7 @@ impl Render for SettingsWindow {
                         .sidebar_title("Ansible")
                         .safe_area_top(TITLE_BAR_HEIGHT)
                         .sidebar_width(px(250.0))
+                        .sidebar_shell_inset(px(16.0))
                         .when(can_undo, |settings| {
                             settings.page_header_action({
                                 let weak_self = cx.weak_entity();
diff --git a/rust-toolchain.toml b/rust-toolchain.toml
new file mode 100644
index 0000000..12dd525
--- /dev/null
+++ b/rust-toolchain.toml
@@ -0,0 +1,4 @@
+[toolchain]
+channel = "1.95.0"
+profile = "minimal"
+components = ["rustfmt", "clippy"]

From 3182f523afaabfd4ee6b7218c0e7bc92ec143b80 Mon Sep 17 00:00:00 2001
From: Aditya Sharma <adityaksharma@gmail.com>
Date: Wed, 15 Jul 2026 16:52:10 -0700
Subject: [PATCH 2/3] fix: restore default sidebar inset

---
 crates/app/src/ui/settings/settings_window.rs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/crates/app/src/ui/settings/settings_window.rs b/crates/app/src/ui/settings/settings_window.rs
index eb49148..c66265c 100644
--- a/crates/app/src/ui/settings/settings_window.rs
+++ b/crates/app/src/ui/settings/settings_window.rs
@@ -317,7 +317,6 @@ impl Render for SettingsWindow {
                         .sidebar_title("Ansible")
                         .safe_area_top(TITLE_BAR_HEIGHT)
                         .sidebar_width(px(250.0))
-                        .sidebar_shell_inset(px(16.0))
                         .when(can_undo, |settings| {
                             settings.page_header_action({
                                 let weak_self = cx.weak_entity();

From 61d6fcda192a1c7b2fda70e20a97071e32d4fa3c Mon Sep 17 00:00:00 2001
From: Aditya Sharma <adityaksharma@gmail.com>
Date: Thu, 16 Jul 2026 12:27:42 -0700
Subject: [PATCH 3/3] fix: satisfy Rust 1.95 checks

---
 crates/app/src/ui/settings/state.rs            | 2 +-
 crates/core/src/transcription/model/catalog.rs | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/crates/app/src/ui/settings/state.rs b/crates/app/src/ui/settings/state.rs
index bb664e7..09ab065 100644
--- a/crates/app/src/ui/settings/state.rs
+++ b/crates/app/src/ui/settings/state.rs
@@ -5,8 +5,8 @@ use std::collections::{HashMap, VecDeque};
 use ansible_core::sidecar::SidecarStatus;
 use ansible_core::storage::HistoryEntry;
 use ansible_core::transcription::ModelInfo;
-use ansible_shared::settings::AppSettings;
 use ansible_shared::ModelId;
+use ansible_shared::settings::AppSettings;
 use gpui::*;
 
 const UNDO_STACK_CAP: usize = 30;
diff --git a/crates/core/src/transcription/model/catalog.rs b/crates/core/src/transcription/model/catalog.rs
index fc4ebb0..2015d50 100644
--- a/crates/core/src/transcription/model/catalog.rs
+++ b/crates/core/src/transcription/model/catalog.rs
@@ -168,7 +168,7 @@ pub(super) fn resolve_model_path_in_dir(models_dir: &Path, spec: &ModelSpec) ->
         }
     }
 
-    candidates.sort_by(|a, b| b.0.cmp(&a.0));
+    candidates.sort_by_key(|candidate| std::cmp::Reverse(candidate.0));
 
     for (_, candidate) in candidates {
         if spec.is_directory {