diff --git a/Cargo.lock b/Cargo.lock
index 2af3336..e3eb3b5 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -107,7 +107,7 @@ version = "1.1.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "40c48f72fd53cd289104fc64099abca73db4166ad86ea0b4341abe65af83dadc"
 dependencies = [
- "windows-sys 0.61.2",
+ "windows-sys 0.60.2",
 ]
 
 [[package]]
@@ -118,7 +118,7 @@ checksum = "291e6a250ff86cd4a820112fb8898808a366d8f9f58ce16d1f538353ad55747d"
 dependencies = [
  "anstyle",
  "once_cell_polyfill",
- "windows-sys 0.61.2",
+ "windows-sys 0.60.2",
 ]
 
 [[package]]
@@ -730,6 +730,16 @@ dependencies = [
  "piper",
 ]
 
+[[package]]
+name = "borsh"
+version = "1.6.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cfd1e3f8955a5d7de9fab72fc8373fade9fb8a703968cb200ae3dc6cf08e185a"
+dependencies = [
+ "bytes",
+ "cfg_aliases",
+]
+
 [[package]]
 name = "bstr"
 version = "1.12.1"
@@ -1084,7 +1094,7 @@ dependencies = [
 [[package]]
 name = "collections"
 version = "0.1.0"
-source = "git+https://github.com/zed-industries/zed?tag=v1.0.1#ad3e097279b3a5c04b273a4f2f6c6ed1729ea0c8"
+source = "git+https://github.com/zed-industries/zed?tag=v1.1.7#c17f25cd782edffab64b7c4167abfa44f865b125"
 dependencies = [
  "indexmap",
  "rustc-hash 2.1.2",
@@ -1508,7 +1518,7 @@ dependencies = [
 [[package]]
 name = "derive_refineable"
 version = "0.1.0"
-source = "git+https://github.com/zed-industries/zed?tag=v1.0.1#ad3e097279b3a5c04b273a4f2f6c6ed1729ea0c8"
+source = "git+https://github.com/zed-industries/zed?tag=v1.1.7#c17f25cd782edffab64b7c4167abfa44f865b125"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -1564,7 +1574,7 @@ dependencies = [
  "libc",
  "option-ext",
  "redox_users",
- "windows-sys 0.61.2",
+ "windows-sys 0.60.2",
 ]
 
 [[package]]
@@ -1753,7 +1763,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "39cab71617ae0d63f51a36d69f866391735b51691dbda63cf6f96d042b63efeb"
 dependencies = [
  "libc",
- "windows-sys 0.61.2",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
@@ -3277,7 +3287,7 @@ dependencies = [
 [[package]]
 name = "gpui"
 version = "0.2.2"
-source = "git+https://github.com/zed-industries/zed?tag=v1.0.1#ad3e097279b3a5c04b273a4f2f6c6ed1729ea0c8"
+source = "git+https://github.com/zed-industries/zed?tag=v1.1.7#c17f25cd782edffab64b7c4167abfa44f865b125"
 dependencies = [
  "anyhow",
  "async-channel 2.5.0",
@@ -3316,7 +3326,6 @@ dependencies = [
  "mach2",
  "media",
  "metal",
- "naga 29.0.3",
  "num_cpus",
  "objc",
  "parking",
@@ -3360,7 +3369,7 @@ dependencies = [
 [[package]]
 name = "gpui_linux"
 version = "0.1.0"
-source = "git+https://github.com/zed-industries/zed?tag=v1.0.1#ad3e097279b3a5c04b273a4f2f6c6ed1729ea0c8"
+source = "git+https://github.com/zed-industries/zed?tag=v1.1.7#c17f25cd782edffab64b7c4167abfa44f865b125"
 dependencies = [
  "anyhow",
  "bytemuck",
@@ -3391,7 +3400,7 @@ dependencies = [
 [[package]]
 name = "gpui_macos"
 version = "0.1.0"
-source = "git+https://github.com/zed-industries/zed?tag=v1.0.1#ad3e097279b3a5c04b273a4f2f6c6ed1729ea0c8"
+source = "git+https://github.com/zed-industries/zed?tag=v1.1.7#c17f25cd782edffab64b7c4167abfa44f865b125"
 dependencies = [
  "anyhow",
  "async-task",
@@ -3434,7 +3443,7 @@ dependencies = [
 [[package]]
 name = "gpui_macros"
 version = "0.1.0"
-source = "git+https://github.com/zed-industries/zed?tag=v1.0.1#ad3e097279b3a5c04b273a4f2f6c6ed1729ea0c8"
+source = "git+https://github.com/zed-industries/zed?tag=v1.1.7#c17f25cd782edffab64b7c4167abfa44f865b125"
 dependencies = [
  "heck 0.5.0",
  "proc-macro2",
@@ -3445,7 +3454,7 @@ dependencies = [
 [[package]]
 name = "gpui_platform"
 version = "0.1.0"
-source = "git+https://github.com/zed-industries/zed?tag=v1.0.1#ad3e097279b3a5c04b273a4f2f6c6ed1729ea0c8"
+source = "git+https://github.com/zed-industries/zed?tag=v1.1.7#c17f25cd782edffab64b7c4167abfa44f865b125"
 dependencies = [
  "console_error_panic_hook",
  "gpui",
@@ -3458,18 +3467,17 @@ dependencies = [
 [[package]]
 name = "gpui_shared_string"
 version = "0.1.0"
-source = "git+https://github.com/zed-industries/zed?tag=v1.0.1#ad3e097279b3a5c04b273a4f2f6c6ed1729ea0c8"
+source = "git+https://github.com/zed-industries/zed?tag=v1.1.7#c17f25cd782edffab64b7c4167abfa44f865b125"
 dependencies = [
- "derive_more",
- "gpui_util",
  "schemars",
  "serde",
+ "smol_str",
 ]
 
 [[package]]
 name = "gpui_util"
 version = "0.1.0"
-source = "git+https://github.com/zed-industries/zed?tag=v1.0.1#ad3e097279b3a5c04b273a4f2f6c6ed1729ea0c8"
+source = "git+https://github.com/zed-industries/zed?tag=v1.1.7#c17f25cd782edffab64b7c4167abfa44f865b125"
 dependencies = [
  "anyhow",
  "log",
@@ -3478,7 +3486,7 @@ dependencies = [
 [[package]]
 name = "gpui_web"
 version = "0.1.0"
-source = "git+https://github.com/zed-industries/zed?tag=v1.0.1#ad3e097279b3a5c04b273a4f2f6c6ed1729ea0c8"
+source = "git+https://github.com/zed-industries/zed?tag=v1.1.7#c17f25cd782edffab64b7c4167abfa44f865b125"
 dependencies = [
  "anyhow",
  "console_error_panic_hook",
@@ -3502,7 +3510,7 @@ dependencies = [
 [[package]]
 name = "gpui_wgpu"
 version = "0.1.0"
-source = "git+https://github.com/zed-industries/zed?tag=v1.0.1#ad3e097279b3a5c04b273a4f2f6c6ed1729ea0c8"
+source = "git+https://github.com/zed-industries/zed?tag=v1.1.7#c17f25cd782edffab64b7c4167abfa44f865b125"
 dependencies = [
  "anyhow",
  "bytemuck",
@@ -3529,7 +3537,7 @@ dependencies = [
 [[package]]
 name = "gpui_windows"
 version = "0.1.0"
-source = "git+https://github.com/zed-industries/zed?tag=v1.0.1#ad3e097279b3a5c04b273a4f2f6c6ed1729ea0c8"
+source = "git+https://github.com/zed-industries/zed?tag=v1.1.7#c17f25cd782edffab64b7c4167abfa44f865b125"
 dependencies = [
  "anyhow",
  "collections",
@@ -3553,9 +3561,9 @@ dependencies = [
 
 [[package]]
 name = "grid"
-version = "0.18.0"
+version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "12101ecc8225ea6d675bc70263074eab6169079621c2186fe0c66590b2df9681"
+checksum = "b40ca9252762c466af32d0b1002e91e4e1bc5398f77455e55474deb466355ff5"
 
 [[package]]
 name = "half"
@@ -3723,7 +3731,7 @@ dependencies = [
 [[package]]
 name = "http_client"
 version = "0.1.0"
-source = "git+https://github.com/zed-industries/zed?tag=v1.0.1#ad3e097279b3a5c04b273a4f2f6c6ed1729ea0c8"
+source = "git+https://github.com/zed-industries/zed?tag=v1.1.7#c17f25cd782edffab64b7c4167abfa44f865b125"
 dependencies = [
  "anyhow",
  "async-compression",
@@ -4141,7 +4149,7 @@ dependencies = [
  "portable-atomic",
  "portable-atomic-util",
  "serde_core",
- "windows-sys 0.61.2",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
@@ -4684,7 +4692,7 @@ dependencies = [
 [[package]]
 name = "media"
 version = "0.1.0"
-source = "git+https://github.com/zed-industries/zed?tag=v1.0.1#ad3e097279b3a5c04b273a4f2f6c6ed1729ea0c8"
+source = "git+https://github.com/zed-industries/zed?tag=v1.1.7#c17f25cd782edffab64b7c4167abfa44f865b125"
 dependencies = [
  "anyhow",
  "bindgen",
@@ -4798,31 +4806,6 @@ dependencies = [
  "unicode-ident",
 ]
 
-[[package]]
-name = "naga"
-version = "29.0.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0dd91265cc2454558f659b3b4b9640f0ddb8cc6521277f166b8a8c181c898079"
-dependencies = [
- "arrayvec",
- "bit-set 0.9.1",
- "bitflags 2.11.1",
- "cfg-if",
- "cfg_aliases",
- "codespan-reporting",
- "half",
- "hashbrown 0.16.1",
- "hexf-parse",
- "indexmap",
- "libm",
- "log",
- "num-traits",
- "once_cell",
- "rustc-hash 1.1.0",
- "thiserror 2.0.18",
- "unicode-ident",
-]
-
 [[package]]
 name = "nanorand"
 version = "0.7.0"
@@ -4953,7 +4936,7 @@ version = "0.50.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7957b9740744892f114936ab4a57b3f487491bbeafaf8083688b16841a4240e5"
 dependencies = [
- "windows-sys 0.61.2",
+ "windows-sys 0.60.2",
 ]
 
 [[package]]
@@ -5339,7 +5322,7 @@ checksum = "9b4f627cb1b25917193a259e49bdad08f671f8d9708acfd5fe0a8c1455d87220"
 [[package]]
 name = "perf"
 version = "0.1.0"
-source = "git+https://github.com/zed-industries/zed?tag=v1.0.1#ad3e097279b3a5c04b273a4f2f6c6ed1729ea0c8"
+source = "git+https://github.com/zed-industries/zed?tag=v1.1.7#c17f25cd782edffab64b7c4167abfa44f865b125"
 dependencies = [
  "collections",
  "serde",
@@ -6023,7 +6006,7 @@ dependencies = [
 [[package]]
 name = "refineable"
 version = "0.1.0"
-source = "git+https://github.com/zed-industries/zed?tag=v1.0.1#ad3e097279b3a5c04b273a4f2f6c6ed1729ea0c8"
+source = "git+https://github.com/zed-industries/zed?tag=v1.1.7#c17f25cd782edffab64b7c4167abfa44f865b125"
 dependencies = [
  "derive_refineable",
 ]
@@ -6181,7 +6164,7 @@ dependencies = [
  "errno",
  "libc",
  "linux-raw-sys 0.4.15",
- "windows-sys 0.59.0",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
@@ -6194,7 +6177,7 @@ dependencies = [
  "errno",
  "libc",
  "linux-raw-sys 0.12.1",
- "windows-sys 0.61.2",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
@@ -6286,7 +6269,7 @@ dependencies = [
 [[package]]
 name = "scheduler"
 version = "0.1.0"
-source = "git+https://github.com/zed-industries/zed?tag=v1.0.1#ad3e097279b3a5c04b273a4f2f6c6ed1729ea0c8"
+source = "git+https://github.com/zed-industries/zed?tag=v1.1.7#c17f25cd782edffab64b7c4167abfa44f865b125"
 dependencies = [
  "async-task",
  "backtrace",
@@ -6704,6 +6687,10 @@ name = "smol_str"
 version = "0.3.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4aaa7368fcf4852a4c2dd92df0cace6a71f2091ca0a23391ce7f3a31833f1523"
+dependencies = [
+ "borsh",
+ "serde_core",
+]
 
 [[package]]
 name = "spin"
@@ -6748,7 +6735,7 @@ dependencies = [
  "cfg-if",
  "libc",
  "psm",
- "windows-sys 0.61.2",
+ "windows-sys 0.60.2",
 ]
 
 [[package]]
@@ -6829,7 +6816,7 @@ checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292"
 [[package]]
 name = "sum_tree"
 version = "0.1.0"
-source = "git+https://github.com/zed-industries/zed?tag=v1.0.1#ad3e097279b3a5c04b273a4f2f6c6ed1729ea0c8"
+source = "git+https://github.com/zed-industries/zed?tag=v1.1.7#c17f25cd782edffab64b7c4167abfa44f865b125"
 dependencies = [
  "heapless 0.9.3",
  "log",
@@ -6990,9 +6977,9 @@ dependencies = [
 
 [[package]]
 name = "taffy"
-version = "0.9.0"
+version = "0.10.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a13e5d13f79d558b5d353a98072ca8ca0e99da429467804de959aa8c83c9a004"
+checksum = "aea22054047c16c3f34d3ac473a2170be1424b1115b2a3adcf28cfb067c88859"
 dependencies = [
  "arrayvec",
  "grid",
@@ -7028,7 +7015,7 @@ dependencies = [
  "getrandom 0.4.2",
  "once_cell",
  "rustix 1.1.4",
- "windows-sys 0.61.2",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
@@ -7658,7 +7645,7 @@ checksum = "f2f6fb2847f6742cd76af783a2a2c49e9375d0a111c7bef6f71cd9e738c72d6e"
 dependencies = [
  "memoffset",
  "tempfile",
- "windows-sys 0.61.2",
+ "windows-sys 0.60.2",
 ]
 
 [[package]]
@@ -7991,7 +7978,7 @@ checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821"
 [[package]]
 name = "util"
 version = "0.1.0"
-source = "git+https://github.com/zed-industries/zed?tag=v1.0.1#ad3e097279b3a5c04b273a4f2f6c6ed1729ea0c8"
+source = "git+https://github.com/zed-industries/zed?tag=v1.1.7#c17f25cd782edffab64b7c4167abfa44f865b125"
 dependencies = [
  "anyhow",
  "async-fs",
@@ -8030,7 +8017,7 @@ dependencies = [
 [[package]]
 name = "util_macros"
 version = "0.1.0"
-source = "git+https://github.com/zed-industries/zed?tag=v1.0.1#ad3e097279b3a5c04b273a4f2f6c6ed1729ea0c8"
+source = "git+https://github.com/zed-industries/zed?tag=v1.1.7#c17f25cd782edffab64b7c4167abfa44f865b125"
 dependencies = [
  "perf",
  "quote",
@@ -8349,7 +8336,7 @@ dependencies = [
  "hashbrown 0.16.1",
  "js-sys",
  "log",
- "naga 29.0.0",
+ "naga",
  "parking_lot",
  "portable-atomic",
  "profiling",
@@ -8379,7 +8366,7 @@ dependencies = [
  "hashbrown 0.16.1",
  "indexmap",
  "log",
- "naga 29.0.0",
+ "naga",
  "once_cell",
  "parking_lot",
  "portable-atomic",
@@ -8444,7 +8431,7 @@ dependencies = [
  "libc",
  "libloading",
  "log",
- "naga 29.0.0",
+ "naga",
  "ndk-sys",
  "objc2",
  "objc2-core-foundation",
@@ -8477,7 +8464,7 @@ name = "wgpu-naga-bridge"
 version = "29.0.0"
 source = "git+https://github.com/zed-industries/wgpu.git?branch=v29#a466bc382ea747f8e1ac810efdb6dcd49a514575"
 dependencies = [
- "naga 29.0.0",
+ "naga",
  "wgpu-types",
 ]
 
@@ -8528,7 +8515,7 @@ version = "0.1.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c2a7b1c03c876122aa43f3020e6c3c3ee5c05081c9a00739faf7503aeba10d22"
 dependencies = [
- "windows-sys 0.61.2",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
@@ -9013,7 +9000,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7d6f32a0ff4a9f6f01231eb2059cc85479330739333e0e58cadf03b6af2cca10"
 dependencies = [
  "cfg-if",
- "windows-sys 0.61.2",
+ "windows-sys 0.60.2",
 ]
 
 [[package]]
@@ -9435,7 +9422,7 @@ checksum = "3be3d40e40a133f9c916ee3f9f4fa2d9d63435b5fbe1bfc6d9dae0aa0ada1513"
 [[package]]
 name = "zlog"
 version = "0.1.0"
-source = "git+https://github.com/zed-industries/zed?tag=v1.0.1#ad3e097279b3a5c04b273a4f2f6c6ed1729ea0c8"
+source = "git+https://github.com/zed-industries/zed?tag=v1.1.7#c17f25cd782edffab64b7c4167abfa44f865b125"
 dependencies = [
  "anyhow",
  "chrono",
@@ -9452,7 +9439,7 @@ checksum = "b8848ee67ecc8aedbaf3e4122217aff892639231befc6a1b58d29fff4c2cabaa"
 [[package]]
 name = "ztracing"
 version = "0.1.0"
-source = "git+https://github.com/zed-industries/zed?tag=v1.0.1#ad3e097279b3a5c04b273a4f2f6c6ed1729ea0c8"
+source = "git+https://github.com/zed-industries/zed?tag=v1.1.7#c17f25cd782edffab64b7c4167abfa44f865b125"
 dependencies = [
  "tracing",
  "tracing-subscriber",
@@ -9463,7 +9450,7 @@ dependencies = [
 [[package]]
 name = "ztracing_macro"
 version = "0.1.0"
-source = "git+https://github.com/zed-industries/zed?tag=v1.0.1#ad3e097279b3a5c04b273a4f2f6c6ed1729ea0c8"
+source = "git+https://github.com/zed-industries/zed?tag=v1.1.7#c17f25cd782edffab64b7c4167abfa44f865b125"
 
 [[package]]
 name = "zune-core"
diff --git a/shell/gpui/Cargo.toml b/shell/gpui/Cargo.toml
index 80246c1..91562ad 100644
--- a/shell/gpui/Cargo.toml
+++ b/shell/gpui/Cargo.toml
@@ -12,8 +12,8 @@ path = "src/main.rs"
 
 [dependencies]
 jayjay-core = { path = "../../crates/jayjay-core" }
-gpui = { git = "https://github.com/zed-industries/zed", tag = "v1.0.1" }
-gpui_platform = { git = "https://github.com/zed-industries/zed", tag = "v1.0.1", features = ["font-kit", "runtime_shaders"] }
+gpui = { git = "https://github.com/zed-industries/zed", tag = "v1.1.7" }
+gpui_platform = { git = "https://github.com/zed-industries/zed", tag = "v1.1.7", features = ["font-kit", "runtime_shaders"] }
 chrono = { workspace = true }
 font-kit = "0.14"
 ureq = "3"
@@ -26,5 +26,5 @@ serde = { workspace = true }
 toml = { workspace = true }
 
 [dev-dependencies]
-gpui = { git = "https://github.com/zed-industries/zed", tag = "v1.0.1", features = ["test-support"] }
+gpui = { git = "https://github.com/zed-industries/zed", tag = "v1.1.7", features = ["test-support"] }
 jj-test-fixtures = { path = "../../crates/jj-test-fixtures" }