diff --git a/Cargo.lock b/Cargo.lock
index 2b5307f..0afd32e 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -212,17 +212,14 @@ dependencies = [
 
 [[package]]
 name = "async-compression"
-version = "0.4.29"
+version = "0.4.30"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5bee399cc3a623ec5a2db2c5b90ee0190a2260241fbe0c023ac8f7bab426aaf8"
+checksum = "977eb15ea9efd848bb8a4a1a2500347ed7f0bf794edf0dc3ddcf439f43d36b23"
 dependencies = [
  "compression-codecs",
  "compression-core",
- "deflate64",
- "flate2",
  "futures-core",
  "futures-io",
- "memchr",
  "pin-project-lite",
 ]
 
@@ -532,7 +529,7 @@ version = "0.69.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "271383c67ccabffb7381723dea0672a673f292304fcb45c01cc648c7a8d58088"
 dependencies = [
- "bitflags 2.9.3",
+ "bitflags 2.9.4",
  "cexpr",
  "clang-sys",
  "itertools 0.12.1",
@@ -555,7 +552,7 @@ version = "0.71.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5f58bf3d7db68cfbac37cfc485a8d711e87e064c3d0fe0435b92f7a407f9d6b3"
 dependencies = [
- "bitflags 2.9.3",
+ "bitflags 2.9.4",
  "cexpr",
  "clang-sys",
  "itertools 0.13.0",
@@ -642,9 +639,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
 
 [[package]]
 name = "bitflags"
-version = "2.9.3"
+version = "2.9.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "34efbcccd345379ca2868b2b2c9d3782e9cc58ba87bc7d79d5b53d9c9ae6f25d"
+checksum = "2261d10cca569e4643e526d8dc2e62e433cc8aba21ab764233731f8d369bf394"
 dependencies = [
  "serde",
 ]
@@ -662,7 +659,7 @@ source = "git+https://github.com/kvark/blade?rev=e0ec4e720957edd51b945b64dd85605
 dependencies = [
  "ash",
  "ash-window",
- "bitflags 2.9.3",
+ "bitflags 2.9.4",
  "bytemuck",
  "codespan-reporting 0.11.1",
  "glow",
@@ -821,7 +818,7 @@ version = "0.13.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b99da2f8558ca23c71f4fd15dc57c906239752dd27ff3c00a1d56b685b7cbfec"
 dependencies = [
- "bitflags 2.9.3",
+ "bitflags 2.9.4",
  "log",
  "polling",
  "rustix 0.38.44",
@@ -906,10 +903,11 @@ dependencies = [
 
 [[package]]
 name = "cc"
-version = "1.2.34"
+version = "1.2.35"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "42bc4aea80032b7bf409b0bc7ccad88853858911b7713a8062fdc0623867bedc"
+checksum = "590f9024a68a8c40351881787f1934dc11afd69090f5edb6831464694d836ea3"
 dependencies = [
+ "find-msvc-tools",
  "jobserver",
  "libc",
  "shlex",
@@ -1064,7 +1062,7 @@ version = "0.26.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ad36507aeb7e16159dfe68db81ccc27571c3ccd4b76fb2fb72fc59e7a4b1b64c"
 dependencies = [
- "bitflags 2.9.3",
+ "bitflags 2.9.4",
  "block",
  "cocoa-foundation 0.2.1",
  "core-foundation 0.10.1",
@@ -1094,7 +1092,7 @@ version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "81411967c50ee9a1fc11365f8c585f863a22a9697c89239c452292c40ba79b0d"
 dependencies = [
- "bitflags 2.9.3",
+ "bitflags 2.9.4",
  "block",
  "core-foundation 0.10.1",
  "core-graphics-types 0.2.0",
@@ -1125,7 +1123,7 @@ dependencies = [
 [[package]]
 name = "collections"
 version = "0.1.0"
-source = "git+https://github.com/zed-industries/zed#7d0a303785fd73677c255fb15657e6af8dc1e3e8"
+source = "git+https://github.com/zed-industries/zed#2a7761fe172217213c8092c52a42bfa0898b2688"
 dependencies = [
  "indexmap",
  "rustc-hash 2.1.1",
@@ -1181,16 +1179,13 @@ dependencies = [
 
 [[package]]
 name = "compression-codecs"
-version = "0.4.29"
+version = "0.4.30"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c7eea68f0e02c2b0aa8856e9a9478444206d4b6828728e7b0697c0f8cca265cb"
+checksum = "485abf41ac0c8047c07c87c72c8fb3eb5197f6e9d7ded615dfd1a00ae00a0f64"
 dependencies = [
  "compression-core",
  "deflate64",
  "flate2",
- "futures-core",
- "memchr",
- "pin-project-lite",
 ]
 
 [[package]]
@@ -1317,7 +1312,7 @@ version = "0.24.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "fa95a34622365fa5bbf40b20b75dba8dfa8c94c734aea8ac9a5ca38af14316f1"
 dependencies = [
- "bitflags 2.9.3",
+ "bitflags 2.9.4",
  "core-foundation 0.10.1",
  "core-graphics-types 0.2.0",
  "foreign-types 0.5.0",
@@ -1330,7 +1325,7 @@ version = "0.24.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "32eb7c354ae9f6d437a6039099ce7ecd049337a8109b23d73e48e8ffba8e9cd5"
 dependencies = [
- "bitflags 2.9.3",
+ "bitflags 2.9.4",
  "core-foundation 0.9.4",
  "core-graphics-types 0.1.3",
  "foreign-types 0.5.0",
@@ -1354,7 +1349,7 @@ version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3d44a101f213f6c4cdc1853d4b78aef6db6bdfa3468798cc1d9912f4735013eb"
 dependencies = [
- "bitflags 2.9.3",
+ "bitflags 2.9.4",
  "core-foundation 0.10.1",
  "libc",
 ]
@@ -1365,7 +1360,7 @@ version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7e4583956b9806b69f73fcb23aee05eb3620efc282972f08f6a6db7504f8334d"
 dependencies = [
- "bitflags 2.9.3",
+ "bitflags 2.9.4",
  "block",
  "cfg-if",
  "core-foundation 0.10.1",
@@ -1413,7 +1408,7 @@ version = "0.14.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "da46a9d5a8905cc538a4a5bceb6a4510de7a51049c5588c0114efce102bcbbe8"
 dependencies = [
- "bitflags 2.9.3",
+ "bitflags 2.9.4",
  "fontdb 0.16.2",
  "log",
  "rangemap",
@@ -1545,9 +1540,9 @@ checksum = "da692b8d1080ea3045efaab14434d40468c3d8657e42abddfffca87b428f4c1b"
 
 [[package]]
 name = "deranged"
-version = "0.4.0"
+version = "0.5.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9c9e6a11ca8224451684bc0d7d5a7adbf8f2fd6887261a1cfc3c0432f9d4068e"
+checksum = "d630bccd429a5bb5a64b5e94f693bfc48c9f8566418fda4c494cc94f911f87cc"
 dependencies = [
  "powerfmt",
 ]
@@ -1568,7 +1563,7 @@ dependencies = [
 [[package]]
 name = "derive_refineable"
 version = "0.1.0"
-source = "git+https://github.com/zed-industries/zed#7d0a303785fd73677c255fb15657e6af8dc1e3e8"
+source = "git+https://github.com/zed-industries/zed#2a7761fe172217213c8092c52a42bfa0898b2688"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -1640,7 +1635,7 @@ version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "89a09f22a6c6069a18470eb92d2298acf25463f14256d24778e1230d789a2aec"
 dependencies = [
- "bitflags 2.9.3",
+ "bitflags 2.9.4",
  "objc2",
 ]
 
@@ -1949,13 +1944,19 @@ dependencies = [
  "windows-sys 0.60.2",
 ]
 
+[[package]]
+name = "find-msvc-tools"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e178e4fba8a2726903f6ba98a6d221e76f9c12c650d5dc0e6afdc50677b49650"
+
 [[package]]
 name = "flatbuffers"
 version = "25.2.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1045398c1bfd89168b5fd3f1fc11f6e70b34f6f66300c87d44d3de849463abf1"
 dependencies = [
- "bitflags 2.9.3",
+ "bitflags 2.9.4",
  "rustc_version",
 ]
 
@@ -2016,7 +2017,7 @@ name = "font-kit"
 version = "0.14.1"
 source = "git+https://github.com/zed-industries/font-kit?rev=5474cfad4b719a72ec8ed2cb7327b2b01fd10568#5474cfad4b719a72ec8ed2cb7327b2b01fd10568"
 dependencies = [
- "bitflags 2.9.3",
+ "bitflags 2.9.4",
  "byteorder",
  "core-foundation 0.10.1",
  "core-graphics 0.24.0",
@@ -2442,7 +2443,7 @@ version = "0.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "fbcd2dba93594b227a1f57ee09b8b9da8892c34d55aa332e034a228d0fe6a171"
 dependencies = [
- "bitflags 2.9.3",
+ "bitflags 2.9.4",
  "gpu-alloc-types",
 ]
 
@@ -2463,13 +2464,13 @@ version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "98ff03b468aa837d70984d55f5d3f846f6ec31fe34bbb97c4f85219caeee1ca4"
 dependencies = [
- "bitflags 2.9.3",
+ "bitflags 2.9.4",
 ]
 
 [[package]]
 name = "gpui"
 version = "0.1.0"
-source = "git+https://github.com/zed-industries/zed#7d0a303785fd73677c255fb15657e6af8dc1e3e8"
+source = "git+https://github.com/zed-industries/zed#2a7761fe172217213c8092c52a42bfa0898b2688"
 dependencies = [
  "anyhow",
  "as-raw-xcb-connection",
@@ -2563,7 +2564,7 @@ dependencies = [
 [[package]]
 name = "gpui_macros"
 version = "0.1.0"
-source = "git+https://github.com/zed-industries/zed#7d0a303785fd73677c255fb15657e6af8dc1e3e8"
+source = "git+https://github.com/zed-industries/zed#2a7761fe172217213c8092c52a42bfa0898b2688"
 dependencies = [
  "heck 0.5.0",
  "proc-macro2",
@@ -2575,7 +2576,7 @@ dependencies = [
 [[package]]
 name = "gpui_tokio"
 version = "0.1.0"
-source = "git+https://github.com/zed-industries/zed#7d0a303785fd73677c255fb15657e6af8dc1e3e8"
+source = "git+https://github.com/zed-industries/zed#2a7761fe172217213c8092c52a42bfa0898b2688"
 dependencies = [
  "anyhow",
  "gpui",
@@ -2662,7 +2663,7 @@ version = "0.20.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7d4f449bab7320c56003d37732a917e18798e2f1709d80263face2b4f9436ddb"
 dependencies = [
- "bitflags 2.9.3",
+ "bitflags 2.9.4",
  "byteorder",
  "heed-traits",
  "heed-types",
@@ -2798,7 +2799,7 @@ dependencies = [
 [[package]]
 name = "http_client"
 version = "0.1.0"
-source = "git+https://github.com/zed-industries/zed#7d0a303785fd73677c255fb15657e6af8dc1e3e8"
+source = "git+https://github.com/zed-industries/zed#2a7761fe172217213c8092c52a42bfa0898b2688"
 dependencies = [
  "anyhow",
  "bytes",
@@ -2818,7 +2819,7 @@ dependencies = [
 [[package]]
 name = "http_client_tls"
 version = "0.1.0"
-source = "git+https://github.com/zed-industries/zed#7d0a303785fd73677c255fb15657e6af8dc1e3e8"
+source = "git+https://github.com/zed-industries/zed#2a7761fe172217213c8092c52a42bfa0898b2688"
 dependencies = [
  "rustls",
  "rustls-platform-verifier",
@@ -3198,7 +3199,7 @@ version = "0.7.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "046fa2d4d00aea763528b4950358d0ead425372445dc8ff86312b3c69ff7727b"
 dependencies = [
- "bitflags 2.9.3",
+ "bitflags 2.9.4",
  "cfg-if",
  "libc",
 ]
@@ -3423,7 +3424,7 @@ version = "0.1.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "391290121bad3d37fbddad76d8f5d1c1c314cfc646d143d7e07a3086ddff0ce3"
 dependencies = [
- "bitflags 2.9.3",
+ "bitflags 2.9.4",
  "libc",
  "redox_syscall",
 ]
@@ -3620,7 +3621,7 @@ dependencies = [
 [[package]]
 name = "media"
 version = "0.1.0"
-source = "git+https://github.com/zed-industries/zed#7d0a303785fd73677c255fb15657e6af8dc1e3e8"
+source = "git+https://github.com/zed-industries/zed#2a7761fe172217213c8092c52a42bfa0898b2688"
 dependencies = [
  "anyhow",
  "bindgen 0.71.1",
@@ -3672,7 +3673,7 @@ version = "0.29.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7ecfd3296f8c56b7c1f6fbac3c71cefa9d78ce009850c45000015f206dc7fa21"
 dependencies = [
- "bitflags 2.9.3",
+ "bitflags 2.9.4",
  "block",
  "core-graphics-types 0.1.3",
  "foreign-types 0.5.0",
@@ -3744,7 +3745,7 @@ checksum = "2b977c445f26e49757f9aca3631c3b8b836942cb278d69a92e7b80d3b24da632"
 dependencies = [
  "arrayvec",
  "bit-set",
- "bitflags 2.9.3",
+ "bitflags 2.9.4",
  "cfg_aliases",
  "codespan-reporting 0.12.0",
  "half",
@@ -3811,7 +3812,7 @@ version = "0.29.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "71e2746dc3a24dd78b3cfcb7be93368c6de9963d30f43a6a73998a9cf4b17b46"
 dependencies = [
- "bitflags 2.9.3",
+ "bitflags 2.9.4",
  "cfg-if",
  "cfg_aliases",
  "libc",
@@ -3823,7 +3824,7 @@ version = "0.30.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "74523f3a35e05aba87a1d978330aef40f67b0304ac79c1c00b294c9830543db6"
 dependencies = [
- "bitflags 2.9.3",
+ "bitflags 2.9.4",
  "cfg-if",
  "cfg_aliases",
  "libc",
@@ -3858,7 +3859,7 @@ dependencies = [
 [[package]]
 name = "nostr"
 version = "0.43.0"
-source = "git+https://github.com/rust-nostr/nostr#84b1a016cffc30625567a03e2d3bcae86463f075"
+source = "git+https://github.com/rust-nostr/nostr#762b6f71bbd003caf4ca90393b12f6a42a00c610"
 dependencies = [
  "aes",
  "base64",
@@ -3882,7 +3883,7 @@ dependencies = [
 [[package]]
 name = "nostr-connect"
 version = "0.43.0"
-source = "git+https://github.com/rust-nostr/nostr#84b1a016cffc30625567a03e2d3bcae86463f075"
+source = "git+https://github.com/rust-nostr/nostr#762b6f71bbd003caf4ca90393b12f6a42a00c610"
 dependencies = [
  "async-utility",
  "nostr",
@@ -3894,7 +3895,7 @@ dependencies = [
 [[package]]
 name = "nostr-database"
 version = "0.43.0"
-source = "git+https://github.com/rust-nostr/nostr#84b1a016cffc30625567a03e2d3bcae86463f075"
+source = "git+https://github.com/rust-nostr/nostr#762b6f71bbd003caf4ca90393b12f6a42a00c610"
 dependencies = [
  "flatbuffers",
  "lru",
@@ -3905,7 +3906,7 @@ dependencies = [
 [[package]]
 name = "nostr-lmdb"
 version = "0.43.0"
-source = "git+https://github.com/rust-nostr/nostr#84b1a016cffc30625567a03e2d3bcae86463f075"
+source = "git+https://github.com/rust-nostr/nostr#762b6f71bbd003caf4ca90393b12f6a42a00c610"
 dependencies = [
  "async-utility",
  "flume",
@@ -3919,7 +3920,7 @@ dependencies = [
 [[package]]
 name = "nostr-relay-pool"
 version = "0.43.0"
-source = "git+https://github.com/rust-nostr/nostr#84b1a016cffc30625567a03e2d3bcae86463f075"
+source = "git+https://github.com/rust-nostr/nostr#762b6f71bbd003caf4ca90393b12f6a42a00c610"
 dependencies = [
  "async-utility",
  "async-wsocket",
@@ -3936,7 +3937,7 @@ dependencies = [
 [[package]]
 name = "nostr-sdk"
 version = "0.43.0"
-source = "git+https://github.com/rust-nostr/nostr#84b1a016cffc30625567a03e2d3bcae86463f075"
+source = "git+https://github.com/rust-nostr/nostr#762b6f71bbd003caf4ca90393b12f6a42a00c610"
 dependencies = [
  "async-utility",
  "nostr",
@@ -4119,7 +4120,7 @@ version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e6f29f568bec459b0ddff777cec4fe3fd8666d82d5a40ebd0ff7e66134f89bcc"
 dependencies = [
- "bitflags 2.9.3",
+ "bitflags 2.9.4",
  "objc2",
  "objc2-core-foundation",
  "objc2-foundation",
@@ -4132,7 +4133,7 @@ version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1c10c2894a6fed806ade6027bcd50662746363a9589d3ec9d9bef30a4e4bc166"
 dependencies = [
- "bitflags 2.9.3",
+ "bitflags 2.9.4",
  "dispatch2",
  "objc2",
 ]
@@ -4149,7 +4150,7 @@ version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "900831247d2fe1a09a683278e5384cfb8c80c79fe6b166f9d14bfdde0ea1b03c"
 dependencies = [
- "bitflags 2.9.3",
+ "bitflags 2.9.4",
  "objc2",
  "objc2-core-foundation",
 ]
@@ -4160,7 +4161,7 @@ version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7f246c183239540aab1782457b35ab2040d4259175bd1d0c58e46ada7b47a874"
 dependencies = [
- "bitflags 2.9.3",
+ "bitflags 2.9.4",
  "block2",
  "objc2",
  "objc2-foundation",
@@ -4172,7 +4173,7 @@ version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "90ffb6a0cd5f182dc964334388560b12a57f7b74b3e2dec5e2722aa2dfb2ccd5"
 dependencies = [
- "bitflags 2.9.3",
+ "bitflags 2.9.4",
  "objc2",
  "objc2-core-foundation",
  "objc2-foundation",
@@ -4185,7 +4186,7 @@ version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "25b1312ad7bc8a0e92adae17aa10f90aae1fb618832f9b993b022b591027daed"
 dependencies = [
- "bitflags 2.9.3",
+ "bitflags 2.9.4",
  "objc2",
  "objc2-core-foundation",
  "objc2-foundation",
@@ -4289,7 +4290,7 @@ version = "0.10.73"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8505734d46c8ab1e19a1dce3aef597ad87dcb4c37e7188231769bd6bd51cebf8"
 dependencies = [
- "bitflags 2.9.3",
+ "bitflags 2.9.4",
  "cfg-if",
  "foreign-types 0.3.2",
  "libc",
@@ -4991,7 +4992,7 @@ version = "0.5.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5407465600fb0548f1442edf71dd20683c6ed326200ace4b1ef0763521bb3b77"
 dependencies = [
- "bitflags 2.9.3",
+ "bitflags 2.9.4",
 ]
 
 [[package]]
@@ -5028,7 +5029,7 @@ dependencies = [
 [[package]]
 name = "refineable"
 version = "0.1.0"
-source = "git+https://github.com/zed-industries/zed#7d0a303785fd73677c255fb15657e6af8dc1e3e8"
+source = "git+https://github.com/zed-industries/zed#2a7761fe172217213c8092c52a42bfa0898b2688"
 dependencies = [
  "derive_refineable",
  "workspace-hack",
@@ -5182,7 +5183,7 @@ dependencies = [
 [[package]]
 name = "reqwest_client"
 version = "0.1.0"
-source = "git+https://github.com/zed-industries/zed#7d0a303785fd73677c255fb15657e6af8dc1e3e8"
+source = "git+https://github.com/zed-industries/zed#2a7761fe172217213c8092c52a42bfa0898b2688"
 dependencies = [
  "anyhow",
  "bytes",
@@ -5193,7 +5194,6 @@ dependencies = [
  "regex",
  "reqwest 0.12.15",
  "serde",
- "smol",
  "tokio",
  "workspace-hack",
 ]
@@ -5373,7 +5373,7 @@ version = "0.38.44"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "fdb5bc1ae2baa591800df16c9ca78619bf65c0488b41b96ccec5d11220d8c154"
 dependencies = [
- "bitflags 2.9.3",
+ "bitflags 2.9.4",
  "errno",
  "libc",
  "linux-raw-sys 0.4.15",
@@ -5386,7 +5386,7 @@ version = "1.0.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "11181fbabf243db407ef8df94a6ce0b2f9a733bd8be4ad02b4eda9602296cac8"
 dependencies = [
- "bitflags 2.9.3",
+ "bitflags 2.9.4",
  "errno",
  "libc",
  "linux-raw-sys 0.9.4",
@@ -5491,7 +5491,7 @@ version = "0.14.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "cfb9cf8877777222e4a3bc7eb247e398b56baba500c38c1c46842431adc8b55c"
 dependencies = [
- "bitflags 2.9.3",
+ "bitflags 2.9.4",
  "bytemuck",
  "libm",
  "smallvec",
@@ -5508,7 +5508,7 @@ version = "0.20.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "fd3c7c96f8a08ee34eff8857b11b49b07d71d1c3f4e88f8a88d4c9e9f90b1702"
 dependencies = [
- "bitflags 2.9.3",
+ "bitflags 2.9.4",
  "bytemuck",
  "core_maths",
  "log",
@@ -5679,7 +5679,7 @@ version = "2.11.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "897b2245f0b511c87893af39b033e5ca9cce68824c4d7e7630b5a1d339658d02"
 dependencies = [
- "bitflags 2.9.3",
+ "bitflags 2.9.4",
  "core-foundation 0.9.4",
  "core-foundation-sys",
  "libc",
@@ -5692,7 +5692,7 @@ version = "3.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "80fb1d92c5028aa318b4b8bd7302a5bfcf48be96a37fc6fc790f806b0004ee0c"
 dependencies = [
- "bitflags 2.9.3",
+ "bitflags 2.9.4",
  "core-foundation 0.10.1",
  "core-foundation-sys",
  "libc",
@@ -5718,7 +5718,7 @@ checksum = "0f7d95a54511e0c7be3f51e8867aa8cf35148d7b9445d44de2f943e2b206e749"
 [[package]]
 name = "semantic_version"
 version = "0.1.0"
-source = "git+https://github.com/zed-industries/zed#7d0a303785fd73677c255fb15657e6af8dc1e3e8"
+source = "git+https://github.com/zed-industries/zed#2a7761fe172217213c8092c52a42bfa0898b2688"
 dependencies = [
  "anyhow",
  "serde",
@@ -6049,7 +6049,7 @@ version = "0.3.0+sdk-1.3.268.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "eda41003dc44290527a59b13432d4a0379379fa074b70174882adfbdfd917844"
 dependencies = [
- "bitflags 2.9.3",
+ "bitflags 2.9.4",
 ]
 
 [[package]]
@@ -6159,7 +6159,7 @@ checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292"
 [[package]]
 name = "sum_tree"
 version = "0.1.0"
-source = "git+https://github.com/zed-industries/zed#7d0a303785fd73677c255fb15657e6af8dc1e3e8"
+source = "git+https://github.com/zed-industries/zed#2a7761fe172217213c8092c52a42bfa0898b2688"
 dependencies = [
  "arrayvec",
  "log",
@@ -6352,7 +6352,7 @@ version = "0.6.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3c879d448e9d986b661742763247d3693ed13609438cf3d006f51f5368a5ba6b"
 dependencies = [
- "bitflags 2.9.3",
+ "bitflags 2.9.4",
  "core-foundation 0.9.4",
  "system-configuration-sys",
 ]
@@ -6531,12 +6531,11 @@ dependencies = [
 
 [[package]]
 name = "time"
-version = "0.3.41"
+version = "0.3.43"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8a7619e19bc266e0f9c5e6686659d394bc57973859340060a69221e57dbc0c40"
+checksum = "83bde6f1ec10e72d583d91623c939f623002284ef622b87de38cfd546cbf2031"
 dependencies = [
  "deranged",
- "itoa",
  "num-conv",
  "powerfmt",
  "serde",
@@ -6546,15 +6545,15 @@ dependencies = [
 
 [[package]]
 name = "time-core"
-version = "0.1.4"
+version = "0.1.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c9e9a38711f559d9e3ce1cdb06dd7c5b8ea546bc90052da6d06bb76da74bb07c"
+checksum = "40868e7c1d2f0b8d73e4a8c7f0ff63af4f6d19be117e90bd73eb1d62cf831c6b"
 
 [[package]]
 name = "time-macros"
-version = "0.2.22"
+version = "0.2.24"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3526739392ec93fd8b359c8e98514cb3e8e021beb4e5f597b00a0221f8ed8a49"
+checksum = "30cfb0125f12d9c277f35663a0a33f8c30190f4e4574868a330595412d34ebf3"
 dependencies = [
  "num-conv",
  "time-core",
@@ -6830,7 +6829,7 @@ version = "0.6.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "adc82fd73de2a9722ac5da747f12383d2bfdb93591ee6c58486e0097890f05f2"
 dependencies = [
- "bitflags 2.9.3",
+ "bitflags 2.9.4",
  "bytes",
  "futures-util",
  "http",
@@ -7187,7 +7186,7 @@ checksum = "b6c140620e7ffbb22c2dee59cafe6084a59b5ffc27a8859a5f0d494b5d52b6be"
 [[package]]
 name = "util"
 version = "0.1.0"
-source = "git+https://github.com/zed-industries/zed#7d0a303785fd73677c255fb15657e6af8dc1e3e8"
+source = "git+https://github.com/zed-industries/zed#2a7761fe172217213c8092c52a42bfa0898b2688"
 dependencies = [
  "anyhow",
  "async-fs",
@@ -7221,9 +7220,9 @@ dependencies = [
 
 [[package]]
 name = "uuid"
-version = "1.18.0"
+version = "1.18.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f33196643e165781c20a5ead5582283a7dacbb87855d867fbc2df3f81eddc1be"
+checksum = "2f87b8aa10b915a06587d0dec516c282ff295b475d94abf425d62b57710070a2"
 dependencies = [
  "getrandom 0.3.3",
  "js-sys",
@@ -7473,7 +7472,7 @@ version = "0.31.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c66a47e840dc20793f2264eb4b3e4ecb4b75d91c0dd4af04b456128e0bdd449d"
 dependencies = [
- "bitflags 2.9.3",
+ "bitflags 2.9.4",
  "rustix 1.0.8",
  "wayland-backend",
  "wayland-scanner",
@@ -7496,7 +7495,7 @@ version = "0.31.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8f81f365b8b4a97f422ac0e8737c438024b5951734506b0e1d775c73030561f4"
 dependencies = [
- "bitflags 2.9.3",
+ "bitflags 2.9.4",
  "wayland-backend",
  "wayland-client",
  "wayland-scanner",
@@ -7508,7 +7507,7 @@ version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "23803551115ff9ea9bce586860c5c5a971e360825a0309264102a9495a5ff479"
 dependencies = [
- "bitflags 2.9.3",
+ "bitflags 2.9.4",
  "wayland-backend",
  "wayland-client",
  "wayland-protocols",
@@ -8306,7 +8305,7 @@ name = "xim-parser"
 version = "0.2.1"
 source = "git+https://github.com/zed-industries/xim-rs?rev=c0a70c1bd2ce197364216e5e818a2cb3adb99a8d#c0a70c1bd2ce197364216e5e818a2cb3adb99a8d"
 dependencies = [
- "bitflags 2.9.3",
+ "bitflags 2.9.4",
 ]
 
 [[package]]
diff --git a/crates/auto_update/src/lib.rs b/crates/auto_update/src/lib.rs
index dd562c4..92b3375 100644
--- a/crates/auto_update/src/lib.rs
+++ b/crates/auto_update/src/lib.rs
@@ -108,12 +108,9 @@ impl AutoUpdater {
 
         cx.spawn_in(window, async move |this, cx| {
             if let Ok(Some(update)) = checking.await {
-                cx.update(|window, cx| {
-                    this.update(cx, |this, cx| {
-                        this.set_status(AutoUpdateStatus::checked(update), cx);
-                        this.install_update(window, cx);
-                    })
-                    .ok();
+                this.update_in(cx, |this, window, cx| {
+                    this.set_status(AutoUpdateStatus::checked(update), cx);
+                    this.install_update(window, cx);
                 })
                 .ok();
             } else {
diff --git a/crates/coop/src/chatspace.rs b/crates/coop/src/chatspace.rs
index 4d6af91..7b48427 100644
--- a/crates/coop/src/chatspace.rs
+++ b/crates/coop/src/chatspace.rs
@@ -886,25 +886,21 @@ impl ChatSpace {
         cx.spawn_in(window, async move |this, cx| {
             match task.await {
                 Ok(_) => {
-                    cx.update(|window, cx| {
-                        this.update(cx, |this, cx| {
-                            this.remove_auth_request(&challenge, cx);
+                    this.update_in(cx, |this, window, cx| {
+                        this.remove_auth_request(&challenge, cx);
 
-                            // Save the authenticated relay to automatically authenticate future requests
-                            settings.update(cx, |this, cx| {
-                                this.push_relay(&url, cx);
-                            });
+                        // Save the authenticated relay to automatically authenticate future requests
+                        settings.update(cx, |this, cx| {
+                            this.push_relay(&url, cx);
+                        });
 
-                            // Clear the current notification
-                            window.clear_notification_by_id(SharedString::from(challenge), cx);
+                        // Clear the current notification
+                        window.clear_notification_by_id(SharedString::from(challenge), cx);
 
-                            // Push a new notification after current cycle
-                            cx.defer_in(window, move |_, window, cx| {
-                                window
-                                    .push_notification(format!("{url} has been authenticated"), cx);
-                            });
-                        })
-                        .ok();
+                        // Push a new notification after current cycle
+                        cx.defer_in(window, move |_, window, cx| {
+                            window.push_notification(format!("{url} has been authenticated"), cx);
+                        });
                     })
                     .ok();
                 }
diff --git a/crates/coop/src/views/chat/mod.rs b/crates/coop/src/views/chat/mod.rs
index c4a5f76..57c7b9a 100644
--- a/crates/coop/src/views/chat/mod.rs
+++ b/crates/coop/src/views/chat/mod.rs
@@ -460,12 +460,9 @@ impl Chat {
                     .ok();
                 }
                 Err(e) => {
-                    cx.update(|window, cx| {
-                        this.update(cx, |this, cx| {
-                            window.push_notification(e.to_string(), cx);
-                            this.uploading(false, cx);
-                        })
-                        .ok();
+                    this.update_in(cx, |this, window, cx| {
+                        window.push_notification(e.to_string(), cx);
+                        this.uploading(false, cx);
                     })
                     .ok();
                 }
diff --git a/crates/coop/src/views/edit_profile.rs b/crates/coop/src/views/edit_profile.rs
index b52f0cf..1f9119a 100644
--- a/crates/coop/src/views/edit_profile.rs
+++ b/crates/coop/src/views/edit_profile.rs
@@ -69,32 +69,29 @@ impl EditProfile {
 
             cx.spawn_in(window, async move |this, cx| {
                 if let Ok(Some(metadata)) = task.await {
-                    cx.update(|window, cx| {
-                        this.update(cx, |this: &mut EditProfile, cx| {
-                            this.avatar_input.update(cx, |this, cx| {
-                                if let Some(avatar) = metadata.picture.as_ref() {
-                                    this.set_value(avatar, window, cx);
-                                }
-                            });
-                            this.bio_input.update(cx, |this, cx| {
-                                if let Some(bio) = metadata.about.as_ref() {
-                                    this.set_value(bio, window, cx);
-                                }
-                            });
-                            this.name_input.update(cx, |this, cx| {
-                                if let Some(display_name) = metadata.display_name.as_ref() {
-                                    this.set_value(display_name, window, cx);
-                                }
-                            });
-                            this.website_input.update(cx, |this, cx| {
-                                if let Some(website) = metadata.website.as_ref() {
-                                    this.set_value(website, window, cx);
-                                }
-                            });
-                            this.profile = Some(metadata);
-                            cx.notify();
-                        })
-                        .ok();
+                    this.update_in(cx, |this: &mut EditProfile, window, cx| {
+                        this.avatar_input.update(cx, |this, cx| {
+                            if let Some(avatar) = metadata.picture.as_ref() {
+                                this.set_value(avatar, window, cx);
+                            }
+                        });
+                        this.bio_input.update(cx, |this, cx| {
+                            if let Some(bio) = metadata.about.as_ref() {
+                                this.set_value(bio, window, cx);
+                            }
+                        });
+                        this.name_input.update(cx, |this, cx| {
+                            if let Some(display_name) = metadata.display_name.as_ref() {
+                                this.set_value(display_name, window, cx);
+                            }
+                        });
+                        this.website_input.update(cx, |this, cx| {
+                            if let Some(website) = metadata.website.as_ref() {
+                                this.set_value(website, window, cx);
+                            }
+                        });
+                        this.profile = Some(metadata);
+                        cx.notify();
                     })
                     .ok();
                 }
diff --git a/crates/coop/src/views/new_account.rs b/crates/coop/src/views/new_account.rs
index a3a3461..6a8c5ca 100644
--- a/crates/coop/src/views/new_account.rs
+++ b/crates/coop/src/views/new_account.rs
@@ -194,14 +194,11 @@ impl NewAccount {
         cx.spawn_in(window, async move |this, cx| {
             match Flatten::flatten(task.await.map_err(|e| e.into())) {
                 Ok(Ok(url)) => {
-                    cx.update(|window, cx| {
-                        this.update(cx, |this, cx| {
-                            this.uploading(false, cx);
-                            this.avatar_input.update(cx, |this, cx| {
-                                this.set_value(url.to_string(), window, cx);
-                            });
-                        })
-                        .ok();
+                    this.update_in(cx, |this, window, cx| {
+                        this.uploading(false, cx);
+                        this.avatar_input.update(cx, |this, cx| {
+                            this.set_value(url.to_string(), window, cx);
+                        });
                     })
                     .ok();
                 }
diff --git a/crates/coop/src/views/sidebar/mod.rs b/crates/coop/src/views/sidebar/mod.rs
index 6b56835..9276bc4 100644
--- a/crates/coop/src/views/sidebar/mod.rs
+++ b/crates/coop/src/views/sidebar/mod.rs
@@ -192,11 +192,8 @@ impl Sidebar {
 
     fn debounced_search(&self, window: &mut Window, cx: &mut Context<Self>) -> Task<()> {
         cx.spawn_in(window, async move |this, cx| {
-            cx.update(|window, cx| {
-                this.update(cx, |this, cx| {
-                    this.search(window, cx);
-                })
-                .ok();
+            this.update_in(cx, |this, window, cx| {
+                this.search(window, cx);
             })
             .ok();
         })
@@ -227,18 +224,15 @@ impl Sidebar {
         cx.spawn_in(window, async move |this, cx| {
             match task.await {
                 Ok(Some(results)) => {
-                    cx.update(|window, cx| {
-                        this.update(cx, |this, cx| {
-                            let msg = t!("sidebar.empty", query = query_cloned);
-                            let rooms = results.into_iter().map(|r| cx.new(|_| r)).collect_vec();
+                    this.update_in(cx, |this, window, cx| {
+                        let msg = t!("sidebar.empty", query = query_cloned);
+                        let rooms = results.into_iter().map(|r| cx.new(|_| r)).collect_vec();
 
-                            if rooms.is_empty() {
-                                window.push_notification(msg, cx);
-                            }
+                        if rooms.is_empty() {
+                            window.push_notification(msg, cx);
+                        }
 
-                            this.results(rooms, true, window, cx);
-                        })
-                        .ok();
+                        this.results(rooms, true, window, cx);
                     })
                     .ok();
                 }
@@ -254,12 +248,10 @@ impl Sidebar {
                 }
                 // Async task failed
                 Err(e) => {
-                    cx.update(|window, cx| {
-                        this.update(cx, |this, cx| {
-                            window.push_notification(e.to_string(), cx);
-                            this.set_finding(false, window, cx);
-                            this.set_cancel_handle(None, cx);
-                        })
+                    this.update_in(cx, |this, window, cx| {
+                        window.push_notification(e.to_string(), cx);
+                        this.set_finding(false, window, cx);
+                        this.set_cancel_handle(None, cx);
                     })
                     .ok();
                 }
diff --git a/crates/registry/src/lib.rs b/crates/registry/src/lib.rs
index faf79b7..d188e06 100644
--- a/crates/registry/src/lib.rs
+++ b/crates/registry/src/lib.rs
@@ -340,9 +340,11 @@ impl Registry {
         cx.spawn_in(window, async move |this, cx| {
             match task.await {
                 Ok(rooms) => {
-                    this.update(cx, |this, cx| {
-                        this.extend_rooms(rooms, cx);
-                        this.sort(cx);
+                    this.update_in(cx, |_, window, cx| {
+                        cx.defer_in(window, |this, _window, cx| {
+                            this.extend_rooms(rooms, cx);
+                            this.sort(cx);
+                        });
                     })
                     .ok();
                 }
@@ -450,7 +452,9 @@ impl Registry {
 
             // Resort all rooms in the registry by their created at (after updated)
             if is_new_event {
-                self.sort(cx);
+                cx.defer_in(window, |this, _window, cx| {
+                    this.sort(cx);
+                });
             }
         } else {
             let room = Room::new(&event)